From 3901d60545cae336a6eae8c01c4cbb29c580a352 Mon Sep 17 00:00:00 2001 From: modmuss50 <modmuss50@gmail.com> Date: Sun, 22 Oct 2017 18:23:58 +0100 Subject: [PATCH] Some work on charging ic2 items, moving back to a proper pc. --- .../crafttweaker/CTIndustrialGrinder.java | 2 +- .../tiles/storage/TileEnergyStorage.java | 5 +++++ .../java/techreborn/utils/IC2ItemCharger.java | 19 +++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 src/main/java/techreborn/utils/IC2ItemCharger.java diff --git a/src/main/java/techreborn/compat/crafttweaker/CTIndustrialGrinder.java b/src/main/java/techreborn/compat/crafttweaker/CTIndustrialGrinder.java index 28b53af86..0edabed16 100644 --- a/src/main/java/techreborn/compat/crafttweaker/CTIndustrialGrinder.java +++ b/src/main/java/techreborn/compat/crafttweaker/CTIndustrialGrinder.java @@ -35,7 +35,7 @@ import stanhebben.zenscript.annotations.ZenMethod; import techreborn.api.Reference; import techreborn.api.recipe.machines.IndustrialGrinderRecipe; -@ZenClass("mods.techreborn.grinder") +@ZenClass("mods.techreborn.industralGrinder") public class CTIndustrialGrinder extends CTGeneric { @ZenMethod diff --git a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java index 9927c7849..d03c86ea6 100644 --- a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java +++ b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java @@ -37,6 +37,8 @@ import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.blocks.storage.BlockEnergyStorage; +import techreborn.compat.CompatManager; +import techreborn.utils.IC2ItemCharger; /** * Created by Rushmead @@ -77,6 +79,9 @@ public class TileEnergyStorage extends TilePowerAcceptor implements IToolDrop, I PoweredItem.setEnergy(PoweredItem.getEnergy(stack) + item.getMaxTransfer(stack), stack); } } + if(CompatManager.isIC2Loaded){ + IC2ItemCharger.chargeIc2Item(this, stack); + } } if (!inventory.getStackInSlot(1).isEmpty()) { ItemStack stack = inventory.getStackInSlot(1); diff --git a/src/main/java/techreborn/utils/IC2ItemCharger.java b/src/main/java/techreborn/utils/IC2ItemCharger.java new file mode 100644 index 000000000..d39eb6e6d --- /dev/null +++ b/src/main/java/techreborn/utils/IC2ItemCharger.java @@ -0,0 +1,19 @@ +package techreborn.utils; + +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import net.minecraft.item.ItemStack; +import reborncore.common.powerSystem.TilePowerAcceptor; + +public class IC2ItemCharger { + + public static void chargeIc2Item(TilePowerAcceptor tilePowerAcceptor, ItemStack stack){ + if(stack.isEmpty()){ + return; + } + if(stack.getItem() instanceof IElectricItem){ + tilePowerAcceptor.useEnergy(ElectricItem.manager.charge(stack, tilePowerAcceptor.getEnergy(), 4, false, false)); + } + } + +}