update

src/main/java/reobf/proghatches/ae/BlockStockingCircuitRequestInterceptor.java

@@ -33,7 +33,7 @@ public boolean onBlockActivated(World worldIn, int x, int y, int z, EntityPlayer
 		te.mark[0]=player.getCurrentEquippedItem();
 		if(te.mark[0]!=null)te.mark[0]=te.mark[0].copy();
 		}else{
-			if(player.getCurrentEquippedItem()==null)
+			if(player.getCurrentEquippedItem()!=null)
 			player.addChatMessage(new ChatComponentTranslation("tile.proghatches.circuit_interceptor.change", 
 					player.getCurrentEquippedItem().getDisplayName()
 					));	
@@ -47,7 +47,7 @@ public boolean onBlockActivated(World worldIn, int x, int y, int z, EntityPlayer
 
 		}
 
-
+		return true;
 	}
 
 	return super.onBlockActivated(worldIn, x, y, z, player, side, subX, subY, subZ);
@@ -66,13 +66,22 @@ public TileEntity createNewTileEntity(World worldIn, int meta) {
 
 	@Override
 	public void addInformation(ItemStack p_77624_1_, List l) {
+
+		if(p_77624_1_.getItemDamage()==1){
+			l.add(StatCollector.translateToLocal("proghatch.circuit_interceptor.tooltip.1.0"));
+			l.add(StatCollector.translateToLocal("proghatch.circuit_interceptor.tooltip.1.1"));
+
+		}else{
 		l.add(StatCollector.translateToLocal("proghatch.circuit_interceptor.tooltip.0"));
 		l.add(StatCollector.translateToLocal("proghatch.circuit_interceptor.tooltip.1"));
+		}
+
 	}
 
 	@Override
 	public String getName(ItemStack p_77624_1_) {
-		// TODO Auto-generated method stub
+	if(p_77624_1_
+			.getItemDamage()==1){return "tile.proghatches.circuit_interceptor.1";}
 		return null;
 	}
 

src/main/java/reobf/proghatches/main/CommonProxy.java

@@ -261,7 +261,7 @@ private static void a(){
 
 	public void init(FMLInitializationEvent event) {
 		tab = new ProgHatchCreativeTab("proghatches");
-		new EUCraftingCreativeTab("proghatches.eucrafting");
+		//new EUCraftingCreativeTab("proghatches.eucrafting");
 		// AEApi.instance().registries().gridCache().registerGridCache(null,
 		// null);;
 		// AEApi.instance().registries().interfaceTerminal().register(TileFluidInterface.class);

src/main/java/reobf/proghatches/main/MyMod.java

@@ -208,6 +208,7 @@ public class MyMod {
 
 		if((Boolean)Launch.blackboard.get("fml.deobfuscatedEnvironment") ){
 		DualityInterface.class.getDeclaredFields();
+		CraftFromPatternTask.class.getDeclaredFields();
 		/*CraftingCPUCluster.class.getDeclaredFields();
 		NBTTagCompound t=new NBTTagCompound();
 		AEFluidStack.create(new FluidStack(FluidRegistry.WATER,123).writeToNBT(t));

src/main/java/reobf/proghatches/main/mixin/mixins/MixinAE2FCCompat.java

@@ -11,6 +11,7 @@
 import com.glodblock.github.inventory.FluidConvertingInventoryAdaptor;
 import com.glodblock.github.util.BlockPos;
 import com.glodblock.github.util.Util;
+import com.llamalad7.mixinextras.sugar.Local;
 
 import appeng.util.InventoryAdaptor;
 import gregtech.api.interfaces.tileentity.ICoverable;
@@ -39,7 +40,7 @@ private static void wrap(TileEntity capProvider, ForgeDirection face,
 
 			require=1)
 	private static void wrap(TileEntity capProvider, ForgeDirection face,
-			CallbackInfoReturnable<InventoryAdaptor> ret, TileEntity inter) {
+			CallbackInfoReturnable<InventoryAdaptor> ret,  @Local(ordinal = 1) TileEntity inter) {
 
 
 		//System.out.println(face);
@@ -51,7 +52,7 @@ private static void wrap(TileEntity capProvider, ForgeDirection face,
 
 
 		boolean ispart = false;
-		ispart = Util.getPart(inter, face.getOpposite()) instanceof PartEUP2PInterface;
+		/*ispart = Util.getPart(inter, face.getOpposite()) instanceof PartEUP2PInterface;
 		
 
 		if ( ispart) {
@@ -62,7 +63,7 @@ private static void wrap(TileEntity capProvider, ForgeDirection face,
 			IFluidHandler fluid = capProvider instanceof IFluidHandler ? (IFluidHandler) capProvider : null;
 			boolean onmi = false;
 			ret.setReturnValue(new FluidConvertingInventoryAdaptor(capProvider, item, fluid, face, pos, onmi));
-		}
+		}*/
 		boolean iscover = check(capProvider, face);
 		if(iscover){
 			InventoryAdaptor item = InventoryAdaptor.getAdaptor(capProvider, face);

src/main/java/reobf/proghatches/main/mixin/mixins/MixinAEAdaptorSkipStackSizeCheck.java

@@ -66,7 +66,7 @@ public void constructor(IInventory s,CallbackInfo a) {
 			skipStackSizeCheck=skipStackSizeCheck||check(s);
 	}
 
-	public boolean check(Object s){	
+	private static boolean check(Object s){	
 		if(s!=null&&s instanceof IGregTechTileEntity){
 		return	Optional.ofNullable(((IGregTechTileEntity)s).getMetaTileEntity())
 		.map(ss->ss instanceof ISkipStackSizeCheck?(ISkipStackSizeCheck)ss:null)

src/main/java/reobf/proghatches/main/mixin/mixins/MixinAwarenessForDualHatch.java

@@ -96,7 +96,7 @@ public ArrayList<IDualInputHatch> mDualInputHatches0(){
 	} 
 
 	@Inject(method = "startRecipeProcessing", at = { @At(value = "RETURN") }/*,require=1*/)
-	public void a(CallbackInfo c) {
+	public void startRecipeProcessing(CallbackInfo c) {
 
 
 		for (IDualInputHatch hatch : (mDualInputHatches0())) {
@@ -109,7 +109,7 @@ public void a(CallbackInfo c) {
 	}
 
 	@Inject(method = "endRecipeProcessing", at = { @At(value = "RETURN") }/*,require=1*/)
-	public void b(CallbackInfo c) {
+	public void endRecipeProcessing(CallbackInfo c) {
 		/*Consumer<CheckRecipeResult> setResultIfFailure = result -> {
 			if (!result.wasSuccessful()) {
 				this.checkRecipeResult = result;

src/main/java/reobf/proghatches/main/mixin/mixins/MixinCanCraftExempt.java

@@ -12,6 +12,9 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
+import com.llamalad7.mixinextras.sugar.Share;
+import com.llamalad7.mixinextras.sugar.ref.LocalBooleanRef;
+
 import appeng.api.networking.crafting.ICraftingPatternDetails;
 import appeng.api.networking.energy.IEnergyGrid;
 import appeng.api.storage.data.IAEItemStack;
@@ -25,36 +28,28 @@
 @Mixin(value = CraftingCPUCluster.class, remap = false, priority = 1)
 public class MixinCanCraftExempt {
 
-	public boolean shouldExempt;
+	// public boolean shouldExempt;
 
-	@ModifyVariable(method = "executeCrafting", at = @At(value = "INVOKE",  target = "getMediums(Lappeng/api/networking/crafting/ICraftingPatternDetails;)Ljava/util/List;"),require=1)
-	private ICraftingPatternDetails executeCrafting(
-			ICraftingPatternDetails details) {
-		shouldExempt = (details instanceof ProgrammingCircuitProvider.CircuitProviderPatternDetial);
+	@ModifyVariable(method = "executeCrafting", at = @At(value = "INVOKE", target = "getMediums(Lappeng/api/networking/crafting/ICraftingPatternDetails;)Ljava/util/List;"), require = 1)
+	private ICraftingPatternDetails executeCrafting(ICraftingPatternDetails details,
+			@Share("arg") LocalBooleanRef shouldExempt) {
+		shouldExempt.set((details instanceof ProgrammingCircuitProvider.CircuitProviderPatternDetial));
 		return details;
 
 	}
 
-
-
-
-
-	@ModifyVariable(method = "executeCrafting", at = @At(value = "INVOKE",target = "isBusy()Z"), require = 1)
-	private InventoryCrafting executeCrafting0(InventoryCrafting x) {
+	@ModifyVariable(method = "executeCrafting", at = @At(value = "INVOKE", target = "isBusy()Z"), require = 1)
+	private InventoryCrafting executeCrafting0(InventoryCrafting x, @Share("arg") LocalBooleanRef shouldExempt) {
 
-		return shouldExempt ? (new InventoryCraftingDummy()) : x;
+		return shouldExempt.get() ? (new InventoryCraftingDummy()) : x;
 
 	}
-
-
-
-
-
+
 	@Inject(method = "canCraft", at = @At("RETURN"), cancellable = true, require = 1)
 	private void canCraft(final ICraftingPatternDetails details, final IAEItemStack[] condensedInputs,
 			CallbackInfoReturnable<Boolean> ci) {
 		if ((details instanceof ProgrammingCircuitProvider.CircuitProviderPatternDetial)) {
 			ci.setReturnValue(true);
 		}
-		}
+	}
 }

src/main/java/reobf/proghatches/main/mixin/mixins/MixinCraftFromPatternTaskPatch.java

@@ -10,6 +10,8 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import com.llamalad7.mixinextras.sugar.Local;
+
 import appeng.api.networking.crafting.ICraftingPatternDetails;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.crafting.v2.CraftingContext;
@@ -22,7 +24,8 @@
 
 @Mixin(value=CraftFromPatternTask.class,remap=true)
 public class MixinCraftFromPatternTaskPatch {
-
+    //this is always true for 2.7.x
+	/*
 	private static Boolean shouldPatch=null;
 	private boolean shouldPatch(){
 		if(shouldPatch!=null)return shouldPatch;
@@ -36,13 +39,19 @@ private boolean shouldPatch(){
 			shouldPatch=false;
 		}
 		return shouldPatch();
-	}
+	}*/
 	@Shadow (remap=false)
 	  protected  IAEItemStack[] patternInputs;
+
+
 	@Inject(method="<init>",at = { @At("RETURN") },remap=false, require = 1)
-	public void calculateOneStep(CraftingRequest<IAEItemStack> request, ICraftingPatternDetails pattern,
-            int priority, boolean allowSimulation, boolean isComplex,CallbackInfo xx){
-		if(shouldPatch())
+	//public void calculateOneStep(CraftingRequest<IAEItemStack> request, ICraftingPatternDetails pattern,
+    //        int priority, boolean allowSimulation, boolean isComplex,CallbackInfo xx){
+	public void calculateOneStep(CallbackInfo xx,@Local(argsOnly=true) ICraftingPatternDetails  pattern){
+
+
+
+		//if(shouldPatch())
 		if(pattern instanceof IInputMightBeEmptyPattern){
 
 			patternInputs=Arrays.stream(patternInputs).filter(s->s.getStackSize()>0).toArray(IAEItemStack[]::new);

src/main/java/reobf/proghatches/main/mixin/mixins/MixinPatternEncodingCiruitSpecialTreatment2.java

@@ -25,7 +25,7 @@
 public class MixinPatternEncodingCiruitSpecialTreatment2 {
 
 	@ModifyVariable(require = 1, method = "getRecipeInput", at = @At(value = "INVOKE", target = "removeIf(Ljava/util/function/Predicate;)Z"))
-	private List g(List<PositionedStack> c) {
+	private List getRecipeInput(List<PositionedStack> c) {
 		AtomicBoolean circuit = new AtomicBoolean(false);
 		if (ItemProgrammingToolkit.holding() == false) {
 			return c;

src/main/java/reobf/proghatches/main/mixin/mixins/MixinStorageChangeEvent.java

@@ -2,6 +2,7 @@
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 
 import appeng.api.networking.events.MENetworkChannelsChanged;
 import appeng.api.networking.events.MENetworkEventSubscribe;
@@ -32,7 +33,7 @@ public void storageChange_Mixin(MENetworkStorageEvent w){
 
 
     private Boolean isMETank;
-    @MENetworkEventSubscribe
+    @MENetworkEventSubscribe @Unique
     public void powerRender(final MENetworkPowerStatusChange w) {
 
     	if(isMETank==null){
@@ -43,7 +44,7 @@ public void powerRender(final MENetworkPowerStatusChange w) {
 			if(te!=null)((IStoageCellUpdate)te).cellUpdate();
 		}
     }  
-    @MENetworkEventSubscribe
+    @MENetworkEventSubscribe @Unique
     public void updateChannels(final MENetworkChannelsChanged w) {
     	if(isMETank==null){
     		isMETank=getMetaTileEntity() instanceof IStoageCellUpdate;

src/main/java/reobf/proghatches/main/mixin/mixins/eucrafting/MixinInstantComplete.java

@@ -11,6 +11,8 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
+import com.llamalad7.mixinextras.sugar.Local;
+
 import appeng.api.networking.crafting.ICraftingMedium;
 import appeng.api.networking.crafting.ICraftingPatternDetails;
 import appeng.api.networking.energy.IEnergyGrid;
@@ -22,27 +24,14 @@
 @Mixin(value = CraftingCPUCluster.class, remap = false, priority = 1)
 public class MixinInstantComplete {
 
-	private ICraftingMedium temp;
-
-
-	@ModifyVariable(at = @At(value = "INVOKE_ASSIGN",  target = "pushPattern") , 
-			method = "executeCrafting"
-	)
-
-	public ICraftingMedium a(/*IEnergyGrid eg, CraftingGridCache cc, CallbackInfo ci,		*/ICraftingMedium m) {
-		return temp=m;
-		/*if (m instanceof IInstantCompletable) {
-			((IInstantCompletable) m).complete();
-
-		}*/
 
-	}
-
 	@Inject(at = @At(value = "INVOKE", shift = Shift.BEFORE, target = "markDirty") , 
 			method = "executeCrafting"
 	)
 
-	public void b(IEnergyGrid eg, CraftingGridCache cc, CallbackInfo ci) {
+	public void MixinInstantComplete_executeCrafting(IEnergyGrid eg, CraftingGridCache cc, CallbackInfo ci,
+
+		@Local	ICraftingMedium temp) {
 
 		if (temp instanceof IInstantCompletable) {
 			((IInstantCompletable) temp).complete();

src/main/java/reobf/proghatches/main/mixin/mixins/part2/MixinContextNoCircuitCache.java

@@ -32,14 +32,14 @@ public boolean isAllowed(IAEStack stack) {
 
 			if(false==((TileStockingCircuitRequestInterceptor)te.getMachine())
 			.isAllowed(stack)){
-				System.out.println("cachef");
+				//System.out.println("cachef");
 				mapcache.put(stack.copy(), false);
 				return false;}
 
 
 
 		}
-		System.out.println("cachet");
+	//	System.out.println("cachet");
 	mapcache.put(stack.copy(), true);
 	return true;
 	}