update

reobf · Jan 4, 2025 · 71f3a17 · 71f3a17
1 parent 939bae0
commit 71f3a17
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git 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
@@ -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<InventoryCrafting> 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<InventoryCrafting> inv0/*,
 			@Share("isMulti") LocalBooleanRef isMulti*/) {
-
+InventoryCrafting inv = inv0.get();
 		//if (isMulti.get()) {
 		if(medium instanceof IMultiplePatternPushable){
 			int used = 0;