sensor improvements and von da graagg generator WIP

Author: GregoriusT

CHANGELOG.md

@@ -5,7 +5,7 @@ This is the most recent Changelog. It also contains some of the changes inside t
 Nothing (I tend to only add finished Stuff to the Changelog).
 
 
-6.17.06: (Not released yet)
+6.17.06: (to be released somewhen today if everything still works)
 [FIXED] Crucibles did not accept excessive amounts of Air while nearly full. We talking >1000KU worth of Air in ONE go, while only one Ingot worth of space is in the Crucible.
 [FIXED] GT6 Alexandrite Ore Veins will no longer generate when HBM NTM is installed (balance concerns), it also generally wont be on the "Small Gem Ores List" anymore. You can still use the Matter Replicator to make Alexandrite though, if you find a sample first.
 [CHANGED] GT6 Mossy Cobble (Not Vanilla Mossy Cobble) will make you (and Mobs) slide off if you are not sneaking. This Block spawns Mobs AND makes them slide off if there is space, which is Ideal for Mob Farms.
@@ -15,9 +15,16 @@ Nothing (I tend to only add finished Stuff to the Changelog).
 [CHANGED] Can now rightclick a Tap or Nozzle with an Ender Garbage Bin or similar other Mod Voiding Items, to drain one attached Fluid Tank entirely.
 [CHANGED] Bedrock Drill can now accept the "Running Possible Detector" to check if there is 100L of Lubricant inside (and if the Structure is Okay).
 [CHANGED] Crucibles are now 1000 times harder to break when not empty.
+[CHANGED] Sensors are now able to cleanly read GT6 Multiblock Stats without needing to be adjacent to the Controller. (before this there was plenty of hacks that made it work somewhat)
 [ADDED] Steel Rope, which is just another type of Rope.
 [ADDED] Ultimet Boilers corresponding to the TaHFC Burning Boxes.
 [ADDED] Yellow and Brown Grass now indicate Lava, Gas and Oil Springs. Greener Grass indicates Water Springs.
+[ADDED]
+Von Da Graagg Generator
+A Multiblock that turns Energy into "Mobs wont spawn except on Mossy Cobblestone", in a Range of up to 256m. It consumes 16EU/m/t to do so.
+Its Design is like what english people tend to call a Tesla Coil, see https://en.wikipedia.org/wiki/Van_de_Graaff_generator for its inspiration.
+The exception of Mossy Cobblestone (from both Vanilla and GregTech) was made so people can use this for highly efficient Mob Farms.
+As always, if you have trouble understanding the Tooltip, just use the GT Builder Wand to build it.
 
 
 6.17.05:

src/main/java/gregapi/tileentity/machines/MultiTileEntitySensorTE.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2021 GregTech-6 Team
+ * Copyright (c) 2025 GregTech-6 Team
  *
  * This file is part of GregTech.
  *
@@ -19,10 +19,6 @@
 
 package gregapi.tileentity.machines;
 
-import static gregapi.data.CS.*;
-
-import java.util.List;
-
 import gregapi.GT_API_Proxy;
 import gregapi.computer.ITileEntityComputerizable;
 import gregapi.data.BI;
@@ -31,6 +27,7 @@
 import gregapi.render.IIconContainer;
 import gregapi.tileentity.ITileEntityServerTickPost;
 import gregapi.tileentity.delegate.DelegatorTileEntity;
+import gregapi.tileentity.multiblocks.MultiTileEntityMultiBlockPart;
 import gregapi.util.UT;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -39,6 +36,10 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 
+import java.util.List;
+
+import static gregapi.data.CS.*;
+
 /**
  * @author Gregorius Techneticies
  */
@@ -126,6 +127,12 @@ public void onServerTickPost(boolean aFirst) {
 			mDisplayedNumber = mSetNumber = UT.Code.bind16(mSetNumber);
 
 			DelegatorTileEntity<TileEntity> tDelegator = getAdjacentTileEntity(mSecondFacing);
+			if (tDelegator.mTileEntity instanceof MultiTileEntityMultiBlockPart) {
+				if (((MultiTileEntityMultiBlockPart)tDelegator.mTileEntity).mTarget != null) {
+					tDelegator = new DelegatorTileEntity<>((TileEntity)((MultiTileEntityMultiBlockPart)tDelegator.mTileEntity).mTarget, tDelegator.mSideOfTileEntity);
+				}
+			}
+			
 			mValues[mIndex] = UT.Code.bindInt(getCurrentValue(tDelegator));
 			mCurrentValue = (mValues.length == 1 ? mValues[0] : UT.Code.averageInts(mValues));
 			mCurrentMax = UT.Code.bindInt(getCurrentMax(tDelegator));

src/main/java/gregtech/loaders/b/Loader_MultiTileEntities.java

@@ -1277,6 +1277,7 @@ private static void multiblocks(MultiTileEntityRegistry aRegistry, MultiTileEnti
 		aMat = MT.Ad;                   aRegistry.add("Large Adamantium Crucible"                           , "Multiblock Machines", 17305, 17101, MultiTileEntityCrucible.class            , aMat.mToolQuality, 16, aMachine   , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS, 100.0F, NBT_RESISTANCE, 100.0F, NBT_TEXTURE, "crucible"                , NBT_DESIGN, 18005, NBT_ACIDPROOF, T), "hMy", 'M', aRegistry.getItem(18005));
 
 
+		aMat = MT.SteelGalvanized;      aRegistry.add("Von da Graagg Generator"                             , "Multiblock Machines", 17996, 17101, MultiTileEntityVonDaGraagg.class         , aMat.mToolQuality, 16, aMachine   , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   6.0F, NBT_RESISTANCE,   6.0F, NBT_TEXTURE, "vondagraagg"             , NBT_ENERGY_ACCEPTED, TD.Energy.EU), "CSC", "PMP", "CEC", 'M', OP.casingMachine.dat(aMat), 'P', IL.Processor_Crystal_Ruby, 'C', OD_CIRCUITS[6], 'S', OP.gem.dat(MT.NetherStar), 'E', OP.gem.dat(MT.EnderEye));
 		aMat = MT.SteelGalvanized;      aRegistry.add("Logistics Core"                                      , "Logistics"          , 17997, 17997, MultiTileEntityLogisticsCore.class       , aMat.mToolQuality, 16, aMachine   , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   6.0F, NBT_RESISTANCE,   6.0F, NBT_TEXTURE, "logisticscore"           , NBT_ENERGY_ACCEPTED, TD.Energy.EU), "CCC", "PMP", "CCC", 'M', OP.casingMachine.dat(aMat), 'P', IL.Processor_Crystal_Emerald, 'C', OD_CIRCUITS[6]);
 		aMat = ANY.W;                   aRegistry.add("Lightning Rod Electric Output"                       , "Multiblock Machines", 17998, 17101, MultiTileEntityLightningRod.class        , aMat.mToolQuality, 16, aMachine   , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,  10.0F, NBT_RESISTANCE,  10.0F, NBT_TEXTURE, "lightningrod"            , NBT_ENERGY_EMITTED, TD.Energy.EU, NBT_CAPACITY, 18000 * VREC[6]), "CWC", "PMP", "CWC", 'M', OP.casingMachine.dat(aMat), 'W', OP.wireGt16.dat(MT.NiobiumTitanium), 'P', IL.Processor_Crystal_Sapphire, 'C', OD_CIRCUITS[6]);
 		aMat = MT.Ti;                   aRegistry.add("Bedrock Mining Drill Controller"                     , "Multiblock Machines", 17999, 17101, MultiTileEntityBedrockDrill.class        , aMat.mToolQuality, 16, aMachine   , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   9.0F, NBT_RESISTANCE,   9.0F, NBT_TEXTURE, "bedrockdrill"            , NBT_RECIPEMAP, RM.BedrockOreList, NBT_ENERGY_ACCEPTED, TD.Energy.RU), "PYP", "CMC", "GIG", 'M', OP.casingMachineDense.dat(aMat), 'G', OP.gearGt.dat(MT.TungstenSteel), 'I', OP.toolHeadDrill.dat(MT.TungstenSteel), 'P', IL.Processor_Crystal_Ruby, 'Y', IL.CONVEYERS[5], 'C', OD_CIRCUITS[6]);

src/main/java/gregtech/tileentity/multiblocks/MultiTileEntityVonDaGraagg.java

@@ -26,8 +26,12 @@
 import gregapi.data.LH.Chat;
 import gregapi.data.TD;
 import gregapi.tileentity.ITileEntityMobSpawnInhibitor;
+import gregapi.tileentity.data.ITileEntityGibbl;
+import gregapi.tileentity.data.ITileEntityProgress;
 import gregapi.tileentity.energy.ITileEntityEnergy;
 import gregapi.tileentity.multiblocks.IMultiBlockEnergy;
+import gregapi.tileentity.multiblocks.ITileEntityMultiBlockController;
+import gregapi.tileentity.multiblocks.MultiTileEntityMultiBlockPart;
 import gregapi.tileentity.multiblocks.TileEntityBase10MultiBlockBase;
 import gregapi.util.UT;
 import net.minecraft.block.Block;
@@ -48,7 +52,7 @@
 /**
  * @author Gregorius Techneticies
  */
-public class MultiTileEntityVonDaGraagg extends TileEntityBase10MultiBlockBase implements ITileEntityEnergy, ITileEntityMobSpawnInhibitor, IMultiBlockEnergy {
+public class MultiTileEntityVonDaGraagg extends TileEntityBase10MultiBlockBase implements ITileEntityEnergy, ITileEntityMobSpawnInhibitor, IMultiBlockEnergy, ITileEntityProgress, ITileEntityGibbl {
 	public long mEnergy = 0, mCurrentRange = 256;
 	public TagData mEnergyTypeAccepted = TD.Energy.EU;
 
@@ -60,36 +64,53 @@ public void readFromNBT2(NBTTagCompound aNBT) {
 
 	@Override
 	public boolean checkStructure2(ChunkCoordinates aCoordinates, Entity aPlayer, IInventory aInventory) {
-		int tX = getOffsetXN(mFacing, 2), tY = yCoord-1, tZ = getOffsetZN(mFacing, 2);
+		int tX = xCoord, tY = yCoord, tZ = zCoord;
 		if (worldObj.blockExists(tX-2, tY, tZ-2) && worldObj.blockExists(tX+2, tY, tZ-2) && worldObj.blockExists(tX-2, tY, tZ+2) && worldObj.blockExists(tX+2, tY, tZ+2)) {
 			boolean tSuccess = T;
 
+			for (int i = -2; i <= 2; i++) for (int j = -2; j <= 2; j++) {
+			if (!ITileEntityMultiBlockController.Util.checkAndSetTargetOffset(this, i, +0, j, 18028, getMultiTileEntityRegistryID(), 0, MultiTileEntityMultiBlockPart.ONLY_ENERGY_IN, aCoordinates, aPlayer, aInventory)) tSuccess = F;
+			if (!ITileEntityMultiBlockController.Util.checkAndSetTargetOffset(this, i, +1, j, 18028, getMultiTileEntityRegistryID(), 0, MultiTileEntityMultiBlockPart.ONLY_ENERGY_IN, aCoordinates, aPlayer, aInventory)) tSuccess = F;
+			}
+			if (!ITileEntityMultiBlockController.Util.checkAndSetTargetOffset(this, 0, +2, 0, 18040, getMultiTileEntityRegistryID(), 0, MultiTileEntityMultiBlockPart.NOTHING       , aCoordinates, aPlayer, aInventory)) tSuccess = F;
+			if (!ITileEntityMultiBlockController.Util.checkAndSetTargetOffset(this, 0, +3, 0, 18040, getMultiTileEntityRegistryID(), 0, MultiTileEntityMultiBlockPart.NOTHING       , aCoordinates, aPlayer, aInventory)) tSuccess = F;
+			if (!ITileEntityMultiBlockController.Util.checkAndSetTargetOffset(this, 0, +4, 0, 18040, getMultiTileEntityRegistryID(), 0, MultiTileEntityMultiBlockPart.NOTHING       , aCoordinates, aPlayer, aInventory)) tSuccess = F;
+			if (!ITileEntityMultiBlockController.Util.checkAndSetTargetOffset(this, 0, +5, 0, 18040, getMultiTileEntityRegistryID(), 0, MultiTileEntityMultiBlockPart.NOTHING       , aCoordinates, aPlayer, aInventory)) tSuccess = F;
+			if (!ITileEntityMultiBlockController.Util.checkAndSetTargetOffset(this, 0, +6, 0, 18040, getMultiTileEntityRegistryID(), 0, MultiTileEntityMultiBlockPart.NOTHING       , aCoordinates, aPlayer, aInventory)) tSuccess = F;
+			
+			if (!ITileEntityMultiBlockController.Util.checkAndSetTargetOffset(this, 0, +7, 0, 18029, getMultiTileEntityRegistryID(), 0, MultiTileEntityMultiBlockPart.NOTHING       , aCoordinates, aPlayer, aInventory)) tSuccess = F;
+			for (int i = -1; i <= 1; i++) for (int j = -1; j <= 1; j++) if (i != 0 || j != 0) {
+			if (!ITileEntityMultiBlockController.Util.checkAndSetTargetOffset(this, i, +5, j, 18029, getMultiTileEntityRegistryID(), 0, MultiTileEntityMultiBlockPart.NOTHING       , aCoordinates, aPlayer, aInventory)) tSuccess = F;
+			if (!ITileEntityMultiBlockController.Util.checkAndSetTargetOffset(this, i, +6, j, 18029, getMultiTileEntityRegistryID(), 0, MultiTileEntityMultiBlockPart.NOTHING       , aCoordinates, aPlayer, aInventory)) tSuccess = F;
+			if (!ITileEntityMultiBlockController.Util.checkAndSetTargetOffset(this, i, +7, j, 18029, getMultiTileEntityRegistryID(), 0, MultiTileEntityMultiBlockPart.NOTHING       , aCoordinates, aPlayer, aInventory)) tSuccess = F;
+			}
 			return tSuccess;
 		}
 		return mStructureOkay;
 	}
 
 	static {
-		LH.add("gt.tooltip.multiblock.largeboiler.1", "TODO");
-		LH.add("gt.tooltip.multiblock.largeboiler.2", "TODO");
-		LH.add("gt.tooltip.multiblock.largeboiler.3", "TODO");
-		LH.add("gt.tooltip.multiblock.largeboiler.4", "TODO");
+		LH.add("gt.tooltip.multiblock.von.da.graagg.1", "5x5x2 Base of 49 Dense Galvanized Steel Wall with Main at bottom Center");
+		LH.add("gt.tooltip.multiblock.von.da.graagg.2", "A 5m long Pole of Large Copper Coil with +1 Dense Steel Wall ontop");
+		LH.add("gt.tooltip.multiblock.von.da.graagg.3", "Wrap a 3x3x3 of 24 Dense Steel Wall around the Top");
+		LH.add("gt.tooltip.multiblock.von.da.graagg.4", "Prevents Mob Spawns except on Mossy Cobblestone, Range depends on Input.");
 	}
 
 	@Override
 	public void addToolTips(List<String> aList, ItemStack aStack, boolean aF3_H) {
 		aList.add(Chat.CYAN     + LH.get(LH.STRUCTURE) + ":");
-		aList.add(Chat.WHITE    + LH.get("gt.tooltip.multiblock.von.da.graag.1"));
-		aList.add(Chat.WHITE    + LH.get("gt.tooltip.multiblock.von.da.graag.2"));
-		aList.add(Chat.WHITE    + LH.get("gt.tooltip.multiblock.von.da.graag.3"));
-		aList.add(Chat.WHITE    + LH.get("gt.tooltip.multiblock.von.da.graag.4"));
+		aList.add(Chat.WHITE    + LH.get("gt.tooltip.multiblock.von.da.graagg.1"));
+		aList.add(Chat.WHITE    + LH.get("gt.tooltip.multiblock.von.da.graagg.2"));
+		aList.add(Chat.WHITE    + LH.get("gt.tooltip.multiblock.von.da.graagg.3"));
+		aList.add(Chat.CYAN     + LH.get("gt.tooltip.multiblock.von.da.graagg.4"));
+		LH.addEnergyToolTips(this, aList, mEnergyTypeAccepted, null, LH.get(LH.FACE_BOTTOM), "");
 		super.addToolTips(aList, aStack, aF3_H);
 	}
 
 	@Override
 	public boolean isInsideStructure(int aX, int aY, int aZ) {
 		// TODO actual dimensions of Structure
-		int tX = getOffsetXN(mFacing, 2), tY = yCoord-1, tZ = getOffsetZN(mFacing, 2);
+		int tX = xCoord, tY = yCoord, tZ = zCoord;
 		return aX >= tX - 2 && aY >= tY && aZ >= tZ - 2 && aX <= tX + 2 && aY <= tY + 8 && aZ <= tZ + 2;
 	}
 
@@ -123,19 +144,24 @@ public void onTick2(long aTimer, boolean aIsServerSide) {
 				GT_API_Proxy.MOB_SPAWN_INHIBITORS.add(this);
 				mHasToAddToList = F;
 			}
-			mCurrentRange = UT.Code.bind8(mStructureOkay ? mEnergy / 16 : 0);
-			mEnergy = 0;
+			mCurrentRange = UT.Code.bind8(mStructureOkay ? Math.min(mEnergy, 4096) / 16 : 0);
+			mEnergy -= 4096; if (mEnergy < 0) mEnergy = 0;
 		}
 	}
 
 	@Override
 	public void onMagnifyingGlass2(List<String> aChatReturn) {
-		aChatReturn.add("Square Radius: " + mCurrentRange + "m");
+		aChatReturn.add("Square Radius: " + mCurrentRange + "m of 256m");
 	}
 
 	@Override public byte getDefaultSide() {return SIDE_FRONT;}
 	@Override public boolean[] getValidSides() {return SIDES_HORIZONTAL;}
 
+	@Override public long getGibblValue   (byte aSide) {return mCurrentRange;}
+	@Override public long getGibblMax     (byte aSide) {return 256;}
+	@Override public long getProgressValue(byte aSide) {return mCurrentRange;}
+	@Override public long getProgressMax  (byte aSide) {return 256;}
+	
 	@Override public boolean isEnergyType(TagData aEnergyType, byte aSide, boolean aEmitting) {return !aEmitting && aEnergyType == mEnergyTypeAccepted;}
 	@Override public boolean isEnergyAcceptingFrom(TagData aEnergyType, byte aSide, boolean aTheoretical) {return isEnergyType(aEnergyType, aSide, F);}
 	@Override public boolean isEnergyCapacitorType(TagData aEnergyType, byte aSide) {return aEnergyType == mEnergyTypeAccepted;}