update

reobf · Sep 8, 2024 · c996e6a · c996e6a
1 parent 18cf9dc
commit c996e6a
Show file tree

Hide file tree

Showing 18 changed files with 2,844 additions and 16 deletions.
diff --git a/src/main/java/reobf/proghatches/ae/DummyCluster.java b/src/main/java/reobf/proghatches/ae/DummyCluster.java
diff --git a/src/main/java/reobf/proghatches/block/BlockIOHub.java b/src/main/java/reobf/proghatches/block/BlockIOHub.java
@@ -22,6 +22,7 @@
 import net.minecraftforge.event.ForgeEventFactory;
 
 public class BlockIOHub extends BlockContainer {
+	private IIcon inv_me_slave;
 	public BlockIOHub() {
 		super(new GT_Material_Machines());
 
@@ -49,6 +50,7 @@ public void registerBlockIcons(IIconRegister reg) {
 		provider_active_overlay = reg.registerIcon("proghatches:provider_active");
 		provider_in_overlay = reg.registerIcon("proghatches:provider_in");
 		provider_in_active_overlay = reg.registerIcon("proghatches:provider_in_active");
+		inv_me_slave = reg.registerIcon("proghatches:inv_me_slave");
 		super.registerBlockIcons(reg);
 	}
 
@@ -100,7 +102,7 @@ public boolean onBlockActivated(World worldIn, int x, int y, int z, EntityPlayer
 	static public int magicNO_provider_active_overlay = 0x7d;
 	static public int magicNO_provider_in_overlay = 0x7c;
 	static public int magicNO_provider_in_active_overlay = 0x7b;
-
+	static public int magicNO_inv_me_slave = 0x7a;
 	@SideOnly(value = Side.CLIENT)
 	@Override
 	public IIcon getIcon(int side, int meta) {
@@ -110,6 +112,7 @@ public IIcon getIcon(int side, int meta) {
 		if(meta==0x7d)return provider_active_overlay;
 		if(meta==0x7c)return provider_in_overlay;
 		if(meta==0x7b)return provider_in_active_overlay;
+		if(meta==0x7a)return inv_me_slave;
 		//spotless:on
 		return super.getIcon(side, meta);
 	}

diff --git a/src/main/java/reobf/proghatches/gt/metatileentity/BufferedDualInputHatch.java b/src/main/java/reobf/proghatches/gt/metatileentity/BufferedDualInputHatch.java
@@ -1148,6 +1148,7 @@ public void detectAndSendChanges(boolean init) {
 				// flush changes to client
 				// sometimes vanilla detection will fail so sync it manually
 				// System.out.println(last-getBaseMetaTileEntity().getTimer());
+				if(getBaseMetaTileEntity()!=null)
 				if (last >= getBaseMetaTileEntity().getTimer())
 					getWindow().getContext().getContainer().inventorySlots.forEach(s -> ((Slot) s).onSlotChanged());
 
@@ -1670,4 +1671,5 @@ public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlaye
 
 		return super.onRightclick(aBaseMetaTileEntity, aPlayer, side, aX, aY, aZ);
 	}
+
 }
diff --git a/src/main/java/reobf/proghatches/gt/metatileentity/DualInputHatch.java b/src/main/java/reobf/proghatches/gt/metatileentity/DualInputHatch.java
@@ -126,6 +126,7 @@
 import reobf.proghatches.gt.metatileentity.util.IMultiCircuitSupport;
 import reobf.proghatches.gt.metatileentity.util.IProgrammingCoverBlacklisted;
 import reobf.proghatches.gt.metatileentity.util.IRecipeProcessingAwareDualHatch;
+import reobf.proghatches.gt.metatileentity.util.ISkipStackSizeCheck;
 import reobf.proghatches.gt.metatileentity.util.InventoryItemHandler;
 import reobf.proghatches.gt.metatileentity.util.ListeningFluidTank;
 import reobf.proghatches.item.ItemProgrammingCircuit;
@@ -136,7 +137,7 @@
 
 public class DualInputHatch extends GT_MetaTileEntity_Hatch_InputBus
 		implements IConfigurationCircuitSupport, IAddGregtechLogo, IAddUIWidgets, IDualInputHatch,
-		IProgrammingCoverBlacklisted, IRecipeProcessingAwareDualHatch/*,IMultiCircuitSupport*/ {
+		IProgrammingCoverBlacklisted, IRecipeProcessingAwareDualHatch,ISkipStackSizeCheck/*,IMultiCircuitSupport*/ {
 
 	static java.text.DecimalFormat format = new java.text.DecimalFormat("#,###");
 	public boolean mMultiFluid;
@@ -270,7 +271,7 @@ public DualInputHatch(String aName, int aTier, int aSlots, String[] aDescription
 	public NBTTagCompound writeToNBT(ItemStack is, NBTTagCompound tag) {
 		is.writeToNBT(tag);
 		tag.setInteger("ICount", is.stackSize);
-      
+		
 		return tag;
 	}