aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/item/base
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-10-07 13:04:05 +1000
committerAlkalus <draknyte1@hotmail.com>2017-10-07 13:04:05 +1000
commitd98e0b22cb0d7dbb7145cf0f751f6e4e44ed08d1 (patch)
treee1719570ed4cbf62c202c5b6548a9f365ea7332e /src/Java/gtPlusPlus/core/item/base
parentab880b63b5aa60b8e3d4f65b38c1d2ec880d1ed2 (diff)
downloadGT5-Unofficial-d98e0b22cb0d7dbb7145cf0f751f6e4e44ed08d1.tar.gz
GT5-Unofficial-d98e0b22cb0d7dbb7145cf0f751f6e4e44ed08d1.tar.bz2
GT5-Unofficial-d98e0b22cb0d7dbb7145cf0f751f6e4e44ed08d1.zip
$ Fixed custom IC2 cells. (HF, SO2, etc)
% Changed how cells can be generated for further flexibility. - Removed logging from the LFTR.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/base')
-rw-r--r--src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
index c9340badda..f5fff65882 100644
--- a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
+++ b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
@@ -6,9 +6,14 @@ import gtPlusPlus.core.item.base.BaseItemComponent;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.fluid.FluidUtils;
+import gtPlusPlus.core.util.item.ItemUtils;
+import ic2.core.Ic2Items;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidContainerRegistry;
public class BaseItemCell extends BaseItemComponent{
@@ -19,6 +24,19 @@ public class BaseItemCell extends BaseItemComponent{
public BaseItemCell(final Material material) {
super(material, BaseItemComponent.ComponentTypes.CELL);
this.fluidColour = (short[]) ((material == null) ? this.extraData : material.getRGBA());
+ //FluidContainerRegistry.registerFluidContainer(material.getFluid(1000), ItemUtils.getSimpleStack(this), Ic2Items.cell.copy());
+ }
+
+ public BaseItemCell(final String unlocalName, final String localName, final short[] RGBa) {
+ super(unlocalName, localName, RGBa);
+ this.fluidColour = RGBa;
+ FluidContainerRegistry.registerFluidContainer(FluidUtils.getFluidStack(unlocalName.toLowerCase(), 0), ItemUtils.getSimpleStack(this), Ic2Items.cell.copy());
+ }
+
+ public BaseItemCell(final String unlocalName, final String localName, final short[] RGBa, final Fluid cellFluid) {
+ super(unlocalName, localName, RGBa);
+ this.fluidColour = RGBa;
+ FluidContainerRegistry.registerFluidContainer(FluidUtils.getFluidStack(cellFluid, 1000), ItemUtils.getSimpleStack(this), Ic2Items.cell.copy());
}
@Override