aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorHoleFish <48403212+HoleFish@users.noreply.github.com>2024-04-01 01:03:33 +0800
committerGitHub <noreply@github.com>2024-03-31 19:03:33 +0200
commitb73971d16d6f47d932ce5293875b93ddd5caf60f (patch)
treea0a0890b36771737c11f4bff5029e4e5f485e847 /src/main/java
parent7fb1553be109670ed70d7a30dac6e3f2034f826a (diff)
downloadGT5-Unofficial-b73971d16d6f47d932ce5293875b93ddd5caf60f.tar.gz
GT5-Unofficial-b73971d16d6f47d932ce5293875b93ddd5caf60f.tar.bz2
GT5-Unofficial-b73971d16d6f47d932ce5293875b93ddd5caf60f.zip
Stocking input busses don't update texture on TGS (#863)
* fix * move warning
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
index 5ce6c2db45..bc53dbeab5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
@@ -25,6 +25,7 @@ import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemShears;
import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.fluids.FluidStack;
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
@@ -111,6 +112,9 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
.addInfo("Output multiplier is equal to: 2*tier^2 - 2*tier + 5")
.addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
.addController("Front center").addCasingInfoMin(mCasingName, 8, false).addInputBus("Any casing", 1)
+ .addStructureInfo(
+ EnumChatFormatting.YELLOW
+ + "Stocking Input Busses and Crafting Input Busses/Buffers are not allowed!")
.addOutputBus("Any casing", 1).addEnergyHatch("Any casing", 1).addMaintenanceHatch("Any casing", 1)
.addMufflerHatch("Any casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
return tt;
@@ -138,16 +142,14 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
}
@Override
- public boolean checkHatch() {
+ public boolean addInputBusToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
// Tools from a stocking inout bus can not be damaged, this would cause an infinite durability exploit.
// Therefore disallow ME input bus.
- if (!super.checkHatch()) return false;
- for (GT_MetaTileEntity_Hatch_InputBus inputBus : mInputBusses) {
- if (inputBus instanceof GT_MetaTileEntity_Hatch_InputBus_ME) {
- return false;
- }
- }
- return true;
+ if (aTileEntity == null) return false;
+ IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
+ if (aMetaTileEntity == null) return false;
+ if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus_ME) return false;
+ return super.addInputBusToMachineList(aTileEntity, aBaseCasingIndex);
}
@Override