mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Tiered Gas Tanks and tiered Fluid Tanks!
This commit is contained in:
1 parent
08b6490bd3
commit
3c1496740c
40 files changed
+498
-171
No files matched your search
@@ -41,7 +41,7 @@ import mekanism.client.gui.GuiOsmiumCompressor;
|
||||
import mekanism.client.gui.GuiPRC;
|
||||
import mekanism.client.gui.GuiPasswordEnter;
|
||||
import mekanism.client.gui.GuiPasswordModify;
|
||||
import mekanism.client.gui.GuiPortableTank;
|
||||
import mekanism.client.gui.GuiFluidTank;
|
||||
import mekanism.client.gui.GuiPrecisionSawmill;
|
||||
import mekanism.client.gui.GuiPurificationChamber;
|
||||
import mekanism.client.gui.GuiRobitCrafting;
|
||||
@@ -93,7 +93,7 @@ import mekanism.client.render.tileentity.RenderLaserTractorBeam;
|
||||
import mekanism.client.render.tileentity.RenderLogisticalSorter;
|
||||
import mekanism.client.render.tileentity.RenderMetallurgicInfuser;
|
||||
import mekanism.client.render.tileentity.RenderObsidianTNT;
|
||||
import mekanism.client.render.tileentity.RenderPortableTank;
|
||||
import mekanism.client.render.tileentity.RenderFluidTank;
|
||||
import mekanism.client.render.tileentity.RenderPressurizedReactionChamber;
|
||||
import mekanism.client.render.tileentity.RenderRotaryCondensentrator;
|
||||
import mekanism.client.render.tileentity.RenderThermalEvaporationController;
|
||||
@@ -160,7 +160,7 @@ import mekanism.common.tile.TileEntityObsidianTNT;
|
||||
import mekanism.common.tile.TileEntityOredictionificator;
|
||||
import mekanism.common.tile.TileEntityOsmiumCompressor;
|
||||
import mekanism.common.tile.TileEntityPRC;
|
||||
import mekanism.common.tile.TileEntityPortableTank;
|
||||
import mekanism.common.tile.TileEntityFluidTank;
|
||||
import mekanism.common.tile.TileEntityPrecisionSawmill;
|
||||
import mekanism.common.tile.TileEntityPurificationChamber;
|
||||
import mekanism.common.tile.TileEntityRotaryCondensentrator;
|
||||
@@ -320,7 +320,7 @@ public class ClientProxy extends CommonProxy
|
||||
ClientRegistry.registerTileEntity(TileEntityChemicalCrystallizer.class, "ChemicalCrystallizer", new RenderChemicalCrystallizer());
|
||||
ClientRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator", new RenderSeismicVibrator());
|
||||
ClientRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber", new RenderPressurizedReactionChamber());
|
||||
ClientRegistry.registerTileEntity(TileEntityPortableTank.class, "PortableTank", new RenderPortableTank());
|
||||
ClientRegistry.registerTileEntity(TileEntityFluidTank.class, "PortableTank", new RenderFluidTank()); //TODO rename
|
||||
ClientRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher", new RenderFluidicPlenisher());
|
||||
ClientRegistry.registerTileEntity(TileEntityLaser.class, "Laser", new RenderLaser());
|
||||
ClientRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier", new RenderLaserAmplifier());
|
||||
@@ -490,7 +490,7 @@ public class ClientProxy extends CommonProxy
|
||||
case 40:
|
||||
return new GuiPRC(player.inventory, (TileEntityPRC)tileEntity);
|
||||
case 41:
|
||||
return new GuiPortableTank(player.inventory, (TileEntityPortableTank)tileEntity);
|
||||
return new GuiFluidTank(player.inventory, (TileEntityFluidTank)tileEntity);
|
||||
case 42:
|
||||
return new GuiFluidicPlenisher(player.inventory, (TileEntityFluidicPlenisher)tileEntity);
|
||||
case 43:
|
||||
|
||||
@@ -91,7 +91,7 @@ public class MekanismKeyHandler extends MekKeyHandler
|
||||
{
|
||||
ItemBlockMachine machine = (ItemBlockMachine)item;
|
||||
|
||||
if(MachineType.get(toolStack) == MachineType.PORTABLE_TANK)
|
||||
if(MachineType.get(toolStack) == MachineType.FLUID_TANK)
|
||||
{
|
||||
machine.setBucketMode(toolStack, !machine.getBucketMode(toolStack));
|
||||
Mekanism.packetHandler.sendToServer(new PortableTankStateMessage(machine.getBucketMode(toolStack)));
|
||||
|
||||
+4
-4
@@ -7,7 +7,7 @@ import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler;
|
||||
import mekanism.client.gui.element.GuiSlot.SlotOverlay;
|
||||
import mekanism.client.gui.element.GuiSlot.SlotType;
|
||||
import mekanism.common.inventory.container.ContainerPortableTank;
|
||||
import mekanism.common.tile.TileEntityPortableTank;
|
||||
import mekanism.common.tile.TileEntityFluidTank;
|
||||
import mekanism.common.util.LangUtils;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.MekanismUtils.ResourceType;
|
||||
@@ -19,11 +19,11 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class GuiPortableTank extends GuiMekanism
|
||||
public class GuiFluidTank extends GuiMekanism
|
||||
{
|
||||
public TileEntityPortableTank tileEntity;
|
||||
public TileEntityFluidTank tileEntity;
|
||||
|
||||
public GuiPortableTank(InventoryPlayer inventory, TileEntityPortableTank tentity)
|
||||
public GuiFluidTank(InventoryPlayer inventory, TileEntityFluidTank tentity)
|
||||
{
|
||||
super(tentity, new ContainerPortableTank(inventory, tentity));
|
||||
tileEntity = tentity;
|
||||
@@ -46,7 +46,7 @@ public class GuiGasTank extends GuiMekanism
|
||||
int xAxis = (mouseX - (width - xSize) / 2);
|
||||
int yAxis = (mouseY - (height - ySize) / 2);
|
||||
|
||||
String capacityInfo = tileEntity.gasTank.getStored() + "/" + tileEntity.MAX_GAS;
|
||||
String capacityInfo = tileEntity.gasTank.getStored() + "/" + tileEntity.tier.storage;
|
||||
|
||||
fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getInventoryName()) / 2), 6, 0x404040);
|
||||
fontRendererObj.drawString(capacityInfo, 45, 40, 0x404040);
|
||||
@@ -74,7 +74,7 @@ public class GuiGasTank extends GuiMekanism
|
||||
|
||||
if(tileEntity.gasTank.getGas() != null)
|
||||
{
|
||||
int scale = (int)(((double)tileEntity.gasTank.getStored() / tileEntity.MAX_GAS) * 72);
|
||||
int scale = (int)(((double)tileEntity.gasTank.getStored() / tileEntity.tier.storage) * 72);
|
||||
drawTexturedModalRect(guiWidth + 65, guiHeight + 17, 176, 0, scale, 10);
|
||||
}
|
||||
|
||||
|
||||
+5
-4
@@ -1,14 +1,14 @@
|
||||
package mekanism.client.model;
|
||||
|
||||
import mekanism.client.render.MekanismRenderer;
|
||||
|
||||
import mekanism.common.Tier.FluidTankTier;
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class ModelPortableTank extends ModelBase
|
||||
public class ModelFluidTank extends ModelBase
|
||||
{
|
||||
ModelRenderer Base;
|
||||
ModelRenderer PoleFL;
|
||||
@@ -21,7 +21,7 @@ public class ModelPortableTank extends ModelBase
|
||||
ModelRenderer RightGlass;
|
||||
ModelRenderer LeftGlass;
|
||||
|
||||
public ModelPortableTank()
|
||||
public ModelFluidTank()
|
||||
{
|
||||
textureWidth = 128;
|
||||
textureHeight = 128;
|
||||
@@ -88,7 +88,7 @@ public class ModelPortableTank extends ModelBase
|
||||
setRotation(LeftGlass, 0F, 0F, 0F);
|
||||
}
|
||||
|
||||
public void render(float size)
|
||||
public void render(float size, FluidTankTier tier)
|
||||
{
|
||||
Base.render(size);
|
||||
PoleFL.render(size);
|
||||
@@ -98,6 +98,7 @@ public class ModelPortableTank extends ModelBase
|
||||
Top.render(size);
|
||||
|
||||
MekanismRenderer.blendOn();
|
||||
MekanismRenderer.color(tier.getBaseTier().getColor());
|
||||
FrontGlass.render(size);
|
||||
BackGlass.render(size);
|
||||
RightGlass.render(size);
|
||||
@@ -9,6 +9,7 @@ import mekanism.api.gas.GasRegistry;
|
||||
import mekanism.api.util.ListUtils;
|
||||
import mekanism.client.gui.GuiChemicalInjectionChamber;
|
||||
import mekanism.client.gui.element.GuiProgress.ProgressBar;
|
||||
import mekanism.common.Tier.GasTankTier;
|
||||
import mekanism.common.recipe.RecipeHandler.Recipe;
|
||||
import mekanism.common.recipe.machines.InjectionRecipe;
|
||||
import mekanism.common.util.LangUtils;
|
||||
@@ -49,18 +50,31 @@ public class ChemicalInjectionChamberRecipeHandler extends AdvancedMachineRecipe
|
||||
{
|
||||
List<ItemStack> fuels = new ArrayList<ItemStack>();
|
||||
fuels.addAll(OreDictionary.getOres("dustSulfur"));
|
||||
fuels.add(MekanismUtils.getFullGasTank(GasRegistry.getGas("sulfuricAcid")));
|
||||
|
||||
for(GasTankTier tier : GasTankTier.values())
|
||||
{
|
||||
fuels.add(MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("sulfuricAcid")));
|
||||
}
|
||||
|
||||
return fuels;
|
||||
}
|
||||
else if(gasType == GasRegistry.getGas("water"))
|
||||
{
|
||||
return ListUtils.asList(MekanismUtils.getFullGasTank(GasRegistry.getGas("water")));
|
||||
for(GasTankTier tier : GasTankTier.values())
|
||||
{
|
||||
return ListUtils.asList(MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("water")));
|
||||
}
|
||||
}
|
||||
else if(gasType == GasRegistry.getGas("hydrogenChloride"))
|
||||
{
|
||||
List<ItemStack> fuels = new ArrayList<ItemStack>();
|
||||
fuels.addAll(OreDictionary.getOres("dustSalt"));
|
||||
fuels.add(MekanismUtils.getFullGasTank(GasRegistry.getGas("hydrogenChloride")));
|
||||
|
||||
for(GasTankTier tier : GasTankTier.values())
|
||||
{
|
||||
fuels.add(MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("hydrogenChloride")));
|
||||
}
|
||||
|
||||
return fuels;
|
||||
}
|
||||
|
||||
|
||||
@@ -7,8 +7,9 @@ import java.util.List;
|
||||
import mekanism.api.gas.Gas;
|
||||
import mekanism.api.gas.GasRegistry;
|
||||
import mekanism.api.util.ListUtils;
|
||||
import mekanism.client.gui.element.GuiProgress.ProgressBar;
|
||||
import mekanism.client.gui.GuiPurificationChamber;
|
||||
import mekanism.client.gui.element.GuiProgress.ProgressBar;
|
||||
import mekanism.common.Tier.GasTankTier;
|
||||
import mekanism.common.recipe.RecipeHandler.Recipe;
|
||||
import mekanism.common.recipe.machines.PurificationRecipe;
|
||||
import mekanism.common.util.LangUtils;
|
||||
@@ -53,7 +54,10 @@ public class PurificationChamberRecipeHandler extends AdvancedMachineRecipeHandl
|
||||
{
|
||||
if(gasType == GasRegistry.getGas("oxygen"))
|
||||
{
|
||||
return ListUtils.asList(new ItemStack(Items.flint), MekanismUtils.getFullGasTank(GasRegistry.getGas("oxygen")));
|
||||
for(GasTankTier tier : GasTankTier.values())
|
||||
{
|
||||
return ListUtils.asList(new ItemStack(Items.flint), MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("oxygen")));
|
||||
}
|
||||
}
|
||||
|
||||
return new ArrayList<ItemStack>();
|
||||
|
||||
@@ -15,7 +15,7 @@ import mekanism.api.infuse.InfuseType;
|
||||
import mekanism.api.transmitters.TransmissionType;
|
||||
import mekanism.client.render.tileentity.RenderConfigurableMachine;
|
||||
import mekanism.client.render.tileentity.RenderDynamicTank;
|
||||
import mekanism.client.render.tileentity.RenderPortableTank;
|
||||
import mekanism.client.render.tileentity.RenderFluidTank;
|
||||
import mekanism.client.render.tileentity.RenderThermalEvaporationController;
|
||||
import mekanism.common.ObfuscatedNames;
|
||||
import mekanism.common.base.ISpecialBounds;
|
||||
@@ -142,7 +142,7 @@ public class MekanismRenderer
|
||||
|
||||
RenderDynamicTank.resetDisplayInts();
|
||||
RenderThermalEvaporationController.resetDisplayInts();
|
||||
RenderPortableTank.resetDisplayInts();
|
||||
RenderFluidTank.resetDisplayInts();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -9,12 +9,12 @@ import mekanism.client.model.ModelAtomicDisassembler;
|
||||
import mekanism.client.model.ModelEnergyCube;
|
||||
import mekanism.client.model.ModelEnergyCube.ModelEnergyCore;
|
||||
import mekanism.client.model.ModelFlamethrower;
|
||||
import mekanism.client.model.ModelFluidTank;
|
||||
import mekanism.client.model.ModelFreeRunners;
|
||||
import mekanism.client.model.ModelGasMask;
|
||||
import mekanism.client.model.ModelGasTank;
|
||||
import mekanism.client.model.ModelJetpack;
|
||||
import mekanism.client.model.ModelObsidianTNT;
|
||||
import mekanism.client.model.ModelPortableTank;
|
||||
import mekanism.client.model.ModelRobit;
|
||||
import mekanism.client.model.ModelScubaTank;
|
||||
import mekanism.client.render.MekanismRenderer;
|
||||
@@ -22,16 +22,19 @@ import mekanism.client.render.RenderGlowPanel;
|
||||
import mekanism.client.render.RenderPartTransmitter;
|
||||
import mekanism.client.render.entity.RenderBalloon;
|
||||
import mekanism.client.render.tileentity.RenderBin;
|
||||
import mekanism.client.render.tileentity.RenderPortableTank;
|
||||
import mekanism.client.render.tileentity.RenderFluidTank;
|
||||
import mekanism.common.MekanismBlocks;
|
||||
import mekanism.common.MekanismItems;
|
||||
import mekanism.common.Tier.BaseTier;
|
||||
import mekanism.common.Tier.EnergyCubeTier;
|
||||
import mekanism.common.Tier.FluidTankTier;
|
||||
import mekanism.common.base.IEnergyCube;
|
||||
import mekanism.common.block.BlockMachine.MachineType;
|
||||
import mekanism.common.inventory.InventoryBin;
|
||||
import mekanism.common.item.ItemAtomicDisassembler;
|
||||
import mekanism.common.item.ItemBalloon;
|
||||
import mekanism.common.item.ItemBlockBasic;
|
||||
import mekanism.common.item.ItemBlockGasTank;
|
||||
import mekanism.common.item.ItemBlockMachine;
|
||||
import mekanism.common.item.ItemFlamethrower;
|
||||
import mekanism.common.item.ItemFreeRunners;
|
||||
@@ -43,7 +46,7 @@ import mekanism.common.multipart.ItemGlowPanel;
|
||||
import mekanism.common.multipart.ItemPartTransmitter;
|
||||
import mekanism.common.multipart.TransmitterType;
|
||||
import mekanism.common.tile.TileEntityBin;
|
||||
import mekanism.common.tile.TileEntityPortableTank;
|
||||
import mekanism.common.tile.TileEntityFluidTank;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.MekanismUtils.ResourceType;
|
||||
import net.minecraft.block.Block;
|
||||
@@ -84,12 +87,12 @@ public class ItemRenderingHandler implements IItemRenderer
|
||||
public ModelScubaTank scubaTank = new ModelScubaTank();
|
||||
public ModelFreeRunners freeRunners = new ModelFreeRunners();
|
||||
public ModelAtomicDisassembler atomicDisassembler = new ModelAtomicDisassembler();
|
||||
public ModelPortableTank portableTank = new ModelPortableTank();
|
||||
public ModelFluidTank portableTank = new ModelFluidTank();
|
||||
public ModelFlamethrower flamethrower = new ModelFlamethrower();
|
||||
|
||||
private final RenderBalloon balloonRenderer = new RenderBalloon();
|
||||
private final RenderBin binRenderer = (RenderBin)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityBin.class);
|
||||
private final RenderPortableTank portableTankRenderer = (RenderPortableTank)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityPortableTank.class);
|
||||
private final RenderFluidTank portableTankRenderer = (RenderFluidTank)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityFluidTank.class);
|
||||
private final RenderItem renderItem = (RenderItem)RenderManager.instance.getEntityClassRenderObject(EntityItem.class);
|
||||
|
||||
@Override
|
||||
@@ -293,7 +296,8 @@ public class ItemRenderingHandler implements IItemRenderer
|
||||
else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.GasTank)
|
||||
{
|
||||
GL11.glPushMatrix();
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank.png"));
|
||||
BaseTier tier = ((ItemBlockGasTank)item.getItem()).getBaseTier(item);
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tier.getName() + ".png"));
|
||||
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
|
||||
GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F);
|
||||
GL11.glTranslatef(0.0F, -1.0F, 0.0F);
|
||||
@@ -506,15 +510,16 @@ public class ItemRenderingHandler implements IItemRenderer
|
||||
flamethrower.render(0.0625F);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
else if(MachineType.get(item) == MachineType.PORTABLE_TANK)
|
||||
else if(MachineType.get(item) == MachineType.FLUID_TANK)
|
||||
{
|
||||
GL11.glPushMatrix();
|
||||
GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F);
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PortableTank.png"));
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidTank.png"));
|
||||
|
||||
ItemBlockMachine itemMachine = (ItemBlockMachine)item.getItem();
|
||||
FluidTankTier tier = FluidTankTier.values()[itemMachine.getBaseTier(item).ordinal()];
|
||||
Fluid fluid = itemMachine.getFluidStack(item) != null ? itemMachine.getFluidStack(item).getFluid() : null;
|
||||
portableTankRenderer.render(fluid, itemMachine.getPrevScale(item), false, null, -0.5, -0.5, -0.5);
|
||||
portableTankRenderer.render(tier, fluid, itemMachine.getPrevScale(item), false, null, -0.5, -0.5, -0.5);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
else {
|
||||
|
||||
+14
-13
@@ -3,46 +3,47 @@ package mekanism.client.render.tileentity;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import mekanism.client.model.ModelPortableTank;
|
||||
import mekanism.client.model.ModelFluidTank;
|
||||
import mekanism.client.render.MekanismRenderer;
|
||||
import mekanism.client.render.MekanismRenderer.DisplayInteger;
|
||||
import mekanism.client.render.MekanismRenderer.Model3D;
|
||||
import mekanism.common.tile.TileEntityPortableTank;
|
||||
import mekanism.common.Tier.FluidTankTier;
|
||||
import mekanism.common.tile.TileEntityFluidTank;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.MekanismUtils.ResourceType;
|
||||
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class RenderPortableTank extends TileEntitySpecialRenderer
|
||||
public class RenderFluidTank extends TileEntitySpecialRenderer
|
||||
{
|
||||
private static Map<Fluid, DisplayInteger[]> cachedCenterFluids = new HashMap<Fluid, DisplayInteger[]>();
|
||||
private static Map<Fluid, DisplayInteger[]> cachedValveFluids = new HashMap<Fluid, DisplayInteger[]>();
|
||||
|
||||
private static int stages = 1400;
|
||||
|
||||
private ModelPortableTank model = new ModelPortableTank();
|
||||
private ModelFluidTank model = new ModelFluidTank();
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick)
|
||||
{
|
||||
renderAModelAt((TileEntityPortableTank)tileEntity, x, y, z, partialTick);
|
||||
renderAModelAt((TileEntityFluidTank)tileEntity, x, y, z, partialTick);
|
||||
}
|
||||
|
||||
private void renderAModelAt(TileEntityPortableTank tileEntity, double x, double y, double z, float partialTick)
|
||||
private void renderAModelAt(TileEntityFluidTank tileEntity, double x, double y, double z, float partialTick)
|
||||
{
|
||||
Fluid fluid = tileEntity.fluidTank.getFluid() != null ? tileEntity.fluidTank.getFluid().getFluid() : null;
|
||||
render(fluid, tileEntity.prevScale, tileEntity.isActive, tileEntity.valve > 0 ? tileEntity.valveFluid : null, x, y, z);
|
||||
render(tileEntity.tier, fluid, tileEntity.prevScale, tileEntity.isActive, tileEntity.valve > 0 ? tileEntity.valveFluid : null, x, y, z);
|
||||
}
|
||||
|
||||
public void render(Fluid fluid, float fluidScale, boolean active, Fluid valveFluid, double x, double y, double z)
|
||||
public void render(FluidTankTier tier, Fluid fluid, float fluidScale, boolean active, Fluid valveFluid, double x, double y, double z)
|
||||
{
|
||||
if(fluid != null && fluidScale > 0)
|
||||
{
|
||||
@@ -93,10 +94,10 @@ public class RenderPortableTank extends TileEntitySpecialRenderer
|
||||
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F);
|
||||
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PortableTank" + (active ? "On" : "") + ".png"));
|
||||
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidTank" + (active ? "On" : "") + ".png"));
|
||||
|
||||
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
|
||||
model.render(0.0625F);
|
||||
model.render(0.0625F, tier);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
@@ -7,11 +7,12 @@ import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.MekanismUtils.ResourceType;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class RenderGasTank extends TileEntitySpecialRenderer
|
||||
{
|
||||
@@ -27,7 +28,7 @@ public class RenderGasTank extends TileEntitySpecialRenderer
|
||||
{
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F);
|
||||
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank.png"));
|
||||
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tileEntity.tier.getBaseTier().getName() + ".png"));
|
||||
|
||||
switch(tileEntity.facing)
|
||||
{
|
||||
|
||||
@@ -49,9 +49,9 @@ import mekanism.common.inventory.container.ContainerRobitRepair;
|
||||
import mekanism.common.inventory.container.ContainerRobitSmelting;
|
||||
import mekanism.common.inventory.container.ContainerRotaryCondensentrator;
|
||||
import mekanism.common.inventory.container.ContainerSeismicVibrator;
|
||||
import mekanism.common.inventory.container.ContainerThermalEvaporationController;
|
||||
import mekanism.common.inventory.container.ContainerSolarNeutronActivator;
|
||||
import mekanism.common.inventory.container.ContainerTeleporter;
|
||||
import mekanism.common.inventory.container.ContainerThermalEvaporationController;
|
||||
import mekanism.common.inventory.container.ContainerUpgradeManagement;
|
||||
import mekanism.common.item.ItemPortableTeleporter;
|
||||
import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage;
|
||||
@@ -82,6 +82,7 @@ import mekanism.common.tile.TileEntityEnergizedSmelter;
|
||||
import mekanism.common.tile.TileEntityEnergyCube;
|
||||
import mekanism.common.tile.TileEntityEnrichmentChamber;
|
||||
import mekanism.common.tile.TileEntityFactory;
|
||||
import mekanism.common.tile.TileEntityFluidTank;
|
||||
import mekanism.common.tile.TileEntityFluidicPlenisher;
|
||||
import mekanism.common.tile.TileEntityGasTank;
|
||||
import mekanism.common.tile.TileEntityInductionCasing;
|
||||
@@ -98,15 +99,14 @@ import mekanism.common.tile.TileEntityObsidianTNT;
|
||||
import mekanism.common.tile.TileEntityOredictionificator;
|
||||
import mekanism.common.tile.TileEntityOsmiumCompressor;
|
||||
import mekanism.common.tile.TileEntityPRC;
|
||||
import mekanism.common.tile.TileEntityPortableTank;
|
||||
import mekanism.common.tile.TileEntityPrecisionSawmill;
|
||||
import mekanism.common.tile.TileEntityPurificationChamber;
|
||||
import mekanism.common.tile.TileEntityRotaryCondensentrator;
|
||||
import mekanism.common.tile.TileEntitySeismicVibrator;
|
||||
import mekanism.common.tile.TileEntityThermalEvaporationController;
|
||||
import mekanism.common.tile.TileEntitySolarNeutronActivator;
|
||||
import mekanism.common.tile.TileEntityStructuralGlass;
|
||||
import mekanism.common.tile.TileEntityTeleporter;
|
||||
import mekanism.common.tile.TileEntityThermalEvaporationController;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
@@ -180,7 +180,7 @@ public class CommonProxy implements IGuiProvider
|
||||
GameRegistry.registerTileEntity(TileEntityChemicalCrystallizer.class, "ChemicalCrystallizer");
|
||||
GameRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator");
|
||||
GameRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber");
|
||||
GameRegistry.registerTileEntity(TileEntityPortableTank.class, "PortableTank");
|
||||
GameRegistry.registerTileEntity(TileEntityFluidTank.class, "PortableTank"); //TODO rename
|
||||
GameRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher");
|
||||
GameRegistry.registerTileEntity(TileEntityLaser.class, "Laser");
|
||||
GameRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier");
|
||||
@@ -508,7 +508,7 @@ public class CommonProxy implements IGuiProvider
|
||||
case 40:
|
||||
return new ContainerPRC(player.inventory, (TileEntityPRC)tileEntity);
|
||||
case 41:
|
||||
return new ContainerPortableTank(player.inventory, (TileEntityPortableTank)tileEntity);
|
||||
return new ContainerPortableTank(player.inventory, (TileEntityFluidTank)tileEntity);
|
||||
case 42:
|
||||
return new ContainerFluidicPlenisher(player.inventory, (TileEntityFluidicPlenisher)tileEntity);
|
||||
case 43:
|
||||
|
||||
@@ -34,6 +34,8 @@ import mekanism.common.FluidNetwork.FluidTransferEvent;
|
||||
import mekanism.common.Tier.BaseTier;
|
||||
import mekanism.common.Tier.EnergyCubeTier;
|
||||
import mekanism.common.Tier.FactoryTier;
|
||||
import mekanism.common.Tier.FluidTankTier;
|
||||
import mekanism.common.Tier.GasTankTier;
|
||||
import mekanism.common.Tier.InductionCellTier;
|
||||
import mekanism.common.Tier.InductionProviderTier;
|
||||
import mekanism.common.base.IChunkLoadHandler;
|
||||
@@ -78,9 +80,9 @@ import mekanism.common.tile.TileEntityCardboardBox;
|
||||
import mekanism.common.tile.TileEntityElectricBlock;
|
||||
import mekanism.common.tile.TileEntityEntangledBlock;
|
||||
import mekanism.common.tile.TileEntityPressureDisperser;
|
||||
import mekanism.common.tile.TileEntitySuperheatingElement;
|
||||
import mekanism.common.tile.TileEntityThermalEvaporationBlock;
|
||||
import mekanism.common.tile.TileEntityThermalEvaporationValve;
|
||||
import mekanism.common.tile.TileEntitySuperheatingElement;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.voice.VoiceServerManager;
|
||||
import mekanism.common.world.GenHandler;
|
||||
@@ -314,9 +316,6 @@ public class Mekanism
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.AtomicDisassembler.getUnchargedItem(), new Object[] {
|
||||
"AEA", "ACA", " O ", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), MekanismItems.AtomicAlloy, Character.valueOf('O'), "ingotRefinedObsidian"
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(), new Object[] {
|
||||
"PPP", "PDP", "PPP", Character.valueOf('P'), "ingotOsmium", Character.valueOf('D'), "dustIron"
|
||||
}));
|
||||
MachineType.METALLURGIC_INFUSER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 8), new Object[] {
|
||||
"IFI", "ROR", "IFI", Character.valueOf('I'), "ingotIron", Character.valueOf('F'), Blocks.furnace, Character.valueOf('R'), "dustRedstone", Character.valueOf('O'), "ingotOsmium"
|
||||
}));
|
||||
@@ -382,11 +381,11 @@ public class Mekanism
|
||||
Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('T'), MekanismItems.TeleportationCore
|
||||
}));
|
||||
MachineType.ROTARY_CONDENSENTRATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 0), new Object[] {
|
||||
"GCG", "tEI", "GCG", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('t'), MekanismUtils.getEmptyGasTank(), Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(),
|
||||
Character.valueOf('T'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock2, 1, 11)
|
||||
"GCG", "tEI", "GCG", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('t'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(),
|
||||
Character.valueOf('T'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('I'), MekanismUtils.getEmptyFluidTank(FluidTankTier.BASIC)
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.Jetpack.getEmptyItem(), new Object[] {
|
||||
"SCS", "TGT", " T ", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank()
|
||||
"SCS", "TGT", " T ", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC)
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Dictionary), new Object[] {
|
||||
"C", "B", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('B'), Items.book
|
||||
@@ -398,10 +397,10 @@ public class Mekanism
|
||||
" C ", "ATA", "SSS", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('S'), "ingotSteel"
|
||||
}));
|
||||
MachineType.CHEMICAL_OXIDIZER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 1), new Object[] {
|
||||
"ACA", "ERG", "ACA", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('E'), new ItemStack(MekanismBlocks.MachineBlock, 1, 13), Character.valueOf('A'), MekanismItems.EnrichedAlloy
|
||||
"ACA", "ERG", "ACA", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('E'), new ItemStack(MekanismBlocks.MachineBlock, 1, 13), Character.valueOf('A'), MekanismItems.EnrichedAlloy
|
||||
}));
|
||||
MachineType.CHEMICAL_INFUSER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 2), new Object[] {
|
||||
"ACA", "GRG", "ACA", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('A'), MekanismItems.EnrichedAlloy
|
||||
"ACA", "GRG", "ACA", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('A'), MekanismItems.EnrichedAlloy
|
||||
}));
|
||||
MachineType.CHEMICAL_INJECTION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 3), new Object[] {
|
||||
"RCR", "GPG", "RCR", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('R'), "alloyElite", Character.valueOf('G'), "ingotGold", Character.valueOf('P'), new ItemStack(MekanismBlocks.MachineBlock, 1, 9)
|
||||
@@ -431,13 +430,13 @@ public class Mekanism
|
||||
" S ", "SCS", " S ", Character.valueOf('C'), "ingotCopper", Character.valueOf('S'), "ingotSteel"
|
||||
}));
|
||||
MachineType.CHEMICAL_DISSOLUTION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 6), new Object[] {
|
||||
"CGC", "EAE", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('E'), MekanismItems.EnrichedAlloy
|
||||
"CGC", "EAE", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('E'), MekanismItems.EnrichedAlloy
|
||||
}));
|
||||
MachineType.CHEMICAL_WASHER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 7), new Object[] {
|
||||
"CWC", "EIE", "CGC", Character.valueOf('W'), Items.bucket, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
"CWC", "EIE", "CGC", Character.valueOf('W'), Items.bucket, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
}));
|
||||
MachineType.CHEMICAL_CRYSTALLIZER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 8), new Object[] {
|
||||
"CGC", "ASA", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('S'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
"CGC", "ASA", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('S'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.FreeRunners.getUnchargedItem(), new Object[] {
|
||||
"C C", "A A", "T T", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem()
|
||||
@@ -455,12 +454,9 @@ public class Mekanism
|
||||
"TLT", "CIC", "TTT", Character.valueOf('T'), "ingotTin", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
}));
|
||||
MachineType.PRESSURIZED_REACTION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 10), new Object[] {
|
||||
"TET", "CIC", "GFG", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(),
|
||||
"TET", "CIC", "GFG", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC),
|
||||
Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock, 1, 0), Character.valueOf('F'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9)
|
||||
}));
|
||||
MachineType.PORTABLE_TANK.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 11), new Object[] {
|
||||
"III", "GCG", "III", Character.valueOf('I'), "ingotIron", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC)
|
||||
}));
|
||||
MachineType.FLUIDIC_PLENISHER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 12), new Object[] {
|
||||
"TTT", "CPC", "TTT", Character.valueOf('P'), new ItemStack(MekanismBlocks.MachineBlock, 1, 12), Character.valueOf('T'), "ingotTin", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC)
|
||||
}));
|
||||
@@ -468,7 +464,7 @@ public class Mekanism
|
||||
"O O", "OSO", "O O", Character.valueOf('O'), "ingotOsmium", Character.valueOf('S'), "stickWood"
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.Flamethrower.getEmptyItem(), new Object[] {
|
||||
"TTT", "TGS", "BCB", Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('S'), Items.flint_and_steel, Character.valueOf('B'), "ingotBronze", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED)
|
||||
"TTT", "TGS", "BCB", Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('S'), Items.flint_and_steel, Character.valueOf('B'), "ingotBronze", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED)
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.GaugeDropper.getEmptyItem(), new Object[] {
|
||||
" O ", "G G", "GGG", Character.valueOf('O'), "ingotOsmium", Character.valueOf('G'), "paneGlass"
|
||||
@@ -530,6 +526,34 @@ public class Mekanism
|
||||
"ATA", "dEd", "ATA", Character.valueOf('A'), "alloyUltimate", Character.valueOf('d'), "gemDiamond", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.ELITE)
|
||||
}));
|
||||
|
||||
//Gas Tank Recipes
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), new Object[] {
|
||||
"APA", "P P", "APA", Character.valueOf('P'), "ingotOsmium", Character.valueOf('A'), "alloyBasic"
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.ADVANCED), new Object[] {
|
||||
"APA", "PTP", "APA", Character.valueOf('P'), "ingotOsmium", Character.valueOf('A'), "alloyAdvanced", Character.valueOf('T'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC)
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.ELITE), new Object[] {
|
||||
"APA", "PTP", "APA", Character.valueOf('P'), "ingotOsmium", Character.valueOf('A'), "alloyElite", Character.valueOf('T'), MekanismUtils.getEmptyGasTank(GasTankTier.ADVANCED)
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.ULTIMATE), new Object[] {
|
||||
"APA", "PTP", "APA", Character.valueOf('P'), "ingotOsmium", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismUtils.getEmptyGasTank(GasTankTier.ELITE)
|
||||
}));
|
||||
|
||||
//Fluid Tank Recipes
|
||||
MachineType.FLUID_TANK.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.BASIC), new Object[] {
|
||||
"AIA", "I I", "AIA", Character.valueOf('I'), "ingotIron", Character.valueOf('A'), "alloyBasic"
|
||||
}));
|
||||
MachineType.FLUID_TANK.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.ADVANCED), new Object[] {
|
||||
"AIA", "ITI", "AIA", Character.valueOf('I'), "ingotIron", Character.valueOf('A'), "alloyAdvanced", Character.valueOf('T'), MekanismUtils.getEmptyFluidTank(FluidTankTier.BASIC)
|
||||
}));
|
||||
MachineType.FLUID_TANK.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.ELITE), new Object[] {
|
||||
"AIA", "ITI", "AIA", Character.valueOf('I'), "ingotIron", Character.valueOf('A'), "alloyElite", Character.valueOf('T'), MekanismUtils.getEmptyFluidTank(FluidTankTier.ADVANCED)
|
||||
}));
|
||||
MachineType.FLUID_TANK.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.ULTIMATE), new Object[] {
|
||||
"AIA", "ITI", "AIA", Character.valueOf('I'), "ingotIron", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismUtils.getEmptyFluidTank(FluidTankTier.ELITE)
|
||||
}));
|
||||
|
||||
//Induction Cell recipes
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionCell(InductionCellTier.BASIC), new Object[] {
|
||||
"LTL", "TET", "LTL", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), Character.valueOf('L'), "dustLithium"
|
||||
|
||||
@@ -553,6 +553,97 @@ public final class Tier
|
||||
}
|
||||
}
|
||||
|
||||
public static enum FluidTankTier
|
||||
{
|
||||
BASIC(14000, 400),
|
||||
ADVANCED(28000, 800),
|
||||
ELITE(56000, 1600),
|
||||
ULTIMATE(112000, 3200);
|
||||
|
||||
public BaseTier getBaseTier()
|
||||
{
|
||||
return BaseTier.values()[ordinal()];
|
||||
}
|
||||
|
||||
public int storage;
|
||||
private int baseStorage;
|
||||
|
||||
public int output;
|
||||
private int baseOutput;
|
||||
|
||||
private FluidTankTier(int s, int o)
|
||||
{
|
||||
baseStorage = storage = s;
|
||||
baseOutput = output = o;
|
||||
}
|
||||
|
||||
protected void loadConfig()
|
||||
{
|
||||
storage = Mekanism.configuration.get("tier", getBaseTier().getName() + "FluidTankStorage", baseStorage).getInt();
|
||||
output = Mekanism.configuration.get("tier", getBaseTier().getName() + "FluidTankOutput", baseOutput).getInt();
|
||||
}
|
||||
|
||||
protected void readConfig(ByteBuf dataStream)
|
||||
{
|
||||
storage = dataStream.readInt();
|
||||
output = dataStream.readInt();
|
||||
}
|
||||
|
||||
protected void writeConfig(ByteBuf dataStream)
|
||||
{
|
||||
dataStream.writeInt(storage);
|
||||
dataStream.writeInt(output);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The tiers used by Logistical Transporters and their corresponding values.
|
||||
* @author AidanBrady
|
||||
*
|
||||
*/
|
||||
public static enum GasTankTier
|
||||
{
|
||||
BASIC(64000, 256),
|
||||
ADVANCED(128000, 512),
|
||||
ELITE(256000, 1028),
|
||||
ULTIMATE(512000, 2056);
|
||||
|
||||
public BaseTier getBaseTier()
|
||||
{
|
||||
return BaseTier.values()[ordinal()];
|
||||
}
|
||||
|
||||
public int storage;
|
||||
private int baseStorage;
|
||||
|
||||
public int output;
|
||||
private int baseOutput;
|
||||
|
||||
private GasTankTier(int s, int o)
|
||||
{
|
||||
baseStorage = storage = s;
|
||||
baseOutput = output = o;
|
||||
}
|
||||
|
||||
protected void loadConfig()
|
||||
{
|
||||
storage = Mekanism.configuration.get("tier", getBaseTier().getName() + "GasTankStorage", baseStorage).getInt();
|
||||
output = Mekanism.configuration.get("tier", getBaseTier().getName() + "GasTankOutput", baseOutput).getInt();
|
||||
}
|
||||
|
||||
protected void readConfig(ByteBuf dataStream)
|
||||
{
|
||||
storage = dataStream.readInt();
|
||||
output = dataStream.readInt();
|
||||
}
|
||||
|
||||
protected void writeConfig(ByteBuf dataStream)
|
||||
{
|
||||
dataStream.writeInt(storage);
|
||||
dataStream.writeInt(output);
|
||||
}
|
||||
}
|
||||
|
||||
public static void loadConfig()
|
||||
{
|
||||
for(CableTier tier : CableTier.values())
|
||||
@@ -594,6 +685,16 @@ public final class Tier
|
||||
{
|
||||
tier.loadConfig();
|
||||
}
|
||||
|
||||
for(FluidTankTier tier : FluidTankTier.values())
|
||||
{
|
||||
tier.loadConfig();
|
||||
}
|
||||
|
||||
for(GasTankTier tier : GasTankTier.values())
|
||||
{
|
||||
tier.loadConfig();
|
||||
}
|
||||
}
|
||||
|
||||
public static void readConfig(ByteBuf dataStream)
|
||||
@@ -637,6 +738,16 @@ public final class Tier
|
||||
{
|
||||
tier.readConfig(dataStream);
|
||||
}
|
||||
|
||||
for(FluidTankTier tier : FluidTankTier.values())
|
||||
{
|
||||
tier.readConfig(dataStream);
|
||||
}
|
||||
|
||||
for(GasTankTier tier : GasTankTier.values())
|
||||
{
|
||||
tier.readConfig(dataStream);
|
||||
}
|
||||
}
|
||||
|
||||
public static void writeConfig(ByteBuf dataStream)
|
||||
@@ -680,5 +791,15 @@ public final class Tier
|
||||
{
|
||||
tier.writeConfig(dataStream);
|
||||
}
|
||||
|
||||
for(FluidTankTier tier : FluidTankTier.values())
|
||||
{
|
||||
tier.writeConfig(dataStream);
|
||||
}
|
||||
|
||||
for(GasTankTier tier : GasTankTier.values())
|
||||
{
|
||||
tier.writeConfig(dataStream);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package mekanism.common.base;
|
||||
|
||||
import mekanism.common.Tier.BaseTier;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public interface ITierItem
|
||||
{
|
||||
public BaseTier getBaseTier(ItemStack stack);
|
||||
|
||||
public void setBaseTier(ItemStack stack, BaseTier tier);
|
||||
}
|
||||
@@ -119,11 +119,11 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
|
||||
{
|
||||
if(getBlockFromItem(stack.getItem()) == MekanismBlocks.BasicBlock2 && stack.getItemDamage() == 3)
|
||||
{
|
||||
return icons[3][((ItemBlockBasic)stack.getItem()).getTier(stack).ordinal()];
|
||||
return icons[3][((ItemBlockBasic)stack.getItem()).getBaseTier(stack).ordinal()];
|
||||
}
|
||||
else if(getBlockFromItem(stack.getItem()) == MekanismBlocks.BasicBlock2 && stack.getItemDamage() == 4)
|
||||
{
|
||||
return icons[4][((ItemBlockBasic)stack.getItem()).getTier(stack).ordinal()];
|
||||
return icons[4][((ItemBlockBasic)stack.getItem()).getBaseTier(stack).ordinal()];
|
||||
}
|
||||
|
||||
return getIcon(side, stack.getItemDamage());
|
||||
@@ -331,7 +331,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
|
||||
if(tier.isObtainable())
|
||||
{
|
||||
ItemStack stack = new ItemStack(item, 1, type.meta);
|
||||
((ItemBlockBasic)stack.getItem()).setTier(stack, tier);
|
||||
((ItemBlockBasic)stack.getItem()).setBaseTier(stack, tier);
|
||||
list.add(stack);
|
||||
}
|
||||
}
|
||||
@@ -830,12 +830,12 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
|
||||
else if(type == BasicType.INDUCTION_CELL)
|
||||
{
|
||||
TileEntityInductionCell tileEntity = (TileEntityInductionCell)world.getTileEntity(x, y, z);
|
||||
((ItemBlockBasic)ret.getItem()).setTier(ret, tileEntity.tier.getBaseTier());
|
||||
((ItemBlockBasic)ret.getItem()).setBaseTier(ret, tileEntity.tier.getBaseTier());
|
||||
}
|
||||
else if(type == BasicType.INDUCTION_PROVIDER)
|
||||
{
|
||||
TileEntityInductionProvider tileEntity = (TileEntityInductionProvider)world.getTileEntity(x, y, z);
|
||||
((ItemBlockBasic)ret.getItem()).setTier(ret, tileEntity.tier.getBaseTier());
|
||||
((ItemBlockBasic)ret.getItem()).setBaseTier(ret, tileEntity.tier.getBaseTier());
|
||||
}
|
||||
|
||||
TileEntity tileEntity = world.getTileEntity(x, y, z);
|
||||
|
||||
@@ -164,6 +164,7 @@ public class BlockEnergyCube extends BlockContainer
|
||||
|
||||
tileEntity.setFacing((short)change);
|
||||
world.notifyBlocksOfNeighborChange(x, y, z, this);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ import mekanism.api.gas.IGasItem;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.MekanismBlocks;
|
||||
import mekanism.common.base.ISustainedInventory;
|
||||
import mekanism.common.base.ITierItem;
|
||||
import mekanism.common.tile.TileEntityBasicBlock;
|
||||
import mekanism.common.tile.TileEntityGasTank;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
@@ -102,12 +103,15 @@ public class BlockGasTank extends BlockContainer
|
||||
}
|
||||
|
||||
if(MekanismUtils.isBCWrench(tool))
|
||||
{
|
||||
((IToolWrench)tool).wrenchUsed(entityplayer, x, y, z);
|
||||
}
|
||||
|
||||
int change = ForgeDirection.ROTATION_MATRIX[ForgeDirection.UP.ordinal()][tileEntity.facing];
|
||||
|
||||
tileEntity.setFacing((short)change);
|
||||
world.notifyBlocksOfNeighborChange(x, y, z, this);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -120,6 +124,7 @@ public class BlockGasTank extends BlockContainer
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -203,6 +208,9 @@ public class BlockGasTank extends BlockContainer
|
||||
{
|
||||
TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(x, y, z);
|
||||
ItemStack itemStack = new ItemStack(MekanismBlocks.GasTank);
|
||||
|
||||
ITierItem tierItem = (ITierItem)itemStack.getItem();
|
||||
tierItem.setBaseTier(itemStack, tileEntity.tier.getBaseTier());
|
||||
|
||||
IGasItem storageTank = (IGasItem)itemStack.getItem();
|
||||
storageTank.setGas(itemStack, tileEntity.gasTank.getGas());
|
||||
|
||||
@@ -22,6 +22,7 @@ import mekanism.common.CTMData;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.MekanismBlocks;
|
||||
import mekanism.common.Tier.BaseTier;
|
||||
import mekanism.common.Tier.FluidTankTier;
|
||||
import mekanism.common.base.IActiveState;
|
||||
import mekanism.common.base.IBlockCTM;
|
||||
import mekanism.common.base.IBoundingBlock;
|
||||
@@ -34,6 +35,7 @@ import mekanism.common.base.ISpecialBounds;
|
||||
import mekanism.common.base.ISustainedData;
|
||||
import mekanism.common.base.ISustainedInventory;
|
||||
import mekanism.common.base.ISustainedTank;
|
||||
import mekanism.common.base.ITierItem;
|
||||
import mekanism.common.base.IUpgradeTile;
|
||||
import mekanism.common.item.ItemBlockMachine;
|
||||
import mekanism.common.network.PacketElectricChest.ElectricChestMessage;
|
||||
@@ -63,6 +65,7 @@ import mekanism.common.tile.TileEntityEnergizedSmelter;
|
||||
import mekanism.common.tile.TileEntityEnrichmentChamber;
|
||||
import mekanism.common.tile.TileEntityEntangledBlock;
|
||||
import mekanism.common.tile.TileEntityFactory;
|
||||
import mekanism.common.tile.TileEntityFluidTank;
|
||||
import mekanism.common.tile.TileEntityFluidicPlenisher;
|
||||
import mekanism.common.tile.TileEntityLaser;
|
||||
import mekanism.common.tile.TileEntityLaserAmplifier;
|
||||
@@ -72,7 +75,6 @@ import mekanism.common.tile.TileEntityMetallurgicInfuser;
|
||||
import mekanism.common.tile.TileEntityOredictionificator;
|
||||
import mekanism.common.tile.TileEntityOsmiumCompressor;
|
||||
import mekanism.common.tile.TileEntityPRC;
|
||||
import mekanism.common.tile.TileEntityPortableTank;
|
||||
import mekanism.common.tile.TileEntityPrecisionSawmill;
|
||||
import mekanism.common.tile.TileEntityPurificationChamber;
|
||||
import mekanism.common.tile.TileEntityRotaryCondensentrator;
|
||||
@@ -141,7 +143,7 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
* 1:8: Chemical Crystallizer
|
||||
* 1:9: Seismic Vibrator
|
||||
* 1:10: Pressurized Reaction Chamber
|
||||
* 1:11: Portable Tank
|
||||
* 1:11: Fluid Tank
|
||||
* 1:12: Fluidic Plenisher
|
||||
* 1:13: Laser
|
||||
* 1:14: Laser Amplifier
|
||||
@@ -515,17 +517,23 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo
|
||||
}
|
||||
|
||||
break;
|
||||
case PORTABLE_TANK:
|
||||
list.add(new ItemStack(item, 1, type.meta));
|
||||
case FLUID_TANK:
|
||||
ItemBlockMachine itemMachine = (ItemBlockMachine)item;
|
||||
|
||||
for(FluidTankTier tier : FluidTankTier.values())
|
||||
{
|
||||
ItemStack stack = new ItemStack(item, 1, type.meta);
|
||||
itemMachine.setBaseTier(stack, tier.getBaseTier());
|
||||
list.add(stack);
|
||||
}
|
||||
|
||||
if(general.prefilledPortableTanks)
|
||||
{
|
||||
ItemBlockMachine itemMachine = (ItemBlockMachine)item;
|
||||
|
||||
for(Fluid f : FluidRegistry.getRegisteredFluids().values())
|
||||
{
|
||||
try { //Prevent bad IDs
|
||||
ItemStack filled = new ItemStack(item, 1, type.meta);
|
||||
itemMachine.setBaseTier(filled, BaseTier.ULTIMATE);
|
||||
itemMachine.setFluidStack(new FluidStack(f, itemMachine.getCapacity(filled)), filled);
|
||||
itemMachine.setPrevScale(filled, 1);
|
||||
list.add(filled);
|
||||
@@ -620,10 +628,10 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
case PORTABLE_TANK:
|
||||
case FLUID_TANK:
|
||||
if(entityplayer.getCurrentEquippedItem() != null && FluidContainerRegistry.isContainer(entityplayer.getCurrentEquippedItem()))
|
||||
{
|
||||
if(manageInventory(entityplayer, (TileEntityPortableTank)tileEntity))
|
||||
if(manageInventory(entityplayer, (TileEntityFluidTank)tileEntity))
|
||||
{
|
||||
entityplayer.inventory.markDirty();
|
||||
return true;
|
||||
@@ -758,7 +766,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo
|
||||
return world.setBlockToAir(x, y, z);
|
||||
}
|
||||
|
||||
private boolean manageInventory(EntityPlayer player, TileEntityPortableTank tileEntity)
|
||||
private boolean manageInventory(EntityPlayer player, TileEntityFluidTank tileEntity)
|
||||
{
|
||||
ItemStack itemStack = player.getCurrentEquippedItem();
|
||||
|
||||
@@ -911,6 +919,12 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo
|
||||
{
|
||||
itemStack.setTagCompound(new NBTTagCompound());
|
||||
}
|
||||
|
||||
if(tileEntity instanceof TileEntityFluidTank)
|
||||
{
|
||||
ITierItem tierItem = (ITierItem)itemStack.getItem();
|
||||
tierItem.setBaseTier(itemStack, ((TileEntityFluidTank)tileEntity).tier.getBaseTier());
|
||||
}
|
||||
|
||||
if(tileEntity instanceof IUpgradeTile)
|
||||
{
|
||||
@@ -1034,7 +1048,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo
|
||||
case CHARGEPAD:
|
||||
setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.06F, 1.0F);
|
||||
break;
|
||||
case PORTABLE_TANK:
|
||||
case FLUID_TANK:
|
||||
setBlockBounds(0.125F, 0.0F, 0.125F, 0.875F, 1.0F, 0.875F);
|
||||
break;
|
||||
default:
|
||||
@@ -1064,7 +1078,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo
|
||||
case CHARGEPAD:
|
||||
case ELECTRIC_CHEST:
|
||||
return false;
|
||||
case PORTABLE_TANK:
|
||||
case FLUID_TANK:
|
||||
return side == ForgeDirection.UP || side == ForgeDirection.DOWN;
|
||||
default:
|
||||
return true;
|
||||
@@ -1122,7 +1136,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo
|
||||
CHEMICAL_CRYSTALLIZER(MachineBlock.MACHINE_BLOCK_2, 8, "ChemicalCrystallizer", 37, TileEntityChemicalCrystallizer.class, true, true, true),
|
||||
SEISMIC_VIBRATOR(MachineBlock.MACHINE_BLOCK_2, 9, "SeismicVibrator", 39, TileEntitySeismicVibrator.class, true, true, false),
|
||||
PRESSURIZED_REACTION_CHAMBER(MachineBlock.MACHINE_BLOCK_2, 10, "PressurizedReactionChamber", 40, TileEntityPRC.class, true, true, false),
|
||||
PORTABLE_TANK(MachineBlock.MACHINE_BLOCK_2, 11, "PortableTank", 41, TileEntityPortableTank.class, false, true, false),
|
||||
FLUID_TANK(MachineBlock.MACHINE_BLOCK_2, 11, "FluidTank", 41, TileEntityFluidTank.class, false, true, false),
|
||||
FLUIDIC_PLENISHER(MachineBlock.MACHINE_BLOCK_2, 12, "FluidicPlenisher", 42, TileEntityFluidicPlenisher.class, true, true, false),
|
||||
LASER(MachineBlock.MACHINE_BLOCK_2, 13, "Laser", -1, TileEntityLaser.class, true, true, false),
|
||||
LASER_AMPLIFIER(MachineBlock.MACHINE_BLOCK_2, 14, "LaserAmplifier", 44, TileEntityLaserAmplifier.class, false, true, false),
|
||||
@@ -1283,7 +1297,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo
|
||||
return usage.seismicVibratorUsage;
|
||||
case PRESSURIZED_REACTION_CHAMBER:
|
||||
return usage.pressurizedReactionBaseUsage;
|
||||
case PORTABLE_TANK:
|
||||
case FLUID_TANK:
|
||||
return 0;
|
||||
case FLUIDIC_PLENISHER:
|
||||
return usage.fluidicPlenisherUsage;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package mekanism.common.inventory.container;
|
||||
|
||||
import mekanism.common.inventory.slot.SlotOutput;
|
||||
import mekanism.common.tile.TileEntityPortableTank;
|
||||
import mekanism.common.tile.TileEntityFluidTank;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
@@ -12,9 +12,9 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
|
||||
public class ContainerPortableTank extends Container
|
||||
{
|
||||
private TileEntityPortableTank tileEntity;
|
||||
private TileEntityFluidTank tileEntity;
|
||||
|
||||
public ContainerPortableTank(InventoryPlayer inventory, TileEntityPortableTank tentity)
|
||||
public ContainerPortableTank(InventoryPlayer inventory, TileEntityFluidTank tentity)
|
||||
{
|
||||
tileEntity = tentity;
|
||||
addSlotToContainer(new Slot(tentity, 0, 146, 19));
|
||||
|
||||
@@ -15,6 +15,7 @@ import mekanism.common.MekanismBlocks;
|
||||
import mekanism.common.Tier.BaseTier;
|
||||
import mekanism.common.Tier.InductionCellTier;
|
||||
import mekanism.common.Tier.InductionProviderTier;
|
||||
import mekanism.common.base.ITierItem;
|
||||
import mekanism.common.block.BlockBasic.BasicType;
|
||||
import mekanism.common.inventory.InventoryBin;
|
||||
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
|
||||
@@ -66,7 +67,7 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
* @author AidanBrady
|
||||
*
|
||||
*/
|
||||
public class ItemBlockBasic extends ItemBlock implements IEnergizedItem
|
||||
public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierItem
|
||||
{
|
||||
public Block metaBlock;
|
||||
|
||||
@@ -91,7 +92,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem
|
||||
public ItemStack getUnchargedCell(InductionCellTier tier)
|
||||
{
|
||||
ItemStack stack = new ItemStack(MekanismBlocks.BasicBlock2, 1, 3);
|
||||
setTier(stack, tier.getBaseTier());
|
||||
setBaseTier(stack, tier.getBaseTier());
|
||||
|
||||
return stack;
|
||||
}
|
||||
@@ -99,12 +100,13 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem
|
||||
public ItemStack getUnchargedProvider(InductionProviderTier tier)
|
||||
{
|
||||
ItemStack stack = new ItemStack(MekanismBlocks.BasicBlock2, 1, 4);
|
||||
setTier(stack, tier.getBaseTier());
|
||||
setBaseTier(stack, tier.getBaseTier());
|
||||
|
||||
return stack;
|
||||
}
|
||||
|
||||
public BaseTier getTier(ItemStack itemstack)
|
||||
@Override
|
||||
public BaseTier getBaseTier(ItemStack itemstack)
|
||||
{
|
||||
if(itemstack.stackTagCompound == null)
|
||||
{
|
||||
@@ -114,7 +116,8 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem
|
||||
return BaseTier.values()[itemstack.stackTagCompound.getInteger("tier")];
|
||||
}
|
||||
|
||||
public void setTier(ItemStack itemstack, BaseTier tier)
|
||||
@Override
|
||||
public void setBaseTier(ItemStack itemstack, BaseTier tier)
|
||||
{
|
||||
if(itemstack.stackTagCompound == null)
|
||||
{
|
||||
@@ -161,13 +164,13 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem
|
||||
}
|
||||
else if(type == BasicType.INDUCTION_CELL)
|
||||
{
|
||||
InductionCellTier tier = InductionCellTier.values()[getTier(itemstack).ordinal()];
|
||||
InductionCellTier tier = InductionCellTier.values()[getBaseTier(itemstack).ordinal()];
|
||||
|
||||
list.add(tier.getBaseTier().getColor() + LangUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(tier.maxEnergy));
|
||||
}
|
||||
else if(type == BasicType.INDUCTION_PROVIDER)
|
||||
{
|
||||
InductionProviderTier tier = InductionProviderTier.values()[getTier(itemstack).ordinal()];
|
||||
InductionProviderTier tier = InductionProviderTier.values()[getBaseTier(itemstack).ordinal()];
|
||||
|
||||
list.add(tier.getBaseTier().getColor() + LangUtils.localize("tooltip.outputRate") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(tier.output));
|
||||
}
|
||||
@@ -250,7 +253,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem
|
||||
else if(type == BasicType.INDUCTION_CELL)
|
||||
{
|
||||
TileEntityInductionCell tileEntity = (TileEntityInductionCell)world.getTileEntity(x, y, z);
|
||||
tileEntity.tier = InductionCellTier.values()[getTier(stack).ordinal()];
|
||||
tileEntity.tier = InductionCellTier.values()[getBaseTier(stack).ordinal()];
|
||||
|
||||
if(!world.isRemote)
|
||||
{
|
||||
@@ -260,7 +263,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem
|
||||
else if(type == BasicType.INDUCTION_PROVIDER)
|
||||
{
|
||||
TileEntityInductionProvider tileEntity = (TileEntityInductionProvider)world.getTileEntity(x, y, z);
|
||||
tileEntity.tier = InductionProviderTier.values()[getTier(stack).ordinal()];
|
||||
tileEntity.tier = InductionProviderTier.values()[getBaseTier(stack).ordinal()];
|
||||
|
||||
if(!world.isRemote)
|
||||
{
|
||||
@@ -290,7 +293,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem
|
||||
|
||||
if(type == BasicType.INDUCTION_CELL || type == BasicType.INDUCTION_PROVIDER)
|
||||
{
|
||||
name += getTier(itemstack).getName();
|
||||
name += getBaseTier(itemstack).getName();
|
||||
}
|
||||
|
||||
return name;
|
||||
@@ -334,7 +337,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem
|
||||
{
|
||||
if(BasicType.get(itemStack) == BasicType.INDUCTION_CELL)
|
||||
{
|
||||
return InductionCellTier.values()[getTier(itemStack).ordinal()].maxEnergy;
|
||||
return InductionCellTier.values()[getBaseTier(itemStack).ordinal()].maxEnergy;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -76,6 +76,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE
|
||||
ItemStack stack = new ItemStack(this);
|
||||
setEnergyCubeTier(stack, tier);
|
||||
stack.setItemDamage(100);
|
||||
|
||||
return stack;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
package mekanism.common.item;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.api.EnumColor;
|
||||
import mekanism.api.Range4D;
|
||||
import mekanism.api.gas.Gas;
|
||||
import mekanism.api.gas.GasRegistry;
|
||||
import mekanism.api.gas.GasStack;
|
||||
@@ -10,7 +13,11 @@ import mekanism.api.gas.IGasItem;
|
||||
import mekanism.client.MekKeyHandler;
|
||||
import mekanism.client.MekanismKeyHandler;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.Tier.BaseTier;
|
||||
import mekanism.common.Tier.GasTankTier;
|
||||
import mekanism.common.base.ISustainedInventory;
|
||||
import mekanism.common.base.ITierItem;
|
||||
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
|
||||
import mekanism.common.tile.TileEntityGasTank;
|
||||
import mekanism.common.util.LangUtils;
|
||||
import net.minecraft.block.Block;
|
||||
@@ -26,7 +33,7 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.Constants.NBT;
|
||||
|
||||
public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedInventory
|
||||
public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedInventory, ITierItem
|
||||
{
|
||||
public Block metaBlock;
|
||||
|
||||
@@ -58,11 +65,11 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI
|
||||
{
|
||||
return metaBlock.getIcon(2, i);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack itemstack)
|
||||
public String getItemStackDisplayName(ItemStack itemstack)
|
||||
{
|
||||
return getUnlocalizedName() + "." + "GasTank";
|
||||
return LangUtils.localize("tile.GasTank" + getBaseTier(itemstack).getName() + ".name");
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -73,9 +80,16 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI
|
||||
if(place)
|
||||
{
|
||||
TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(x, y, z);
|
||||
tileEntity.tier = GasTankTier.values()[getBaseTier(stack).ordinal()];
|
||||
tileEntity.gasTank.setMaxGas(tileEntity.tier.storage);
|
||||
tileEntity.gasTank.setGas(getGas(stack));
|
||||
|
||||
((ISustainedInventory)tileEntity).setInventory(getInventory(stack));
|
||||
|
||||
if(!world.isRemote)
|
||||
{
|
||||
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity)));
|
||||
}
|
||||
}
|
||||
|
||||
return place;
|
||||
@@ -103,12 +117,6 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreated(ItemStack itemstack, World world, EntityPlayer entityplayer)
|
||||
{
|
||||
itemstack = getEmptyItem();
|
||||
}
|
||||
|
||||
@Override
|
||||
public GasStack getGas(ItemStack itemstack)
|
||||
{
|
||||
@@ -152,43 +160,72 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI
|
||||
}
|
||||
}
|
||||
|
||||
public ItemStack getEmptyItem()
|
||||
public ItemStack getEmptyItem(GasTankTier tier)
|
||||
{
|
||||
ItemStack empty = new ItemStack(this);
|
||||
setBaseTier(empty, tier.getBaseTier());
|
||||
setGas(empty, null);
|
||||
empty.setItemDamage(100);
|
||||
|
||||
return empty;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubItems(Item item, CreativeTabs tabs, List list)
|
||||
{
|
||||
ItemStack empty = new ItemStack(this);
|
||||
setGas(empty, null);
|
||||
empty.setItemDamage(100);
|
||||
list.add(empty);
|
||||
for(GasTankTier tier : GasTankTier.values())
|
||||
{
|
||||
ItemStack empty = new ItemStack(this);
|
||||
setBaseTier(empty, tier.getBaseTier());
|
||||
setGas(empty, null);
|
||||
empty.setItemDamage(100);
|
||||
list.add(empty);
|
||||
}
|
||||
|
||||
for(Gas type : GasRegistry.getRegisteredGasses())
|
||||
{
|
||||
if(type.isVisible())
|
||||
{
|
||||
ItemStack filled = new ItemStack(this);
|
||||
setBaseTier(filled, BaseTier.ULTIMATE);
|
||||
setGas(filled, new GasStack(type, ((IGasItem)filled.getItem()).getMaxGas(filled)));
|
||||
list.add(filled);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public BaseTier getBaseTier(ItemStack itemstack)
|
||||
{
|
||||
if(itemstack.stackTagCompound == null)
|
||||
{
|
||||
return BaseTier.BASIC;
|
||||
}
|
||||
|
||||
return BaseTier.values()[itemstack.stackTagCompound.getInteger("tier")];
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setBaseTier(ItemStack itemstack, BaseTier tier)
|
||||
{
|
||||
if(itemstack.stackTagCompound == null)
|
||||
{
|
||||
itemstack.setTagCompound(new NBTTagCompound());
|
||||
}
|
||||
|
||||
itemstack.stackTagCompound.setInteger("tier", tier.ordinal());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxGas(ItemStack itemstack)
|
||||
{
|
||||
return MAX_GAS;
|
||||
return GasTankTier.values()[getBaseTier(itemstack).ordinal()].storage;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRate(ItemStack itemstack)
|
||||
{
|
||||
return TRANSFER_RATE;
|
||||
return GasTankTier.values()[getBaseTier(itemstack).ordinal()].output;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -17,6 +17,7 @@ import mekanism.client.MekKeyHandler;
|
||||
import mekanism.client.MekanismKeyHandler;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.Tier.BaseTier;
|
||||
import mekanism.common.Tier.FluidTankTier;
|
||||
import mekanism.common.Upgrade;
|
||||
import mekanism.common.base.IElectricChest;
|
||||
import mekanism.common.base.IFactory;
|
||||
@@ -26,6 +27,7 @@ import mekanism.common.base.ISideConfiguration;
|
||||
import mekanism.common.base.ISustainedData;
|
||||
import mekanism.common.base.ISustainedInventory;
|
||||
import mekanism.common.base.ISustainedTank;
|
||||
import mekanism.common.base.ITierItem;
|
||||
import mekanism.common.base.IUpgradeTile;
|
||||
import mekanism.common.block.BlockMachine.MachineType;
|
||||
import mekanism.common.integration.IC2ItemManager;
|
||||
@@ -36,7 +38,7 @@ import mekanism.common.tile.TileEntityBasicBlock;
|
||||
import mekanism.common.tile.TileEntityElectricBlock;
|
||||
import mekanism.common.tile.TileEntityElectricChest;
|
||||
import mekanism.common.tile.TileEntityFactory;
|
||||
import mekanism.common.tile.TileEntityPortableTank;
|
||||
import mekanism.common.tile.TileEntityFluidTank;
|
||||
import mekanism.common.util.LangUtils;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import net.minecraft.block.Block;
|
||||
@@ -113,7 +115,7 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
@Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHCore"),
|
||||
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2")
|
||||
})
|
||||
public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IElectricChest, IEnergyContainerItem, IFluidContainerItem
|
||||
public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IElectricChest, IEnergyContainerItem, IFluidContainerItem, ITierItem
|
||||
{
|
||||
public Block metaBlock;
|
||||
|
||||
@@ -159,6 +161,10 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
|
||||
return tier.getLocalizedName() + " " + RecipeType.values()[getRecipeType(itemstack)].getLocalizedName() + " " + super.getItemStackDisplayName(itemstack);
|
||||
}
|
||||
else if(type == MachineType.FLUID_TANK)
|
||||
{
|
||||
return LangUtils.localize("tile.FluidTank" + getBaseTier(itemstack).getName() + ".name");
|
||||
}
|
||||
|
||||
return super.getItemStackDisplayName(itemstack);
|
||||
}
|
||||
@@ -171,7 +177,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
|
||||
if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey))
|
||||
{
|
||||
if(type == MachineType.PORTABLE_TANK)
|
||||
if(type == MachineType.FLUID_TANK)
|
||||
{
|
||||
FluidStack fluidStack = getFluidStack(itemstack);
|
||||
|
||||
@@ -197,7 +203,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.locked") + ": " + EnumColor.GREY + LangUtils.transYesNo(getLocked(itemstack)));
|
||||
}
|
||||
|
||||
if(type == MachineType.PORTABLE_TANK)
|
||||
if(type == MachineType.FLUID_TANK)
|
||||
{
|
||||
list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.portableTank.bucketMode") + ": " + EnumColor.GREY + LangUtils.transYesNo(getBucketMode(itemstack)));
|
||||
}
|
||||
@@ -207,7 +213,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack)));
|
||||
}
|
||||
|
||||
if(hasTank(itemstack) && type != MachineType.PORTABLE_TANK)
|
||||
if(hasTank(itemstack) && type != MachineType.FLUID_TANK)
|
||||
{
|
||||
FluidStack fluidStack = getFluidStack(itemstack);
|
||||
|
||||
@@ -242,7 +248,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
{
|
||||
MachineType type = MachineType.get(stack);
|
||||
|
||||
if(type == MachineType.PORTABLE_TANK && getBucketMode(stack))
|
||||
if(type == MachineType.FLUID_TANK && getBucketMode(stack))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -287,6 +293,13 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
{
|
||||
TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z);
|
||||
|
||||
if(tileEntity instanceof TileEntityFluidTank)
|
||||
{
|
||||
TileEntityFluidTank tile = (TileEntityFluidTank)tileEntity;
|
||||
tile.tier = FluidTankTier.values()[getBaseTier(stack).ordinal()];
|
||||
tile.fluidTank.setCapacity(tile.tier.storage);
|
||||
}
|
||||
|
||||
if(tileEntity instanceof IUpgradeTile)
|
||||
{
|
||||
if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("upgrades"))
|
||||
@@ -442,11 +455,11 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(type == MachineType.PORTABLE_TANK)
|
||||
else if(type == MachineType.FLUID_TANK)
|
||||
{
|
||||
if(world != null && !world.isRemote)
|
||||
{
|
||||
float targetScale = (float)(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0)/TileEntityPortableTank.MAX_FLUID;
|
||||
float targetScale = (float)(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0)/getCapacity(itemstack);
|
||||
|
||||
if(Math.abs(getPrevScale(itemstack) - targetScale) > 0.01)
|
||||
{
|
||||
@@ -525,7 +538,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(type == MachineType.PORTABLE_TANK && getBucketMode(itemstack))
|
||||
else if(type == MachineType.FLUID_TANK && getBucketMode(itemstack))
|
||||
{
|
||||
MovingObjectPosition pos = getMovingObjectPositionFromPlayer(world, entityplayer, !entityplayer.isSneaking());
|
||||
|
||||
@@ -554,7 +567,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
|
||||
if(fluid != null && (getFluidStack(itemstack) == null || getFluidStack(itemstack).isFluidEqual(fluid)))
|
||||
{
|
||||
int needed = TileEntityPortableTank.MAX_FLUID-(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0);
|
||||
int needed = getCapacity(itemstack)-(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0);
|
||||
|
||||
if(fluid.amount > needed)
|
||||
{
|
||||
@@ -715,7 +728,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
|
||||
MachineType type = MachineType.get((ItemStack)data[0]);
|
||||
|
||||
return type == MachineType.ELECTRIC_PUMP || type == MachineType.PORTABLE_TANK || type == MachineType.FLUIDIC_PLENISHER;
|
||||
return type == MachineType.ELECTRIC_PUMP || type == MachineType.FLUID_TANK || type == MachineType.FLUIDIC_PLENISHER;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -984,13 +997,13 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
@Override
|
||||
public int getCapacity(ItemStack container)
|
||||
{
|
||||
return TileEntityPortableTank.MAX_FLUID;
|
||||
return FluidTankTier.values()[getBaseTier(container).ordinal()].storage;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int fill(ItemStack container, FluidStack resource, boolean doFill)
|
||||
{
|
||||
if(MachineType.get(container) == MachineType.PORTABLE_TANK && resource != null)
|
||||
if(MachineType.get(container) == MachineType.FLUID_TANK && resource != null)
|
||||
{
|
||||
FluidStack stored = getFluidStack(container);
|
||||
int toFill;
|
||||
@@ -1002,10 +1015,10 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
|
||||
if(stored == null)
|
||||
{
|
||||
toFill = Math.min(resource.amount, TileEntityPortableTank.MAX_FLUID);
|
||||
toFill = Math.min(resource.amount, getCapacity(container));
|
||||
}
|
||||
else {
|
||||
toFill = Math.min(resource.amount, TileEntityPortableTank.MAX_FLUID-stored.amount);
|
||||
toFill = Math.min(resource.amount, getCapacity(container)-stored.amount);
|
||||
}
|
||||
|
||||
if(doFill)
|
||||
@@ -1023,7 +1036,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
@Override
|
||||
public FluidStack drain(ItemStack container, int maxDrain, boolean doDrain)
|
||||
{
|
||||
if(MachineType.get(container) == MachineType.PORTABLE_TANK)
|
||||
if(MachineType.get(container) == MachineType.FLUID_TANK)
|
||||
{
|
||||
FluidStack stored = getFluidStack(container);
|
||||
|
||||
@@ -1043,4 +1056,26 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BaseTier getBaseTier(ItemStack itemstack)
|
||||
{
|
||||
if(itemstack.stackTagCompound == null)
|
||||
{
|
||||
return BaseTier.BASIC;
|
||||
}
|
||||
|
||||
return BaseTier.values()[itemstack.stackTagCompound.getInteger("tier")];
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setBaseTier(ItemStack itemstack, BaseTier tier)
|
||||
{
|
||||
if(itemstack.stackTagCompound == null)
|
||||
{
|
||||
itemstack.setTagCompound(new NBTTagCompound());
|
||||
}
|
||||
|
||||
itemstack.stackTagCompound.setInteger("tier", tier.ordinal());
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,7 @@ import mekanism.api.gas.Gas;
|
||||
import mekanism.api.gas.GasStack;
|
||||
import mekanism.api.gas.IGasItem;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.tile.TileEntityPortableTank;
|
||||
import mekanism.common.tile.TileEntityFluidTank;
|
||||
import mekanism.common.util.LangUtils;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -160,10 +160,10 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo
|
||||
|
||||
if(stored == null)
|
||||
{
|
||||
toFill = Math.min(resource.amount, TileEntityPortableTank.MAX_FLUID);
|
||||
toFill = Math.min(resource.amount, CAPACITY);
|
||||
}
|
||||
else {
|
||||
toFill = Math.min(resource.amount, TileEntityPortableTank.MAX_FLUID-stored.amount);
|
||||
toFill = Math.min(resource.amount, CAPACITY-stored.amount);
|
||||
}
|
||||
|
||||
if(doFill)
|
||||
|
||||
+24
-11
@@ -9,6 +9,7 @@ import mekanism.api.IConfigurable;
|
||||
import mekanism.api.MekanismConfig.general;
|
||||
import mekanism.api.Range4D;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.Tier.FluidTankTier;
|
||||
import mekanism.common.base.IActiveState;
|
||||
import mekanism.common.base.IFluidContainerManager;
|
||||
import mekanism.common.base.ISustainedTank;
|
||||
@@ -17,6 +18,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage;
|
||||
import mekanism.common.util.FluidContainerUtils;
|
||||
import mekanism.common.util.FluidContainerUtils.ContainerEditMode;
|
||||
import mekanism.common.util.InventoryUtils;
|
||||
import mekanism.common.util.LangUtils;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -32,18 +34,18 @@ import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidContainerItem;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
|
||||
public class TileEntityPortableTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandler, ISustainedTank, IFluidContainerManager, ITankManager
|
||||
public class TileEntityFluidTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandler, ISustainedTank, IFluidContainerManager, ITankManager
|
||||
{
|
||||
public boolean isActive;
|
||||
|
||||
public boolean clientActive;
|
||||
|
||||
public static final int MAX_FLUID = 14000;
|
||||
|
||||
public FluidTank fluidTank = new FluidTank(MAX_FLUID);
|
||||
public FluidTank fluidTank;
|
||||
|
||||
public ContainerEditMode editMode = ContainerEditMode.BOTH;
|
||||
|
||||
public FluidTankTier tier = FluidTankTier.BASIC;
|
||||
|
||||
public int updateDelay;
|
||||
|
||||
public int prevAmount;
|
||||
@@ -55,10 +57,11 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements
|
||||
|
||||
public boolean needsPacket;
|
||||
|
||||
public TileEntityPortableTank()
|
||||
public TileEntityFluidTank()
|
||||
{
|
||||
super("PortableTank");
|
||||
super("FluidTank");
|
||||
|
||||
fluidTank = new FluidTank(tier.storage);
|
||||
inventory = new ItemStack[2];
|
||||
}
|
||||
|
||||
@@ -140,6 +143,12 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInventoryName()
|
||||
{
|
||||
return LangUtils.localize("tile.FluidTank" + tier.getBaseTier().getName() + ".name");
|
||||
}
|
||||
|
||||
private void activeEmit()
|
||||
{
|
||||
if(fluidTank.getFluid() != null)
|
||||
@@ -148,7 +157,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements
|
||||
|
||||
if(tileEntity instanceof IFluidHandler)
|
||||
{
|
||||
FluidStack toDrain = new FluidStack(fluidTank.getFluid(), Math.min(100, fluidTank.getFluidAmount()));
|
||||
FluidStack toDrain = new FluidStack(fluidTank.getFluid(), Math.min(tier.output, fluidTank.getFluidAmount()));
|
||||
fluidTank.drain(((IFluidHandler)tileEntity).fill(ForgeDirection.UP, toDrain, true), true);
|
||||
}
|
||||
}
|
||||
@@ -287,7 +296,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements
|
||||
{
|
||||
Coord4D up = Coord4D.get(this).getFromSide(ForgeDirection.UP);
|
||||
|
||||
if(up.getTileEntity(worldObj) instanceof TileEntityPortableTank)
|
||||
if(up.getTileEntity(worldObj) instanceof TileEntityFluidTank)
|
||||
{
|
||||
IFluidHandler handler = (IFluidHandler)up.getTileEntity(worldObj);
|
||||
|
||||
@@ -353,6 +362,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements
|
||||
{
|
||||
super.writeToNBT(nbtTags);
|
||||
|
||||
nbtTags.setInteger("tier", tier.ordinal());
|
||||
nbtTags.setBoolean("isActive", isActive);
|
||||
nbtTags.setInteger("editMode", editMode.ordinal());
|
||||
|
||||
@@ -367,6 +377,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements
|
||||
{
|
||||
super.readFromNBT(nbtTags);
|
||||
|
||||
tier = FluidTankTier.values()[nbtTags.getInteger("tier")];
|
||||
clientActive = isActive = nbtTags.getBoolean("isActive");
|
||||
editMode = ContainerEditMode.values()[nbtTags.getInteger("editMode")];
|
||||
|
||||
@@ -381,6 +392,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements
|
||||
{
|
||||
super.handlePacketData(dataStream);
|
||||
|
||||
tier = FluidTankTier.values()[dataStream.readInt()];
|
||||
clientActive = dataStream.readBoolean();
|
||||
valve = dataStream.readInt();
|
||||
editMode = ContainerEditMode.values()[dataStream.readInt()];
|
||||
@@ -415,9 +427,9 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements
|
||||
|
||||
Coord4D top = Coord4D.get(this).getFromSide(ForgeDirection.UP);
|
||||
|
||||
if(top.getTileEntity(worldObj) instanceof TileEntityPortableTank)
|
||||
if(top.getTileEntity(worldObj) instanceof TileEntityFluidTank)
|
||||
{
|
||||
needed += ((TileEntityPortableTank)top.getTileEntity(worldObj)).getCurrentNeeded();
|
||||
needed += ((TileEntityFluidTank)top.getTileEntity(worldObj)).getCurrentNeeded();
|
||||
}
|
||||
|
||||
return needed;
|
||||
@@ -428,6 +440,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements
|
||||
{
|
||||
super.getNetworkedData(data);
|
||||
|
||||
data.add(tier.ordinal());
|
||||
data.add(isActive);
|
||||
data.add(valve);
|
||||
data.add(editMode.ordinal());
|
||||
@@ -558,7 +571,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements
|
||||
{
|
||||
TileEntity tile = Coord4D.get(this).getFromSide(ForgeDirection.DOWN).getTileEntity(worldObj);
|
||||
|
||||
if(isActive && !(tile instanceof TileEntityPortableTank))
|
||||
if(isActive && !(tile instanceof TileEntityFluidTank))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -17,6 +17,7 @@ import mekanism.api.gas.ITubeConnection;
|
||||
import mekanism.api.transmitters.TransmissionType;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.SideData;
|
||||
import mekanism.common.Tier.GasTankTier;
|
||||
import mekanism.common.base.IEjector;
|
||||
import mekanism.common.base.IRedstoneControl;
|
||||
import mekanism.common.base.ISideConfiguration;
|
||||
@@ -24,6 +25,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage;
|
||||
import mekanism.common.tile.component.TileComponentConfig;
|
||||
import mekanism.common.tile.component.TileComponentEjector;
|
||||
import mekanism.common.util.InventoryUtils;
|
||||
import mekanism.common.util.LangUtils;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
@@ -42,12 +44,9 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH
|
||||
}
|
||||
|
||||
/** The type of gas stored in this tank. */
|
||||
public GasTank gasTank = new GasTank(MAX_GAS);
|
||||
|
||||
public static final int MAX_GAS = 96000;
|
||||
|
||||
/** How fast this tank can output gas. */
|
||||
public int output = 256;
|
||||
public GasTank gasTank;
|
||||
|
||||
public GasTankTier tier = GasTankTier.BASIC;
|
||||
|
||||
public GasMode dumping;
|
||||
|
||||
@@ -74,6 +73,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH
|
||||
configComponent.setIOConfig(TransmissionType.GAS);
|
||||
configComponent.setEjecting(TransmissionType.GAS, true);
|
||||
|
||||
gasTank = new GasTank(tier.storage);
|
||||
inventory = new ItemStack[2];
|
||||
dumping = GasMode.IDLE;
|
||||
controlType = RedstoneControl.DISABLED;
|
||||
@@ -100,19 +100,19 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH
|
||||
{
|
||||
if(configComponent.isEjecting(TransmissionType.GAS))
|
||||
{
|
||||
GasStack toSend = new GasStack(gasTank.getGas().getGas(), Math.min(gasTank.getStored(), output));
|
||||
GasStack toSend = new GasStack(gasTank.getGas().getGas(), Math.min(gasTank.getStored(), tier.output));
|
||||
gasTank.draw(GasTransmission.emit(toSend, this, configComponent.getSidesForData(TransmissionType.GAS, facing, 2)), true);
|
||||
}
|
||||
}
|
||||
|
||||
if(dumping == GasMode.DUMPING)
|
||||
{
|
||||
gasTank.draw(8, true);
|
||||
gasTank.draw(tier.storage/400, true);
|
||||
}
|
||||
|
||||
if(dumping == GasMode.DUMPING_EXCESS && gasTank.getNeeded() < output)
|
||||
if(dumping == GasMode.DUMPING_EXCESS && gasTank.getNeeded() < tier.output)
|
||||
{
|
||||
gasTank.draw(output-gasTank.getNeeded(), true);
|
||||
gasTank.draw(tier.output-gasTank.getNeeded(), true);
|
||||
}
|
||||
|
||||
int newGasAmount = gasTank.getStored();
|
||||
@@ -125,6 +125,12 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH
|
||||
currentGasAmount = newGasAmount;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInventoryName()
|
||||
{
|
||||
return LangUtils.localize("tile.GasTank" + tier.getBaseTier().getName() + ".name");
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canExtractItem(int slotID, ItemStack itemstack, int side)
|
||||
@@ -226,6 +232,9 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH
|
||||
}
|
||||
|
||||
super.handlePacketData(dataStream);
|
||||
|
||||
tier = GasTankTier.values()[dataStream.readInt()];
|
||||
gasTank.setMaxGas(tier.storage);
|
||||
|
||||
if(dataStream.readBoolean())
|
||||
{
|
||||
@@ -246,6 +255,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH
|
||||
{
|
||||
super.readFromNBT(nbtTags);
|
||||
|
||||
tier = GasTankTier.values()[nbtTags.getInteger("tier")];
|
||||
gasTank.read(nbtTags.getCompoundTag("gasTank"));
|
||||
dumping = GasMode.values()[nbtTags.getInteger("dumping")];
|
||||
|
||||
@@ -257,6 +267,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH
|
||||
{
|
||||
super.writeToNBT(nbtTags);
|
||||
|
||||
nbtTags.setInteger("tier", tier.ordinal());
|
||||
nbtTags.setTag("gasTank", gasTank.write(new NBTTagCompound()));
|
||||
nbtTags.setInteger("dumping", dumping.ordinal());
|
||||
nbtTags.setInteger("controlType", controlType.ordinal());
|
||||
@@ -266,6 +277,8 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH
|
||||
public ArrayList getNetworkedData(ArrayList data)
|
||||
{
|
||||
super.getNetworkedData(data);
|
||||
|
||||
data.add(tier.ordinal());
|
||||
|
||||
if(gasTank.getGas() != null)
|
||||
{
|
||||
|
||||
@@ -34,6 +34,8 @@ import mekanism.common.OreDictCache;
|
||||
import mekanism.common.Tier.BaseTier;
|
||||
import mekanism.common.Tier.EnergyCubeTier;
|
||||
import mekanism.common.Tier.FactoryTier;
|
||||
import mekanism.common.Tier.FluidTankTier;
|
||||
import mekanism.common.Tier.GasTankTier;
|
||||
import mekanism.common.Tier.InductionCellTier;
|
||||
import mekanism.common.Tier.InductionProviderTier;
|
||||
import mekanism.common.Upgrade;
|
||||
@@ -49,6 +51,7 @@ import mekanism.common.inventory.container.ContainerElectricChest;
|
||||
import mekanism.common.item.ItemBlockBasic;
|
||||
import mekanism.common.item.ItemBlockEnergyCube;
|
||||
import mekanism.common.item.ItemBlockGasTank;
|
||||
import mekanism.common.item.ItemBlockMachine;
|
||||
import mekanism.common.network.PacketElectricChest.ElectricChestMessage;
|
||||
import mekanism.common.network.PacketElectricChest.ElectricChestPacketType;
|
||||
import mekanism.common.tile.TileEntityAdvancedBoundingBlock;
|
||||
@@ -368,10 +371,18 @@ public final class MekanismUtils
|
||||
* Retrieves an empty Gas Tank.
|
||||
* @return empty gas tank
|
||||
*/
|
||||
public static ItemStack getEmptyGasTank()
|
||||
public static ItemStack getEmptyGasTank(GasTankTier tier)
|
||||
{
|
||||
ItemStack itemstack = ((ItemBlockGasTank)new ItemStack(MekanismBlocks.GasTank).getItem()).getEmptyItem();
|
||||
return itemstack;
|
||||
return ((ItemBlockGasTank)new ItemStack(MekanismBlocks.GasTank).getItem()).getEmptyItem(tier);
|
||||
}
|
||||
|
||||
public static ItemStack getEmptyFluidTank(FluidTankTier tier)
|
||||
{
|
||||
ItemStack stack = new ItemStack(MekanismBlocks.MachineBlock2, 1, 11);
|
||||
ItemBlockMachine itemMachine = (ItemBlockMachine)stack.getItem();
|
||||
itemMachine.setBaseTier(stack, tier.getBaseTier());
|
||||
|
||||
return stack;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1336,9 +1347,9 @@ public final class MekanismUtils
|
||||
* @param gas - gas to fill the tank with
|
||||
* @return filled gas tank
|
||||
*/
|
||||
public static ItemStack getFullGasTank(Gas gas)
|
||||
public static ItemStack getFullGasTank(GasTankTier tier, Gas gas)
|
||||
{
|
||||
ItemStack tank = getEmptyGasTank();
|
||||
ItemStack tank = getEmptyGasTank(tier);
|
||||
ItemBlockGasTank item = (ItemBlockGasTank)tank.getItem();
|
||||
item.setGas(tank, new GasStack(gas, item.MAX_GAS));
|
||||
|
||||
|
||||
@@ -11,8 +11,8 @@ import mekanism.api.gas.IGasItem;
|
||||
import mekanism.common.Upgrade;
|
||||
import mekanism.common.base.IEnergyCube;
|
||||
import mekanism.common.base.IFactory;
|
||||
import mekanism.common.base.ITierItem;
|
||||
import mekanism.common.block.BlockMachine.MachineType;
|
||||
import mekanism.common.item.ItemBlockBasic;
|
||||
import mekanism.common.recipe.ShapedMekanismRecipe;
|
||||
import mekanism.common.recipe.ShapelessMekanismRecipe;
|
||||
import net.minecraft.block.Block;
|
||||
@@ -79,9 +79,9 @@ public class RecipeUtils
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else if(target.getItem() instanceof ItemBlockBasic && input.getItem() instanceof ItemBlockBasic)
|
||||
else if(target.getItem() instanceof ITierItem && input.getItem() instanceof ITierItem)
|
||||
{
|
||||
if(((ItemBlockBasic)target.getItem()).getTier(target) != ((ItemBlockBasic)input.getItem()).getTier(input))
|
||||
if(((ITierItem)target.getItem()).getBaseTier(target) != ((ITierItem)input.getItem()).getBaseTier(input))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -14,6 +14,7 @@ import mekanism.common.Mekanism;
|
||||
import mekanism.common.MekanismBlocks;
|
||||
import mekanism.common.MekanismItems;
|
||||
import mekanism.common.Tier.BaseTier;
|
||||
import mekanism.common.Tier.GasTankTier;
|
||||
import mekanism.common.Version;
|
||||
import mekanism.common.base.IModule;
|
||||
import mekanism.common.multiblock.MultiblockManager;
|
||||
@@ -166,7 +167,7 @@ public class MekanismGenerators implements IModule
|
||||
" I ", "IGI", " I ", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.Reactor, 1, 1), Character.valueOf('G'), "blockGlass"
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.Reactor, 1, 0), new Object[] {
|
||||
"CGC", "ITI", "III", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('G'), "paneGlass", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.Reactor, 1, 1), Character.valueOf('T'), MekanismUtils.getEmptyGasTank()
|
||||
"CGC", "ITI", "III", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('G'), "paneGlass", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.Reactor, 1, 1), Character.valueOf('T'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC)
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.ReactorGlass, 2, 1), new Object[] {
|
||||
" I ", "ILI", " I ", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.ReactorGlass, 1, 0), Character.valueOf('L'), "blockRedstone"
|
||||
|
||||
Reference in new issue
Block a user