diff --git a/gradle.properties b/gradle.properties index d3a9a2e..b72c236 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,6 @@ plasma_build=22 api_version=1.1.0.1 # Mod Properties -mod_version = 1.0.0 +mod_version = 1.1.0 maven_group = xyz.pixelatedw.finalbeta archives_base_name = finalbeta diff --git a/src/main/java/xyz/pixelatedw/finalbeta/WyHelper.java b/src/main/java/xyz/pixelatedw/finalbeta/WyHelper.java index c5d579e..799fa43 100644 --- a/src/main/java/xyz/pixelatedw/finalbeta/WyHelper.java +++ b/src/main/java/xyz/pixelatedw/finalbeta/WyHelper.java @@ -31,10 +31,10 @@ public class WyHelper { return INSTANCE; } else { try { - Field f = Minecraft.class.getDeclaredField("instance"); + Field f = Minecraft.class.getDeclaredFields()[1]; f.setAccessible(true); return (Minecraft) f.get(null); - } catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) { + } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { e.printStackTrace(); } return null; diff --git a/src/main/java/xyz/pixelatedw/finalbeta/mixin/LevelMixin.java b/src/main/java/xyz/pixelatedw/finalbeta/mixin/LevelMixin.java index 5b68dc6..3e93e6e 100644 --- a/src/main/java/xyz/pixelatedw/finalbeta/mixin/LevelMixin.java +++ b/src/main/java/xyz/pixelatedw/finalbeta/mixin/LevelMixin.java @@ -11,7 +11,7 @@ import xyz.pixelatedw.finalbeta.WyHelper; @Mixin(Level.class) public class LevelMixin { - @Inject(method = "method_242", at = @At(value = "INVOKE", target = "Lnet/minecraft/level/LevelMonsterSpawner;method_1870")) + @Inject(method = "method_242", at = @At(value = "INVOKE", target = "Lnet/minecraft/level/LevelMonsterSpawner;method_1870(Lnet/minecraft/level/Level;ZZ)V")) public void tick(CallbackInfo ci) { WyHelper.playTime++; } diff --git a/src/main/java/xyz/pixelatedw/finalbeta/mixin/MinecraftMixin.java b/src/main/java/xyz/pixelatedw/finalbeta/mixin/MinecraftMixin.java index 03e0615..7700742 100644 --- a/src/main/java/xyz/pixelatedw/finalbeta/mixin/MinecraftMixin.java +++ b/src/main/java/xyz/pixelatedw/finalbeta/mixin/MinecraftMixin.java @@ -17,7 +17,7 @@ import xyz.pixelatedw.finalbeta.ModConfig; @Mixin(Minecraft.class) public class MinecraftMixin { - @Redirect(method = "init()V", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/Display;create()V")) + @Redirect(method = "init()V", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/Display;create()V"), remap = false) public void createDisplay() throws LWJGLException { // Why the fuck is this even a thing ? What was its intended purpose ? I NEED TO KNOW Minecraft.field_2800 = null; diff --git a/src/main/java/xyz/pixelatedw/finalbeta/mixin/OverlayMixin.java b/src/main/java/xyz/pixelatedw/finalbeta/mixin/OverlayMixin.java index 98b3675..f4ae69e 100644 --- a/src/main/java/xyz/pixelatedw/finalbeta/mixin/OverlayMixin.java +++ b/src/main/java/xyz/pixelatedw/finalbeta/mixin/OverlayMixin.java @@ -25,16 +25,17 @@ public class OverlayMixin extends DrawableHelper { method = "render(FZII)V", at = @At( value = "INVOKE", - target = "Lorg/lwjgl/opengl/GL11;glPopMatrix()V" + target = "Lorg/lwjgl/opengl/GL11;glPopMatrix()V", + remap = false ), slice = @Slice( from = @At( value = "INVOKE", - target = "drawTextWithShadow(Lnet/minecraft/client/render/TextRenderer;Ljava/lang/String;III)V" + target = "Lnet/minecraft/client/gui/Overlay;drawTextWithShadow(Lnet/minecraft/client/render/TextRenderer;Ljava/lang/String;III)V" ), to = @At( value = "FIELD", - target = "jukeboxMessageTime:I", + target = "Lnet/minecraft/client/gui/Overlay;jukeboxMessageTime:I", opcode = Opcodes.GETFIELD ) )