Made ECR diffs more preview-friendly in future commits

This commit is contained in:
LAX1DUDE
2022-12-29 22:10:05 -08:00
parent 3d6bbb672c
commit 67a922d528
701 changed files with 3835 additions and 3747 deletions

View File

@ -7,22 +7,22 @@
> DELETE 8 @ 8 : 11
> CHANGE 11 : 13 @ 14 : 16
> CHANGE 3 : 5 @ 6 : 8
~
~ import net.lax1dude.eaglercraft.v1_8.EaglerZLIB;
> DELETE 15 @ 18 : 22
> DELETE 4 @ 4 : 8
> CHANGE 19 : 21 @ 26 : 27
> CHANGE 4 : 6 @ 8 : 9
~ DataInputStream datainputstream = new DataInputStream(
~ new BufferedInputStream(EaglerZLIB.newGZIPInputStream(is)));
> CHANGE 34 : 35 @ 40 : 41
> CHANGE 15 : 16 @ 14 : 15
~ new BufferedOutputStream(EaglerZLIB.newGZIPOutputStream(parOutputStream)));
> DELETE 44 @ 50 : 96
> DELETE 10 @ 10 : 56
> EOF

View File

@ -11,9 +11,9 @@
+ import java.util.regex.Pattern;
+
> DELETE 8 @ 5 : 21
> DELETE 6 @ 3 : 19
> INSERT 9 : 12 @ 22
> INSERT 1 : 4 @ 17
+ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;

View File

@ -7,18 +7,18 @@
> DELETE 2 @ 2 : 3
> DELETE 6 @ 7 : 8
> DELETE 4 @ 5 : 6
> INSERT 7 : 8 @ 9
> INSERT 1 : 2 @ 2
+ import java.util.Set;
> INSERT 9 : 12 @ 10
> INSERT 2 : 5 @ 1
+
+ import com.google.common.collect.Maps;
+
> DELETE 14 @ 12 : 24
> DELETE 5 @ 2 : 14
> EOF

View File

@ -7,9 +7,9 @@
> DELETE 2 @ 2 : 3
> DELETE 6 @ 7 : 16
> DELETE 4 @ 5 : 14
> INSERT 7 : 12 @ 17
> INSERT 1 : 6 @ 10
+ import com.google.common.collect.Lists;
+

View File

@ -15,25 +15,25 @@
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.Property;
> CHANGE 26 : 27 @ 25 : 26
> CHANGE 24 : 25 @ 23 : 24
~ EaglercraftUUID uuid;
> CHANGE 28 : 29 @ 27 : 28
> CHANGE 2 : 3 @ 2 : 3
~ uuid = EaglercraftUUID.fromString(s1);
> CHANGE 33 : 34 @ 32 : 33
> CHANGE 5 : 6 @ 5 : 6
~ Multimap<String, Property> propertiesMap = MultimapBuilder.hashKeys().arrayListValues().build();
> DELETE 36 @ 35 : 36
> DELETE 3 @ 3 : 4
> CHANGE 38 : 39 @ 38 : 40
> CHANGE 2 : 3 @ 3 : 5
~ for (int i = 0, l = nbttaglist.tagCount(); i < l; ++i) {
> CHANGE 40 : 48 @ 41 : 47
> CHANGE 2 : 10 @ 3 : 9
~ String value = nbttagcompound1.getString("Value");
~ if (!StringUtils.isNullOrEmpty(value)) {
@ -44,17 +44,17 @@
~ propertiesMap.put(s2, new Property(s2, value));
~ }
> CHANGE 53 : 54 @ 52 : 53
> CHANGE 13 : 14 @ 11 : 12
~ return new GameProfile(uuid, s, propertiesMap);
> CHANGE 66 : 68 @ 65 : 66
> CHANGE 13 : 15 @ 13 : 14
~ Multimap<String, Property> propertiesMap = profile.getProperties();
~ if (!propertiesMap.isEmpty()) {
> DELETE 69 @ 67 : 68
> DELETE 3 @ 2 : 3
> DELETE 84 @ 83 : 85
> DELETE 15 @ 16 : 18
> EOF