diff options
Diffstat (limited to 'src')
4 files changed, 8 insertions, 20 deletions
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java b/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java index 99a6d00..33d8b43 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java @@ -136,7 +136,7 @@ public class ScreenDrawing { float b = (color & 255) / 255.0F; Tessellator tessellator = Tessellator.getInstance(); BufferBuilder buffer = tessellator.getBuffer(); - Matrix4f model = matrices.peek().getModel(); + Matrix4f model = matrices.peek().getPositionMatrix(); RenderSystem.enableBlend(); RenderSystem.setShaderTexture(0, texture); RenderSystem.setShaderColor(r, g, b, opacity); diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WTabPanel.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WTabPanel.java index 718e44b..9c16c73 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WTabPanel.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WTabPanel.java @@ -116,19 +116,7 @@ public class WTabPanel extends WPanel { @Nullable private final Consumer<TooltipBuilder> tooltip; - /** - * Constructs a tab. - * - * @param title the tab title - * @param icon the tab icon - * @param widget the widget contained in the tab - * @param tooltip the tab tooltip - * @throws IllegalArgumentException if both the title and the icon are null - * @throws NullPointerException if the widget is null - * @deprecated Use {@link Builder} instead. - */ - @Deprecated - public Tab(@Nullable Text title, @Nullable Icon icon, WWidget widget, @Nullable Consumer<TooltipBuilder> tooltip) { + private Tab(@Nullable Text title, @Nullable Icon icon, WWidget widget, @Nullable Consumer<TooltipBuilder> tooltip) { if (title == null && icon == null) { throw new IllegalArgumentException("A tab must have a title or an icon"); } diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java index 200161c..5d2fc9f 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java @@ -240,7 +240,7 @@ public class WTextField extends WWidget { private void invertedRect(MatrixStack matrices, int x, int y, int width, int height) { Tessellator tessellator = Tessellator.getInstance(); BufferBuilder buffer = tessellator.getBuffer(); - Matrix4f model = matrices.peek().getModel(); + Matrix4f model = matrices.peek().getPositionMatrix(); RenderSystem.setShaderColor(0.0F, 0.0F, 1.0F, 1.0F); RenderSystem.setShader(GameRenderer::getPositionTexShader); RenderSystem.disableTexture(); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 87ab98b..abca72c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,11 +23,11 @@ "modmenu": ["io.github.cottonmc.cotton.gui.impl.modmenu.ModMenuSupport"] }, "depends": { - "fabricloader": ">=0.11.0", - "fabric": "*", - "minecraft": ">=1.17.1", - "jankson": "^3.0.0", - "fabric-networking-api-v1": "^1.0.0", + "java": ">=17", + "fabricloader": ">=0.12.5", + "fabric": ">=0.42.4", + "minecraft": "~1.18-beta.2", + "jankson": "^4.0.0", "libninepatch": "^1.1.0" }, "suggests": { |