diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 81506be17..4d6dc7aee 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -304,7 +304,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityGasTank.class, "GasTank", new RenderGasTank()); ClientRegistry.registerTileEntity(TileEntityEnergyCube.class, "EnergyCube", new RenderEnergyCube()); ClientRegistry.registerTileEntity(TileEntityElectricPump.class, "ElectricPump", new RenderElectricPump()); - ClientRegistry.registerTileEntity(TileEntityPersonalChest.class, "ElectricChest", new RenderPersonalChest()); //TODO rename + ClientRegistry.registerTileEntity(TileEntityPersonalChest.class, "PersonalChest", new RenderPersonalChest()); ClientRegistry.registerTileEntity(TileEntityDynamicTank.class, "DynamicTank", new RenderDynamicTank()); ClientRegistry.registerTileEntity(TileEntityDynamicValve.class, "DynamicValve", new RenderDynamicTank()); ClientRegistry.registerTileEntity(TileEntityChargepad.class, "Chargepad", new RenderChargepad()); @@ -317,14 +317,14 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityChemicalInfuser.class, "ChemicalInfuser", new RenderChemicalInfuser()); ClientRegistry.registerTileEntity(TileEntityChemicalInjectionChamber.class, "ChemicalInjectionChamber", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityElectrolyticSeparator.class, "ElectrolyticSeparator", new RenderElectrolyticSeparator()); - ClientRegistry.registerTileEntity(TileEntityThermalEvaporationController.class, "SalinationController", new RenderThermalEvaporationController()); //TODO rename + ClientRegistry.registerTileEntity(TileEntityThermalEvaporationController.class, "ThermalEvaporationController", new RenderThermalEvaporationController()); ClientRegistry.registerTileEntity(TileEntityPrecisionSawmill.class, "PrecisionSawmill", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityChemicalDissolutionChamber.class, "ChemicalDissolutionChamber", new RenderChemicalDissolutionChamber()); ClientRegistry.registerTileEntity(TileEntityChemicalWasher.class, "ChemicalWasher", new RenderChemicalWasher()); ClientRegistry.registerTileEntity(TileEntityChemicalCrystallizer.class, "ChemicalCrystallizer", new RenderChemicalCrystallizer()); ClientRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator", new RenderSeismicVibrator()); ClientRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber", new RenderPressurizedReactionChamber()); - ClientRegistry.registerTileEntity(TileEntityFluidTank.class, "PortableTank", new RenderFluidTank()); //TODO rename + ClientRegistry.registerTileEntity(TileEntityFluidTank.class, "FluidTank", new RenderFluidTank()); ClientRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher", new RenderFluidicPlenisher()); //ClientRegistry.registerTileEntity(TileEntityLaser.class, "Laser", new RenderLaser()); ClientRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier", new RenderLaserAmplifier()); @@ -405,7 +405,7 @@ public class ClientProxy extends CommonProxy ModelBakery.registerItemVariants(MekanismItems.WalkieTalkie, ItemWalkieTalkie.OFF_MODEL); - for(int i = 0; i <= 9; i++) + for(int i = 1; i <= 9; i++) { ModelBakery.registerItemVariants(MekanismItems.WalkieTalkie, ItemWalkieTalkie.getModel(i)); } @@ -424,6 +424,11 @@ public class ClientProxy extends CommonProxy for(MachineType type : MachineType.values()) { + if(!type.isValidMachine()) + { + continue; + } + List modelsToAdd = new ArrayList(); String resource = "mekanism:" + type.getName(); RecipeType recipePointer = null; @@ -545,9 +550,13 @@ public class ClientProxy extends CommonProxy if(tierPointer.ordinal() < BaseTier.values().length-1) { tierPointer = BaseTier.values()[tierPointer.ordinal()+1]; - resource = "mekanism:" + type.getName() + "_" + tierPointer.getName(); - continue; + if(tierPointer.isObtainable()) + { + resource = "mekanism:" + type.getName() + "_" + tierPointer.getName(); + + continue; + } } } } diff --git a/src/main/java/mekanism/client/model/ModelObsidianTNT.java b/src/main/java/mekanism/client/model/ModelObsidianTNT.java deleted file mode 100644 index 261a5139f..000000000 --- a/src/main/java/mekanism/client/model/ModelObsidianTNT.java +++ /dev/null @@ -1,189 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelObsidianTNT extends ModelBase -{ - ModelRenderer Wick9; - ModelRenderer Wick8; - ModelRenderer Wick7; - ModelRenderer Wick6; - ModelRenderer Wick5; - ModelRenderer Wick4; - ModelRenderer Wick3; - ModelRenderer Wick2; - ModelRenderer Wick1; - ModelRenderer Wooden2; - ModelRenderer Wooden1; - ModelRenderer Rod1; - ModelRenderer Rod2; - ModelRenderer Rod3; - ModelRenderer Rod4; - ModelRenderer Rod5; - ModelRenderer Rod6; - ModelRenderer Rod7; - ModelRenderer Rod8; - ModelRenderer Rod9; - - public ModelObsidianTNT() - { - textureWidth = 64; - textureHeight = 64; - - Wick9 = new ModelRenderer(this, 0, 0); - Wick9.addBox(0F, 0F, 0F, 1, 2, 1); - Wick9.setRotationPoint(-0.5F, 9.2F, -0.5F); - Wick9.setTextureSize(64, 64); - Wick9.mirror = true; - setRotation(Wick9, 0F, 0F, 0.2268928F); - Wick8 = new ModelRenderer(this, 0, 0); - Wick8.addBox(0F, 0F, 0F, 1, 2, 1); - Wick8.setRotationPoint(-0.5F, 9.5F, -5.5F); - Wick8.setTextureSize(64, 64); - Wick8.mirror = true; - setRotation(Wick8, 0F, 0F, -0.2379431F); - Wick7 = new ModelRenderer(this, 0, 0); - Wick7.addBox(0F, 0F, 0F, 1, 2, 1); - Wick7.setRotationPoint(-0.5F, 9.5F, 4.5F); - Wick7.setTextureSize(64, 64); - Wick7.mirror = true; - setRotation(Wick7, 0F, 0F, -0.2379431F); - Wick6 = new ModelRenderer(this, 0, 0); - Wick6.addBox(0F, 0F, 0F, 1, 2, 1); - Wick6.setRotationPoint(-5.5F, 9.2F, -5.5F); - Wick6.setTextureSize(64, 64); - Wick6.mirror = true; - setRotation(Wick6, 0F, 0F, 0.2268928F); - Wick5 = new ModelRenderer(this, 0, 0); - Wick5.addBox(0F, 0F, 0F, 1, 2, 1); - Wick5.setRotationPoint(-5.5F, 9.5F, -0.5F); - Wick5.setTextureSize(64, 64); - Wick5.mirror = true; - setRotation(Wick5, 0F, 0F, -0.2379431F); - Wick4 = new ModelRenderer(this, 0, 0); - Wick4.addBox(0F, 0F, 0F, 1, 2, 1); - Wick4.setRotationPoint(-5.5F, 9.2F, 4.5F); - Wick4.setTextureSize(64, 64); - Wick4.mirror = true; - setRotation(Wick4, 0F, 0F, 0.2268928F); - Wick3 = new ModelRenderer(this, 0, 0); - Wick3.addBox(0F, 0F, 0F, 1, 2, 1); - Wick3.setRotationPoint(4.5F, 9.2F, -5.5F); - Wick3.setTextureSize(64, 64); - Wick3.mirror = true; - setRotation(Wick3, 0F, 0F, 0.2268928F); - Wick2 = new ModelRenderer(this, 0, 0); - Wick2.addBox(0F, 0F, 0F, 1, 2, 1); - Wick2.setRotationPoint(4.5F, 9.5F, -0.5F); - Wick2.setTextureSize(64, 64); - Wick2.mirror = true; - setRotation(Wick2, 0F, 0F, -0.2379431F); - Wick1 = new ModelRenderer(this, 0, 0); - Wick1.addBox(0F, 0F, 0F, 1, 2, 1); - Wick1.setRotationPoint(4.5F, 9.2F, 4.5F); - Wick1.setTextureSize(64, 64); - Wick1.mirror = true; - setRotation(Wick1, 0F, 0F, 0.2268928F); - Wooden2 = new ModelRenderer(this, 0, 0); - Wooden2.addBox(0F, 0F, 0F, 16, 3, 16); - Wooden2.setRotationPoint(-8F, 12F, -8F); - Wooden2.setTextureSize(64, 64); - Wooden2.mirror = true; - setRotation(Wooden2, 0F, 0F, 0F); - Wooden1 = new ModelRenderer(this, 0, 0); - Wooden1.addBox(0F, 0F, 0F, 16, 3, 16); - Wooden1.setRotationPoint(-8F, 20F, -8F); - Wooden1.setTextureSize(64, 64); - Wooden1.mirror = true; - setRotation(Wooden1, 0F, 0F, 0F); - Rod1 = new ModelRenderer(this, 0, 20); - Rod1.addBox(0F, 0F, 0F, 4, 13, 4); - Rod1.setRotationPoint(3F, 11F, 3F); - Rod1.setTextureSize(64, 64); - Rod1.mirror = true; - setRotation(Rod1, 0F, 0F, 0F); - Rod2 = new ModelRenderer(this, 0, 20); - Rod2.addBox(0F, 0F, 0F, 4, 13, 4); - Rod2.setRotationPoint(3F, 11F, -2F); - Rod2.setTextureSize(64, 64); - Rod2.mirror = true; - setRotation(Rod2, 0F, 0F, 0F); - Rod3 = new ModelRenderer(this, 0, 20); - Rod3.addBox(0F, 0F, 0F, 4, 13, 4); - Rod3.setRotationPoint(3F, 11F, -7F); - Rod3.setTextureSize(64, 64); - Rod3.mirror = true; - setRotation(Rod3, 0F, 0F, 0F); - Rod4 = new ModelRenderer(this, 0, 20); - Rod4.addBox(0F, 0F, 0F, 4, 13, 4); - Rod4.setRotationPoint(-2F, 11F, -7F); - Rod4.setTextureSize(64, 64); - Rod4.mirror = true; - setRotation(Rod4, 0F, 0F, 0F); - Rod5 = new ModelRenderer(this, 0, 20); - Rod5.addBox(0F, 0F, 0F, 4, 13, 4); - Rod5.setRotationPoint(-2F, 11F, -2F); - Rod5.setTextureSize(64, 64); - Rod5.mirror = true; - setRotation(Rod5, 0F, 0F, 0F); - Rod6 = new ModelRenderer(this, 0, 20); - Rod6.addBox(0F, 0F, 0F, 4, 13, 4); - Rod6.setRotationPoint(-2F, 11F, 3F); - Rod6.setTextureSize(64, 64); - Rod6.mirror = true; - setRotation(Rod6, 0F, 0F, 0F); - Rod7 = new ModelRenderer(this, 0, 20); - Rod7.addBox(0F, 0F, 0F, 4, 13, 4); - Rod7.setRotationPoint(-7F, 11F, -2F); - Rod7.setTextureSize(64, 64); - Rod7.mirror = true; - setRotation(Rod7, 0F, 0F, 0F); - Rod8 = new ModelRenderer(this, 0, 20); - Rod8.addBox(0F, 0F, 0F, 4, 13, 4); - Rod8.setRotationPoint(-7F, 11F, 3F); - Rod8.setTextureSize(64, 64); - Rod8.mirror = true; - setRotation(Rod8, 0F, 0F, 0F); - Rod9 = new ModelRenderer(this, 0, 20); - Rod9.addBox(0F, 0F, 0F, 4, 13, 4); - Rod9.setRotationPoint(-7F, 11F, -7F); - Rod9.setTextureSize(64, 64); - Rod9.mirror = true; - setRotation(Rod9, 0F, 0F, 0F); - } - - public void render(float size) - { - Wick9.render(size); - Wick8.render(size); - Wick7.render(size); - Wick6.render(size); - Wick5.render(size); - Wick4.render(size); - Wick3.render(size); - Wick2.render(size); - Wick1.render(size); - Wooden2.render(size); - Wooden1.render(size); - Rod1.render(size); - Rod2.render(size); - Rod3.render(size); - Rod4.render(size); - Rod5.render(size); - Rod6.render(size); - Rod7.render(size); - Rod8.render(size); - Rod9.render(size); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 74301886e..ef2bedf23 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -25,7 +25,6 @@ import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemModelMesher; import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.model.ModelBakery; @@ -354,8 +353,6 @@ public class MekanismRenderer optifineBreak = true; } - RenderHelper.disableStandardItemLighting(); - float glowRatioX = Math.min((glow/15F)*240F + lightmapLastX, 240); float glowRatioY = Math.min((glow/15F)*240F + lightmapLastY, 240); diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index 79ea89ba6..3ad465f55 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -36,7 +36,6 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; @@ -93,7 +92,7 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel GlStateManager.pushMatrix(); ItemBlockBasic itemBasic = (ItemBlockBasic)stack.getItem(); InventoryBin inv = new InventoryBin(stack); - binRenderer.render(EnumFacing.NORTH, inv.getItemType(), inv.getItemCount(), -0.5, -0.5, -0.5); + binRenderer.render(EnumFacing.NORTH, inv.getItemType(), inv.getItemCount(), false, -0.5, -0.5, -0.5); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.enableRescaleNormal(); GlStateManager.enableAlpha(); @@ -221,8 +220,9 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel } else if(type == TransformType.GUI) { - GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); - GlStateManager.rotate(45, -1.0F, 0.0F, 0.0F); + GlStateManager.rotate(225, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(45, -1.0F, 0.0F, -1.0F); + GlStateManager.scale(0.6F, 0.6F, 0.6F); GlStateManager.translate(0.0F, -0.2F, 0.0F); } else { @@ -260,9 +260,8 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel } else if(type == TransformType.GUI) { - GlStateManager.translate(0.45F, -0.45F, 0.0F); - GlStateManager.rotate(-45, 0.0F, 1.0F, 0.0F); - GlStateManager.scale(1.4, 1.4, 1.4); + GlStateManager.translate(-0.6F, 0.0F, 0.0F); + GlStateManager.rotate(45, 0.0F, 1.0F, 0.0F); } flamethrower.render(0.0625F); @@ -344,7 +343,6 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel GlStateManager.scale(0.5F, 0.5F, 0.5F); doRender(cameraTransformType); GlStateManager.scale(2.0F, 2.0F, 2.0F); - RenderHelper.enableStandardItemLighting(); GlStateManager.popMatrix(); return Pair.of(this, null); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index 46421e824..fa7ead15f 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -29,10 +29,10 @@ public class RenderBin extends TileEntitySpecialRenderer return; } - render(tileEntity.facing, tileEntity.itemType, tileEntity.clientAmount, x, y, z); + render(tileEntity.facing, tileEntity.itemType, tileEntity.clientAmount, true, x, y, z); } - public void render(EnumFacing facing, ItemStack itemType, int clientAmount, double x, double y, double z) + public void render(EnumFacing facing, ItemStack itemType, int clientAmount, boolean text, double x, double y, double z) { String amount = ""; @@ -75,7 +75,7 @@ public class RenderBin extends TileEntitySpecialRenderer GlStateManager.popMatrix(); } - if(!amount.equals("")) + if(text && !amount.equals("")) { renderText(amount, facing, 0.02F, x, y - 0.3725F, z); } diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 993d5d1d4..72cd7fb2d 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -145,13 +145,6 @@ import net.minecraftforge.fml.relauncher.FMLInjectionData; */ public class CommonProxy implements IGuiProvider { -/* - public static int MACHINE_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); - public static int BASIC_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); - public static int PLASTIC_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); - public static int CTM_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); -*/ - protected static WeakReference dummyPlayer = new WeakReference(null); /** @@ -171,7 +164,7 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityGasTank.class, "GasTank"); GameRegistry.registerTileEntity(TileEntityEnergyCube.class, "EnergyCube"); GameRegistry.registerTileEntity(TileEntityElectricPump.class, "ElectricPump"); - GameRegistry.registerTileEntity(TileEntityPersonalChest.class, "ElectricChest"); //TODO rename + GameRegistry.registerTileEntity(TileEntityPersonalChest.class, "PersonalChest"); GameRegistry.registerTileEntity(TileEntityDynamicTank.class, "DynamicTank"); GameRegistry.registerTileEntity(TileEntityDynamicValve.class, "DynamicValve"); GameRegistry.registerTileEntity(TileEntityChargepad.class, "Chargepad"); @@ -185,14 +178,14 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityChemicalInfuser.class, "ChemicalInfuser"); GameRegistry.registerTileEntity(TileEntityChemicalInjectionChamber.class, "ChemicalInjectionChamber"); GameRegistry.registerTileEntity(TileEntityElectrolyticSeparator.class, "ElectrolyticSeparator"); - GameRegistry.registerTileEntity(TileEntityThermalEvaporationController.class, "SalinationController"); //TODO rename + GameRegistry.registerTileEntity(TileEntityThermalEvaporationController.class, "ThermalEvaporationController"); GameRegistry.registerTileEntity(TileEntityPrecisionSawmill.class, "PrecisionSawmill"); GameRegistry.registerTileEntity(TileEntityChemicalDissolutionChamber.class, "ChemicalDissolutionChamber"); GameRegistry.registerTileEntity(TileEntityChemicalWasher.class, "ChemicalWasher"); GameRegistry.registerTileEntity(TileEntityChemicalCrystallizer.class, "ChemicalCrystallizer"); GameRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator"); GameRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber"); - GameRegistry.registerTileEntity(TileEntityFluidTank.class, "PortableTank"); //TODO rename + GameRegistry.registerTileEntity(TileEntityFluidTank.class, "FluidTank"); GameRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher"); GameRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier"); GameRegistry.registerTileEntity(TileEntityLaserTractorBeam.class, "LaserTractorBeam"); @@ -377,7 +370,7 @@ public class CommonProxy implements IGuiProvider usage.heavyWaterElectrolysisUsage = Mekanism.configuration.get("usage", "HeavyWaterElectrolysisUsage", 800D).getDouble(); usage.formulaicAssemblicatorUsage = Mekanism.configuration.get("usage", "FormulaicAssemblicatorUsage", 100D).getDouble(); -//TODO: Tier.loadConfig(); + Tier.loadConfig(); if(Mekanism.configuration.hasChanged()) { diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index ff23459a7..3f5d5d36d 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1168,8 +1168,8 @@ public class Mekanism GameRegistry.registerTileEntity(TileEntityBoundingBlock.class, "BoundingBlock"); GameRegistry.registerTileEntity(TileEntityAdvancedBoundingBlock.class, "AdvancedBoundingBlock"); GameRegistry.registerTileEntity(TileEntityCardboardBox.class, "CardboardBox"); - GameRegistry.registerTileEntity(TileEntityThermalEvaporationValve.class, "SalinationValve"); //TODO rename - GameRegistry.registerTileEntity(TileEntityThermalEvaporationBlock.class, "SalinationTank"); //TODO rename + GameRegistry.registerTileEntity(TileEntityThermalEvaporationValve.class, "ThermalEvaporationValve"); + GameRegistry.registerTileEntity(TileEntityThermalEvaporationBlock.class, "ThermalEvaporationBlock"); GameRegistry.registerTileEntity(TileEntityPressureDisperser.class, "PressureDisperser"); GameRegistry.registerTileEntity(TileEntitySuperheatingElement.class, "SuperheatingElement"); GameRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser"); diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index d57ee2a48..3fa50b985 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -726,12 +726,10 @@ public final class Tier public static void init() { -/* if(initiated) { return; } -*/ for(Class c : Tier.class.getDeclaredClasses()) { diff --git a/src/main/java/mekanism/common/block/states/BlockStateMachine.java b/src/main/java/mekanism/common/block/states/BlockStateMachine.java index 4a4a430ab..67b2a2059 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateMachine.java +++ b/src/main/java/mekanism/common/block/states/BlockStateMachine.java @@ -213,7 +213,7 @@ public class BlockStateMachine extends ExtendedBlockState for(MachineType type : MachineType.values()) { - if(type != QUANTUM_ENTANGLOPORTER && type != AMBIENT_ACCUMULATOR) + if(type.isValidMachine()) { ret.add(type); } @@ -221,6 +221,11 @@ public class BlockStateMachine extends ExtendedBlockState return ret; } + + public boolean isValidMachine() + { + return this != AMBIENT_ACCUMULATOR; + } public static MachineType get(Block block, int meta) { diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index c8a54d5cf..ead5f76d1 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -126,13 +126,13 @@ public class BoilerUpdateProtocol extends UpdateProtocol int totalAir = 0; //Find the first available block in the structure for water storage (including casings) - for(int x = 0; x < structure.volLength; x++) + for(int x = structure.renderLocation.xCoord; x < structure.renderLocation.xCoord+structure.volLength; x++) { - for(int y = 0; y < initDisperser.yCoord - structure.renderLocation.yCoord; y++) + for(int y = structure.renderLocation.yCoord; y < initDisperser.yCoord; y++) { - for(int z = 0; z < structure.volWidth; z++) + for(int z = structure.renderLocation.zCoord; z < structure.renderLocation.zCoord+structure.volWidth; z++) { - if(pointer.getWorld().isAirBlock(pos.translate(x, y, z).getPos()) || isViableNode(pos.translate(x, y, z).getPos())) + if(pointer.getWorld().isAirBlock(new BlockPos(x, y, z)) || isViableNode(x, y, z)) { initAir = new Coord4D(x, y, z, pointer.getWorld().provider.getDimensionId()); totalAir++; diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index aaf032918..4de13ef1b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -217,7 +217,7 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock