From 7165748cc6bf2f0e21845757cc4a62e58a2d5f7d Mon Sep 17 00:00:00 2001 From: atiedebee Date: Wed, 31 May 2023 14:57:30 +0200 Subject: [PATCH] Updated to 1.19.4 --- gradle.properties | 12 ++++++------ .../partialKeepinventory/gui/InvSettingsScreen.java | 4 ++-- .../partialKeepinventory/gui/Widgets/SimpleText.java | 2 +- .../gui/Widgets/TextHeaderEntry.java | 2 +- .../partialKeepinventory/gui/XpSettingsScreen.java | 2 +- .../network/ClientListeners.java | 2 +- .../network/ServerListeners.java | 3 +-- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index f3f5b96..64d6de4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,9 +4,9 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.19.3 - yarn_mappings=1.19.3+build.5 - loader_version=0.14.14 + minecraft_version=1.19.4 + yarn_mappings=1.19.4+build.2 + loader_version=0.14.21 # Mod Properties mod_version = 0.2.2-alpha @@ -14,7 +14,7 @@ org.gradle.parallel=true archives_base_name = partial-keepinv # Dependencies - fabric_version=0.74.0+1.19.3 + fabric_version=0.83.0+1.19.4 crunch_version=1.1 - modmenu_version=5.0.2 - trinkets_version=3.5.0 \ No newline at end of file + modmenu_version=6.1.0 + trinkets_version=3.6.0 \ No newline at end of file diff --git a/src/main/java/me/atie/partialKeepinventory/gui/InvSettingsScreen.java b/src/main/java/me/atie/partialKeepinventory/gui/InvSettingsScreen.java index 8869ee5..db82527 100644 --- a/src/main/java/me/atie/partialKeepinventory/gui/InvSettingsScreen.java +++ b/src/main/java/me/atie/partialKeepinventory/gui/InvSettingsScreen.java @@ -201,7 +201,7 @@ public void resize(MinecraftClient client, int width, int height) { this.height = height; heading.updateDimensions(width); entries.updateDimensions(width); - footing.getButtonWidget().setPos(width - ParentSettingsScreen.widgetHeight- ParentSettingsScreen.sideMargin, height - ParentSettingsScreen.widgetHeight - ParentSettingsScreen.vertOptionMargin); + footing.getButtonWidget().setPosition(width - ParentSettingsScreen.widgetHeight- ParentSettingsScreen.sideMargin, height - ParentSettingsScreen.widgetHeight - ParentSettingsScreen.vertOptionMargin); } private void setEntryVisibility(KeepinvMode mode) { @@ -273,7 +273,7 @@ public void resize(MinecraftClient client, int width, int height) { this.height = height; heading.updateDimensions(width); options.updateDimensions(width); - footing.getButtonWidget().setPos(width - ParentSettingsScreen.widgetHeight- ParentSettingsScreen.sideMargin, height - ParentSettingsScreen.widgetHeight - ParentSettingsScreen.vertOptionMargin); + footing.getButtonWidget().setPosition(width - ParentSettingsScreen.widgetHeight- ParentSettingsScreen.sideMargin, height - ParentSettingsScreen.widgetHeight - ParentSettingsScreen.vertOptionMargin); } @Override diff --git a/src/main/java/me/atie/partialKeepinventory/gui/Widgets/SimpleText.java b/src/main/java/me/atie/partialKeepinventory/gui/Widgets/SimpleText.java index 9ae36e6..35cda2f 100644 --- a/src/main/java/me/atie/partialKeepinventory/gui/Widgets/SimpleText.java +++ b/src/main/java/me/atie/partialKeepinventory/gui/Widgets/SimpleText.java @@ -30,7 +30,7 @@ public SimpleText(TextRenderer textRenderer, Text text, int yPos) { textWidgets = new TextWidget[lineCount]; for( int i = 0; i < lineCount; i++ ){ textWidgets[i] = new TextWidget(Text.literal(lines.get(i)), textRenderer); - textWidgets[i].setPos(ParentSettingsScreen.sideMargin, yPos); + textWidgets[i].setPosition(ParentSettingsScreen.sideMargin, yPos); yPos += textRenderer.fontHeight + 2; } this.height = yPos - this.yPos; diff --git a/src/main/java/me/atie/partialKeepinventory/gui/Widgets/TextHeaderEntry.java b/src/main/java/me/atie/partialKeepinventory/gui/Widgets/TextHeaderEntry.java index 147edd9..1a50100 100644 --- a/src/main/java/me/atie/partialKeepinventory/gui/Widgets/TextHeaderEntry.java +++ b/src/main/java/me/atie/partialKeepinventory/gui/Widgets/TextHeaderEntry.java @@ -51,7 +51,7 @@ public void updateDimensions(int windowWidth) { int width = windowWidth - 2 * ParentSettingsScreen.sideMargin; int x = ParentSettingsScreen.sideMargin; - textWidget.setPos(x, yPos); + textWidget.setPosition(x, yPos); textWidget.setWidth(width); } diff --git a/src/main/java/me/atie/partialKeepinventory/gui/XpSettingsScreen.java b/src/main/java/me/atie/partialKeepinventory/gui/XpSettingsScreen.java index dab0ab9..394125b 100644 --- a/src/main/java/me/atie/partialKeepinventory/gui/XpSettingsScreen.java +++ b/src/main/java/me/atie/partialKeepinventory/gui/XpSettingsScreen.java @@ -236,7 +236,7 @@ public void resize(MinecraftClient client, int width, int height) { saveDropExpressionButton.updateDimensions(width); saveDropExpressionButton.getButtonWidget().setX(xpDropExpressionTextField.getTextFieldWidget().getX() - 10 - saveDropExpressionButton.getButtonWidget().getWidth()); - footing.getButtonWidget().setPos(width - ParentSettingsScreen.widgetHeight- ParentSettingsScreen.sideMargin, height - ParentSettingsScreen.widgetHeight - ParentSettingsScreen.vertOptionMargin); + footing.getButtonWidget().setPosition(width - ParentSettingsScreen.widgetHeight- ParentSettingsScreen.sideMargin, height - ParentSettingsScreen.widgetHeight - ParentSettingsScreen.vertOptionMargin); } @Override diff --git a/src/main/java/me/atie/partialKeepinventory/network/ClientListeners.java b/src/main/java/me/atie/partialKeepinventory/network/ClientListeners.java index 8292300..6ceff9a 100644 --- a/src/main/java/me/atie/partialKeepinventory/network/ClientListeners.java +++ b/src/main/java/me/atie/partialKeepinventory/network/ClientListeners.java @@ -11,8 +11,8 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.client.network.ServerInfo; -import net.minecraft.network.Packet; import net.minecraft.network.PacketByteBuf; +import net.minecraft.network.packet.Packet; import static me.atie.partialKeepinventory.PartialKeepInventory.CONFIG; diff --git a/src/main/java/me/atie/partialKeepinventory/network/ServerListeners.java b/src/main/java/me/atie/partialKeepinventory/network/ServerListeners.java index 4ad6914..f705848 100644 --- a/src/main/java/me/atie/partialKeepinventory/network/ServerListeners.java +++ b/src/main/java/me/atie/partialKeepinventory/network/ServerListeners.java @@ -11,7 +11,7 @@ import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.Packet; +import net.minecraft.network.packet.Packet; import net.minecraft.network.PacketByteBuf; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerPlayNetworkHandler; @@ -29,7 +29,6 @@ public class ServerListeners { private static final HashSet pkiPlayers = new HashSet<>(); public static void init() { -// ServerPlayConnectionEvents.JOIN.register(ServerListeners::sendConfig); ServerPlayConnectionEvents.DISCONNECT.register((handler, server) -> pkiPlayers.remove(handler.getPlayer())); ServerPlayNetworking.registerGlobalReceiver(Identifiers.configUpdatePacket, ServerListeners::updateConfig);