diff --git a/changelog/1.2.16.md b/changelog/1.2.16.md new file mode 100644 index 00000000..922b8d03 --- /dev/null +++ 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 index c7aa8f14..9c14fb4b 100644 --- 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/src/main/java/plus/dragons/createenchantmentindustry/foundation/mixin/FillingBySpoutMixin.java b/src/main/java/plus/dragons/createenchantmentindustry/foundation/mixin/FillingBySpoutMixin.java index 83d6cebc..1aa43735 100644 --- a/src/main/java/plus/dragons/createenchantmentindustry/foundation/mixin/FillingBySpoutMixin.java +++ b/src/main/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 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 cir) { ItemStack result = MendingBySpout.mendItem(world, (int) requiredAmount, stack, availableFluid); diff --git a/src/main/java/plus/dragons/createenchantmentindustry/foundation/mixin/OpenEndedPipeInvoker.java b/src/main/java/plus/dragons/createenchantmentindustry/foundation/mixin/OpenEndedPipeInvoker.java deleted file mode 100644 index 7e39dc81..00000000 --- a/src/main/java/plus/dragons/createenchantmentindustry/foundation/mixin/OpenEndedPipeInvoker.java +++ /dev/null @@ -1,14 +0,0 @@ -package plus.dragons.createenchantmentindustry.foundation.mixin; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -import com.simibubi.create.content.fluids.OpenEndedPipe; - -import io.github.fabricators_of_create.porting_lib.fluids.FluidStack; - -@Mixin(OpenEndedPipe.class) -public interface OpenEndedPipeInvoker { - @Invoker(remap = false) - void invokeApplyEffects(FluidStack fluid); -} diff --git a/src/main/java/plus/dragons/createenchantmentindustry/foundation/mixin/fabric/RegistrateDisplayItemsGeneratorMixin.java b/src/main/java/plus/dragons/createenchantmentindustry/foundation/mixin/fabric/RegistrateDisplayItemsGeneratorMixin.java index 64747386..bce3566a 100644 --- a/src/main/java/plus/dragons/createenchantmentindustry/foundation/mixin/fabric/RegistrateDisplayItemsGeneratorMixin.java +++ b/src/main/java/plus/dragons/createenchantmentindustry/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 index 25074253..9036924c 100644 --- 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",