Skip to content

Commit fc49207

Browse files
committed
hot full crucibles are now 1000 times harder to break
1 parent f522c83 commit fc49207

6 files changed

Lines changed: 12 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Nothing (I tend to only add finished Stuff to the Changelog).
1313
[CHANGED] Oil Shale in Coke Oven now gives you 10x the Oil, making it actually worthwhile to use at all.
1414
[CHANGED] The 3 Types of Golden Juices now make roughly ten times less Biomass than before, they now either produce 65x (64x plus base value), 9x (8x plus base value) or 2x (1x plus base value) the output of Juice based Biomass.
1515
[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.
16+
[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).
17+
[CHANGED] Crucibles are now 1000 times harder to break when over 500 Kelvin unless empty.
1618
[ADDED] Steel Rope, which is just another type of Rope.
1719
[ADDED] Ultimet Boilers corresponding to the TaHFC Burning Boxes.
1820
[ADDED] Yellow and Brown Grass now indicate Lava, Gas and Oil Springs. Greener Grass indicates Water Springs.

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import gregapi.oredict.OreDictMaterialStack;
3030
import gregapi.tileentity.energy.ITileEntityEnergy;
3131
import gregapi.tileentity.energy.ITileEntityEnergyDataCapacitor;
32+
import gregapi.tileentity.machines.ITileEntityRunningPossible;
3233
import gregapi.tileentity.multiblocks.*;
3334
import gregapi.util.ST;
3435
import gregapi.util.UT;
@@ -53,7 +54,7 @@
5354
/**
5455
* @author Gregorius Techneticies
5556
*/
56-
public class MultiTileEntityBedrockDrill extends TileEntityBase10MultiBlockBase implements ITileEntityEnergy, ITileEntityEnergyDataCapacitor, IMultiBlockEnergy, IMultiBlockFluidHandler, IFluidHandler {
57+
public class MultiTileEntityBedrockDrill extends TileEntityBase10MultiBlockBase implements ITileEntityEnergy, ITileEntityEnergyDataCapacitor, IMultiBlockEnergy, IMultiBlockFluidHandler, IFluidHandler, ITileEntityRunningPossible {
5758
public long mEnergy = 0;
5859
public int mType = rng(BlocksGT.stones.length+(IL.EtFu_Deepslate_Cobble.exists() ? 2 : 1));
5960
public TagData mEnergyTypeAccepted = TD.Energy.RU;
@@ -307,4 +308,6 @@ public long doInject(TagData aEnergyType, byte aSide, long aSize, long aAmount,
307308
@Override public boolean canExtractItem2(int aSlot, ItemStack aStack, byte aSide) {return T;}
308309

309310
@Override public String getTileEntityName() {return "gt.multitileentity.multiblock.drill.bedrock";}
311+
312+
@Override public boolean getStateRunningPossible() {return mStructureOkay && mTank.has(100);}
310313
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -708,5 +708,7 @@ public void onWalkOver2(EntityLivingBase aEntity) {
708708
@Override public long getEnergySizeInputMax(TagData aEnergyType, byte aSide) {return Long.MAX_VALUE;}
709709
@Override public Collection<TagData> getEnergyTypes(byte aSide) {return ENERGYTYPES;}
710710

711+
@Override public float getBlockHardness() {return mContent.isEmpty() || mTemperature < Math.max(500, WD.envTemp(worldObj, xCoord, yCoord, zCoord)) ? super.getBlockHardness() : super.getBlockHardness() * 1000;}
712+
711713
@Override public String getTileEntityName() {return "gt.multitileentity.multiblock.crucible";}
712714
}

src/main/java/gregtech/tileentity/tools/MultiTileEntityFluidNozzle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public boolean onBlockActivated3(EntityPlayer aPlayer, byte aSide, float aHitX,
7373
DelegatorTileEntity<TileEntity> tDelegator = getAdjacentTileEntity(mFacing);
7474
if (tDelegator.mTileEntity instanceof ITileEntityTapAccessible) {
7575
ItemStack aStack = aPlayer.getCurrentEquippedItem();
76-
if (ItemsGT.VOIDING_ITEMS.contains(aStack)) {
76+
if (ItemsGT.VOIDING_ITEMS.contains(aStack, F)) {
7777
UT.Sounds.send(SFX.MC_FIZZ, 1.0F, 2.0F, this, F);
7878
GarbageGT.trash(((ITileEntityTapAccessible)tDelegator.mTileEntity).nozzleDrain(tDelegator.mSideOfTileEntity, Integer.MAX_VALUE, T));
7979
return T;

src/main/java/gregtech/tileentity/tools/MultiTileEntityFluidTap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public boolean onBlockActivated3(EntityPlayer aPlayer, byte aSide, float aHitX,
7979
DelegatorTileEntity<TileEntity> tDelegator = getAdjacentTileEntity(mFacing);
8080
if (tDelegator.mTileEntity instanceof ITileEntityTapAccessible) {
8181
ItemStack aStack = aPlayer.getCurrentEquippedItem();
82-
if (ItemsGT.VOIDING_ITEMS.contains(aStack)) {
82+
if (ItemsGT.VOIDING_ITEMS.contains(aStack, F)) {
8383
UT.Sounds.send(SFX.IC_SPRAY, 1.0F, 2.0F, this, F);
8484
GarbageGT.trash(((ITileEntityTapAccessible)tDelegator.mTileEntity).tapDrain(tDelegator.mSideOfTileEntity, Integer.MAX_VALUE, T));
8585
return T;

src/main/java/gregtech/tileentity/tools/MultiTileEntitySmeltery.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -697,5 +697,7 @@ public boolean checkObstruction(EntityPlayer aPlayer, byte aSide, float aHitX, f
697697
@Override public long getEnergySizeInputMax(TagData aEnergyType, byte aSide) {return Long.MAX_VALUE;}
698698
@Override public Collection<TagData> getEnergyTypes(byte aSide) {return ENERGYTYPES;}
699699

700+
@Override public float getBlockHardness() {return mContent.isEmpty() || mTemperature < Math.max(500, WD.envTemp(worldObj, xCoord, yCoord, zCoord)) ? super.getBlockHardness() : super.getBlockHardness() * 1000;}
701+
700702
@Override public String getTileEntityName() {return "gt.multitileentity.smeltery";}
701703
}

0 commit comments

Comments
 (0)