From 65b698face6a7b113e3e18774e4adf54ce968672 Mon Sep 17 00:00:00 2001 From: Quantumlyy Date: Wed, 13 Dec 2023 09:43:43 +0100 Subject: [PATCH] perform standard check alongside gt check --- dependencies.gradle | 3 +-- .../tileentity/TileEntityApiamancersDrainerCommon.java | 6 +++--- .../tileentity/TileEntityApiamancersDrainerGT.java | 6 ++++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 493ea46..59f8681 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -8,7 +8,6 @@ dependencies { compileOnly('com.github.GTNewHorizons:Baubles:1.0.3:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:Botania:1.10.3-GTNH:api') {transitive = false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.101:dev') { transitive = false } - + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.101:dev') } diff --git a/src/main/java/magicbees/tileentity/TileEntityApiamancersDrainerCommon.java b/src/main/java/magicbees/tileentity/TileEntityApiamancersDrainerCommon.java index 95a9e73..800525d 100644 --- a/src/main/java/magicbees/tileentity/TileEntityApiamancersDrainerCommon.java +++ b/src/main/java/magicbees/tileentity/TileEntityApiamancersDrainerCommon.java @@ -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 classes = ClassUtils.getAllInterfaces(above.getClass()).stream().map(Class::getName) .collect(Collectors.toSet()); diff --git a/src/main/java/magicbees/tileentity/TileEntityApiamancersDrainerGT.java b/src/main/java/magicbees/tileentity/TileEntityApiamancersDrainerGT.java index c429218..1ee764b 100644 --- a/src/main/java/magicbees/tileentity/TileEntityApiamancersDrainerGT.java +++ b/src/main/java/magicbees/tileentity/TileEntityApiamancersDrainerGT.java @@ -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) {