diff --git a/build.gradle b/build.gradle index a5d1573..5d9e44c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,98 +1,66 @@ -buildscript { - repositories { - mavenCentral() - jcenter() - maven { - name = "forge" - url = "https://maven.minecraftforge.net" -// url = "http://files.minecraftforge.net/maven" - } - maven { - name = 'sponge' - url = 'https://repo.spongepowered.org/maven' - } - maven { - url = 'https://jitpack.io' - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' - classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT' - } +plugins { + id "fabric-loom" version "${loom_version}" + id "legacy-looming" version "${loom_version}" + id 'java' } -apply plugin: 'net.minecraftforge.gradle.tweaker-client' -apply plugin: 'org.spongepowered.mixin' -apply plugin: 'java' +version = project.mod_version +group = project.maven_group -version = "Release" -group= "me.eldodebug" -archivesBaseName = "GlideClient" - -sourceCompatibility = targetCompatibility = 1.8 -compileJava.options.encoding = 'UTF-8' - -minecraft { - version = "1.8.9" - tweakClass = "me.eldodebug.soar.injection.mixin.GlideTweaker" - runDir = "run" - mappings = "stable_22" - clientJvmArgs = ["-XX:-DisableExplicitGC"] - makeObfSourceJar = false +base { + archivesName = project.archives_base_name } -repositories { - maven { - name "jitpack" - url "https://jitpack.io" - } - - maven { - name "spongepowered" - url "https://repo.spongepowered.org/maven/" +loom { + runs { + client { + programArgs("--accessToken", "0", "--version", "1.8.9", "--userProperties", "{}", "--tweakClass", "me.eldodebug.soar.injection.mixin.GlideTweaker") + setMainClass("net.minecraft.launchwrapper.Launch") + } } - jcenter() - mavenCentral() } -configurations { - embed - compile.extendsFrom(embed) +legacyLooming {} + +repositories { + mavenCentral() + maven { url 'https://raw.githubusercontent.com/BleachDev/cursed-mappings/main/' } + maven { url 'https://repo.spongepowered.org/maven/' } } dependencies { - embed('org.spongepowered:mixin:0.7.11-SNAPSHOT') { - exclude module: 'launchwrapper' - exclude module: 'guava' - exclude module: 'gson' - exclude module: 'commons-io' - } - embed(files('libs/lwjgl-soar.jar')) - embed(files('libs/lwjgl-soar-natives.jar')) -} + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings(legacy.yarn(project.minecraft_version, project.yarn_build)) + + implementation "net.minecraft:launchwrapper:1.12" + implementation 'org.ow2.asm:asm-all:5.0.3' + implementation 'org.json:json:20251224' + implementation 'org.spongepowered:mixin:0.7.11-SNAPSHOT' + implementation 'javax.annotation:javax.annotation-api:1.3.2' -mixin { - defaultObfuscationEnv = "notch" - add sourceSets.main, "mixins.soar.refmap.json" + implementation(files('libs/lwjgl-soar.jar')) + implementation(files('libs/lwjgl-soar-natives.jar')) } -processResources { - inputs.files "src/main/resources" - outputs.dir "build/classes/main" - copy { - from("src/main/resources") - into("build/classes/main") +tasks.withType(JavaCompile).configureEach { + it.options.encoding = "UTF-8" + + if (JavaVersion.current().isJava9Compatible()) { + it.options.release = 8 } } -jar { - dependsOn configurations.compile - from { - configurations.embed.collect { - it.isDirectory() ? it : zipTree(it) - } +tasks.named("runClient") { + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(8) } - exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA' +} + +java { + withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } jar { @@ -103,10 +71,13 @@ jar { "Manifest-Version": 1.0, 'FMLAT': 'soar_at.cfg' ) +} - configurations.embed.each { dep -> - from(project.zipTree(dep)) { - exclude 'META-INF', 'META-INF/**' - } +processResources { + inputs.files "src/main/resources" + outputs.dir "build/classes/main" + copy { + from("src/main/resources") + into("build/classes/main") } -} +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..ab5b738 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,13 @@ +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +minecraft_version=1.8.9 +yarn_build = mcp +loader_version=0.18.3 +loom_version=1.14-SNAPSHOT + +mod_version=Release +maven_group=me.eldodebug +archives_base_name=GlideClient + +fabric_version=1.13.2+1.8.9 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae45383..d205b54 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +zipStorePath=wrapper/dists \ No newline at end of file diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/settings.gradle b/settings.gradle index 47eb8e9..9293594 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,17 @@ +pluginManagement { + repositories { + maven { + name = "Fabric" + url = "https://maven.fabricmc.net/" + } + maven { + name = "legacy-fabric" + url = "https://maven.legacyfabric.net/" + } + mavenCentral() + gradlePluginPortal() + } +} + rootProject.name = 'Client' diff --git a/src/main/java/me/eldodebug/soar/gui/GuiEditHUD.java b/src/main/java/me/eldodebug/soar/gui/GuiEditHUD.java index 57febfc..3d29d35 100644 --- a/src/main/java/me/eldodebug/soar/gui/GuiEditHUD.java +++ b/src/main/java/me/eldodebug/soar/gui/GuiEditHUD.java @@ -260,11 +260,9 @@ public void mouseReleased(int mouseX, int mouseY, int mouseButton) { for(HUDMod m : mods) { m.setDragging(false); } - - try { - super.mouseClicked(mouseX, mouseY, mouseButton); - } catch (IOException e) {} - } + + super.mouseClicked(mouseX, mouseY, mouseButton); + } @Override public void keyTyped(char typedChar, int keyCode) { diff --git a/src/main/java/me/eldodebug/soar/gui/GuiFixConnecting.java b/src/main/java/me/eldodebug/soar/gui/GuiFixConnecting.java index 8e96d7b..309d7a0 100644 --- a/src/main/java/me/eldodebug/soar/gui/GuiFixConnecting.java +++ b/src/main/java/me/eldodebug/soar/gui/GuiFixConnecting.java @@ -150,14 +150,14 @@ public void updateScreen() { } } - protected void keyTyped(char typedChar, int keyCode) throws IOException {} + protected void keyTyped(char typedChar, int keyCode) {} public void initGui() { this.buttonList.clear(); this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 4 + 120 + 12, I18n.format("gui.cancel"))); } - protected void actionPerformed(GuiButton button) throws IOException { + protected void actionPerformed(GuiButton button) { if (button.id == 0) { this.cancel = true; diff --git a/src/main/java/me/eldodebug/soar/gui/GuiQuickPlay.java b/src/main/java/me/eldodebug/soar/gui/GuiQuickPlay.java index 5499a0f..b725137 100644 --- a/src/main/java/me/eldodebug/soar/gui/GuiQuickPlay.java +++ b/src/main/java/me/eldodebug/soar/gui/GuiQuickPlay.java @@ -165,12 +165,10 @@ public void mouseClicked(int mouseX, int mouseY, int mouseButton) { int offsetX = 0; int offsetY = 0; int index = 1; - - try { - super.mouseClicked(mouseX, mouseY, mouseButton); - } catch (IOException e) {} - - if(currentQuickPlay == null) { + + super.mouseClicked(mouseX, mouseY, mouseButton); + + if(currentQuickPlay == null) { for(QuickPlay q : quickPlayManager.getQuickPlays()) { if(MouseUtils.isInside(mouseX, mouseY, x + 15 + offsetX, y + 42 + offsetY, 110, 42) && mouseButton == 0) { diff --git a/src/main/java/me/eldodebug/soar/gui/mainmenu/GuiGlideMainMenu.java b/src/main/java/me/eldodebug/soar/gui/mainmenu/GuiGlideMainMenu.java index 3f6c406..1ca12d4 100644 --- a/src/main/java/me/eldodebug/soar/gui/mainmenu/GuiGlideMainMenu.java +++ b/src/main/java/me/eldodebug/soar/gui/mainmenu/GuiGlideMainMenu.java @@ -195,10 +195,8 @@ public void mouseClicked(int mouseX, int mouseY, int mouseButton) { } currentScene.mouseClicked(mouseX, mouseY, mouseButton); - try { - super.mouseClicked(mouseX, mouseY, mouseButton); - } catch (IOException e) {} - } + super.mouseClicked(mouseX, mouseY, mouseButton); + } @Override public void mouseReleased(int mouseX, int mouseY, int mouseButton) { @@ -211,7 +209,7 @@ public void keyTyped(char typedChar, int keyCode) { } @Override - public void handleInput() throws IOException { + public void handleInput() { super.handleInput(); } diff --git a/src/main/java/me/eldodebug/soar/gui/modmenu/GuiModMenu.java b/src/main/java/me/eldodebug/soar/gui/modmenu/GuiModMenu.java index 2485cc9..a9e9000 100644 --- a/src/main/java/me/eldodebug/soar/gui/modmenu/GuiModMenu.java +++ b/src/main/java/me/eldodebug/soar/gui/modmenu/GuiModMenu.java @@ -250,11 +250,9 @@ public void mouseClicked(int mouseX, int mouseY, int mouseButton) { FileUtils.openFolderAtPath(Glide.getInstance().getFileManager().getCustomCapeDir()); } } - - try { - super.mouseClicked(mouseX, mouseY, mouseButton); - } catch (IOException e) {} - } + + super.mouseClicked(mouseX, mouseY, mouseButton); + } @Override public void mouseReleased(int mouseX, int mouseY, int mouseButton) { diff --git a/src/main/java/me/eldodebug/soar/injection/mixin/GlideTweaker.java b/src/main/java/me/eldodebug/soar/injection/mixin/GlideTweaker.java index c51ffa4..7baf85b 100644 --- a/src/main/java/me/eldodebug/soar/injection/mixin/GlideTweaker.java +++ b/src/main/java/me/eldodebug/soar/injection/mixin/GlideTweaker.java @@ -14,6 +14,7 @@ import net.minecraft.launchwrapper.ITweaker; import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.LaunchClassLoader; +import org.spongepowered.asm.mixin.transformer.ClassInfo; public class GlideTweaker implements ITweaker { diff --git a/src/main/java/me/eldodebug/soar/injection/transformer/LwjglTransformer.java b/src/main/java/me/eldodebug/soar/injection/transformer/LwjglTransformer.java index ffc1fc4..ddc9eaa 100644 --- a/src/main/java/me/eldodebug/soar/injection/transformer/LwjglTransformer.java +++ b/src/main/java/me/eldodebug/soar/injection/transformer/LwjglTransformer.java @@ -22,7 +22,8 @@ public byte[] transform(String name, String transformedName, byte[] basicClass) ClassNode node = new ClassNode(); reader.accept(node, ClassReader.EXPAND_FRAMES); - for (MethodNode method : node.methods) { + for (Object m : node.methods) { + MethodNode method = (MethodNode) m; if (method.name.equals("configGL")) { InsnList list = new InsnList(); diff --git a/src/main/java/me/eldodebug/soar/management/waypoint/WaypointManager.java b/src/main/java/me/eldodebug/soar/management/waypoint/WaypointManager.java index a45921b..8ac206f 100644 --- a/src/main/java/me/eldodebug/soar/management/waypoint/WaypointManager.java +++ b/src/main/java/me/eldodebug/soar/management/waypoint/WaypointManager.java @@ -104,7 +104,7 @@ public String getWorld() { return "server-" + ServerUtils.getServerIP() + "-" + mc.theWorld.provider.getDimensionId(); } - return "local-" + mc.getIntegratedServer().getFolderName() + "-" + mc.theWorld.provider.getDimensionId(); + return "local-" + mc.getIntegratedServer().method_2028() + "-" + mc.theWorld.provider.getDimensionId(); } public ArrayList getWaypoints() {