perform standard check alongside gt check

This commit is contained in:
Quantumlyy committed 2023-12-13 09:43:43 +01:00
1 parent 123ff12302
commit 65b698face
3 files changed
+8 -7

No files matched your search

@@ -50,7 +50,8 @@ public class TileEntityApiamancersDrainerCommon extends TileEntity implements IA
if (increment >= Config.drainerTimeBetween) {
increment = 0;
try {
IBeeHousing beeHousing = beeHousing();
TileEntity above = worldObj.getTileEntity(this.xCoord, this.yCoord + 1, this.zCoord);
IBeeHousing beeHousing = beeHousing(above);
if (beeHousing != null) {
LogHelper.warn("is housing");
IBeekeepingLogic beekeepingLogic = beeHousing.getBeekeepingLogic();
@@ -86,8 +87,7 @@ public class TileEntityApiamancersDrainerCommon extends TileEntity implements IA
increment++;
}
protected IBeeHousing beeHousing() {
TileEntity above = worldObj.getTileEntity(this.xCoord, this.yCoord + 1, this.zCoord);
protected IBeeHousing beeHousing(TileEntity above) {
// TODO: Revert once Industrial Apiary is working
Set<String> classes = ClassUtils.getAllInterfaces(above.getClass()).stream().map(Class::getName)
.collect(Collectors.toSet());
@@ -19,8 +19,10 @@ public class TileEntityApiamancersDrainerGT extends TileEntityApiamancersDrainer
public static boolean isGTLoaded = Loader.isModLoaded("gregtech");
@Override
protected IBeeHousing beeHousing() {
TileEntity above = worldObj.getTileEntity(this.xCoord, this.yCoord + 1, this.zCoord);
protected IBeeHousing beeHousing(TileEntity above) {
IBeeHousing regularCheck = super.beeHousing(above);
if (regularCheck != null) return regularCheck;
boolean isGTMetaTileEntity = above instanceof BaseMetaTileEntity;
if (isGTMetaTileEntity) {