From 71f3a171e5988ac593383c3e81adeb81d7352e63 Mon Sep 17 00:00:00 2001 From: reobf <2215595288@qq.com> Date: Sat, 4 Jan 2025 23:05:29 +0800 Subject: [PATCH] update --- .../gt/metatileentity/DualInputHatch.java | 2 +- .../mixin/mixins/part2/MixinMultiPattern.java | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main/java/reobf/proghatches/gt/metatileentity/DualInputHatch.java b/src/main/java/reobf/proghatches/gt/metatileentity/DualInputHatch.java index 02ce905..2c916e0 100644 --- a/src/main/java/reobf/proghatches/gt/metatileentity/DualInputHatch.java +++ b/src/main/java/reobf/proghatches/gt/metatileentity/DualInputHatch.java @@ -354,7 +354,7 @@ public void saveNBTData(NBTTagCompound aNBT) { public void loadNBTData(NBTTagCompound aNBT) { if(aNBT.hasKey("x")==false)return; super.loadNBTData(aNBT); - if(aNBT.hasKey("trunOffEnsure")) + //if(aNBT.hasKey("trunOffEnsure")) //trunOffEnsure=aNBT.getBoolean("trunOffEnsure"); shared.deser(aNBT.getCompoundTag("shared")); fluidLimit= aNBT.getInteger("fluidLimit"); diff --git a/src/main/java/reobf/proghatches/main/mixin/mixins/part2/MixinMultiPattern.java b/src/main/java/reobf/proghatches/main/mixin/mixins/part2/MixinMultiPattern.java index e698596..7a769d7 100644 --- a/src/main/java/reobf/proghatches/main/mixin/mixins/part2/MixinMultiPattern.java +++ b/src/main/java/reobf/proghatches/main/mixin/mixins/part2/MixinMultiPattern.java @@ -70,15 +70,13 @@ public ICraftingMedium b(ICraftingMedium a,@Share("isMulti") LocalBooleanRef isM return a; }*/ - /*@Unique - InventoryCrafting inv; - @ModifyArg( require = 1,method = "executeCrafting", at = @At(value = "INVOKE", target = "Lappeng/api/networking/crafting/ICraftingMedium;pushPattern(Lappeng/api/networking/crafting/ICraftingPatternDetails;Lnet/minecraft/inventory/InventoryCrafting;)Z")) - public InventoryCrafting a(InventoryCrafting a) { + + @Inject( require = 1,method = "executeCrafting", at = @At(value = "INVOKE", target = "Lappeng/api/networking/crafting/ICraftingMedium;pushPattern(Lappeng/api/networking/crafting/ICraftingPatternDetails;Lnet/minecraft/inventory/InventoryCrafting;)Z")) + public void a(CallbackInfo x,@Local InventoryCrafting local,@Share("inv") LocalRef inv) { - inv = a; - return a; - }*/ + inv.set(local); + } /*@Unique ICraftingPatternDetails detail; @@ -118,13 +116,13 @@ private void postCraftingStatusChange(final IAEItemStack diff) { private static final IAEItemStack[] EMPTY = new IAEItemStack[0]; @Inject( require = 1,at = @At(value = "INVOKE", shift = Shift.BEFORE, target = "markDirty"), method = "executeCrafting") - public void MixinMultiPattern_executeCrafting(IEnergyGrid eg, CraftingGridCache cc, CallbackInfo ci, + public void MixinMultiPattern_executeCrafting(IEnergyGrid eg, CraftingGridCache cc, CallbackInfo ci2, @Local ICraftingMedium medium, @Local ICraftingPatternDetails detail, @Local java.util.Map.Entry e, - @Local InventoryCrafting inv/*, + @Share("inv") LocalRef inv0/*, @Share("isMulti") LocalBooleanRef isMulti*/) { - +InventoryCrafting inv = inv0.get(); //if (isMulti.get()) { if(medium instanceof IMultiplePatternPushable){ int used = 0;