AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-24 04:50:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Beekeeper module not working with GT IApiary

Browse Source
This commit is contained in:
Noktuska 2024-03-25 03:41:04 +01:00
parent 6681bf9438
commit 3fb7b47278
2 changed files with 39 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/scala/li/cil/oc/integration/forestry/UpgradeBeekeeper.scala
View File

@ -31,6 +31,8 @@ class UpgradeBeekeeper(val host: EnvironmentHost with internal.Agent) extends pr
DeviceAttribute.Product -> "Breeding bees for you (almost)"
)
private final val defaultStackSize = 64
override def getDeviceInfo: util.Map[String, String] = deviceInfo
override def position: BlockPosition = BlockPosition(host)
override protected def checkSideForAction(args: Arguments, n: Int): ForgeDirection = args.checkSideAny(n)
@ -98,7 +100,7 @@ class UpgradeBeekeeper(val host: EnvironmentHost with internal.Agent) extends pr
def addIndustrialUpgrade(context: Context, args: Arguments): Array[AnyRef] = {
val facing = checkSideForAction(args, 0)
val pos = position.offset(facing)
var amount = 999
var amount = defaultStackSize
if (args.count() > 1)
amount = args.checkInteger(1)
result(UpgradeBeekeeperUtil.addIndustrialUpgrade(pos, host.mainInventory(), host.selectedSlot(), amount))
@ -108,8 +110,9 @@ class UpgradeBeekeeper(val host: EnvironmentHost with internal.Agent) extends pr
val facing = checkSideForAction(args, 0)
val pos = position.offset(facing)
val slot = args.checkInteger(1)
if (slot < 1 || slot > 4)
return result(Unit, "Wrong slot index (should be 1-4)")
val maxIndex = UpgradeBeekeeperUtil.getMaxIndustrialUpgradeCount
if (slot < 1 || slot > maxIndex)
return result(Unit, "Wrong slot index (should be 1-" + maxIndex + ")")
result(UpgradeBeekeeperUtil.getIndustrialUpgrade(pos, slot))
}
@Callback(doc = """function(side:number, slot: number[, amount: number]):boolean -- Remove industrial upgrade from the given slot of the industrial apiary at the given side.""")
@ -117,11 +120,12 @@ class UpgradeBeekeeper(val host: EnvironmentHost with internal.Agent) extends pr
val facing = checkSideForAction(args, 0)
val pos = position.offset(facing)
val slot = args.checkInteger(1)
var amount = 999
val maxIndex = UpgradeBeekeeperUtil.getMaxIndustrialUpgradeCount
var amount = defaultStackSize
if (args.count() > 2)
amount = args.checkInteger(2)
if (slot < 1 || slot > 4)
return result(false, "Wrong slot index (should be 1-4)")
if (slot < 1 || slot > maxIndex)
return result(false, "Wrong slot index (should be 1-" + maxIndex + ")")
result(UpgradeBeekeeperUtil.removeIndustrialUpgrade(pos, host.mainInventory(), host.selectedSlot(), slot, amount))
}
}

71
src/main/scala/li/cil/oc/integration/forestry/UpgradeBeekeeperUtil.java
View File

@ -1,8 +1,8 @@
package li.cil.oc.integration.forestry;
import cpw.mods.fml.common.Loader;
import forestry.api.apiculture.IBeeHousing;
import gregtech.api.metatileentity.BaseMetaTileEntity;
import gregtech.api.util.GT_ApiaryUpgrade;
import gregtech.api.util.GT_Utility;
import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_IndustrialApiary;
import li.cil.oc.util.BlockPosition;
@ -17,8 +17,7 @@ import net.minecraft.world.World;
* */
public final class UpgradeBeekeeperUtil {
// First upgrade slot index of Industrial Apiaries because it's private for some reason
private static final int UPGRADE_INDEX = 7;
private static final boolean GT_LOADED = Loader.isModLoaded("gregtech");
private UpgradeBeekeeperUtil() {}
/** Returns an IBeeHousing TileEntity at position pos. Can be an Industrial Apiary */
@ -32,6 +31,10 @@ public final class UpgradeBeekeeperUtil {
return null;
if (te instanceof IBeeHousing)
return (IBeeHousing)te;
if (!GT_LOADED)
return null;
// Scala doesn't compile if these checks are of the form (a instanceof B b)
if (!(te instanceof BaseMetaTileEntity))
return null;
@ -43,7 +46,7 @@ public final class UpgradeBeekeeperUtil {
/** Returns a Tile Entity for Industrial Apiaries at position pos, or null if none exist */
public static GT_MetaTileEntity_IndustrialApiary getGTIApiaryAt(BlockPosition pos) {
if (pos.world().isEmpty())
if (!GT_LOADED || pos.world().isEmpty())
return null;
World world = pos.world().get();
@ -82,72 +85,56 @@ public final class UpgradeBeekeeperUtil {
return true;
}
public static int getMaxIndustrialUpgradeCount() {
if (!GT_LOADED)
return 0;
return GT_MetaTileEntity_IndustrialApiary.getMaxUpgradeCount();
}
public static int addIndustrialUpgrade(BlockPosition pos, IInventory hostInv, int slot, int amount) {
GT_MetaTileEntity_IndustrialApiary iapiary = getGTIApiaryAt(pos);
if (iapiary == null)
if (iapiary == null || amount <= 0)
return 0;
ItemStack stackToInstall = hostInv.getStackInSlot(slot);
if (stackToInstall == null || !GT_ApiaryUpgrade.isUpgrade(stackToInstall))
if (stackToInstall == null)
return 0;
amount = Math.min(amount, stackToInstall.stackSize);
for (int i = UPGRADE_INDEX; i < UPGRADE_INDEX + 4; i++) {
// isItemValidForSlot ensures merging existing stacks
if (!iapiary.isItemValidForSlot(i, stackToInstall))
continue;
ItemStack stackToTryPush = stackToInstall.splitStack(amount);
iapiary.addUpgrade(stackToTryPush);
int itemsPushed = amount - stackToTryPush.stackSize;
// Any Upgrades that weren't pushed go back into host inventory
stackToInstall.stackSize += stackToTryPush.stackSize;
int maxStackSize = GT_ApiaryUpgrade.getUpgrade(stackToInstall).getMaxNumber();
ItemStack stack = iapiary.getStackInSlot(i);
// Push into empty slot
if (stack == null) {
amount = Math.min(amount, maxStackSize);
iapiary.setInventorySlotContents(i, stackToInstall.splitStack(amount));
if (stackToInstall.stackSize <= 0)
hostInv.setInventorySlotContents(slot, null);
return amount;
}
// Merge stacks
if (!GT_Utility.areStacksEqual(stackToInstall, stack))
continue;
amount = Math.max(Math.min(amount, maxStackSize - stack.stackSize), 0);
if (amount == 0)
return 0;
stack.stackSize += amount;
stackToInstall.stackSize -= amount;
if (stackToInstall.stackSize <= 0)
hostInv.setInventorySlotContents(slot, null);
return amount;
}
return 0;
return itemsPushed;
}
public static ItemStack getIndustrialUpgrade(BlockPosition pos, int index){
if (index < 1 || index > 4)
if (index < 1 || index > getMaxIndustrialUpgradeCount())
return null;
GT_MetaTileEntity_IndustrialApiary iapiary = getGTIApiaryAt(pos);
if (iapiary == null)
return null;
return iapiary.getStackInSlot(index - 1 + UPGRADE_INDEX);
return iapiary.getUpgrade(index - 1);
}
public static int removeIndustrialUpgrade(BlockPosition pos, IInventory hostInv, int slot, int index, int amount) {
if (index < 1 || index > 4)
if (index < 1 || index > getMaxIndustrialUpgradeCount() || amount <= 0)
return 0;
GT_MetaTileEntity_IndustrialApiary iapiary = getGTIApiaryAt(pos);
if (iapiary == null)
return 0;
index = index - 1 + UPGRADE_INDEX;
ItemStack stack = iapiary.getStackInSlot(index);
ItemStack stack = iapiary.getUpgrade(index - 1);
if (stack == null)
return 0;
stack = stack.copy();
amount = Math.min(amount, stack.stackSize);
int moved = insertIntoHostInv(hostInv, slot, stack.splitStack(amount));
// If less items were moved than planned, move the unmoved items back
stack.stackSize += (amount - moved);
if (stack.stackSize <= 0)
iapiary.setInventorySlotContents(index, null);
iapiary.removeUpgrade(index - 1, moved);
return moved;
}