mirror of
https://github.com/Eaglercraft-Archive/Eaglercraftx-1.8.8-src.git
synced 2025-06-28 02:48:14 -05:00
Made future ECR diff commits even more preview friendly
This commit is contained in:
@ -7,22 +7,22 @@
|
||||
|
||||
> DELETE 8 @ 8 : 11
|
||||
|
||||
> CHANGE 3 : 5 @ 6 : 8
|
||||
> CHANGE 3 : 5 @ 3 : 5
|
||||
|
||||
~
|
||||
~ import net.lax1dude.eaglercraft.v1_8.EaglerZLIB;
|
||||
|
||||
> DELETE 4 @ 4 : 8
|
||||
> DELETE 2 @ 2 : 6
|
||||
|
||||
> CHANGE 4 : 6 @ 8 : 9
|
||||
> CHANGE 4 : 6 @ 4 : 5
|
||||
|
||||
~ DataInputStream datainputstream = new DataInputStream(
|
||||
~ new BufferedInputStream(EaglerZLIB.newGZIPInputStream(is)));
|
||||
|
||||
> CHANGE 15 : 16 @ 14 : 15
|
||||
> CHANGE 13 : 14 @ 13 : 14
|
||||
|
||||
~ new BufferedOutputStream(EaglerZLIB.newGZIPOutputStream(parOutputStream)));
|
||||
|
||||
> DELETE 10 @ 10 : 56
|
||||
> DELETE 9 @ 9 : 55
|
||||
|
||||
> EOF
|
||||
|
@ -11,9 +11,9 @@
|
||||
+ import java.util.regex.Pattern;
|
||||
+
|
||||
|
||||
> DELETE 6 @ 3 : 19
|
||||
> DELETE 3 @ 3 : 19
|
||||
|
||||
> INSERT 1 : 4 @ 17
|
||||
> INSERT 1 : 4 @ 1
|
||||
|
||||
+ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
|
||||
|
@ -7,18 +7,18 @@
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> DELETE 4 @ 5 : 6
|
||||
> DELETE 4 @ 4 : 5
|
||||
|
||||
> INSERT 1 : 2 @ 2
|
||||
> INSERT 1 : 2 @ 1
|
||||
|
||||
+ import java.util.Set;
|
||||
|
||||
> INSERT 2 : 5 @ 1
|
||||
> INSERT 1 : 4 @ 1
|
||||
|
||||
+
|
||||
+ import com.google.common.collect.Maps;
|
||||
+
|
||||
|
||||
> DELETE 5 @ 2 : 14
|
||||
> DELETE 2 @ 2 : 14
|
||||
|
||||
> EOF
|
||||
|
@ -7,9 +7,9 @@
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> DELETE 4 @ 5 : 14
|
||||
> DELETE 4 @ 4 : 13
|
||||
|
||||
> INSERT 1 : 6 @ 10
|
||||
> INSERT 1 : 6 @ 1
|
||||
|
||||
+ import com.google.common.collect.Lists;
|
||||
+
|
||||
|
@ -15,25 +15,25 @@
|
||||
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.Property;
|
||||
|
||||
> CHANGE 24 : 25 @ 23 : 24
|
||||
> CHANGE 17 : 18 @ 17 : 18
|
||||
|
||||
~ EaglercraftUUID uuid;
|
||||
|
||||
> CHANGE 2 : 3 @ 2 : 3
|
||||
> CHANGE 1 : 2 @ 1 : 2
|
||||
|
||||
~ uuid = EaglercraftUUID.fromString(s1);
|
||||
|
||||
> CHANGE 5 : 6 @ 5 : 6
|
||||
> CHANGE 4 : 5 @ 4 : 5
|
||||
|
||||
~ Multimap<String, Property> propertiesMap = MultimapBuilder.hashKeys().arrayListValues().build();
|
||||
|
||||
> DELETE 3 @ 3 : 4
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> CHANGE 2 : 3 @ 3 : 5
|
||||
> CHANGE 2 : 3 @ 2 : 4
|
||||
|
||||
~ for (int i = 0, l = nbttaglist.tagCount(); i < l; ++i) {
|
||||
|
||||
> CHANGE 2 : 10 @ 3 : 9
|
||||
> CHANGE 1 : 9 @ 1 : 7
|
||||
|
||||
~ String value = nbttagcompound1.getString("Value");
|
||||
~ if (!StringUtils.isNullOrEmpty(value)) {
|
||||
@ -44,17 +44,17 @@
|
||||
~ propertiesMap.put(s2, new Property(s2, value));
|
||||
~ }
|
||||
|
||||
> CHANGE 13 : 14 @ 11 : 12
|
||||
> CHANGE 5 : 6 @ 5 : 6
|
||||
|
||||
~ return new GameProfile(uuid, s, propertiesMap);
|
||||
|
||||
> CHANGE 13 : 15 @ 13 : 14
|
||||
> CHANGE 12 : 14 @ 12 : 13
|
||||
|
||||
~ Multimap<String, Property> propertiesMap = profile.getProperties();
|
||||
~ if (!propertiesMap.isEmpty()) {
|
||||
|
||||
> DELETE 3 @ 2 : 3
|
||||
> DELETE 1 @ 1 : 2
|
||||
|
||||
> DELETE 15 @ 16 : 18
|
||||
> DELETE 15 @ 15 : 17
|
||||
|
||||
> EOF
|
||||
|
Reference in New Issue
Block a user