mirror of
https://github.com/Eaglercraft-Archive/Eaglercraftx-1.8.8-src.git
synced 2025-07-03 04:58:14 -05:00
Made future ECR diff commits even more preview friendly
This commit is contained in:
LAX1DUDE
@ -7,15 +7,15 @@
|
||||
|
||||
> DELETE 2 @ 2 : 7
|
||||
|
||||
> CHANGE 1 : 4 @ 6 : 9
|
||||
> CHANGE 1 : 4 @ 1 : 4
|
||||
|
||||
~ import java.io.ByteArrayOutputStream;
|
||||
~ import java.io.InputStreamReader;
|
||||
~ import java.io.OutputStreamWriter;
|
||||
|
||||
> DELETE 4 @ 4 : 6
|
||||
> DELETE 1 @ 1 : 3
|
||||
|
||||
> INSERT 3 : 21 @ 5
|
||||
> INSERT 3 : 21 @ 3
|
||||
|
||||
+
|
||||
+ import org.json.JSONArray;
|
||||
@ -36,29 +36,29 @@
|
||||
+ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
|
||||
|
||||
> DELETE 23 @ 5 : 7
|
||||
> DELETE 5 @ 5 : 7
|
||||
|
||||
> DELETE 5 @ 7 : 13
|
||||
> DELETE 5 @ 5 : 11
|
||||
|
||||
> DELETE 3 @ 9 : 14
|
||||
> DELETE 3 @ 3 : 8
|
||||
|
||||
> DELETE 1 @ 6 : 14
|
||||
> DELETE 1 @ 1 : 9
|
||||
|
||||
> CHANGE 23 : 26 @ 31 : 34
|
||||
> CHANGE 23 : 26 @ 23 : 26
|
||||
|
||||
~ public int clouds = 1;
|
||||
~ public boolean fancyGraphics = false;
|
||||
~ public int ambientOcclusion = 0;
|
||||
|
||||
> DELETE 11 @ 11 : 12
|
||||
> DELETE 8 @ 8 : 9
|
||||
|
||||
> DELETE 1 @ 2 : 3
|
||||
> DELETE 1 @ 1 : 2
|
||||
|
||||
> CHANGE 36 : 37 @ 37 : 38
|
||||
> CHANGE 36 : 37 @ 36 : 37
|
||||
|
||||
~ public KeyBinding keyBindSprint = new KeyBinding("key.sprint", KeyboardConstants.KEY_R, "key.categories.movement");
|
||||
|
||||
> CHANGE 11 : 17 @ 11 : 18
|
||||
> CHANGE 10 : 16 @ 10 : 17
|
||||
|
||||
~ public KeyBinding keyBindSmoothCamera = new KeyBinding("key.smoothCamera", KeyboardConstants.KEY_M,
|
||||
~ "key.categories.misc");
|
||||
@ -67,13 +67,13 @@
|
||||
~ public KeyBinding keyBindFunction = new KeyBinding("key.function", KeyboardConstants.KEY_F, "key.categories.misc");
|
||||
~ public KeyBinding keyBindClose = new KeyBinding("key.close", KeyboardConstants.KEY_GRAVE, "key.categories.misc");
|
||||
|
||||
> DELETE 18 @ 19 : 20
|
||||
> DELETE 12 @ 12 : 13
|
||||
|
||||
> CHANGE 12 : 13 @ 13 : 14
|
||||
> CHANGE 12 : 13 @ 12 : 13
|
||||
|
||||
~ public int guiScale = 3;
|
||||
|
||||
> INSERT 4 : 13 @ 4
|
||||
> INSERT 3 : 12 @ 3
|
||||
|
||||
+ public boolean hudFps = true;
|
||||
+ public boolean hudCoords = true;
|
||||
@ -85,46 +85,46 @@
|
||||
+ public boolean fog = true;
|
||||
+ public int fxaa = 0;
|
||||
|
||||
> CHANGE 10 : 11 @ 1 : 2
|
||||
> CHANGE 1 : 2 @ 1 : 2
|
||||
|
||||
~ public GameSettings(Minecraft mcIn) {
|
||||
|
||||
> CHANGE 5 : 7 @ 5 : 8
|
||||
> CHANGE 4 : 6 @ 4 : 7
|
||||
|
||||
~ this.keyBindTogglePerspective, this.keyBindSmoothCamera, this.keyBindZoomCamera, this.keyBindFunction,
|
||||
~ this.keyBindClose }, this.keyBindsHotbar);
|
||||
|
||||
> CHANGE 5 : 7 @ 6 : 7
|
||||
> CHANGE 3 : 5 @ 3 : 4
|
||||
|
||||
~ this.gammaSetting = 1.0F;
|
||||
~ this.language = EagRuntime.getConfiguration().getDefaultLocale();
|
||||
|
||||
> CHANGE 4 : 5 @ 3 : 9
|
||||
> CHANGE 2 : 3 @ 2 : 8
|
||||
|
||||
~ GameSettings.Options.RENDER_DISTANCE.setValueMax(18.0F);
|
||||
|
||||
> CHANGE 2 : 3 @ 7 : 8
|
||||
> CHANGE 1 : 2 @ 1 : 2
|
||||
|
||||
~ this.renderDistanceChunks = 4;
|
||||
|
||||
> DELETE 4 @ 4 : 19
|
||||
> DELETE 3 @ 3 : 18
|
||||
|
||||
> CHANGE 3 : 4 @ 18 : 19
|
||||
> CHANGE 3 : 4 @ 3 : 4
|
||||
|
||||
~ : HString.format("%c", new Object[] { Character.valueOf((char) (parInt1 - 256)) })
|
||||
|
||||
> DELETE 84 @ 84 : 85
|
||||
> DELETE 83 @ 83 : 84
|
||||
|
||||
> DELETE 4 @ 5 : 6
|
||||
> DELETE 4 @ 4 : 5
|
||||
|
||||
> INSERT 45 : 47 @ 46
|
||||
> INSERT 45 : 47 @ 45
|
||||
|
||||
+ this.mc.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"),
|
||||
+ I18n.format("resourcePack.load.pleaseWait"));
|
||||
|
||||
> DELETE 60 @ 58 : 75
|
||||
> DELETE 58 @ 58 : 75
|
||||
|
||||
> INSERT 13 : 49 @ 30
|
||||
> INSERT 13 : 49 @ 13
|
||||
|
||||
+ if (parOptions == GameSettings.Options.HUD_FPS) {
|
||||
+ this.hudFps = !this.hudFps;
|
||||
@ -163,9 +163,9 @@
|
||||
+ }
|
||||
+
|
||||
|
||||
> DELETE 90 @ 54 : 60
|
||||
> DELETE 54 @ 54 : 60
|
||||
|
||||
> INSERT 12 : 28 @ 18
|
||||
> INSERT 12 : 28 @ 12
|
||||
|
||||
+ case HUD_COORDS:
|
||||
+ return this.hudCoords;
|
||||
@ -184,21 +184,21 @@
|
||||
+ case FOG:
|
||||
+ return this.fog;
|
||||
|
||||
> CHANGE 59 : 62 @ 43 : 47
|
||||
> CHANGE 43 : 46 @ 43 : 47
|
||||
|
||||
~ : (parOptions == GameSettings.Options.CHAT_SCALE
|
||||
~ ? s + (int) (f * 90.0F + 10.0F) + "%"
|
||||
~ : (parOptions == GameSettings.Options.CHAT_HEIGHT_UNFOCUSED
|
||||
|
||||
> CHANGE 6 : 7 @ 7 : 8
|
||||
> CHANGE 3 : 4 @ 3 : 4
|
||||
|
||||
~ : (parOptions == GameSettings.Options.CHAT_HEIGHT_FOCUSED
|
||||
|
||||
> CHANGE 2 : 3 @ 2 : 3
|
||||
> CHANGE 1 : 2 @ 1 : 2
|
||||
|
||||
~ .calculateChatboxHeight(
|
||||
|
||||
> CHANGE 3 : 22 @ 3 : 37
|
||||
> CHANGE 2 : 21 @ 2 : 36
|
||||
|
||||
~ : (parOptions == GameSettings.Options.CHAT_WIDTH
|
||||
~ ? s + GuiNewChat
|
||||
@ -220,7 +220,7 @@
|
||||
~ + "%")
|
||||
~ : "yee"))))))))))));
|
||||
|
||||
> INSERT 47 : 55 @ 62
|
||||
> INSERT 28 : 36 @ 28
|
||||
|
||||
+ } else if (parOptions == GameSettings.Options.FXAA) {
|
||||
+ if (this.fxaa == 0) {
|
||||
@ -231,17 +231,17 @@
|
||||
+ return s + I18n.format("options.off");
|
||||
+ }
|
||||
|
||||
> CHANGE 15 : 17 @ 7 : 8
|
||||
> CHANGE 7 : 9 @ 7 : 8
|
||||
|
||||
~ byte[] options = EagRuntime.getStorage("g");
|
||||
~ if (options == null) {
|
||||
|
||||
> CHANGE 5 : 7 @ 4 : 5
|
||||
> CHANGE 3 : 5 @ 3 : 4
|
||||
|
||||
~ BufferedReader bufferedreader = new BufferedReader(
|
||||
~ new InputStreamReader(EaglerZLIB.newGZIPInputStream(new EaglerInputStream(options))));
|
||||
|
||||
> CHANGE 85 : 91 @ 84 : 85
|
||||
> CHANGE 83 : 89 @ 83 : 84
|
||||
|
||||
~ this.resourcePacks.clear();
|
||||
~ for (Object o : (new JSONArray(s.substring(s.indexOf(58) + 1))).toList()) {
|
||||
@ -250,7 +250,7 @@
|
||||
~ }
|
||||
~ }
|
||||
|
||||
> CHANGE 12 : 18 @ 7 : 8
|
||||
> CHANGE 6 : 12 @ 6 : 7
|
||||
|
||||
~ this.field_183018_l.clear();
|
||||
~ for (Object o : (new JSONArray(s.substring(s.indexOf(58) + 1))).toList()) {
|
||||
@ -259,11 +259,11 @@
|
||||
~ }
|
||||
~ }
|
||||
|
||||
> DELETE 44 @ 39 : 43
|
||||
> DELETE 38 @ 38 : 42
|
||||
|
||||
> DELETE 4 @ 8 : 12
|
||||
> DELETE 4 @ 4 : 8
|
||||
|
||||
> INSERT 116 : 153 @ 120
|
||||
> INSERT 116 : 153 @ 116
|
||||
|
||||
+ if (astring[0].equals("hudFps")) {
|
||||
+ this.hudFps = astring[1].equals("true");
|
||||
@ -303,28 +303,28 @@
|
||||
+ }
|
||||
+
|
||||
|
||||
> INSERT 43 : 45 @ 6
|
||||
> INSERT 6 : 8 @ 6
|
||||
|
||||
+ Keyboard.setFunctionKeyModifier(keyBindFunction.getKeyCode());
|
||||
+
|
||||
|
||||
> DELETE 19 @ 17 : 18
|
||||
> DELETE 17 @ 17 : 18
|
||||
|
||||
> CHANGE 12 : 14 @ 13 : 14
|
||||
> CHANGE 12 : 14 @ 12 : 13
|
||||
|
||||
~ ByteArrayOutputStream bao = new ByteArrayOutputStream();
|
||||
~ PrintWriter printwriter = new PrintWriter(new OutputStreamWriter(EaglerZLIB.newGZIPOutputStream(bao)));
|
||||
|
||||
> CHANGE 28 : 30 @ 27 : 29
|
||||
> CHANGE 26 : 28 @ 26 : 28
|
||||
|
||||
~ printwriter.println("resourcePacks:" + toJSONArray(this.resourcePacks));
|
||||
~ printwriter.println("incompatibleResourcePacks:" + toJSONArray(this.field_183018_l));
|
||||
|
||||
> DELETE 10 @ 10 : 11
|
||||
> DELETE 8 @ 8 : 9
|
||||
|
||||
> DELETE 1 @ 2 : 3
|
||||
> DELETE 1 @ 1 : 2
|
||||
|
||||
> INSERT 29 : 38 @ 30
|
||||
> INSERT 29 : 38 @ 29
|
||||
|
||||
+ printwriter.println("hudFps:" + this.hudFps);
|
||||
+ printwriter.println("hudWorld:" + this.hudWorld);
|
||||
@ -336,21 +336,21 @@
|
||||
+ printwriter.println("fog:" + this.fog);
|
||||
+ printwriter.println("fxaa:" + this.fxaa);
|
||||
|
||||
> INSERT 14 : 16 @ 5
|
||||
> INSERT 5 : 7 @ 5
|
||||
|
||||
+ Keyboard.setFunctionKeyModifier(keyBindFunction.getKeyCode());
|
||||
+
|
||||
|
||||
> INSERT 13 : 15 @ 11
|
||||
> INSERT 11 : 13 @ 11
|
||||
|
||||
+
|
||||
+ EagRuntime.setStorage("g", bao.toByteArray());
|
||||
|
||||
> CHANGE 12 : 13 @ 10 : 11
|
||||
> CHANGE 10 : 11 @ 10 : 11
|
||||
|
||||
~ : (parSoundCategory == SoundCategory.VOICE ? 0.0F : 1.0F);
|
||||
|
||||
> INSERT 54 : 62 @ 54
|
||||
> INSERT 53 : 61 @ 53
|
||||
|
||||
+ private String toJSONArray(List<String> e) {
|
||||
+ JSONArray arr = new JSONArray();
|
||||
@ -361,16 +361,16 @@
|
||||
+ }
|
||||
+
|
||||
|
||||
> CHANGE 12 : 13 @ 4 : 5
|
||||
> CHANGE 4 : 5 @ 4 : 5
|
||||
|
||||
~ RENDER_DISTANCE("options.renderDistance", true, false, 1.0F, 16.0F, 1.0F),
|
||||
|
||||
> CHANGE 9 : 11 @ 9 : 13
|
||||
> CHANGE 8 : 10 @ 8 : 12
|
||||
|
||||
~ TOUCHSCREEN("options.touchscreen", false, true), CHAT_SCALE("options.chat.scale", true, false),
|
||||
~ CHAT_WIDTH("options.chat.width", true, false), CHAT_HEIGHT_FOCUSED("options.chat.height.focused", true, false),
|
||||
|
||||
> CHANGE 16 : 21 @ 18 : 19
|
||||
> CHANGE 14 : 19 @ 14 : 15
|
||||
|
||||
~ ENTITY_SHADOWS("options.entityShadows", false, true), HUD_FPS("options.hud.fps", false, true),
|
||||
~ HUD_COORDS("options.hud.coords", false, true), HUD_STATS("options.hud.stats", false, true),
|
||||
|
||||
Reference in New Issue
Block a user