From 00fef620d5bf87d10a0fc1e2a19b66367c0ab9e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Ryb=C3=A1rsky?= Date: Thu, 5 Dec 2024 14:12:37 +0100 Subject: [PATCH] Update to 1.21.4 --- gradle.properties | 12 ++++++------ .../brn/serverstorage/items/SimpleBlockItem.java | 3 +-- .../systems/brn/serverstorage/items/SimpleItem.java | 3 +-- .../java/systems/brn/serverstorage/lib/Util.java | 4 ++-- .../brn/serverstorage/screens/CraftingScreen.java | 4 ++-- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7fc4ed0..50704a6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,19 +3,19 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.3 -yarn_mappings=1.21.3+build.2 +minecraft_version=1.21.4 +yarn_mappings=1.21.4+build.1 loader_version=0.16.9 # Fabric API -fabric_version=0.107.0+1.21.3 +fabric_version=0.110.5+1.21.4 # Mod Properties -mod_version=3.3.1 +mod_version=3.3.2 maven_group=systems.brn archives_base_name=Serverstorage # Dependencies -polymer_version=0.10.1+1.21.3 +polymer_version=0.11.0+1.21.4-rc1 server_translations_api_version=2.4.0+1.21.2-rc1 -servergui_version=1.7.2+1.21.2 \ No newline at end of file +servergui_version=1.8.1+1.21.4 \ No newline at end of file diff --git a/src/main/java/systems/brn/serverstorage/items/SimpleBlockItem.java b/src/main/java/systems/brn/serverstorage/items/SimpleBlockItem.java index f963864..1ca0381 100644 --- a/src/main/java/systems/brn/serverstorage/items/SimpleBlockItem.java +++ b/src/main/java/systems/brn/serverstorage/items/SimpleBlockItem.java @@ -2,7 +2,6 @@ package systems.brn.serverstorage.items; import eu.pb4.polymer.core.api.item.PolymerBlockItem; import eu.pb4.polymer.core.api.item.PolymerItem; -import eu.pb4.polymer.resourcepack.api.PolymerResourcePackUtils; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -23,7 +22,7 @@ public class SimpleBlockItem extends PolymerBlockItem implements PolymerItem { public SimpleBlockItem(Item.Settings settings, Block block, Identifier identifier) { super(block, settings, Items.BARRIER); - this.polymerModel = PolymerResourcePackUtils.getBridgedModelId(identifier.withPath("item/" + identifier.getPath())); + this.polymerModel = identifier.withPath("item/" + identifier.getPath()); } @Override diff --git a/src/main/java/systems/brn/serverstorage/items/SimpleItem.java b/src/main/java/systems/brn/serverstorage/items/SimpleItem.java index 4aede6e..e28b195 100644 --- a/src/main/java/systems/brn/serverstorage/items/SimpleItem.java +++ b/src/main/java/systems/brn/serverstorage/items/SimpleItem.java @@ -2,7 +2,6 @@ package systems.brn.serverstorage.items; import eu.pb4.polymer.core.api.item.PolymerItem; import eu.pb4.polymer.core.api.item.SimplePolymerItem; -import eu.pb4.polymer.resourcepack.api.PolymerResourcePackUtils; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; @@ -25,7 +24,7 @@ public class SimpleItem extends SimplePolymerItem implements PolymerItem { public SimpleItem(Settings settings, Identifier identifier) { super(settings, Items.STICK); - this.polymerModel = PolymerResourcePackUtils.getBridgedModelId(identifier.withPath("item/" + identifier.getPath())); + this.polymerModel = identifier.withPath("item/" + identifier.getPath()); } @Override diff --git a/src/main/java/systems/brn/serverstorage/lib/Util.java b/src/main/java/systems/brn/serverstorage/lib/Util.java index af6ea44..884339d 100644 --- a/src/main/java/systems/brn/serverstorage/lib/Util.java +++ b/src/main/java/systems/brn/serverstorage/lib/Util.java @@ -152,7 +152,7 @@ public class Util { // Count the occurrences of each ingredient in the recipe for (Ingredient ingredient : recipe.value().getIngredientPlacement().getIngredients()) { - for (RegistryEntry item : ingredient.getMatchingItems()) { + for (RegistryEntry item : ingredient.getMatchingItems().toList()) { ingredientCounts.put(item.value(), ingredientCounts.getOrDefault(item.value(), 0) + 1); } } @@ -163,7 +163,7 @@ public class Util { int totalAvailable = 0; HashMap inputsTemp = new HashMap<>(); - for (RegistryEntry item : ingredient.getMatchingItems()) { + for (RegistryEntry item : ingredient.getMatchingItems().toList()) { for (Map.Entry entry : itemStackMap.entrySet()) { ItemStack inventoryStack = entry.getKey(); int inventoryCount = entry.getValue(); diff --git a/src/main/java/systems/brn/serverstorage/screens/CraftingScreen.java b/src/main/java/systems/brn/serverstorage/screens/CraftingScreen.java index 2f9bb82..3f68c1d 100644 --- a/src/main/java/systems/brn/serverstorage/screens/CraftingScreen.java +++ b/src/main/java/systems/brn/serverstorage/screens/CraftingScreen.java @@ -167,7 +167,7 @@ public class CraftingScreen extends PagedGui implements Searchable { ItemStack playerStack = playerInventory.getStack(i); if (ingredient.test(playerStack)) { ItemStack stackToRemove = playerStack.copy(); - for (RegistryEntry matchingItemx : ingredient.getMatchingItems()) { + for (RegistryEntry matchingItemx : ingredient.getMatchingItems().toList()) { Item matchingItem = matchingItemx.value(); if (matchingItem == stackToRemove.getItem()) { stackToRemove.setCount(1); // Set count to ingredient requirement @@ -179,7 +179,7 @@ public class CraftingScreen extends PagedGui implements Searchable { } // Check storage network - for (RegistryEntry itemx : ingredient.getMatchingItems()) { + for (RegistryEntry itemx : ingredient.getMatchingItems().toList()) { Item item = itemx.value(); if (this.storageScreen.getNetwork().canRemove(item.getDefaultStack())) { ItemStack stackToRemove = item.getDefaultStack();