Add .gitignore and try to

This commit is contained in:
ThisIsALegitUsername 2022-12-28 04:54:01 +00:00
parent f3b61c27e4
commit 574e33157f
45 changed files with 78053 additions and 78009 deletions

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
build/
bin/

View File

@ -1,4 +1,4 @@
arguments=--init-script /workspace/.vscode-remote/data/User/globalStorage/redhat.java/1.13.0/config_linux/org.eclipse.osgi/51/0/.cp/gradle/init/init.gradle --init-script /workspace/.vscode-remote/data/User/globalStorage/redhat.java/1.13.0/config_linux/org.eclipse.osgi/51/0/.cp/gradle/protobuf/init.gradle --init-script /workspace/.vscode-remote/data/User/globalStorage/redhat.java/1.13.0/config_linux/org.eclipse.osgi/51/0/.cp/gradle/android/init.gradle arguments=--init-script /workspace/.vscode-remote/data/User/globalStorage/redhat.java/1.13.0/config_linux/org.eclipse.osgi/51/0/.cp/gradle/init/init.gradle --init-script /workspace/.vscode-remote/data/User/globalStorage/redhat.java/1.13.0/config_linux/org.eclipse.osgi/51/0/.cp/gradle/protobuf/init.gradle
auto.sync=false auto.sync=false
build.scans.enabled=false build.scans.enabled=false
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -22,14 +22,14 @@ public class Resent {
public static Resent INSTANCE; public static Resent INSTANCE;
static { static {
INSTANCE = new Resent(); INSTANCE = new Resent();
eventBus = EventBus.create(Event.class); eventBus = EventBus.create(Event.class);
} }
public ModManager modManager; public ModManager modManager;
public static void init() { public void init() {
//modManager = new ModManager();
} }

View File

@ -15,6 +15,7 @@ import org.apache.commons.lang3.Validate;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import dev.resent.Resent;
import dev.resent.ui.mods.ClickGUI; import dev.resent.ui.mods.ClickGUI;
import net.lax1dude.eaglercraft.v1_8.Display; import net.lax1dude.eaglercraft.v1_8.Display;
import net.lax1dude.eaglercraft.v1_8.EagRuntime; import net.lax1dude.eaglercraft.v1_8.EagRuntime;
@ -436,6 +437,8 @@ public class Minecraft implements IThreadListener {
this.checkGLError("Post startup"); this.checkGLError("Post startup");
this.ingameGUI = new GuiIngame(this); this.ingameGUI = new GuiIngame(this);
Resent.INSTANCE.init();
ServerList.initServerList(this); ServerList.initServerList(this);
EaglerProfile.read(); EaglerProfile.read();

View File

@ -16,6 +16,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import dev.resent.Resent;
import net.lax1dude.eaglercraft.v1_8.ArrayUtils; import net.lax1dude.eaglercraft.v1_8.ArrayUtils;
import net.lax1dude.eaglercraft.v1_8.EagRuntime; import net.lax1dude.eaglercraft.v1_8.EagRuntime;
import net.lax1dude.eaglercraft.v1_8.EaglerInputStream; import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
@ -693,7 +694,7 @@ public class GameSettings {
while ((s = bufferedreader.readLine()) != null) { while ((s = bufferedreader.readLine()) != null) {
try { try {
String[] astring = s.split(":"); String[] 5astring = s.split(":");
if (astring[0].equals("mouseSensitivity")) { if (astring[0].equals("mouseSensitivity")) {
this.mouseSensitivity = this.parseFloat(astring[1]); this.mouseSensitivity = this.parseFloat(astring[1]);
} }
@ -993,6 +994,8 @@ public class GameSettings {
} }
} }
Resent.INSTANCE.loadSettings();
for (EnumPlayerModelParts enumplayermodelparts : EnumPlayerModelParts.values()) { for (EnumPlayerModelParts enumplayermodelparts : EnumPlayerModelParts.values()) {
if (astring[0].equals("modelPart_" + enumplayermodelparts.getPartName())) { if (astring[0].equals("modelPart_" + enumplayermodelparts.getPartName())) {
this.setModelPartEnabled(enumplayermodelparts, astring[1].equals("true")); this.setModelPartEnabled(enumplayermodelparts, astring[1].equals("true"));