refactor: Some small 1.20.6 changes for consistency

TwelveIterationMods · May 21, 2024 · 4987f41 · 4987f41
1 parent d0c54d2
commit 4987f41
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/common/src/main/java/net/blay09/mods/balm/api/container/DefaultContainer.java b/common/src/main/java/net/blay09/mods/balm/api/container/DefaultContainer.java
@@ -25,8 +25,8 @@ public NonNullList<ItemStack> getItems() {
         return items;
     }
 
-    public void deserialize(HolderLookup.Provider provider, CompoundTag tag) {
-        items = ImplementedContainer.deserializeInventory(provider, tag, items.size());
+    public void deserialize(CompoundTag tag, HolderLookup.Provider provider) {
+        items = ImplementedContainer.deserializeInventory(tag, items.size(), provider);
     }
 
     public CompoundTag serialize(HolderLookup.Provider provider) {

diff --git a/common/src/main/java/net/blay09/mods/balm/api/container/ImplementedContainer.java b/common/src/main/java/net/blay09/mods/balm/api/container/ImplementedContainer.java
@@ -143,7 +143,7 @@ default boolean stillValid(Player player) {
         return true;
     }
 
-    static NonNullList<ItemStack> deserializeInventory(HolderLookup.Provider provider, CompoundTag tag, int minimumSize) {
+    static NonNullList<ItemStack> deserializeInventory(CompoundTag tag, int minimumSize, HolderLookup.Provider provider) {
         int size = Math.max(minimumSize, tag.contains("Size", Tag.TAG_INT) ? tag.getInt("Size") : minimumSize);
         NonNullList<ItemStack> items = NonNullList.withSize(size, ItemStack.EMPTY);
         ListTag itemTags = tag.getList("Items", Tag.TAG_COMPOUND);

diff --git a/common/src/main/java/net/blay09/mods/balm/api/menu/BalmMenuProvider.java b/common/src/main/java/net/blay09/mods/balm/api/menu/BalmMenuProvider.java
@@ -7,5 +7,5 @@
 
 public interface BalmMenuProvider<TPayload> extends MenuProvider {
     TPayload getScreenOpeningData(ServerPlayer player);
-    StreamCodec<FriendlyByteBuf, TPayload> getCodec();
+    StreamCodec<FriendlyByteBuf, TPayload> getScreenStreamCodec();
 }
diff --git a/forge/src/main/java/net/blay09/mods/balm/forge/network/ForgeBalmNetworking.java b/forge/src/main/java/net/blay09/mods/balm/forge/network/ForgeBalmNetworking.java
@@ -59,7 +59,7 @@ public void openGui(Player player, MenuProvider menuProvider) {
     }
 
     private <T> void openGui(ServerPlayer player, BalmMenuProvider<T> menuProvider) {
-        player.openMenu(menuProvider, buf -> menuProvider.getCodec().encode(buf, menuProvider.getScreenOpeningData(player)));
+        player.openMenu(menuProvider, buf -> menuProvider.getScreenStreamCodec().encode(buf, menuProvider.getScreenOpeningData(player)));
     }
 
     @Override

diff --git a/neoforge/src/main/java/net/blay09/mods/balm/neoforge/network/NeoForgeBalmNetworking.java b/neoforge/src/main/java/net/blay09/mods/balm/neoforge/network/NeoForgeBalmNetworking.java
@@ -122,7 +122,7 @@ public void openGui(Player player, MenuProvider menuProvider) {
     }
 
     private <T> void openGui(ServerPlayer player, BalmMenuProvider<T> menuProvider) {
-        player.openMenu(menuProvider, buf -> menuProvider.getCodec().encode(buf, menuProvider.getScreenOpeningData(player)));
+        player.openMenu(menuProvider, buf -> menuProvider.getScreenStreamCodec().encode(buf, menuProvider.getScreenOpeningData(player)));
     }
 
     @Override