Skip to content

Commit

Permalink
actually port to 1.18.2, upgrade devlogin and owo, fix opacity text i…
Browse files Browse the repository at this point in the history
…n AreaIsometricRenderScreen
  • Loading branch information
gliscowo committed Mar 17, 2022
1 parent 94170c1 commit 28b9605
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
owo_version=0.5.4+1.18
Original file line number Diff line number Diff line change
Expand Up @@ -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));
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public BatchIsometricBlockRenderScreen(Iterator<BlockState> renderObjects, Strin
@Override
protected void setupRender() {
if (!renderObjects.hasNext()) {
onClose();
this.close();
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public BatchIsometricItemRenderScreen(Iterator<ItemStack> renderObjects, String
protected void setupRender() {
while (next.isEmpty()) {
if (!renderObjects.hasNext()) {
onClose();
this.close();
return;
}
next = renderObjects.next();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ protected void init() {
}

@Override
public void onClose() {
super.onClose();
public void close() {
super.close();
ImageExporter.Threaded.finish();
}

Expand All @@ -62,7 +62,7 @@ protected CompletableFuture<File> addImageToExportQueue(NativeImage image) {
@Override
public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
if (invalid) {
onClose();
this.close();
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 28b9605

Please sign in to comment.