diff --git a/build.gradle b/build.gradle index 8f40293..b665474 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.0-SNAPSHOT' + id 'fabric-loom' version '1.1-SNAPSHOT' id 'maven-publish' } @@ -26,7 +26,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 files("libs/cmods-1.0.1-dev.jar") + modImplementation files("libs/cmods-1.1.0-dev.jar") modCompileOnly "com.terraformersmc:modmenu:4.1.1" } diff --git a/gradle.properties b/gradle.properties index 8728a69..746da1a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,13 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.19.3 -yarn_mappings=1.19.3+build.2 -loader_version=0.14.13 +minecraft_version=1.19.4 +yarn_mappings=1.19.4+build.1 +loader_version=0.14.17 # Mod Properties -mod_version=2.2.1 +mod_version=2.3.0 maven_group=cmods archives_base_name=haxxor # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.68.1+1.19.3 +fabric_version=0.75.3+1.19.4 diff --git a/src/main/java/cmods/haxxor/client/ui/CropSelectScreen.java b/src/main/java/cmods/haxxor/client/ui/CropSelectScreen.java index 50a36f3..8c86890 100644 --- a/src/main/java/cmods/haxxor/client/ui/CropSelectScreen.java +++ b/src/main/java/cmods/haxxor/client/ui/CropSelectScreen.java @@ -56,9 +56,9 @@ public class CropSelectScreen extends Screen { adder.add(ButtonWidget.builder(ScreenTexts.DONE, button -> client.setScreen(parent)) .width(doneButtonWidth).build(), 2, adder.copyPositioner().marginTop(doneButtonRowIncrement)); - grid.recalculateDimensions(); + grid.refreshPositions(); SimplePositioningWidget.setPos(grid, 0, startHeight, this.width, this.height, 0.5f, 0.0f); - addDrawableChild(grid); + grid.forEachChild(this::addDrawableChild); } public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { @@ -68,10 +68,10 @@ public class CropSelectScreen extends Screen { this.renderBackground(matrices); - drawCenteredText(matrices, this.textRenderer, Text.translatable("haxxor.options.farmer.crop_select.seeds"), + drawCenteredTextWithShadow(matrices, this.textRenderer, Text.translatable("haxxor.options.farmer.crop_select.seeds"), column1 + buttonWidth / 2, startHeight - rowIncrement, 0xffffff); - drawCenteredText(matrices, this.textRenderer, this.title, this.width / 2, 15, 0xffffff); - drawCenteredText(matrices, this.textRenderer, Text.translatable("haxxor.options.farmer.crop_select.blocks"), + drawCenteredTextWithShadow(matrices, this.textRenderer, this.title, this.width / 2, 15, 0xffffff); + drawCenteredTextWithShadow(matrices, this.textRenderer, Text.translatable("haxxor.options.farmer.crop_select.blocks"), column2 + buttonWidth / 2, startHeight - rowIncrement, 0xffffff); super.render(matrices, mouseX, mouseY, delta); diff --git a/src/main/java/cmods/haxxor/client/ui/ElevatorOptionsScreen.java b/src/main/java/cmods/haxxor/client/ui/ElevatorOptionsScreen.java index 075c287..f395702 100644 --- a/src/main/java/cmods/haxxor/client/ui/ElevatorOptionsScreen.java +++ b/src/main/java/cmods/haxxor/client/ui/ElevatorOptionsScreen.java @@ -47,14 +47,14 @@ public class ElevatorOptionsScreen extends Screen { adder.add(ButtonWidget.builder(ScreenTexts.DONE, button -> client.setScreen(parent)) .width(doneButtonWidth).build(), 2, adder.copyPositioner().marginTop(doneButtonRowIncrement)); - grid.recalculateDimensions(); + grid.refreshPositions(); SimplePositioningWidget.setPos(grid, 0, startHeight, this.width, this.height, 0.5f, 0.0f); - addDrawableChild(grid); + grid.forEachChild(this::addDrawableChild); } public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { this.renderBackground(matrices); - drawCenteredText(matrices, this.textRenderer, this.title, this.width / 2, 15, 0xffffff); + drawCenteredTextWithShadow(matrices, this.textRenderer, this.title, this.width / 2, 15, 0xffffff); super.render(matrices, mouseX, mouseY, delta); } diff --git a/src/main/java/cmods/haxxor/client/ui/FarmerOptionsScreen.java b/src/main/java/cmods/haxxor/client/ui/FarmerOptionsScreen.java index 4925140..abe8606 100644 --- a/src/main/java/cmods/haxxor/client/ui/FarmerOptionsScreen.java +++ b/src/main/java/cmods/haxxor/client/ui/FarmerOptionsScreen.java @@ -71,14 +71,14 @@ public class FarmerOptionsScreen extends Screen { adder.add(ButtonWidget.builder(ScreenTexts.DONE, button -> client.setScreen(parent)) .width(doneButtonWidth).build(), 2, adder.copyPositioner().marginTop(doneButtonRowIncrement)); - grid.recalculateDimensions(); + grid.refreshPositions(); SimplePositioningWidget.setPos(grid, 0, startHeight, this.width, this.height, 0.5f, 0.0f); - addDrawableChild(grid); + grid.forEachChild(this::addDrawableChild); } public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { this.renderBackground(matrices); - drawCenteredText(matrices, this.textRenderer, this.title, this.width / 2, 15, 0xffffff); + drawCenteredTextWithShadow(matrices, this.textRenderer, this.title, this.width / 2, 15, 0xffffff); super.render(matrices, mouseX, mouseY, delta); } diff --git a/src/main/java/cmods/haxxor/client/ui/GlowOptionsScreen.java b/src/main/java/cmods/haxxor/client/ui/GlowOptionsScreen.java index ddf312c..d71671b 100644 --- a/src/main/java/cmods/haxxor/client/ui/GlowOptionsScreen.java +++ b/src/main/java/cmods/haxxor/client/ui/GlowOptionsScreen.java @@ -50,14 +50,14 @@ public class GlowOptionsScreen extends Screen { adder.add(ButtonWidget.builder(ScreenTexts.DONE, button -> client.setScreen(parent)) .width(doneButtonWidth).build(), 2, adder.copyPositioner().marginTop(doneButtonRowIncrement)); - grid.recalculateDimensions(); + grid.refreshPositions(); SimplePositioningWidget.setPos(grid, 0, startHeight, this.width, this.height, 0.5f, 0.0f); - addDrawableChild(grid); + grid.forEachChild(this::addDrawableChild); } public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { this.renderBackground(matrices); - drawCenteredText(matrices, this.textRenderer, this.title, this.width / 2, 15, 0xffffff); + drawCenteredTextWithShadow(matrices, this.textRenderer, this.title, this.width / 2, 15, 0xffffff); super.render(matrices, mouseX, mouseY, delta); } diff --git a/src/main/java/cmods/haxxor/client/ui/HaxxorOptionsScreen.java b/src/main/java/cmods/haxxor/client/ui/HaxxorOptionsScreen.java index b108473..53bec03 100644 --- a/src/main/java/cmods/haxxor/client/ui/HaxxorOptionsScreen.java +++ b/src/main/java/cmods/haxxor/client/ui/HaxxorOptionsScreen.java @@ -52,9 +52,9 @@ public class HaxxorOptionsScreen extends Screen { adder.add(ButtonWidget.builder(ScreenTexts.DONE, button -> client.setScreen(parent)) .width(doneButtonWidth).build(), 2, adder.copyPositioner().marginTop(doneButtonRowIncrement)); - grid.recalculateDimensions(); + grid.refreshPositions(); SimplePositioningWidget.setPos(grid, 0, startHeight, this.width, this.height, 0.5f, 0.0f); - addDrawableChild(grid); + grid.forEachChild(this::addDrawableChild); } public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { @@ -62,7 +62,7 @@ public class HaxxorOptionsScreen extends Screen { Text versionText = Text.literal("v" + HaxxorClient.version); - drawCenteredText(matrices, textRenderer, title, this.width / 2, 15, 0xffffff); + drawCenteredTextWithShadow(matrices, textRenderer, title, this.width / 2, 15, 0xffffff); drawTextWithShadow(matrices, textRenderer, versionText, this.width - textRenderer.getWidth(versionText) - 2, this.height - textRenderer.fontHeight - 2, 0xffffff); super.render(matrices, mouseX, mouseY, delta); diff --git a/src/main/java/cmods/haxxor/client/ui/UIOptionsScreen.java b/src/main/java/cmods/haxxor/client/ui/UIOptionsScreen.java index 014a6b0..0ec8ce3 100644 --- a/src/main/java/cmods/haxxor/client/ui/UIOptionsScreen.java +++ b/src/main/java/cmods/haxxor/client/ui/UIOptionsScreen.java @@ -45,14 +45,14 @@ public class UIOptionsScreen extends Screen { adder.add(ButtonWidget.builder(ScreenTexts.DONE, button -> client.setScreen(parent)) .width(doneButtonWidth).build(), 2, adder.copyPositioner().marginTop(doneButtonRowIncrement)); - grid.recalculateDimensions(); + grid.refreshPositions(); SimplePositioningWidget.setPos(grid, 0, startHeight, this.width, this.height, 0.5f, 0.0f); - addDrawableChild(grid); + grid.forEachChild(this::addDrawableChild); } public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { this.renderBackground(matrices); - drawCenteredText(matrices, this.textRenderer, this.title, this.width / 2, 15, 0xffffff); + drawCenteredTextWithShadow(matrices, this.textRenderer, this.title, this.width / 2, 15, 0xffffff); super.render(matrices, mouseX, mouseY, delta); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7748835..6cbf8d7 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,7 +23,7 @@ "depends": { "fabricloader": ">=0.14.10", "fabric": "*", - "minecraft": "1.19.3", - "cmods": "1.0.1" + "minecraft": "1.19.4", + "cmods": "1.1.0" } }