Make settings save

Signed-off-by: BuildTools <unconfigured@null.spigotmc.org>
This commit is contained in:
BuildTools 2023-01-01 12:00:51 -07:00
parent 381c2bafb6
commit e0ae5f2826
10 changed files with 67858 additions and 67766 deletions

View File

@ -4,7 +4,9 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="7c16cb29-fd95-4a14-bee8-e94e1bc0dd58" name="Changes" comment="Maybe fix settings stuff" /> <list default="true" id="7c16cb29-fd95-4a14-bee8-e94e1bc0dd58" name="Changes" comment="Maybe fix settings stuff">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -33,17 +35,6 @@
<item name="eaglercraft-workspace" type="f1a62948:ProjectNode" /> <item name="eaglercraft-workspace" type="f1a62948:ProjectNode" />
<item name="Tasks" type="e4a08cd1:TasksNode" /> <item name="Tasks" type="e4a08cd1:TasksNode" />
</path> </path>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="eaglercraft-workspace" type="f1a62948:ProjectNode" />
<item name="Tasks" type="e4a08cd1:TasksNode" />
<item name="teavm" type="c8890929:TasksNode$1" />
</path>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="eaglercraft-workspace" type="f1a62948:ProjectNode" />
<item name="Run Configurations" type="7b0102dc:RunConfigurationsNode" />
</path>
</expand> </expand>
<select /> <select />
</tree_state> </tree_state>
@ -100,21 +91,8 @@
"vue.rearranger.settings.migration": "true" "vue.rearranger.settings.migration": "true"
} }
}]]></component> }]]></component>
<component name="RunManager" selected="Gradle.Resent-1.8 [teavmc]"> <component name="RunManager" selected="Gradle.Resent-1.8 [jar]">
<configuration name="MainClass" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <configuration name="Resent-1.8 [assemble]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<option name="MAIN_CLASS_NAME" value="net.lax1dude.eaglercraft.v1_8.internal.teavm.MainClass" />
<module name="eaglercraft-workspace.main" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="net.lax1dude.eaglercraft.v1_8.internal.teavm.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="Resent-1.8 [compileJava]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings> <ExternalSystemSettings>
<option name="executionName" /> <option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
@ -125,7 +103,7 @@
</option> </option>
<option name="taskNames"> <option name="taskNames">
<list> <list>
<option value="compileJava" /> <option value="assemble" />
</list> </list>
</option> </option>
<option name="vmOptions" /> <option name="vmOptions" />
@ -135,7 +113,7 @@
<DebugAllEnabled>false</DebugAllEnabled> <DebugAllEnabled>false</DebugAllEnabled>
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="Resent-1.8 [teavmc]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true"> <configuration name="Resent-1.8 [build]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings> <ExternalSystemSettings>
<option name="executionName" /> <option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
@ -146,7 +124,7 @@
</option> </option>
<option name="taskNames"> <option name="taskNames">
<list> <list>
<option value="teavmc" /> <option value="build" />
</list> </list>
</option> </option>
<option name="vmOptions" /> <option name="vmOptions" />
@ -156,8 +134,67 @@
<DebugAllEnabled>false</DebugAllEnabled> <DebugAllEnabled>false</DebugAllEnabled>
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="MakeOfflineDownload.jar" type="JarApplication" temporary="true"> <configuration name="Resent-1.8 [classes]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<option name="JAR_PATH" value="$PROJECT_DIR$/desktopRuntime/MakeOfflineDownload.jar" /> <ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="classes" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<method v="2" />
</configuration>
<configuration name="Resent-1.8 [jar]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="jar" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<method v="2" />
</configuration>
<configuration name="Resent-1.8 [test]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="test" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration default="true" type="JetRunConfigurationType"> <configuration default="true" type="JetRunConfigurationType">
@ -173,28 +210,13 @@
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<configuration name="MakeOfflineDownload.sh" type="ShConfigurationType" temporary="true">
<option name="SCRIPT_TEXT" value="" />
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
<option name="SCRIPT_PATH" value="$PROJECT_DIR$/MakeOfflineDownload.sh" />
<option name="SCRIPT_OPTIONS" value="" />
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_SCRIPT_FILE" value="true" />
<envs />
<method v="2" />
</configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Gradle.Resent-1.8 [teavmc]" /> <item itemvalue="Gradle.Resent-1.8 [jar]" />
<item itemvalue="JAR Application.MakeOfflineDownload.jar" /> <item itemvalue="Gradle.Resent-1.8 [assemble]" />
<item itemvalue="Shell Script.MakeOfflineDownload.sh" /> <item itemvalue="Gradle.Resent-1.8 [build]" />
<item itemvalue="Application.MainClass" /> <item itemvalue="Gradle.Resent-1.8 [classes]" />
<item itemvalue="Gradle.Resent-1.8 [compileJava]" /> <item itemvalue="Gradle.Resent-1.8 [test]" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
@ -236,7 +258,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1672598920646</updated> <updated>1672598920646</updated>
</task> </task>
<option name="localTasksCounter" value="5" /> <task id="LOCAL-00005" summary="Maybe fix settings stuff">
<created>1672599212723</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1672599212723</updated>
</task>
<option name="localTasksCounter" value="6" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -704,6 +704,44 @@ public class GameSettings {
try { try {
String[] astring = s.split(":"); String[] astring = s.split(":");
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.setX(Integer.parseInt(astring[1]));
}
if(astring[0].equals(rmod.name+"_y")){
rmod.setY(Integer.parseInt(astring[1]));
}
if(astring[0].equals(rmod.name+"_lastx")){
rmod.lastX=Integer.parseInt(astring[1]);
}
if(astring[0].equals(rmod.name+"_lasty")){
rmod.lastY=Integer.parseInt(astring[1]);
}
}
for(Setting se : m.settings){
if(se instanceof ModeSetting){
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("mouseSensitivity")) { if (astring[0].equals("mouseSensitivity")) {
this.mouseSensitivity = this.parseFloat(astring[1]); this.mouseSensitivity = this.parseFloat(astring[1]);
} }
@ -1004,44 +1042,6 @@ 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.setX(Integer.parseInt(astring[1]));
}
if(astring[0].equals(rmod.name+"_y")){
rmod.setY(Integer.parseInt(astring[1]));
}
if(astring[0].equals(rmod.name+"_lastx")){
rmod.lastX=Integer.parseInt(astring[1]);
}
if(astring[0].equals(rmod.name+"_lasty")){
rmod.lastY=Integer.parseInt(astring[1]);
}
}
for(Setting se : m.settings){
if(se instanceof ModeSetting){
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"));
}
}
}
}
for (EnumPlayerModelParts enumplayermodelparts : EnumPlayerModelParts.values()) { for (EnumPlayerModelParts enumplayermodelparts : EnumPlayerModelParts.values()) {
if (astring[0].equals("modelPart_" + enumplayermodelparts.getPartName())) { if (astring[0].equals("modelPart_" + enumplayermodelparts.getPartName())) {