Fix crash

DragonsPlusMinecraft · Mar 9, 2024 · 0d8640b · 0d8640b
1 parent ebb598b
commit 0d8640b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 29 deletions.
diff --git a/changelog/1.2.16.md b/changelog/1.2.16.md
@@ -0,0 +1,4 @@
+## Create: Enchantment Industry 1.2.16
+
+### Update
+- Fix crash with fluid spouts
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2G
 # Mod Info
 maven_group = plus.dragons.createenchantmentindustry
 archives_base_name = create_enchantment_industry
-mod_version = 1.2.15
+mod_version = 1.2.16
 
 minecraft_version = 1.20.1
 

diff --git a/...ain/java/plus/dragons/createenchantmentindustry/foundation/mixin/FillingBySpoutMixin.java b/...ain/java/plus/dragons/createenchantmentindustry/foundation/mixin/FillingBySpoutMixin.java
@@ -22,7 +22,7 @@ private static void canItemBeMended(Level world, ItemStack stack, CallbackInfoRe
 
     @Inject(method = "getRequiredAmountForItem",
 			at = @At(value = "INVOKE",
-					target = "Lcom/simibubi/create/content/fluids/transfer/GenericItemFilling;getRequiredAmountForItem(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;Lio/github/fabricators_of_create/porting_lib/util/FluidStack;)J"),
+					target = "Lcom/simibubi/create/content/fluids/transfer/GenericItemFilling;getRequiredAmountForItem(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;Lio/github/fabricators_of_create/porting_lib/fluids/FluidStack;)J"),
 			cancellable = true)
     private static void getRequiredXpAmountForItem(Level world, ItemStack stack, FluidStack availableFluid, CallbackInfoReturnable<Long> cir) {
         int amount = MendingBySpout.getRequiredAmountForItem(world, stack, availableFluid);
@@ -32,7 +32,7 @@ private static void getRequiredXpAmountForItem(Level world, ItemStack stack, Flu
 
     @Inject(method = "fillItem",
 			at = @At(value = "INVOKE",
-					target = "Lcom/simibubi/create/content/fluids/transfer/GenericItemFilling;fillItem(Lnet/minecraft/world/level/Level;JLnet/minecraft/world/item/ItemStack;Lio/github/fabricators_of_create/porting_lib/util/FluidStack;)Lnet/minecraft/world/item/ItemStack;"),
+					target = "Lcom/simibubi/create/content/fluids/transfer/GenericItemFilling;fillItem(Lnet/minecraft/world/level/Level;JLnet/minecraft/world/item/ItemStack;Lio/github/fabricators_of_create/porting_lib/fluids/FluidStack;)Lnet/minecraft/world/item/ItemStack;"),
 			cancellable = true)
     private static void mendItem(Level world, long requiredAmount, ItemStack stack, FluidStack availableFluid, CallbackInfoReturnable<ItemStack> cir) {
         ItemStack result = MendingBySpout.mendItem(world, (int) requiredAmount, stack, availableFluid);

diff --git a/...in/java/plus/dragons/createenchantmentindustry/foundation/mixin/OpenEndedPipeInvoker.java b/...in/java/plus/dragons/createenchantmentindustry/foundation/mixin/OpenEndedPipeInvoker.java
diff --git a/...eateenchantmentindustry/foundation/mixin/fabric/RegistrateDisplayItemsGeneratorMixin.java b/...eateenchantmentindustry/foundation/mixin/fabric/RegistrateDisplayItemsGeneratorMixin.java
@@ -48,19 +48,9 @@ private static void addOrdering(List orderings, String name, Item item, Item anc
 
 		try {
 			cls = Class.forName("com.simibubi.create.AllCreativeModeTabs$RegistrateDisplayItemsGenerator$ItemOrdering");
-		} catch (ClassNotFoundException e) {
-			throw new RuntimeException(e);
-		}
-
-		try {
 			method = cls.getMethod(name, Item.class, Item.class);
-		} catch (NoSuchMethodException e) {
-			throw new RuntimeException(e);
-		}
-
-		try {
 			ordering = method.invoke(null, item, anchor);
-		} catch (InvocationTargetException | IllegalAccessException e) {
+		} catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
 			throw new RuntimeException(e);
 		}
 

diff --git a/src/main/resources/create_enchantment_industry.mixins.json b/src/main/resources/create_enchantment_industry.mixins.json
@@ -13,7 +13,6 @@
     "FluidTankBlockMixin",
     "ItemDrainBlockEntityAccessor",
     "ItemDrainBlockMixin",
-    "OpenEndedPipeInvoker",
     "PlayerMixin",
     "SpoutBlockEntityAccessor",
     "SpoutBlockMixin",