From fea2705952974d9f3a6cdb503f09ba87c92f5561 Mon Sep 17 00:00:00 2001 From: Caedis Date: Fri, 13 Oct 2023 02:17:37 -0500 Subject: [PATCH 1/2] bs+deps --- build.gradle | 4 ++-- dependencies.gradle | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 621bc62..b74b980 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1696265388 +//version: 1696952014 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -793,7 +793,7 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies" } dependencies { - def lwjgl3ifyVersion = '1.5.0' + def lwjgl3ifyVersion = '1.5.1' if (modId != 'lwjgl3ify') { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } diff --git a/dependencies.gradle b/dependencies.gradle index 69f93a7..0d9156b 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,12 +35,12 @@ */ dependencies { annotationProcessor(project(":processor")) - implementation('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-260-GTNH:dev') - implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.30:dev') + implementation('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-262-GTNH:dev') + implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.36:dev') implementation("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") implementation("com.github.GTNewHorizons:EnderIO:2.5.2:dev") - implementation("com.github.GTNewHorizons:Botania:1.10.0-GTNH:dev") - implementation("com.github.GTNewHorizons:TinkersConstruct:1.10.5-GTNH:dev") + implementation("com.github.GTNewHorizons:Botania:1.10.1-GTNH:dev") + implementation("com.github.GTNewHorizons:TinkersConstruct:1.10.6-GTNH:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTplusplus:1.10.13:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTplusplus:1.10.17:dev") } From c3b4acdf7c3af248401440ae7b6f8af47dcfead7 Mon Sep 17 00:00:00 2001 From: Caedis Date: Fri, 13 Oct 2023 02:21:13 -0500 Subject: [PATCH 2/2] Removed mixin warning supresses --- .../duradisplay/mixins/minecraft/MixinGuiContainerCreative.java | 2 -- .../com/caedis/duradisplay/mixins/minecraft/MixinGuiScreen.java | 2 -- .../caedis/duradisplay/mixins/minecraft/MixinRenderItem.java | 1 - 3 files changed, 5 deletions(-) diff --git a/src/main/java/com/caedis/duradisplay/mixins/minecraft/MixinGuiContainerCreative.java b/src/main/java/com/caedis/duradisplay/mixins/minecraft/MixinGuiContainerCreative.java index 52eafe4..fbda53b 100644 --- a/src/main/java/com/caedis/duradisplay/mixins/minecraft/MixinGuiContainerCreative.java +++ b/src/main/java/com/caedis/duradisplay/mixins/minecraft/MixinGuiContainerCreative.java @@ -12,13 +12,11 @@ @Mixin(value = GuiContainerCreative.class) public class MixinGuiContainerCreative { - @SuppressWarnings("UnresolvedMixinReference") @Inject(method = "drawGuiContainerBackgroundLayer(FII)V", at = @At("HEAD")) private void drawBackgroundLayerStart(CallbackInfo cbi) { DurabilityRenderer.Execute = false; } - @SuppressWarnings("UnresolvedMixinReference") @Inject(method = "drawGuiContainerBackgroundLayer(FII)V", at = @At("RETURN")) private void drawBackgroundLayerEnd(CallbackInfo cbi) { DurabilityRenderer.Execute = true; diff --git a/src/main/java/com/caedis/duradisplay/mixins/minecraft/MixinGuiScreen.java b/src/main/java/com/caedis/duradisplay/mixins/minecraft/MixinGuiScreen.java index d46c463..fb6c75e 100644 --- a/src/main/java/com/caedis/duradisplay/mixins/minecraft/MixinGuiScreen.java +++ b/src/main/java/com/caedis/duradisplay/mixins/minecraft/MixinGuiScreen.java @@ -12,13 +12,11 @@ @Mixin(value = GuiScreen.class) public class MixinGuiScreen { - @SuppressWarnings("UnresolvedMixinReference") @Inject(method = "drawScreen(IIF)V", at = @At("HEAD")) private void drawScreenStart(CallbackInfo cbi) { DurabilityRenderer.Execute = false; } - @SuppressWarnings("UnresolvedMixinReference") @Inject(method = "drawScreen(IIF)V", at = @At("RETURN")) private void drawScreenEnd(CallbackInfo cbi) { DurabilityRenderer.Execute = true; diff --git a/src/main/java/com/caedis/duradisplay/mixins/minecraft/MixinRenderItem.java b/src/main/java/com/caedis/duradisplay/mixins/minecraft/MixinRenderItem.java index 44909ae..0e954d8 100644 --- a/src/main/java/com/caedis/duradisplay/mixins/minecraft/MixinRenderItem.java +++ b/src/main/java/com/caedis/duradisplay/mixins/minecraft/MixinRenderItem.java @@ -16,7 +16,6 @@ @Mixin(value = RenderItem.class) public abstract class MixinRenderItem { - @SuppressWarnings({ "UnresolvedMixinReference", "mapping" }) @Redirect( method = "renderItemOverlayIntoGUI(Lnet/minecraft/client/gui/FontRenderer;Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V", at = @At(