From fb52a6580fab55c0dcc84bedcca67d45bd0f4b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Ryb=C3=A1rsky?= Date: Mon, 4 Nov 2024 15:31:36 +0100 Subject: [PATCH] Try to fix crafting --- gradle.properties | 4 ++-- .../systems/brn/serverstorage/ServerStorage.java | 2 +- .../java/systems/brn/serverstorage/lib/Util.java | 13 +++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index e3da2ab..7fc4ed0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,13 +5,13 @@ org.gradle.jvmargs=-Xmx1G minecraft_version=1.21.3 yarn_mappings=1.21.3+build.2 -loader_version=0.16.8 +loader_version=0.16.9 # Fabric API fabric_version=0.107.0+1.21.3 # Mod Properties -mod_version=3.3.0 +mod_version=3.3.1 maven_group=systems.brn archives_base_name=Serverstorage diff --git a/src/main/java/systems/brn/serverstorage/ServerStorage.java b/src/main/java/systems/brn/serverstorage/ServerStorage.java index 1bd9bec..833068c 100644 --- a/src/main/java/systems/brn/serverstorage/ServerStorage.java +++ b/src/main/java/systems/brn/serverstorage/ServerStorage.java @@ -56,7 +56,7 @@ public class ServerStorage implements ModInitializer { public static BlockEntityType INVENTORY_INTERFACE_BLOCK_ENTITY; public static final GameRules.Key ServerStorage_Crafting_Enable = - GameRuleRegistry.register("serverstorage_crafting_module", GameRules.Category.MISC, GameRuleFactory.createBooleanRule(false)); + GameRuleRegistry.register("serverstorage_crafting_module", GameRules.Category.MISC, GameRuleFactory.createBooleanRule(true)); public static final GameRules.Key ServerStorage_Terminal_Enable = GameRuleRegistry.register("serverstorage_terminal_module", GameRules.Category.MISC, GameRuleFactory.createBooleanRule(true)); diff --git a/src/main/java/systems/brn/serverstorage/lib/Util.java b/src/main/java/systems/brn/serverstorage/lib/Util.java index 1928924..af6ea44 100644 --- a/src/main/java/systems/brn/serverstorage/lib/Util.java +++ b/src/main/java/systems/brn/serverstorage/lib/Util.java @@ -180,12 +180,13 @@ public class Util { canMake = false; break; } - int occurrences = ingredientCounts.getOrDefault(ingredient.getMatchingItems().getFirst(),0); - if (occurrences == 0) { - canMake = false; - break; - } - maxAmount = Math.min(maxAmount, totalAvailable / occurrences); +// int occurrences = ingredientCounts.getOrDefault(ingredient.getMatchingItems().getFirst(),0); +// if (occurrences == 0) { +// canMake = false; +// break; +// } +// maxAmount = Math.min(maxAmount, totalAvailable / occurrences); + maxAmount = Math.min(maxAmount, totalAvailable); for (Map.Entry entry : inputsTemp.entrySet()) { ItemStack stackIn = entry.getKey();