diff options
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/net/inyourwalls/frank/ScreenEventHandler.java | 12 | ||||
| -rw-r--r-- | src/main/java/net/inyourwalls/frank/config/ConfigScreen.java | 22 | ||||
| -rw-r--r-- | src/main/resources/fabric.mod.json | 4 |
3 files changed, 18 insertions, 20 deletions
diff --git a/src/main/java/net/inyourwalls/frank/ScreenEventHandler.java b/src/main/java/net/inyourwalls/frank/ScreenEventHandler.java index 3f74a01..e639a1e 100644 --- a/src/main/java/net/inyourwalls/frank/ScreenEventHandler.java +++ b/src/main/java/net/inyourwalls/frank/ScreenEventHandler.java @@ -73,7 +73,7 @@ public class ScreenEventHandler implements ScreenEvents.AfterRender, ScreenEvent Text.translatable("ui.frank.time_left", minutesLeft, secondsLeft), x, y, - this.config.getTextColour() + 0xff000000 | this.config.getTextColour() ); } @@ -83,7 +83,7 @@ public class ScreenEventHandler implements ScreenEvents.AfterRender, ScreenEvent Text.translatable("ui.frank.smeltable", itemsSmeltable), x, y, - this.config.getTextColour() + 0xff000000 | this.config.getTextColour() ); } @@ -93,28 +93,28 @@ public class ScreenEventHandler implements ScreenEvents.AfterRender, ScreenEvent Text.literal("remainingFuelTicks: " + screenHandler.getRemainingFuelTicks()), x, y, - 0xffffff + 0xffffffff ); drawContext.drawTextWithShadow( this.client.textRenderer, Text.literal("totalFuelTicks: " + screenHandler.getTotalFuelTicks()), x, y + 10, - 0xffffff + 0xffffffff ); drawContext.drawTextWithShadow( this.client.textRenderer, Text.literal("currentCookingTicks: " + screenHandler.getCurrentCookingTicks()), x, y + 20, - 0xffffff + 0xffffffff ); drawContext.drawTextWithShadow( this.client.textRenderer, Text.literal("totalCookingTicks: " + screenHandler.getTotalCookingTicks()), x, y + 30, - 0xffffff + 0xffffffff ); } diff --git a/src/main/java/net/inyourwalls/frank/config/ConfigScreen.java b/src/main/java/net/inyourwalls/frank/config/ConfigScreen.java index 8cabcc0..46277c7 100644 --- a/src/main/java/net/inyourwalls/frank/config/ConfigScreen.java +++ b/src/main/java/net/inyourwalls/frank/config/ConfigScreen.java @@ -3,12 +3,12 @@ package net.inyourwalls.frank.config; import net.inyourwalls.frank.Frank; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gl.RenderPipelines; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.tooltip.Tooltip; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; -import net.minecraft.client.render.RenderLayer; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -114,14 +114,14 @@ public class ConfigScreen extends Screen { DISPLAY_MODE_LABEL, labelX, 30, - 0xffffff + 0xffffffff ); context.drawTextWithShadow( this.textRenderer, TEXT_COLOUR_LABEL, labelX, 60, - 0xffffff + 0xffffffff ); renderPreview(context, this.width / 2 - FURNACE_TEXTURE_WIDTH / 2, this.height / 2 - FURNACE_TEXTURE_HEIGHT / 2); @@ -129,7 +129,7 @@ public class ConfigScreen extends Screen { private void renderPreview(DrawContext context, int x, int y) { context.drawTexture( - RenderLayer::getGuiTextured, + RenderPipelines.GUI_TEXTURED, FURNACE_UI_TEXTURE, x, y, @@ -146,7 +146,7 @@ public class ConfigScreen extends Screen { Text.translatable("ui.frank.config.preview"), x + (FURNACE_TEXTURE_WIDTH / 2), y + 6, - 0x404040 + 0xff404040 ); int infoX = x + FURNACE_TEXTURE_WIDTH + 2; @@ -158,14 +158,14 @@ public class ConfigScreen extends Screen { Text.translatable("ui.frank.time_left", 0, 0), infoX, infoY, - modifiedConfig.getTextColour() + 0xff000000 | modifiedConfig.getTextColour() ); context.drawTextWithShadow( this.textRenderer, Text.translatable("ui.frank.smeltable", 0), infoX, infoY + 10, - modifiedConfig.getTextColour() + 0xff000000 | modifiedConfig.getTextColour() ); break; } @@ -176,7 +176,7 @@ public class ConfigScreen extends Screen { Text.translatable("ui.frank.time_left", 0, 0), infoX, infoY, - modifiedConfig.getTextColour() + 0xff000000 | modifiedConfig.getTextColour() ); break; } @@ -187,14 +187,14 @@ public class ConfigScreen extends Screen { Text.translatable("ui.frank.smeltable", 0), infoX, infoY, - modifiedConfig.getTextColour() + 0xff000000 | modifiedConfig.getTextColour() ); context.drawTextWithShadow( this.textRenderer, Text.translatable("ui.frank.time_left", 0, 0), infoX, infoY + 10, - modifiedConfig.getTextColour() + 0xff000000 | modifiedConfig.getTextColour() ); break; } @@ -205,7 +205,7 @@ public class ConfigScreen extends Screen { Text.translatable("ui.frank.smeltable", 0), infoX, infoY, - modifiedConfig.getTextColour() + 0xff000000 | modifiedConfig.getTextColour() ); break; } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 424a293..7e1eef4 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -17,9 +17,7 @@ "client": [ "net.inyourwalls.frank.Frank" ], - "modmenu": [ - "net.inyourwalls.frank.ModMenuIntegration" - ] + "modmenu": ["net.inyourwalls.frank.ModMenuIntegration"] }, "mixins": [ "frank.mixins.json" |