fixed issues

FabiPunktExe · FabiPunktExe · commit 6432ea440c1b · 2023-07-16T17:33:37.000+02:00
diff --git a/settings.gradle b/settings.gradle
@@ -5,7 +5,7 @@ pluginManagement {
         gradlePluginPortal()
     }
 }
-rootProject.name = 'simpleclient'
+rootProject.name = 'SimpleClient'
 include 'simpleclient-core'
 include 'simpleclient-1.8.9'
 include 'simpleclient-1.19.4'
diff --git a/simpleclient-1.8.9/build.gradle b/simpleclient-1.8.9/build.gradle
@@ -3,8 +3,8 @@ plugins {
     id 'fabric-loom' version '1.2-SNAPSHOT'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 repositories {
     maven { url = "https://repo.legacyfabric.net/repository/legacyfabric/" }
@@ -41,5 +41,5 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-    it.options.release.set 17
+    it.options.release.set 8
 }
diff --git a/simpleclient-1.8.9/src/main/java/simpleclient/gui/EditFeaturesScreen.java b/simpleclient-1.8.9/src/main/java/simpleclient/gui/EditFeaturesScreen.java
@@ -30,14 +30,14 @@ public void render(int mouseX, int mouseY, float delta) {
         ItemRendererAdapter itemRenderer = new ItemRendererAdapterImpl();
         // Render Renderable Features
         for (Feature feature : FeatureManager.INSTANCE.getFeatures()) {
-            if (feature instanceof RenderableFeature rf && rf.isEnabled()) {
-                rf.renderDummy(textRenderer, itemRenderer, width, height);
-                if (rf instanceof DraggableFeature df) {
-                    final float xPos = df.getXPos(width);
-                    final float yPos = df.getYPos(height);
+            if (feature instanceof RenderableFeature && ((RenderableFeature) feature).isEnabled()) {
+                ((RenderableFeature) feature).renderDummy(textRenderer, itemRenderer, width, height);
+                if (feature instanceof DraggableFeature) {
+                    final float xPos = ((DraggableFeature) feature).getXPos(width);
+                    final float yPos = ((DraggableFeature) feature).getYPos(height);
                     DrawUtil.border(xPos - 1, yPos - 1,
-                            xPos + df.getWidth(textRenderer, itemRenderer, width, height) + 1,
-                            yPos + df.getHeight(textRenderer, itemRenderer, width, height) + 1, 1.f, 1.f, 0xFFAAAAAA);
+                            xPos + ((DraggableFeature) feature).getWidth(textRenderer, itemRenderer, width, height) + 1,
+                            yPos + ((DraggableFeature) feature).getHeight(textRenderer, itemRenderer, width, height) + 1, 1.f, 1.f, 0xFFAAAAAA);
                 }
             }
         }
@@ -58,12 +58,12 @@ public void render(int mouseX, int mouseY, float delta) {
             float corners = (wY2 - wY1) / 8;
             DrawUtil.roundedRectangle(wX1, wY1 + this.scroll, wX2, wY2 + this.scroll, corners, 0xFF555555);
             // Enable Button
-            if (feature instanceof EnableableFeature ef) {
+            if (feature instanceof EnableableFeature) {
                 float height = wSize / 6;
                 DrawUtil.stadium(wX1 + wSize / 10, scroll + wY2 - wSize / 10 - wSize / 3 / 2,
                         wX1 + wSize / 10 + wSize / 3, scroll + wY2 - wSize / 10,
-                        ef.isEnabled() ? 0xFF00FF00 : 0xFFFF0000);
-                if (ef.isEnabled()) {
+                        ((EnableableFeature) feature).isEnabled() ? 0xFF00FF00 : 0xFFFF0000);
+                if (((EnableableFeature) feature).isEnabled()) {
                     DrawUtil.circle(wX1 + wSize / 10 + wSize / 3 - height / 2,
                             scroll + wY2 - wSize / 10 - height / 2, height * 2 / 5, 0xFF000000);
                 } else {
diff --git a/simpleclient-1.8.9/src/main/java/simpleclient/mixin/GuiMixin.java b/simpleclient-1.8.9/src/main/java/simpleclient/mixin/GuiMixin.java
@@ -3,6 +3,7 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.hud.InGameHud;
+import net.minecraft.entity.player.PlayerEntity;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -37,8 +38,8 @@ private void render(float partialTicks, CallbackInfo ci) {
             int width = client.width / 2;
             int height = client.height / 2;
             for (Feature feature : FeatureManager.INSTANCE.getFeatures()) {
-                if (feature instanceof RenderableFeature rf && rf.isEnabled()) {
-                    rf.render(textRenderer, itemRenderer, width, height);
+                if (feature instanceof RenderableFeature && ((RenderableFeature) feature).isEnabled()) {
+                    ((RenderableFeature) feature).render(textRenderer, itemRenderer, width, height);
                 }
             }
         }
diff --git a/simpleclient-1.8.9/src/main/java/simpleclient/mixin/MinecraftClientMixin.java b/simpleclient-1.8.9/src/main/java/simpleclient/mixin/MinecraftClientMixin.java
@@ -28,12 +28,12 @@ public abstract class MinecraftClientMixin {
 
     @Shadow protected abstract ByteBuffer readInputStreamAsImage(InputStream inputStream) throws IOException;
 
-    @ModifyArg(at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/Display;setTitle(Ljava/lang/String;)V", ordinal = 0), method = "setPixelFormat")
+    @ModifyArg(at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/Display;setTitle(Ljava/lang/String;)V"), method = "setPixelFormat")
     public String setTitle(String newTitle) {
         return "Minecraft 1.8.9 | SimpleClient " + SimpleClient.VERSION;
     }
 
-    @Inject(at = @At(value = "HEAD"), method = "setDefaultIcon", cancellable = true)
+    /*@Inject(at = @At(value = "HEAD"), method = "setDefaultIcon", cancellable = true)
     public void setDefaultIcon(CallbackInfo ci) {
         ci.cancel();
         Util.OperatingSystem operatingSystem = Util.getOperatingSystem();
@@ -56,5 +56,5 @@ public void setDefaultIcon(CallbackInfo ci) {
                 IOUtils.closeQuietly(inputStream2);
             }
         }
-    }
+    }*/
 }
diff --git a/simpleclient-1.8.9/src/main/java/simpleclient/mixin/feature/old_animations/ItemFeatureRendererMixin.java b/simpleclient-1.8.9/src/main/java/simpleclient/mixin/feature/old_animations/ItemFeatureRendererMixin.java
@@ -34,8 +34,8 @@ public void render(LivingEntity entity, float handSwing, float handSwingAmount,
             GlStateManager.scale(f, f, f);
         }
         Label_0327:
-        if (entity instanceof PlayerEntity player) {
-            if (player.isUsingItem()) {
+        if (entity instanceof PlayerEntity) {
+            if (((PlayerEntity) entity).isUsingItem()) {
                 if (entity.isSneaking()) {
                     ((BiPedModel) entityRenderer.getModel()).setArmAngle(0.0325f);
                     GlStateManager.scale(1.05f, 1.05f, 1.05f);
@@ -48,17 +48,17 @@ public void render(LivingEntity entity, float handSwing, float handSwingAmount,
                     GlStateManager.rotate(-24405.0f, 137290.0f, -2009900.0f, -2654900.0f);
                 }
             } else ((BiPedModel) entityRenderer.getModel()).setArmAngle(0.0625f);
-            if (!player.isUsingItem()) {
+            if (!((PlayerEntity) entity).isUsingItem()) {
                 GlStateManager.translate(-0.0855f, 0.4775f, 0.1585f);
                 GlStateManager.rotate(-19.0f, 20.0f, 0.0f, -6.0f);
                 break Label_0327;
             }
-            if (player.isUsingItem()) GlStateManager.translate(-0.0625f, 0.4375f, 0.0625f);
+            if (((PlayerEntity) entity).isUsingItem()) GlStateManager.translate(-0.0625f, 0.4375f, 0.0625f);
         } else {
             ((BiPedModel) entityRenderer.getModel()).setArmAngle(0.0625f);
             GlStateManager.translate(-0.0625f, 0.4375f, 0.0625f);
         }
-        if (entity instanceof PlayerEntity player && player.fishHook != null) itemStack = new ItemStack(Items.FISHING_ROD, 0);
+        if (entity instanceof PlayerEntity && ((PlayerEntity) entity).fishHook != null) itemStack = new ItemStack(Items.FISHING_ROD, 0);
         Item item = itemStack.getItem();
         MinecraftClient minecraft = MinecraftClient.getInstance();
         if (item instanceof BlockItem && Block.getBlockFromItem(item).getBlockType() == 2) {
diff --git a/simpleclient-core/build.gradle b/simpleclient-core/build.gradle
@@ -2,6 +2,9 @@ plugins {
     id 'java'
 }
 
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
 repositories {
     mavenCentral()
     maven { url = "https://jitpack.io"}
@@ -15,5 +18,5 @@ dependencies {
 }
 
 tasks.withType(JavaCompile).configureEach {
-    it.options.release = 17
+    it.options.release.set 8
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ pluginManagement {`
`5`	`5`	`gradlePluginPortal()`
`6`	`6`	`}`
`7`	`7`	`}`
`8`		`-rootProject.name = 'simpleclient'`
	`8`	`+rootProject.name = 'SimpleClient'`
`9`	`9`	`include 'simpleclient-core'`
`10`	`10`	`include 'simpleclient-1.8.9'`
`11`	`11`	`include 'simpleclient-1.19.4'`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ plugins {`
`3`	`3`	`id 'fabric-loom' version '1.2-SNAPSHOT'`
`4`	`4`	`}`
`5`	`5`
`6`		`-sourceCompatibility = JavaVersion.VERSION_17`
`7`		`-targetCompatibility = JavaVersion.VERSION_17`
	`6`	`+sourceCompatibility = JavaVersion.VERSION_1_8`
	`7`	`+targetCompatibility = JavaVersion.VERSION_1_8`
`8`	`8`
`9`	`9`	`repositories {`
`10`	`10`	`maven { url = "https://repo.legacyfabric.net/repository/legacyfabric/" }`
`@@ -41,5 +41,5 @@ processResources {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`tasks.withType(JavaCompile).configureEach {`
`44`		`- it.options.release.set 17`
	`44`	`+ it.options.release.set 8`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`import net.minecraft.client.MinecraftClient;`
`4`	`4`	`import net.minecraft.client.font.TextRenderer;`
`5`	`5`	`import net.minecraft.client.gui.hud.InGameHud;`
	`6`	`+import net.minecraft.entity.player.PlayerEntity;`
`6`	`7`	`import org.spongepowered.asm.mixin.Final;`
`7`	`8`	`import org.spongepowered.asm.mixin.Mixin;`
`8`	`9`	`import org.spongepowered.asm.mixin.Shadow;`
`@@ -37,8 +38,8 @@ private void render(float partialTicks, CallbackInfo ci) {`
`37`	`38`	`int width = client.width / 2;`
`38`	`39`	`int height = client.height / 2;`
`39`	`40`	`for (Feature feature : FeatureManager.INSTANCE.getFeatures()) {`
`40`		`- if (feature instanceof RenderableFeature rf && rf.isEnabled()) {`
`41`		`- rf.render(textRenderer, itemRenderer, width, height);`
	`41`	`+ if (feature instanceof RenderableFeature && ((RenderableFeature) feature).isEnabled()) {`
	`42`	`+ ((RenderableFeature) feature).render(textRenderer, itemRenderer, width, height);`
`42`	`43`	`}`
`43`	`44`	`}`
`44`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,12 @@ public abstract class MinecraftClientMixin {`
`28`	`28`
`29`	`29`	`@Shadow protected abstract ByteBuffer readInputStreamAsImage(InputStream inputStream) throws IOException;`
`30`	`30`
`31`		`- @ModifyArg(at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/Display;setTitle(Ljava/lang/String;)V", ordinal = 0), method = "setPixelFormat")`
	`31`	`+ @ModifyArg(at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/Display;setTitle(Ljava/lang/String;)V"), method = "setPixelFormat")`
`32`	`32`	`public String setTitle(String newTitle) {`
`33`	`33`	`return "Minecraft 1.8.9 \| SimpleClient " + SimpleClient.VERSION;`
`34`	`34`	`}`
`35`	`35`
`36`		`- @Inject(at = @At(value = "HEAD"), method = "setDefaultIcon", cancellable = true)`
	`36`	`+ /*@Inject(at = @At(value = "HEAD"), method = "setDefaultIcon", cancellable = true)`
`37`	`37`	`public void setDefaultIcon(CallbackInfo ci) {`
`38`	`38`	`ci.cancel();`
`39`	`39`	`Util.OperatingSystem operatingSystem = Util.getOperatingSystem();`
`@@ -56,5 +56,5 @@ public void setDefaultIcon(CallbackInfo ci) {`
`56`	`56`	`IOUtils.closeQuietly(inputStream2);`
`57`	`57`	`}`
`58`	`58`	`}`
`59`		`- }`
	`59`	`+ }*/`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,9 @@ plugins {`
`2`	`2`	`id 'java'`
`3`	`3`	`}`
`4`	`4`
	`5`	`+sourceCompatibility = JavaVersion.VERSION_1_8`
	`6`	`+targetCompatibility = JavaVersion.VERSION_1_8`
	`7`	`+`
`5`	`8`	`repositories {`
`6`	`9`	`mavenCentral()`
`7`	`10`	`maven { url = "https://jitpack.io"}`
`@@ -15,5 +18,5 @@ dependencies {`
`15`	`18`	`}`
`16`	`19`
`17`	`20`	`tasks.withType(JavaCompile).configureEach {`
`18`		`- it.options.release = 17`
	`21`	`+ it.options.release.set 8`
`19`	`22`	`}`