From 78c2afb5ea6556237b4f9cc8fda2380e4fa0d170 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Mon, 25 Apr 2016 13:11:26 +0100 Subject: [PATCH] Actually get it compiling again. Seems to run ok, I think? --- src/main/java/mekanism/api/Coord4D.java | 2 - .../java/mekanism/client/ClientProxy.java | 16 ++--- .../mekanism/client/ClientTickHandler.java | 4 +- .../mekanism/client/gui/GuiBoilerStats.java | 4 +- .../mekanism/client/gui/GuiElectricPump.java | 2 +- .../client/gui/GuiFluidicPlenisher.java | 2 +- .../client/gui/GuiFormulaicAssemblicator.java | 11 +-- .../client/gui/GuiQuantumEntangloporter.java | 15 ++-- .../client/gui/GuiResistiveHeater.java | 13 ++-- .../client/gui/GuiThermoelectricBoiler.java | 8 +-- .../client/gui/element/GuiBoilerTab.java | 5 +- .../mekanism/client/gui/element/GuiGraph.java | 5 +- .../client/gui/element/GuiHeatInfo.java | 5 +- .../client/render/MekanismRenderer.java | 2 +- .../client/render/RenderTickHandler.java | 2 +- .../client/render/entity/RenderFlame.java | 6 ++ .../render/particle/EntityScubaBubbleFX.java | 15 ++-- .../RenderThermoelectricBoiler.java | 43 ++++++------ .../common/CommonPlayerTickHandler.java | 13 ++-- .../java/mekanism/common/HeatNetwork.java | 6 +- src/main/java/mekanism/common/Mekanism.java | 3 +- src/main/java/mekanism/common/Tier.java | 4 +- .../mekanism/common/block/BlockBounding.java | 1 + .../mekanism/common/block/BlockMachine.java | 12 ++-- .../block/states/BlockStateMachine.java | 16 +++-- .../content/boiler/BoilerUpdateProtocol.java | 11 ++- .../entangloporter/InventoryFrequency.java | 2 +- .../mekanism/common/entity/EntityFlame.java | 1 + .../common/inventory/InventoryBin.java | 4 +- .../ContainerFormulaicAssemblicator.java | 10 +-- .../ContainerQuantumEntangloporter.java | 4 +- .../container/ContainerResistiveHeater.java | 4 +- .../mekanism/common/item/ItemBlockBasic.java | 6 +- .../common/item/ItemBlockEnergyCube.java | 14 ++-- .../common/item/ItemBlockGasTank.java | 12 ++-- .../common/item/ItemBlockMachine.java | 8 +-- .../common/item/ItemConfigurationCard.java | 20 +++--- .../common/item/ItemControlCircuit.java | 1 - .../common/item/ItemCraftingFormula.java | 36 +++++----- .../common/item/ItemGaugeDropper.java | 8 +-- .../mekanism/common/recipe/BinRecipe.java | 4 +- .../common/tile/TileEntityBoilerCasing.java | 30 ++++++-- .../common/tile/TileEntityBoilerValve.java | 18 ++--- .../common/tile/TileEntityDigitalMiner.java | 2 +- .../common/tile/TileEntityFactory.java | 2 +- .../common/tile/TileEntityFluidTank.java | 2 +- .../TileEntityFormulaicAssemblicator.java | 15 ++-- .../common/tile/TileEntityGasTank.java | 2 +- .../tile/TileEntityQuantumEntangloporter.java | 68 +++++++++---------- .../tile/TileEntityResistiveHeater.java | 18 ++--- .../TileEntityThermalEvaporationValve.java | 6 +- .../mekanism/common/util/InventoryUtils.java | 9 +++ .../mekanism/common/util/RecipeUtils.java | 9 ++- 53 files changed, 290 insertions(+), 251 deletions(-) diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index ab8ee38d3..d5378244f 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -21,8 +21,6 @@ import net.minecraft.util.Vec3i; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; /** * Coord4D - an integer-based way to keep track of and perform operations on blocks in a Minecraft-based environment. This also takes diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 8ac444105..eb9c2a475 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -85,18 +85,12 @@ import mekanism.client.render.tileentity.RenderEnergyCube; import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderFluidicPlenisher; import mekanism.client.render.tileentity.RenderGasTank; -import mekanism.client.render.tileentity.RenderLaser; import mekanism.client.render.tileentity.RenderLaserAmplifier; 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.RenderPressurizedReactionChamber; -import mekanism.client.render.tileentity.RenderRotaryCondensentrator; import mekanism.client.render.tileentity.RenderThermalEvaporationController; import mekanism.client.render.tileentity.RenderSeismicVibrator; -import mekanism.client.render.tileentity.RenderSolarNeutronActivator; import mekanism.client.render.tileentity.RenderTeleporter; import mekanism.client.render.tileentity.RenderThermalEvaporationController; import mekanism.client.render.tileentity.RenderThermoelectricBoiler; @@ -465,7 +459,7 @@ public class ClientProxy extends CommonProxy registerItemRender(MekanismItems.Crystal); registerItemRender(MekanismItems.FreeRunners); registerItemRender(MekanismItems.ArmoredJetpack); - registerItemRender(MekanismItems.FilterCard); + registerItemRender(MekanismItems.ConfigurationCard); registerItemRender(MekanismItems.SeismicReader); registerItemRender(MekanismItems.Substrate); registerItemRender(MekanismItems.Polyethene); @@ -586,18 +580,18 @@ public class ClientProxy extends CommonProxy case 37: return new GuiChemicalCrystallizer(player.inventory, (TileEntityChemicalCrystallizer)tileEntity); case 38: - ItemStack itemStack1 = player.getCurrentEquippedItem().copy(); + ItemStack itemStack1 = player.getCurrentEquippedItem(); if(itemStack1 != null && itemStack1.getItem() instanceof ItemSeismicReader) { - return new GuiSeismicReader(world, new Coord4D(player), itemStack1); + return new GuiSeismicReader(world, new Coord4D(player), itemStack1.copy()); } case 39: return new GuiSeismicVibrator(player.inventory, (TileEntitySeismicVibrator)tileEntity); 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: @@ -607,7 +601,7 @@ public class ClientProxy extends CommonProxy case 45: return new GuiLaserTractorBeam(player.inventory, (TileEntityLaserTractorBeam)tileEntity); case 46: - return new GuiEntangledBlock(player.inventory, (TileEntityEntangledBlock)tileEntity); + return new GuiQuantumEntangloporter(player.inventory, (TileEntityQuantumEntangloporter)tileEntity); case 47: return new GuiSolarNeutronActivator(player.inventory, (TileEntitySolarNeutronActivator)tileEntity); case 48: diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index b1a194298..977c2d1a5 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -422,11 +422,11 @@ public class ClientTickHandler } else if(jetpack.getMode(stack) == JetpackMode.HOVER) { - if((!mc.gameSettings.keyBindJump.getIsKeyPressed() && !mc.gameSettings.keyBindSneak.getIsKeyPressed()) || (mc.gameSettings.keyBindJump.getIsKeyPressed() && mc.gameSettings.keyBindSneak.getIsKeyPressed()) || mc.currentScreen != null) + if((!mc.gameSettings.keyBindJump.isPressed() && !mc.gameSettings.keyBindSneak.isPressed()) || (mc.gameSettings.keyBindJump.isPressed() && mc.gameSettings.keyBindSneak.isPressed()) || mc.currentScreen != null) { return !player.onGround; } - else if(mc.gameSettings.keyBindSneak.getIsKeyPressed() && mc.currentScreen == null) + else if(mc.gameSettings.keyBindSneak.isPressed() && mc.currentScreen == null) { return !player.onGround; } diff --git a/src/main/java/mekanism/client/gui/GuiBoilerStats.java b/src/main/java/mekanism/client/gui/GuiBoilerStats.java index fcb976f18..45e96ce68 100644 --- a/src/main/java/mekanism/client/gui/GuiBoilerStats.java +++ b/src/main/java/mekanism/client/gui/GuiBoilerStats.java @@ -23,8 +23,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiBoilerStats extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java index 911d4f2f2..b6c71c248 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -66,7 +66,7 @@ public class GuiElectricPump extends GuiMekanism @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - fontRendererObj.drawString(tileEntity.getName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getInventoryName()) / 2), 6, 0x404040); + fontRendererObj.drawString(tileEntity.getName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java index 1129f7fa8..22e8ad809 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java +++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java @@ -66,7 +66,7 @@ public class GuiFluidicPlenisher extends GuiMekanism @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - fontRendererObj.drawString(tileEntity.getName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getInventoryName()) / 2), 6, 0x404040); + fontRendererObj.drawString(tileEntity.getName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.finished") + ": " + LangUtils.transYesNo(tileEntity.finishedCalc), 51, 35, 0x00CD00); diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index c6ffa935f..0afbdab18 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -30,8 +31,8 @@ import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiFormulaicAssemblicator extends GuiMekanism @@ -65,7 +66,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); + fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); if(xAxis >= 44 && xAxis <= 60 && yAxis >= 75 && yAxis <= 91) @@ -199,7 +200,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); MekanismRenderer.blendOn(); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), stack, guiWidth + slot.xDisplayPosition, guiHeight + slot.yDisplayPosition); + itemRender.renderItemAndEffectIntoGUI(stack, guiWidth + slot.xDisplayPosition, guiHeight + slot.yDisplayPosition); MekanismRenderer.blendOff(); GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); @@ -217,7 +218,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index e6a1a9d47..f3d20d9e1 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -28,8 +29,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiQuantumEntangloporter extends GuiMekanism @@ -90,7 +91,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism setButton = new GuiButton(2, guiWidth + 27, guiHeight + 116, 60, 20, LangUtils.localize("gui.set")); deleteButton = new GuiButton(3, guiWidth + 89, guiHeight + 116, 60, 20, LangUtils.localize("gui.delete")); - frequencyField = new GuiTextField(fontRendererObj, guiWidth + 50, guiHeight + 104, 86, 11); + frequencyField = new GuiTextField(4, fontRendererObj, guiWidth + 50, guiHeight + 104, 86, 11); frequencyField.setMaxStringLength(MAX_LENGTH); frequencyField.setEnableBackgroundDrawing(false); @@ -194,7 +195,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism } @Override - public void mouseClicked(int mouseX, int mouseY, int button) + public void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); @@ -217,7 +218,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism } @Override - public void keyTyped(char c, int i) + public void keyTyped(char c, int i) throws IOException { if(!frequencyField.isFocused() || i == Keyboard.KEY_ESCAPE) { @@ -242,7 +243,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism } @Override - protected void actionPerformed(GuiButton guibutton) + protected void actionPerformed(GuiButton guibutton) throws IOException { super.actionPerformed(guibutton); @@ -299,7 +300,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism int xAxis = (mouseX-(width-xSize)/2); int yAxis = (mouseY-(height-ySize)/2); - fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 4, 0x404040); + fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 4, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.owner") + ": " + (tileEntity.owner != null ? tileEntity.owner : LangUtils.localize("gui.none")), 8, (ySize-96)+4, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.freq") + ":", 32, 81, 0x404040); diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java index a7b5720d8..c215bd346 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -29,8 +30,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiResistiveHeater extends GuiMekanism @@ -76,7 +77,7 @@ public class GuiResistiveHeater extends GuiMekanism String prevEnergyUsage = energyUsageField != null ? energyUsageField.getText() : ""; - energyUsageField = new GuiTextField(fontRendererObj, guiWidth + 49, guiHeight + 52, 66, 11); + energyUsageField = new GuiTextField(0, fontRendererObj, guiWidth + 49, guiHeight + 52, 66, 11); energyUsageField.setMaxStringLength(7); energyUsageField.setEnableBackgroundDrawing(false); energyUsageField.setText(prevEnergyUsage); @@ -85,7 +86,7 @@ public class GuiResistiveHeater extends GuiMekanism @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getInventoryName()) / 2), 6, 0x404040); + fontRendererObj.drawString(tileEntity.getName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); renderScaledText(LangUtils.localize("gui.temp") + ": " + MekanismUtils.getTemperatureDisplay(tileEntity.temperature, TemperatureUnit.AMBIENT), 50, 25, 0x00CD00, 76); @@ -143,7 +144,7 @@ public class GuiResistiveHeater extends GuiMekanism } @Override - public void mouseClicked(int mouseX, int mouseY, int button) + public void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); @@ -163,7 +164,7 @@ public class GuiResistiveHeater extends GuiMekanism } @Override - public void keyTyped(char c, int i) + public void keyTyped(char c, int i) throws IOException { if(!energyUsageField.isFocused() || i == Keyboard.KEY_ESCAPE) { diff --git a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java index d8ae6623f..dbd9dffc7 100644 --- a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java @@ -24,8 +24,8 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiThermoelectricBoiler extends GuiMekanism @@ -83,7 +83,7 @@ public class GuiThermoelectricBoiler extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040); - fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 5, 0x404040); + fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 5, 0x404040); renderScaledText(LangUtils.localize("gui.temp") + ": " + MekanismUtils.getTemperatureDisplay(tileEntity.structure.temperature, TemperatureUnit.AMBIENT), 43, 30, 0x00CD00, 90); renderScaledText(LangUtils.localize("gui.boilRate") + ": " + tileEntity.structure.lastBoilRate + " mB/t", 43, 39, 0x00CD00, 90); @@ -151,7 +151,7 @@ public class GuiThermoelectricBoiler extends GuiMekanism } mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); - drawTexturedModelRectFromIcon(guiWidth + xPos, guiHeight + yPos + 58 - renderRemaining - start, fluid.getFluid().getIcon(), 16, 16 - (16 - renderRemaining)); + //TODO drawTexturedModelRectFromIcon(guiWidth + xPos, guiHeight + yPos + 58 - renderRemaining - start, fluid.getFluid().getIcon(), 16, 16 - (16 - renderRemaining)); start+=16; if(renderRemaining == 0 || scale == 0) diff --git a/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java b/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java index 24d2b24b8..3272e269d 100644 --- a/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java @@ -10,9 +10,8 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiBoilerTab extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiGraph.java b/src/main/java/mekanism/client/gui/element/GuiGraph.java index 4fbd0f4b2..61ef889a4 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGraph.java +++ b/src/main/java/mekanism/client/gui/element/GuiGraph.java @@ -11,9 +11,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiGraph extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java b/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java index 41d335736..83657dcea 100644 --- a/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java +++ b/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java @@ -10,9 +10,8 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiHeatInfo extends GuiElement diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 7491c3e41..7077c3b9d 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -152,7 +152,7 @@ public class MekanismRenderer RenderDynamicTank.resetDisplayInts(); RenderThermalEvaporationController.resetDisplayInts(); - RenderPortableTank.resetDisplayInts(); + RenderFluidTank.resetDisplayInts(); } public static void initFluidTextures(TextureMap map) { diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index cbaf98e6e..cae943174 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -179,7 +179,7 @@ public class RenderTickHandler Pos3D motion = vec.clone().scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ)); Pos3D v = playerPos.clone().translate(vec); - spawnAndSetParticle("bubble", world, v.xPos, v.yPos, v.zPos, motion.xPos, motion.yPos + 0.2, motion.zPos); + spawnAndSetParticle(EnumParticleTypes.WATER_BUBBLE, world, v.xCoord, v.yCoord, v.zCoord, motion.xCoord, motion.yCoord + 0.2, motion.zCoord); } } } diff --git a/src/main/java/mekanism/client/render/entity/RenderFlame.java b/src/main/java/mekanism/client/render/entity/RenderFlame.java index 603246ce6..bb9615b07 100644 --- a/src/main/java/mekanism/client/render/entity/RenderFlame.java +++ b/src/main/java/mekanism/client/render/entity/RenderFlame.java @@ -4,6 +4,7 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.entity.EntityFlame; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; @@ -16,6 +17,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderFlame extends Render { + public RenderFlame(RenderManager renderManager) + { + super(renderManager); + } + @Override public void doRender(EntityFlame entity, double x, double y, double z, float f, float partialTick) { diff --git a/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java b/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java index 468f7bd1a..c7935560e 100644 --- a/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java +++ b/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java @@ -3,10 +3,12 @@ package mekanism.client.render.particle; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityBubbleFX; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.entity.Entity; import net.minecraft.world.World; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class EntityScubaBubbleFX extends EntityBubbleFX @@ -28,14 +30,13 @@ public class EntityScubaBubbleFX extends EntityBubbleFX particleAge++; } - + @Override - public void renderParticle(Tessellator p_70539_1_, float p_70539_2_, float p_70539_3_, float p_70539_4_, float p_70539_5_, float p_70539_6_, float p_70539_7_) + public void renderParticle(WorldRenderer worldRendererIn, Entity entityIn, float partialTicks, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_) { if(particleAge > 0) { - particleAlpha = Math.min(1, (particleAge+p_70539_2_)/20F); - super.renderParticle(p_70539_1_, p_70539_2_, p_70539_3_, p_70539_4_, p_70539_5_, p_70539_6_, p_70539_7_); + super.renderParticle(worldRendererIn, entityIn, partialTicks, p_180434_4_, p_180434_5_, p_180434_6_, p_180434_7_, p_180434_8_); } } } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java index 106761c66..cf73cecc0 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java @@ -21,11 +21,11 @@ import net.minecraftforge.fluids.FluidRegistry; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer +public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer { private static Map cachedLowerFluids = new HashMap(); private static Map cachedUpperFluids = new HashMap(); @@ -35,12 +35,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer private Fluid WATER = FluidRegistry.WATER; @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityBoilerCasing)tileEntity, x, y, z, partialTick); - } - - public void renderAModelAt(TileEntityBoilerCasing tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityBoilerCasing tileEntity, double x, double y, double z, float partialTick, int destroyStage) { if(tileEntity.clientHasStructure && tileEntity.isRendering && tileEntity.structure != null && tileEntity.structure.renderLocation != null && tileEntity.structure.upperRenderLocation != null) { @@ -49,7 +44,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer RenderData data = new RenderData(); data.location = tileEntity.structure.renderLocation; - data.height = (tileEntity.structure.upperRenderLocation.yCoord-1)-tileEntity.structure.renderLocation.yCoord; + data.height = (tileEntity.structure.upperRenderLocation.getY()-1)-tileEntity.structure.renderLocation.getY(); data.length = tileEntity.structure.volLength; data.width = tileEntity.structure.volWidth; @@ -59,12 +54,12 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer { push(); - GL11.glTranslated(getX(data.location.xCoord), getY(data.location.yCoord), getZ(data.location.zCoord)); + GL11.glTranslated(getX(data.location.getX()), getY(data.location.getY()), getZ(data.location.getZ())); MekanismRenderer.glowOn(tileEntity.structure.waterStored.getFluid().getLuminosity()); MekanismRenderer.colorFluid(tileEntity.structure.waterStored.getFluid()); - DisplayInteger[] displayList = getLowerDisplay(data, tileEntity.structure.waterStored.getFluid(), tileEntity.getWorldObj()); + DisplayInteger[] displayList = getLowerDisplay(data, tileEntity.structure.waterStored.getFluid(), tileEntity.getWorld()); if(tileEntity.structure.waterStored.getFluid().isGaseous()) { @@ -84,11 +79,11 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer { push(); - GL11.glTranslated(getX(valveData.location.xCoord), getY(valveData.location.yCoord), getZ(valveData.location.zCoord)); + GL11.glTranslated(getX(valveData.location.getX()), getY(valveData.location.getY()), getZ(valveData.location.getZ())); MekanismRenderer.glowOn(tileEntity.structure.waterStored.getFluid().getLuminosity()); - getValveDisplay(ValveRenderData.get(data, valveData), tileEntity.structure.waterStored.getFluid(), tileEntity.getWorldObj()).render(); + getValveDisplay(ValveRenderData.get(data, valveData), tileEntity.structure.waterStored.getFluid(), tileEntity.getWorld()).render(); MekanismRenderer.glowOff(); MekanismRenderer.resetColor(); @@ -103,7 +98,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer RenderData data = new RenderData(); data.location = tileEntity.structure.upperRenderLocation; - data.height = (tileEntity.structure.renderLocation.yCoord+tileEntity.structure.volHeight-2)-(tileEntity.structure.upperRenderLocation.yCoord); + data.height = (tileEntity.structure.renderLocation.getY()+tileEntity.structure.volHeight-2)-(tileEntity.structure.upperRenderLocation.getY()); data.length = tileEntity.structure.volLength; data.width = tileEntity.structure.volWidth; @@ -113,12 +108,12 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer { push(); - GL11.glTranslated(getX(data.location.xCoord), getY(data.location.yCoord), getZ(data.location.zCoord)); + GL11.glTranslated(getX(data.location.getX()), getY(data.location.getY()), getZ(data.location.getZ())); MekanismRenderer.glowOn(tileEntity.structure.steamStored.getFluid().getLuminosity()); MekanismRenderer.colorFluid(tileEntity.structure.steamStored.getFluid()); - DisplayInteger display = getUpperDisplay(data, tileEntity.structure.steamStored.getFluid(), tileEntity.getWorldObj()); + DisplayInteger display = getUpperDisplay(data, tileEntity.structure.steamStored.getFluid(), tileEntity.getWorld()); GL11.glColor4f(1F, 1F, 1F, Math.min(1, ((float)tileEntity.structure.steamStored.amount / (float)tileEntity.clientSteamCapacity)+MekanismRenderer.GAS_RENDER_BASE)); display.render(); @@ -157,7 +152,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer Model3D toReturn = new Model3D(); toReturn.baseBlock = Blocks.water; - toReturn.setTexture(fluid.getIcon()); + toReturn.setTexture(fluid.getStill()); final int stages = getStages(data.height); DisplayInteger[] displays = new DisplayInteger[stages]; @@ -168,7 +163,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer { displays[i] = DisplayInteger.createAndStart(); - if(fluid.getIcon() != null) + if(fluid.getStill() != null) { toReturn.minX = 0 + .01; toReturn.minY = 0 + .01; @@ -196,14 +191,14 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer Model3D toReturn = new Model3D(); toReturn.baseBlock = Blocks.water; - toReturn.setTexture(fluid.getIcon()); + toReturn.setTexture(fluid.getStill()); final int stages = getStages(data.height); DisplayInteger display = DisplayInteger.createAndStart(); cachedUpperFluids.put(data, display); - if(STEAM.getIcon() != null) + if(STEAM.getStill() != null) { toReturn.minX = 0 + .01; toReturn.minY = 0 + .01; @@ -230,7 +225,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer Model3D toReturn = new Model3D(); toReturn.baseBlock = Blocks.water; - toReturn.setTexture(fluid.getFlowingIcon()); + toReturn.setTexture(fluid.getFlowing()); DisplayInteger display = DisplayInteger.createAndStart(); @@ -310,7 +305,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer } } - if(fluid.getFlowingIcon() != null) + if(fluid.getFlowing() != null) { MekanismRenderer.renderObject(toReturn); } @@ -322,7 +317,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer private int getValveFluidHeight(ValveRenderData data) { - return data.valveLocation.yCoord - data.location.yCoord; + return data.valveLocation.getY() - data.location.getY(); } private int getStages(int height) diff --git a/src/main/java/mekanism/common/CommonPlayerTickHandler.java b/src/main/java/mekanism/common/CommonPlayerTickHandler.java index 91eef4268..a7a703b0b 100644 --- a/src/main/java/mekanism/common/CommonPlayerTickHandler.java +++ b/src/main/java/mekanism/common/CommonPlayerTickHandler.java @@ -10,12 +10,14 @@ import mekanism.common.item.ItemJetpack.JetpackMode; import mekanism.common.item.ItemScubaTank; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; @@ -138,12 +140,13 @@ public class CommonPlayerTickHandler public static boolean isOnGround(EntityPlayer player) { int x = MathHelper.floor_double(player.posX); - int y = (int)Math.round(player.posY-player.yOffset - 1); + int y = (int)Math.round(player.posY - 1); int z = MathHelper.floor_double(player.posZ); - - Block b = player.worldObj.getBlock(x, y, z); - AxisAlignedBB box = b.getCollisionBoundingBoxFromPool(player.worldObj, x, y, z); - AxisAlignedBB playerBox = player.boundingBox.copy().offset(0, -0.01, 0); + + BlockPos pos = new BlockPos(x, y, z); + IBlockState s = player.worldObj.getBlockState(pos); + AxisAlignedBB box = s.getBlock().getCollisionBoundingBox(player.worldObj, pos, s); + AxisAlignedBB playerBox = player.getCollisionBoundingBox().offset(0, -0.01, 0); return box != null && playerBox.intersectsWith(box); } diff --git a/src/main/java/mekanism/common/HeatNetwork.java b/src/main/java/mekanism/common/HeatNetwork.java index babc9752a..f8b149325 100644 --- a/src/main/java/mekanism/common/HeatNetwork.java +++ b/src/main/java/mekanism/common/HeatNetwork.java @@ -7,7 +7,7 @@ import mekanism.api.IHeatTransfer; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; -import mekanism.common.multipart.MultipartTransmitter; +//import mekanism.common.multipart.MultipartTransmitter; import mekanism.common.util.MekanismUtils; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -77,6 +77,7 @@ public class HeatNetwork extends DynamicNetwork { for(IGridTransmitter transmitter : transmitters) { + /* if(transmitter instanceof MultipartTransmitter && ((MultipartTransmitter)transmitter).getPart() instanceof IHeatTransfer) { IHeatTransfer heatTransmitter = (IHeatTransfer)((MultipartTransmitter)transmitter).getPart(); @@ -84,15 +85,18 @@ public class HeatNetwork extends DynamicNetwork newHeatTransferred += d[0]; newHeatLost += d[1]; } + */ } for(IGridTransmitter transmitter : transmitters) { +/* if(transmitter instanceof MultipartTransmitter && ((MultipartTransmitter)transmitter).getPart() instanceof IHeatTransfer) { IHeatTransfer heatTransmitter = (IHeatTransfer)((MultipartTransmitter)transmitter).getPart(); newSumTemp += heatTransmitter.applyTemperatureChange(); } +*/ } } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index ef77bc3c9..077e40324 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -44,6 +44,7 @@ import mekanism.common.base.IChunkLoadHandler; import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.IModule; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.chunkloading.ChunkManager; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.content.entangloporter.InventoryFrequency; @@ -1269,7 +1270,7 @@ public class Mekanism GasRegistry.register(new Gas("lithium")).registerFluid(); FluidRegistry.registerFluid(new Fluid("heavyWater", new ResourceLocation("mekanism:heavy_water"), new ResourceLocation("mekanism:heavy_water"))); - FluidRegistry.registerFluid(new Fluid("steam").setGaseous(true)); + FluidRegistry.registerFluid(new Fluid("steam", new ResourceLocation("mekanism:steam"), new ResourceLocation("mekanism:steam")).setGaseous(true)); for(Resource resource : Resource.values()) { diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index 31d38931f..75cad341b 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -577,7 +577,7 @@ public final class Tier return BASIC; } } - + */ public static enum FluidTankTier implements ITier { BASIC(14000, 400), @@ -711,7 +711,6 @@ public final class Tier dataStream.writeInt(storage); } } -*/ public static void init() { @@ -776,6 +775,5 @@ public final class Tier public void readConfig(ByteBuf dataStream); public void writeConfig(ByteBuf dataStream); -*/ } } diff --git a/src/main/java/mekanism/common/block/BlockBounding.java b/src/main/java/mekanism/common/block/BlockBounding.java index 6280cd56b..3e2be1efa 100644 --- a/src/main/java/mekanism/common/block/BlockBounding.java +++ b/src/main/java/mekanism/common/block/BlockBounding.java @@ -2,6 +2,7 @@ package mekanism.common.block; import java.util.Random; +import mekanism.common.block.states.BlockStateBounding; import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; import net.minecraft.block.Block; diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index a2ac542c2..524ac08a3 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -10,6 +10,7 @@ import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Mekanism; +import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.FluidTankTier; import mekanism.common.base.IActiveState; import mekanism.common.base.IBoundingBlock; @@ -43,6 +44,7 @@ import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityFluidTank; +import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -337,7 +339,7 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou else if(tileEntity instanceof TileEntityQuantumEntangloporter) { TileEntityQuantumEntangloporter entangloporter = (TileEntityQuantumEntangloporter)tileEntity; - entangloporter.owner = entityliving.getCommandSenderName(); + entangloporter.owner = placer.getName(); } if(tileEntity instanceof IBoundingBlock) @@ -699,12 +701,12 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou if(teleporter.owner == null) { - teleporter.owner = entityplayer.getCommandSenderName(); + teleporter.owner = entityplayer.getName(); } - if(teleporter.owner.equals(entityplayer.getCommandSenderName()) || MekanismUtils.isOp((EntityPlayerMP)entityplayer)) + if(teleporter.owner.equals(entityplayer.getName()) || MekanismUtils.isOp((EntityPlayerMP)entityplayer)) { - entityplayer.openGui(Mekanism.instance, type.guiId, world, x, y, z); + entityplayer.openGui(Mekanism.instance, type.guiId, world, pos.getX(), pos.getY(), pos.getZ()); } else { entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("gui.entangloporter.noAccess"))); @@ -1107,7 +1109,7 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou @Override public AxisAlignedBB getCollisionBoundingBox(World world, BlockPos pos, IBlockState state) { - setBlockBoundsBasedOnState(world, x, y, z); + setBlockBoundsBasedOnState(world, pos); if(world.getTileEntity(pos) instanceof TileEntityChargepad) { diff --git a/src/main/java/mekanism/common/block/states/BlockStateMachine.java b/src/main/java/mekanism/common/block/states/BlockStateMachine.java index 31ea0849d..30832689f 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateMachine.java +++ b/src/main/java/mekanism/common/block/states/BlockStateMachine.java @@ -30,9 +30,10 @@ import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.tile.TileEntityEliteFactory; 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.TileEntityFormulaicAssemblicator; import mekanism.common.tile.TileEntityLaser; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.tile.TileEntityLaserTractorBeam; @@ -41,9 +42,10 @@ 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.TileEntityQuantumEntangloporter; +import mekanism.common.tile.TileEntityResistiveHeater; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntitySolarNeutronActivator; @@ -141,17 +143,17 @@ public class BlockStateMachine extends BlockStateFacing CHEMICAL_CRYSTALLIZER(MachineBlock.MACHINE_BLOCK_2, 8, "ChemicalCrystallizer", 37, TileEntityChemicalCrystallizer.class, true, true, true, Plane.HORIZONTAL, true), SEISMIC_VIBRATOR(MachineBlock.MACHINE_BLOCK_2, 9, "SeismicVibrator", 39, TileEntitySeismicVibrator.class, true, true, false, Plane.HORIZONTAL, true), PRESSURIZED_REACTION_CHAMBER(MachineBlock.MACHINE_BLOCK_2, 10, "PressurizedReactionChamber", 40, TileEntityPRC.class, true, true, false, Plane.HORIZONTAL, true), - PORTABLE_TANK(MachineBlock.MACHINE_BLOCK_2, 11, "PortableTank", 41, TileEntityPortableTank.class, false, true, false, never, true), + FLUID_TANK(MachineBlock.MACHINE_BLOCK_2, 11, "PortableTank", 41, TileEntityFluidTank.class, false, true, false, never, true), FLUIDIC_PLENISHER(MachineBlock.MACHINE_BLOCK_2, 12, "FluidicPlenisher", 42, TileEntityFluidicPlenisher.class, true, true, false, Plane.HORIZONTAL, true), LASER(MachineBlock.MACHINE_BLOCK_2, 13, "Laser", -1, TileEntityLaser.class, true, true, false, always, false), LASER_AMPLIFIER(MachineBlock.MACHINE_BLOCK_2, 14, "LaserAmplifier", 44, TileEntityLaserAmplifier.class, false, true, false, always, true), LASER_TRACTOR_BEAM(MachineBlock.MACHINE_BLOCK_2, 15, "LaserTractorBeam", 45, TileEntityLaserTractorBeam.class, false, true, false, always, true), - QUANTUM_ENTANGLOPORTER(MachineBlock.MACHINE_BLOCK_3, 0, "EntangledBlock", 46, TileEntityEntangledBlock.class, true, false, false, Plane.HORIZONTAL, true), + QUANTUM_ENTANGLOPORTER(MachineBlock.MACHINE_BLOCK_3, 0, "EntangledBlock", 46, TileEntityQuantumEntangloporter.class, true, false, false, Plane.HORIZONTAL, true), SOLAR_NEUTRON_ACTIVATOR(MachineBlock.MACHINE_BLOCK_3, 1, "SolarNeutronActivator", 47, TileEntitySolarNeutronActivator.class, false, true, false, Plane.HORIZONTAL, true), AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 2, "AmbientAccumulator", 48, TileEntityAmbientAccumulator.class, true, false, false, never, true), OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false, Plane.HORIZONTAL, true), - RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, false, false), - FORMULAIC_ASSEMBLICATOR(MachineBlock.MACHINE_BLOCK_3, 5, "FormulaicAssemblicator", 56, TileEntityFormulaicAssemblicator.class, true, false, true); + RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, false, false, always, true), + FORMULAIC_ASSEMBLICATOR(MachineBlock.MACHINE_BLOCK_3, 5, "FormulaicAssemblicator", 56, TileEntityFormulaicAssemblicator.class, true, false, true, always, true); public MachineBlock typeBlock; public int meta; @@ -206,7 +208,7 @@ public class BlockStateMachine extends BlockStateFacing for(MachineType type : MachineType.values()) { - if(type != ENTANGLED_BLOCK && type != AMBIENT_ACCUMULATOR) + if(type != QUANTUM_ENTANGLOPORTER && type != AMBIENT_ACCUMULATOR) { ret.add(type); } diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index d6decafde..5a72a2686 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -156,11 +156,10 @@ public class BoilerUpdateProtocol extends UpdateProtocol @Override public final boolean isValid(Coord4D coord) { - return coord.getY() < initDisperser.getY() && (coord.isAirBlock(pointer.getWorld()) || isViableNode(coord)); - return coord.yCoord >= renderLocation.yCoord-1 && coord.yCoord < initDisperser.yCoord && - coord.xCoord >= renderLocation.xCoord && coord.xCoord < renderLocation.xCoord+volLength && - coord.zCoord >= renderLocation.zCoord && coord.zCoord < renderLocation.zCoord+volWidth && - (coord.isAirBlock(pointer.getWorldObj()) || isViableNode(coord.xCoord, coord.yCoord, coord.zCoord)); + return coord.getY() >= renderLocation.getY()-1 && coord.getY() < initDisperser.getY() && + coord.getX() >= renderLocation.getX() && coord.getX() < renderLocation.getX()+volLength && + coord.getZ() >= renderLocation.getZ() && coord.getZ() < renderLocation.getZ()+volWidth && + (coord.isAirBlock(pointer.getWorld()) || isViableNode(coord)); } }).calculate(initAir); @@ -173,7 +172,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol int steamHeight = (structure.renderLocation.getY()+structure.volHeight-2)-initDisperser.getY(); structure.steamVolume = structure.volWidth*structure.volLength*steamHeight; - structure.upperRenderLocation = new Coord4D(structure.renderLocation.xCoord, initDisperser.yCoord+1, structure.renderLocation.zCoord); + structure.upperRenderLocation = new Coord4D(structure.renderLocation.getX(), initDisperser.getY()+1, structure.renderLocation.getZ()); return true; } diff --git a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java index 1d98fa17a..68fb27146 100644 --- a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java +++ b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java @@ -104,7 +104,7 @@ public class InventoryFrequency extends Frequency if(storedFluid.getFluid() != null) { data.add(true); - data.add(storedFluid.getFluid().getFluidID()); + data.add(storedFluid.getFluid().getFluid().getName()); data.add(storedFluid.getFluidAmount()); } else { diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java index 9c91b4a4e..1657e5928 100644 --- a/src/main/java/mekanism/common/entity/EntityFlame.java +++ b/src/main/java/mekanism/common/entity/EntityFlame.java @@ -21,6 +21,7 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; diff --git a/src/main/java/mekanism/common/inventory/InventoryBin.java b/src/main/java/mekanism/common/inventory/InventoryBin.java index d3c0688ab..ce4adb7f2 100644 --- a/src/main/java/mekanism/common/inventory/InventoryBin.java +++ b/src/main/java/mekanism/common/inventory/InventoryBin.java @@ -3,7 +3,7 @@ package mekanism.common.inventory; import mekanism.api.util.StackUtils; import mekanism.common.Tier.BinTier; import mekanism.common.base.ITierItem; -import mekanism.common.block.BlockBasic.BasicType; +import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -76,7 +76,7 @@ public class InventoryBin return false; } - if(BasicType.get(stack) == BasicType.BIN) + if(BasicBlockType.get(stack) == BasicBlockType.BIN) { return false; } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java b/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java index f9e4c74a0..c100f6ffd 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java @@ -11,8 +11,8 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ContainerFormulaicAssemblicator extends Container { @@ -82,7 +82,7 @@ public class ContainerFormulaicAssemblicator extends Container } tileEntity.open(inventory.player); - tileEntity.openInventory(); + tileEntity.openInventory(inventory.player); } @Override @@ -91,7 +91,7 @@ public class ContainerFormulaicAssemblicator extends Container super.onContainerClosed(entityplayer); tileEntity.close(entityplayer); - tileEntity.closeInventory(); + tileEntity.closeInventory(entityplayer); } @Override @@ -150,7 +150,7 @@ public class ContainerFormulaicAssemblicator extends Container return null; } } - else if(tileEntity.formula == null || tileEntity.formula.isIngredient(tileEntity.getWorldObj(), slotStack)) + else if(tileEntity.formula == null || tileEntity.formula.isIngredient(tileEntity.getWorld(), slotStack)) { if(!mergeItemStack(slotStack, 2, 20, false)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java b/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java index e43016c93..94fb19314 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java @@ -31,7 +31,7 @@ public class ContainerQuantumEntangloporter extends Container } tileEntity.open(inventory.player); - tileEntity.openInventory(); + tileEntity.openInventory(inventory.player); } @Override @@ -40,7 +40,7 @@ public class ContainerQuantumEntangloporter extends Container super.onContainerClosed(entityplayer); tileEntity.close(entityplayer); - tileEntity.closeInventory(); + tileEntity.closeInventory(entityplayer); } @Override diff --git a/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java b/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java index 2f67947f6..ec720df2d 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java @@ -34,7 +34,7 @@ public class ContainerResistiveHeater extends Container } tileEntity.open(inventory.player); - tileEntity.openInventory(); + tileEntity.openInventory(inventory.player); } @Override @@ -43,7 +43,7 @@ public class ContainerResistiveHeater extends Container super.onContainerClosed(entityplayer); tileEntity.close(entityplayer); - tileEntity.closeInventory(); + tileEntity.closeInventory(entityplayer); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 48725a28c..32c5605f7 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -221,8 +221,8 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt return null; } - int newCount = stack.stackTagCompound.getInteger("newCount"); - stack.stackTagCompound.removeTag("newCount"); + int newCount = stack.getTagCompound().getInteger("newCount"); + stack.getTagCompound().removeTag("newCount"); ItemStack ret = stack.copy(); ret.getTagCompound().setInteger("itemCount", newCount); @@ -315,7 +315,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt if(type == BasicBlockType.INDUCTION_CELL || type == BasicBlockType.INDUCTION_PROVIDER) { - return getTier(itemstack).getLocalizedName() + " " + super.getItemStackDisplayName(itemstack); + return getBaseTier(itemstack).getLocalizedName() + " " + super.getItemStackDisplayName(itemstack); } return super.getItemStackDisplayName(itemstack); diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 6de2b50d3..c9a4d9fd9 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -113,7 +113,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE @Override public EnergyCubeTier getEnergyCubeTier(ItemStack itemstack) { - if(itemstack.getTagCompound() == null) + if(!itemstack.hasTagCompound()) { return EnergyCubeTier.BASIC; } @@ -129,7 +129,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE @Override public void setEnergyCubeTier(ItemStack itemstack, EnergyCubeTier tier) { - if(itemstack.getTagCompound() == null) + if(!itemstack.hasTagCompound()) { itemstack.setTagCompound(new NBTTagCompound()); } @@ -172,7 +172,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE { ItemStack itemStack = (ItemStack)data[0]; - if(itemStack.getTagCompound() == null) + if(!itemStack.hasTagCompound()) { itemStack.setTagCompound(new NBTTagCompound()); } @@ -188,7 +188,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE { ItemStack itemStack = (ItemStack)data[0]; - if(itemStack.getTagCompound() == null) + if(!itemStack.hasTagCompound()) { return null; } @@ -202,12 +202,12 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE @Override public double getEnergy(ItemStack itemStack) { - if(itemStack.getTagCompound() == null) + if(!itemStack.hasTagCompound()) { return 0; } - return electricityStored = itemStack.getTagCompound().getDouble("electricity"); + return itemStack.getTagCompound().getDouble("electricity"); } @Override @@ -218,7 +218,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE return; } - if(itemStack.getTagCompound() == null) + if(!itemStack.hasTagCompound()) { itemStack.setTagCompound(new NBTTagCompound()); } diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index cf38f40c5..21bafabff 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -177,23 +177,23 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI @Override public BaseTier getBaseTier(ItemStack itemstack) { - if(itemstack.stackTagCompound == null) + if(!itemstack.hasTagCompound()) { return BaseTier.BASIC; } - return BaseTier.values()[itemstack.stackTagCompound.getInteger("tier")]; + return BaseTier.values()[itemstack.getTagCompound().getInteger("tier")]; } @Override public void setBaseTier(ItemStack itemstack, BaseTier tier) { - if(itemstack.stackTagCompound == null) + if(!itemstack.hasTagCompound()) { itemstack.setTagCompound(new NBTTagCompound()); } - itemstack.stackTagCompound.setInteger("tier", tier.ordinal()); + itemstack.getTagCompound().setInteger("tier", tier.ordinal()); } @Override @@ -262,7 +262,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI { ItemStack itemStack = (ItemStack)data[0]; - if(itemStack.getTagCompound() == null) + if(!itemStack.hasTagCompound()) { itemStack.setTagCompound(new NBTTagCompound()); } @@ -278,7 +278,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI { ItemStack itemStack = (ItemStack)data[0]; - if(itemStack.getTagCompound() == null) + if(!itemStack.hasTagCompound()) { return null; } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 940eac0e9..b0403982c 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -1006,22 +1006,22 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override public BaseTier getBaseTier(ItemStack itemstack) { - if(itemstack.stackTagCompound == null) + if(!itemstack.hasTagCompound()) { return BaseTier.BASIC; } - return BaseTier.values()[itemstack.stackTagCompound.getInteger("tier")]; + return BaseTier.values()[itemstack.getTagCompound().getInteger("tier")]; } @Override public void setBaseTier(ItemStack itemstack, BaseTier tier) { - if(itemstack.stackTagCompound == null) + if(!itemstack.hasTagCompound()) { itemstack.setTagCompound(new NBTTagCompound()); } - itemstack.stackTagCompound.setInteger("tier", tier.ordinal()); + itemstack.getTagCompound().setInteger("tier", tier.ordinal()); } } diff --git a/src/main/java/mekanism/common/item/ItemConfigurationCard.java b/src/main/java/mekanism/common/item/ItemConfigurationCard.java index ce4af3e1a..6b73b05b5 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurationCard.java +++ b/src/main/java/mekanism/common/item/ItemConfigurationCard.java @@ -14,7 +14,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; public class ItemConfigurationCard extends ItemMekanism @@ -33,13 +35,13 @@ public class ItemConfigurationCard extends ItemMekanism list.add(EnumColor.GREY + LangUtils.localize("gui.data") + ": " + EnumColor.INDIGO + LangUtils.localize(getDataType(itemstack))); } - + @Override - public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) + public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { if(!world.isRemote) { - TileEntity tileEntity = world.getTileEntity(x, y, z); + TileEntity tileEntity = world.getTileEntity(pos); if(tileEntity instanceof IConfigCardAccess) { @@ -138,35 +140,35 @@ public class ItemConfigurationCard extends ItemMekanism public void setData(ItemStack itemstack, NBTTagCompound data) { - if(itemstack.stackTagCompound == null) + if(itemstack.hasTagCompound()) { itemstack.setTagCompound(new NBTTagCompound()); } if(data != null) { - itemstack.stackTagCompound.setTag("data", data); + itemstack.getTagCompound().setTag("data", data); } else { - itemstack.stackTagCompound.removeTag("data"); + itemstack.getTagCompound().removeTag("data"); } } public NBTTagCompound getData(ItemStack itemstack) { - if(itemstack.stackTagCompound == null) + if(itemstack.hasTagCompound()) { return null; } - NBTTagCompound data = itemstack.stackTagCompound.getCompoundTag("data"); + NBTTagCompound data = itemstack.getTagCompound().getCompoundTag("data"); if(data.hasNoTags()) { return null; } else { - return itemstack.stackTagCompound.getCompoundTag("data"); + return itemstack.getTagCompound().getCompoundTag("data"); } } diff --git a/src/main/java/mekanism/common/item/ItemControlCircuit.java b/src/main/java/mekanism/common/item/ItemControlCircuit.java index e2138c4a4..fa849cc42 100644 --- a/src/main/java/mekanism/common/item/ItemControlCircuit.java +++ b/src/main/java/mekanism/common/item/ItemControlCircuit.java @@ -3,7 +3,6 @@ package mekanism.common.item; import java.util.List; import mekanism.common.Tier.BaseTier; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/item/ItemCraftingFormula.java b/src/main/java/mekanism/common/item/ItemCraftingFormula.java index 846aaafef..ff527417b 100644 --- a/src/main/java/mekanism/common/item/ItemCraftingFormula.java +++ b/src/main/java/mekanism/common/item/ItemCraftingFormula.java @@ -4,29 +4,28 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.EnumColor; +import mekanism.common.util.InventoryUtils; import mekanism.common.util.LangUtils; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants.NBT; -import codechicken.lib.inventory.InventoryUtils; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemCraftingFormula extends ItemMekanism { - public IIcon[] icons = new IIcon[3]; +// public IIcon[] icons = new IIcon[3]; public ItemCraftingFormula() { super(); } +/* @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister register) @@ -42,14 +41,15 @@ public class ItemCraftingFormula extends ItemMekanism { return getInventory(stack) == null ? icons[0] : (isInvalid(stack) ? icons[1] : icons[2]); } - + @Override @SideOnly(Side.CLIENT) public boolean requiresMultipleRenderPasses() { return true; } - +*/ + @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) @@ -104,7 +104,7 @@ public class ItemCraftingFormula extends ItemMekanism setInventory(stack, null); setInvalid(stack, false); - ((EntityPlayerMP)player).sendContainerAndContentsToPlayer(player.openContainer, player.openContainer.getInventory()); + ((EntityPlayerMP)player).sendContainerToPlayer(player.openContainer); return stack; } @@ -132,32 +132,32 @@ public class ItemCraftingFormula extends ItemMekanism public boolean isInvalid(ItemStack stack) { - if(stack.stackTagCompound == null) + if(!stack.hasTagCompound()) { return false; } - return stack.stackTagCompound.getBoolean("invalid"); + return stack.getTagCompound().getBoolean("invalid"); } public void setInvalid(ItemStack stack, boolean invalid) { - if(stack.stackTagCompound == null) + if(!stack.hasTagCompound()) { stack.setTagCompound(new NBTTagCompound()); } - stack.stackTagCompound.setBoolean("invalid", invalid); + stack.getTagCompound().setBoolean("invalid", invalid); } public ItemStack[] getInventory(ItemStack stack) { - if(stack.stackTagCompound == null || !stack.stackTagCompound.hasKey("Items")) + if(!stack.hasTagCompound() || !stack.getTagCompound().hasKey("Items")) { return null; } - NBTTagList tagList = stack.stackTagCompound.getTagList("Items", NBT.TAG_COMPOUND); + NBTTagList tagList = stack.getTagCompound().getTagList("Items", NBT.TAG_COMPOUND); ItemStack[] inventory = new ItemStack[9]; for(int tagCount = 0; tagCount < tagList.tagCount(); tagCount++) @@ -176,14 +176,14 @@ public class ItemCraftingFormula extends ItemMekanism public void setInventory(ItemStack stack, ItemStack[] inv) { - if(stack.stackTagCompound == null) + if(!stack.hasTagCompound()) { stack.setTagCompound(new NBTTagCompound()); } if(inv == null) { - stack.stackTagCompound.removeTag("Items"); + stack.getTagCompound().removeTag("Items"); return; } @@ -200,6 +200,6 @@ public class ItemCraftingFormula extends ItemMekanism } } - stack.stackTagCompound.setTag("Items", tagList); + stack.getTagCompound().setTag("Items", tagList); } } diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index 0305fe9b3..be3fe256d 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -19,8 +19,8 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidContainerItem { @@ -65,14 +65,14 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo } @Override - public boolean onItemRightClick(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if(player.isSneaking() && !world.isRemote) { setGas(stack, null); setFluid(stack, null); - ((EntityPlayerMP)player).sendContainerAndContentsToPlayer(player.openContainer, player.openContainer.getInventory()); + ((EntityPlayerMP)player).sendContainerToPlayer(player.openContainer); return stack; } diff --git a/src/main/java/mekanism/common/recipe/BinRecipe.java b/src/main/java/mekanism/common/recipe/BinRecipe.java index 2a0558367..a1f4d5931 100644 --- a/src/main/java/mekanism/common/recipe/BinRecipe.java +++ b/src/main/java/mekanism/common/recipe/BinRecipe.java @@ -1,7 +1,7 @@ package mekanism.common.recipe; import mekanism.common.MekanismItems; -import mekanism.common.block.BlockBasic.BasicType; +import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.inventory.InventoryBin; import mekanism.common.item.ItemProxy; import net.minecraft.inventory.IInventory; @@ -40,7 +40,7 @@ public class BinRecipe implements IRecipe return false; } - return BasicType.get(itemStack) == BasicType.BIN && itemStack.stackSize <= 1; + return BasicBlockType.get(itemStack) == BasicBlockType.BIN && itemStack.stackSize <= 1; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index 927e0eb1e..324dd2696 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -170,7 +170,7 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock= structure.upperRenderLocation.yCoord) + if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.getY()) { if(structure.steamStored != null && structure.steamStored.amount > 0) { - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.values()) { - TileEntity tile = Coord4D.get(this).getFromSide(side).getTileEntity(worldObj); + TileEntity tile = Coord4D.get(this).offset(side).getTileEntity(worldObj); if(tile instanceof IFluidHandler && !(tile instanceof TileEntityBoilerValve)) { @@ -63,7 +63,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl { if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) { - if(structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord) + if(structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.getY()) { return new FluidTankInfo[] {steamTank.getInfo()}; } @@ -78,7 +78,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl @Override public int fill(EnumFacing from, FluidStack resource, boolean doFill) { - if(structure != null && structure.upperRenderLocation != null && yCoord < structure.upperRenderLocation.yCoord) + if(structure != null && structure.upperRenderLocation != null && getPos().getY() < structure.upperRenderLocation.getY()) { return waterTank.fill(resource, doFill); } @@ -89,7 +89,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl @Override public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { - if(structure != null && structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord) + if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.getY()) { if(structure.steamStored != null) { @@ -106,7 +106,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl @Override public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { - if(structure != null && structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord) + if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.getY()) { return steamTank.drain(maxDrain, doDrain); } @@ -119,7 +119,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl { if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) { - return structure.upperRenderLocation != null && yCoord < structure.upperRenderLocation.yCoord; + return structure.upperRenderLocation != null && getPos().getY() < structure.upperRenderLocation.getY(); } return false; @@ -130,7 +130,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl { if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) { - return structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord; + return structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.getY(); } return false; diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index a490e5e1b..4ef44e936 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -867,7 +867,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I if(clientActive != isActive) { isActive = clientActive; - MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); + MekanismUtils.updateBlock(worldObj, getPos()); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 77932516f..48f10937c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -1184,6 +1184,6 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I @Override public String getDataType() { - return tier.getBaseTier().getLocalizedName() + " " + recipeType.getLocalizedName() + " " + super.getInventoryName(); + return tier.getBaseTier().getLocalizedName() + " " + recipeType.getLocalizedName() + " " + super.getName(); } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index 69bbdb49b..6c71c0dd1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -147,7 +147,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc } @Override - public String getInventoryName() + public String getName() { return LangUtils.localize("tile.FluidTank" + tier.getBaseTier().getName() + ".name"); } diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index f80abd209..cc6b909de 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -15,7 +15,7 @@ import mekanism.common.Upgrade; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; -import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.content.assemblicator.RecipeFormula; import mekanism.common.item.ItemCraftingFormula; import mekanism.common.tile.component.TileComponentConfig; @@ -27,6 +27,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock implements ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess { @@ -231,13 +232,13 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im container = null; } - if(container != null && !stack.getItem().doesContainerItemLeaveCraftingGrid(stack)) + if(container != null/*TODO && !stack.getItem().doesContainerItemLeaveCraftingGrid(stack)*/) { - if(!stack.getItem().doesContainerItemLeaveCraftingGrid(stack)) + /*TODOif(!stack.getItem().doesContainerItemLeaveCraftingGrid(stack)) { inventory[i] = container.copy(); } - else { + else*/ { boolean move = tryMoveToOutput(container.copy(), false); if(move) @@ -461,13 +462,13 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(EnumFacing side) { return configComponent.getOutput(TransmissionType.ITEM, side, facing).availableSlots; } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) { if(slotID == 1) { @@ -646,7 +647,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im } @Override - public int getOrientation() + public EnumFacing getOrientation() { return facing; } diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 882d1406b..e80efb0dc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -126,7 +126,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH } @Override - public String getInventoryName() + public String getName() { return LangUtils.localize("tile.GasTank" + tier.getBaseTier().getName() + ".name"); } diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 8cec6ce40..f779d4225 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -33,7 +33,7 @@ import mekanism.common.util.PipeUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -53,7 +53,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp public List publicCache = new ArrayList(); public List privateCache = new ArrayList(); - public static final EnumSet nothing = EnumSet.noneOf(ForgeDirection.class); + public static final EnumSet nothing = EnumSet.noneOf(EnumFacing.class); public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; @@ -325,7 +325,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); @@ -376,13 +376,13 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public EnumSet getOutputtingSides() + public EnumSet getOutputtingSides() { return !hasFrequency() ? nothing : configComponent.getSidesForData(TransmissionType.ENERGY, facing, 2); } @Override - public EnumSet getConsumingSides() + public EnumSet getConsumingSides() { return !hasFrequency() ? nothing : configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); } @@ -415,13 +415,13 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { return !hasFrequency() ? 0 : frequency.storedFluid.fill(resource, doFill); } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { if(hasFrequency() && resource.isFluidEqual(frequency.storedFluid.getFluid())) { @@ -432,7 +432,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { if(hasFrequency()) { @@ -443,9 +443,9 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) + public boolean canFill(EnumFacing from, Fluid fluid) { - if(hasFrequency() && configComponent.getOutput(TransmissionType.FLUID, from.ordinal(), facing).ioState == IOState.INPUT) + if(hasFrequency() && configComponent.getOutput(TransmissionType.FLUID, from, facing).ioState == IOState.INPUT) { return frequency.storedFluid.getFluid() == null || fluid == frequency.storedFluid.getFluid().getFluid(); } @@ -454,9 +454,9 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) + public boolean canDrain(EnumFacing from, Fluid fluid) { - if(hasFrequency() && configComponent.getOutput(TransmissionType.FLUID, from.ordinal(), facing).ioState == IOState.OUTPUT) + if(hasFrequency() && configComponent.getOutput(TransmissionType.FLUID, from, facing).ioState == IOState.OUTPUT) { return frequency.storedFluid.getFluid() == null || fluid == frequency.storedFluid.getFluid().getFluid(); } @@ -465,11 +465,11 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) + public FluidTankInfo[] getTankInfo(EnumFacing from) { if(hasFrequency()) { - if(configComponent.getOutput(TransmissionType.FLUID, from.ordinal(), facing).ioState != IOState.OFF) + if(configComponent.getOutput(TransmissionType.FLUID, from, facing).ioState != IOState.OFF) { return new FluidTankInfo[] {frequency.storedFluid.getInfo()}; } @@ -479,33 +479,33 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) + public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) { return !hasFrequency() ? 0 : frequency.storedGas.receive(stack, doTransfer); } @Override - public int receiveGas(ForgeDirection side, GasStack stack) + public int receiveGas(EnumFacing side, GasStack stack) { return receiveGas(side, stack, true); } @Override - public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) + public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer) { return !hasFrequency() ? null : frequency.storedGas.draw(amount, doTransfer); } @Override - public GasStack drawGas(ForgeDirection side, int amount) + public GasStack drawGas(EnumFacing side, int amount) { return drawGas(side, amount, true); } @Override - public boolean canReceiveGas(ForgeDirection side, Gas type) + public boolean canReceiveGas(EnumFacing side, Gas type) { - if(hasFrequency() && configComponent.getOutput(TransmissionType.GAS, side.ordinal(), facing).ioState == IOState.INPUT) + if(hasFrequency() && configComponent.getOutput(TransmissionType.GAS, side, facing).ioState == IOState.INPUT) { return frequency.storedGas.getGasType() == null || type == frequency.storedGas.getGasType(); } @@ -514,9 +514,9 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public boolean canDrawGas(ForgeDirection side, Gas type) + public boolean canDrawGas(EnumFacing side, Gas type) { - if(hasFrequency() && configComponent.getOutput(TransmissionType.GAS, side.ordinal(), facing).ioState == IOState.OUTPUT) + if(hasFrequency() && configComponent.getOutput(TransmissionType.GAS, side, facing).ioState == IOState.OUTPUT) { return frequency.storedGas.getGasType() == null || type == frequency.storedGas.getGasType(); } @@ -569,7 +569,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public double getInsulationCoefficient(ForgeDirection side) + public double getInsulationCoefficient(EnumFacing side) { return 1000; } @@ -600,17 +600,17 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public boolean canConnectHeat(ForgeDirection side) + public boolean canConnectHeat(EnumFacing side) { - return hasFrequency() && configComponent.getOutput(TransmissionType.HEAT, side.ordinal(), facing).ioState != IOState.OFF; + return hasFrequency() && configComponent.getOutput(TransmissionType.HEAT, side, facing).ioState != IOState.OFF; } @Override - public IHeatTransfer getAdjacent(ForgeDirection side) + public IHeatTransfer getAdjacent(EnumFacing side) { - TileEntity adj = Coord4D.get(this).getFromSide(side).getTileEntity(worldObj); + TileEntity adj = Coord4D.get(this).offset(side).getTileEntity(worldObj); - if(hasFrequency() && configComponent.getOutput(TransmissionType.HEAT, side.ordinal(), facing).ioState == IOState.INPUT) + if(hasFrequency() && configComponent.getOutput(TransmissionType.HEAT, side, facing).ioState == IOState.INPUT) { if(adj instanceof IHeatTransfer) { @@ -622,13 +622,13 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public boolean canInsertItem(int slotID, ItemStack itemstack, int side) + public boolean canInsertItem(int slotID, ItemStack itemstack, EnumFacing side) { return hasFrequency() && configComponent.getOutput(TransmissionType.ITEM, side, facing).ioState == IOState.INPUT; } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getSlotsForFace(EnumFacing side) { if(hasFrequency() && configComponent.getOutput(TransmissionType.ITEM, side, facing).ioState != IOState.OFF) { @@ -639,7 +639,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) { return hasFrequency() && configComponent.getOutput(TransmissionType.ITEM, side, facing).ioState == IOState.OUTPUT; } @@ -662,7 +662,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public int getOrientation() + public EnumFacing getOrientation() { return facing; } @@ -674,9 +674,9 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public boolean canTubeConnect(ForgeDirection side) + public boolean canTubeConnect(EnumFacing side) { - return frequency != null && configComponent.getOutput(TransmissionType.GAS, side.ordinal(), facing).ioState != IOState.OFF; + return frequency != null && configComponent.getOutput(TransmissionType.GAS, side, facing).ioState != IOState.OFF; } private static final String[] methods = new String[] {"setFrequency"}; diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 3442c4785..4127ea065 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -10,7 +10,7 @@ import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.IRedstoneControl; -import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.ChargeUtils; @@ -19,7 +19,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock implements IHeatTransfer, IComputerIntegration, IRedstoneControl { @@ -62,7 +62,7 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl if(updateDelay == 0 && clientActive != isActive) { isActive = clientActive; - MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); + MekanismUtils.updateBlock(worldObj, getPos()); } } @@ -178,7 +178,7 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl { updateDelay = general.UPDATE_DELAY; isActive = clientActive; - MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); + MekanismUtils.updateBlock(worldObj, getPos()); } } @@ -213,7 +213,7 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl } @Override - public double getInsulationCoefficient(ForgeDirection side) + public double getInsulationCoefficient(EnumFacing side) { return 1000; } @@ -240,15 +240,15 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl } @Override - public boolean canConnectHeat(ForgeDirection side) + public boolean canConnectHeat(EnumFacing side) { return true; } @Override - public IHeatTransfer getAdjacent(ForgeDirection side) + public IHeatTransfer getAdjacent(EnumFacing side) { - TileEntity adj = Coord4D.get(this).getFromSide(side).getTileEntity(worldObj); + TileEntity adj = Coord4D.get(this).offset(side).getTileEntity(worldObj); if(adj instanceof IHeatTransfer) { @@ -265,7 +265,7 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl if(clientActive != active && updateDelay == 0) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); updateDelay = 10; clientActive = active; diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java index 01e85ddcc..cd504518a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java @@ -110,7 +110,7 @@ public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporat } @Override - public double getInsulationCoefficient(ForgeDirection side) + public double getInsulationCoefficient(EnumFacing side) { return 0; } @@ -139,13 +139,13 @@ public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporat } @Override - public boolean canConnectHeat(ForgeDirection side) + public boolean canConnectHeat(EnumFacing side) { return getController() != null; } @Override - public IHeatTransfer getAdjacent(ForgeDirection side) + public IHeatTransfer getAdjacent(EnumFacing side) { return null; } diff --git a/src/main/java/mekanism/common/util/InventoryUtils.java b/src/main/java/mekanism/common/util/InventoryUtils.java index b3d77294b..369949c1c 100644 --- a/src/main/java/mekanism/common/util/InventoryUtils.java +++ b/src/main/java/mekanism/common/util/InventoryUtils.java @@ -539,4 +539,13 @@ public final class InventoryUtils return false; } + + /*TODO From CCLib -- go back to that version when we're using dependencies again*/ + public static boolean canStack(ItemStack stack1, ItemStack stack2) { + return stack1 == null || stack2 == null || + (stack1.getItem() == stack2.getItem() && + (!stack2.getHasSubtypes() || stack2.getItemDamage() == stack1.getItemDamage()) && + ItemStack.areItemStackTagsEqual(stack2, stack1)) && + stack1.isStackable(); + } } diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index d901afe19..bae34e085 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -14,7 +14,7 @@ import mekanism.common.Upgrade; import mekanism.common.base.IEnergyCube; import mekanism.common.base.IFactory; import mekanism.common.base.ITierItem; -import mekanism.common.block.BlockBasic.BasicType; +import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.inventory.InventoryBin; import mekanism.common.recipe.ShapedMekanismRecipe; @@ -27,6 +27,9 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.oredict.OreDictionary; public class RecipeUtils @@ -190,7 +193,7 @@ public class RecipeUtils } } - if(BasicType.get(toReturn) == BasicType.BIN) + if(BasicBlockType.get(toReturn) == BasicBlockType.BIN) { int foundCount = 0; ItemStack foundType = null; @@ -199,7 +202,7 @@ public class RecipeUtils { ItemStack itemstack = inv.getStackInSlot(i); - if(BasicType.get(itemstack) == BasicType.BIN) + if(BasicBlockType.get(itemstack) == BasicBlockType.BIN) { InventoryBin binInv = new InventoryBin(itemstack);