jadoigdj

src/main/java/dev/resent/ui/mods/ClickGUI.java

@@ -231,7 +231,9 @@ public class ClickGUI extends GuiScreen {
 
     public boolean doesGuiPauseGame() { return false; }
     public boolean isMouseInside(int mouseX, int mouseY, int x, int y, int width, int height) { return (mouseX >= x && mouseX <= width) && (mouseY >= y && mouseY <= height); }
-    public void onGuiClosed() { Keyboard.enableRepeatEvents(false); mc.gameSettings.saveOptions(); }
+    public void onGuiClosed() { Keyboard.enableRepeatEvents(true); mc.gameSettings.saveOptions(); }
+    @Override
+    public void initGui(){ mc.gameSettings.loadOptions(); }
     protected void keyTyped(char par1, int par2) { if (par2 == 0x01 || par2 == Minecraft.getMinecraft().gameSettings.keyBindClickGui.keyCode) { mc.displayGuiScreen(null); } }
 
     @Override

src/main/java/net/minecraft/client/settings/GameSettings.java

@@ -19,6 +19,7 @@ import com.google.common.collect.Sets;
 
 import dev.resent.Resent;
 import dev.resent.module.base.Mod;
+import dev.resent.module.base.ModManager;
 import dev.resent.module.base.RenderModule;
 import dev.resent.setting.BooleanSetting;
 import dev.resent.setting.ModeSetting;
@@ -213,7 +214,7 @@ public class GameSettings {
 				this.keyBindSneak, this.keyBindSprint, this.keyBindDrop, this.keyBindInventory, this.keyBindChat,
 				this.keyBindPlayerList, this.keyBindPickBlock, this.keyBindCommand, this.keyBindScreenshot,
 				this.keyBindTogglePerspective, this.keyBindSmoothCamera, this.keyBindZoomCamera, this.keyBindFunction,
-				this.keyBindClose, this.keyBindClickGui }, this.keyBindsHotbar);
+				this.keyBindClose, this.keyBindClickGui, this.keyBindFreelook }, this.keyBindsHotbar);
 		this.difficulty = EnumDifficulty.NORMAL;
 		this.lastServer = "";
 		this.fovSetting = 70.0F;
@@ -708,6 +709,7 @@ public class GameSettings {
 						this.mouseSensitivity = this.parseFloat(astring[1]);
 					}
 
+
 					if (astring[0].equals("fov")) {
 						this.fovSetting = this.parseFloat(astring[1]) * 40.0F + 70.0F;
 					}
@@ -1005,15 +1007,19 @@ public class GameSettings {
 
 					for(Mod m : Resent.INSTANCE.modManager.modules){
 
+						if(astring[0].equals(m.name)){
+							m.enabled = astring[1].equals("true");
+						}
+
 						List<RenderModule> rmodules = new ArrayList<>();
 						if(m instanceof RenderModule){ rmodules.add((RenderModule)m); }
 			
 						for(RenderModule rmod : rmodules){
 							if(astring[0].equals(rmod.name+"_x")){
-								rmod.x=Integer.parseInt(astring[1]);
+								rmod.setX(Integer.parseInt(astring[1]));
 							}
 							if(astring[0].equals(rmod.name+"_y")){
-								rmod.y=Integer.parseInt(astring[1]);
+								rmod.setY(Integer.parseInt(astring[1]));
 							}
 							if(astring[0].equals(rmod.name+"_lastx")){
 								rmod.lastX=Integer.parseInt(astring[1]);
@@ -1028,15 +1034,13 @@ public class GameSettings {
 								if(astring[0].equals(m.name+"_modesetting_"+se.name)){
 									((ModeSetting)se).setValue(astring[1]);
 								}
+							}
+							if(se instanceof BooleanSetting){
 								if(astring[0].equals(m.name+"_boolsetting_"+se.name)){
 									((BooleanSetting)se).setValue(astring[1].equals("true"));
 								}
 							}
 						}
-			
-						if(astring[0].equals(m.name)){
-							m.setEnabled(astring[1].equals("true"));
-						}
 					}
 
 
@@ -1087,6 +1091,7 @@ public class GameSettings {
 			printwriter.println("difficulty:" + this.difficulty.getDifficultyId());
 			printwriter.println("fancyGraphics:" + this.fancyGraphics);
 			printwriter.println("ao:" + this.ambientOcclusion);
+			printwriter.println("keystrokes:" + ModManager.keyStrokes.isEnabled());
 			switch (this.clouds) {
 			case 0:
 				printwriter.println("renderClouds:false");
@@ -1149,12 +1154,14 @@ public class GameSettings {
 
 			for(Mod m : Resent.INSTANCE.modManager.modules){
 
+				printwriter.println(m.name + ":" + m.isEnabled());
+
 				List<RenderModule> rmodules = new ArrayList<>();
 				if(m instanceof RenderModule){ rmodules.add((RenderModule)m); }
 	
 				for(RenderModule rmod : rmodules){
-					printwriter.println(rmod.name+"_x:"+rmod.x);
+					printwriter.println(rmod.name+"_x:"+rmod.getX());
-					printwriter.println(rmod.name+"_y:"+rmod.y);
+					printwriter.println(rmod.name+"_y:"+rmod.getY());
 					printwriter.println(rmod.name+"_lastx:"+rmod.lastX);
 					printwriter.println(rmod.name+"_lastx:"+rmod.lastX);
 				}
@@ -1168,7 +1175,6 @@ public class GameSettings {
 					}
 				}
 
-				printwriter.println(m.name + ":" + m.isEnabled());
 			}
 
 			for (KeyBinding keybinding : this.keyBindings) {