diff --git a/build.gradle b/build.gradle index 54ff59e..70c650c 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "com.ptsmods:devlogin:1.2.1" + modImplementation 'com.ptsmods:devlogin:2.0' modImplementation "io.wispforest:worldmesher:${project.worldmesher_version}" include "io.wispforest:worldmesher:${project.worldmesher_version}" diff --git a/gradle.properties b/gradle.properties index b37dfad..1adcbbb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,22 +3,22 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html minecraft_base_version=1.18 -minecraft_version=1.18.1 -yarn_mappings=1.18.1+build.10 -loader_version=0.12.12 +minecraft_version=1.18.2 +yarn_mappings=1.18.2+build.2 +loader_version=0.13.3 # Mod Properties -mod_version=0.2.11 +mod_version=0.2.12 maven_group=com.glisco archives_base_name=isometric-renders # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.45.0+1.18 +fabric_version=0.48.0+1.18.2 # https://maven.wispforest.io/io/wispforest/worldmesher/ -worldmesher_version=0.2.5+1.18 +worldmesher_version=0.2.6+1.18 # https://maven.wispforest.io/io/wispforest/exo/ exo_version=0.1.4+1.18 # https://maven.wispforest.io/io/wispforest/owo-lib/ -owo_version=0.3.10+1.18 \ No newline at end of file +owo_version=0.5.4+1.18 \ No newline at end of file diff --git a/src/main/java/com/glisco/isometricrenders/screen/AreaIsometricRenderScreen.java b/src/main/java/com/glisco/isometricrenders/screen/AreaIsometricRenderScreen.java index 19d623a..6b42d92 100644 --- a/src/main/java/com/glisco/isometricrenders/screen/AreaIsometricRenderScreen.java +++ b/src/main/java/com/glisco/isometricrenders/screen/AreaIsometricRenderScreen.java @@ -47,7 +47,7 @@ protected void buildGuiElements() { if (tempOpacity == areaRenderOpacity) return; opacitySlider.setValue(areaRenderOpacity / 100f); }); - opacitySlider = new RenderScreen.SliderWidgetImpl(50, 275, sliderWidth, Translate.make("message.isometric-renders.opacity"), 1, 0.05, areaRenderOpacity / 100f, aDouble -> { + opacitySlider = new RenderScreen.SliderWidgetImpl(50, 275, sliderWidth, Translate.make("opacity"), 1, 0.05, areaRenderOpacity / 100f, aDouble -> { areaRenderOpacity = (int) Math.round(aDouble * 100); opacityField.setText(String.valueOf(areaRenderOpacity)); }); diff --git a/src/main/java/com/glisco/isometricrenders/screen/BatchIsometricBlockRenderScreen.java b/src/main/java/com/glisco/isometricrenders/screen/BatchIsometricBlockRenderScreen.java index 7c472dd..8b216a0 100644 --- a/src/main/java/com/glisco/isometricrenders/screen/BatchIsometricBlockRenderScreen.java +++ b/src/main/java/com/glisco/isometricrenders/screen/BatchIsometricBlockRenderScreen.java @@ -17,7 +17,7 @@ public BatchIsometricBlockRenderScreen(Iterator renderObjects, Strin @Override protected void setupRender() { if (!renderObjects.hasNext()) { - onClose(); + this.close(); return; } diff --git a/src/main/java/com/glisco/isometricrenders/screen/BatchIsometricItemRenderScreen.java b/src/main/java/com/glisco/isometricrenders/screen/BatchIsometricItemRenderScreen.java index 521f855..7802e3e 100644 --- a/src/main/java/com/glisco/isometricrenders/screen/BatchIsometricItemRenderScreen.java +++ b/src/main/java/com/glisco/isometricrenders/screen/BatchIsometricItemRenderScreen.java @@ -20,7 +20,7 @@ public BatchIsometricItemRenderScreen(Iterator renderObjects, String protected void setupRender() { while (next.isEmpty()) { if (!renderObjects.hasNext()) { - onClose(); + this.close(); return; } next = renderObjects.next(); diff --git a/src/main/java/com/glisco/isometricrenders/screen/BatchIsometricRenderScreen.java b/src/main/java/com/glisco/isometricrenders/screen/BatchIsometricRenderScreen.java index 29227c1..6fc6d54 100644 --- a/src/main/java/com/glisco/isometricrenders/screen/BatchIsometricRenderScreen.java +++ b/src/main/java/com/glisco/isometricrenders/screen/BatchIsometricRenderScreen.java @@ -49,8 +49,8 @@ protected void init() { } @Override - public void onClose() { - super.onClose(); + public void close() { + super.close(); ImageExporter.Threaded.finish(); } @@ -62,7 +62,7 @@ protected CompletableFuture addImageToExportQueue(NativeImage image) { @Override public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { if (invalid) { - onClose(); + this.close(); return; } diff --git a/src/main/java/com/glisco/isometricrenders/screen/RenderScreen.java b/src/main/java/com/glisco/isometricrenders/screen/RenderScreen.java index 4766169..181b292 100644 --- a/src/main/java/com/glisco/isometricrenders/screen/RenderScreen.java +++ b/src/main/java/com/glisco/isometricrenders/screen/RenderScreen.java @@ -194,13 +194,13 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { } @Override - public boolean isPauseScreen() { + public boolean shouldPause() { return false; } @Override - public void onClose() { - super.onClose(); + public void close() { + super.close(); closedCallback.run(); IsometricRenderHelper.allowParticles = true; }