diff --git a/src/main/java/mekanism/client/model/ModelDigitalMiner.java b/src/main/java/mekanism/client/model/ModelDigitalMiner.java index f7f04c26e..56ed296e9 100644 --- a/src/main/java/mekanism/client/model/ModelDigitalMiner.java +++ b/src/main/java/mekanism/client/model/ModelDigitalMiner.java @@ -422,12 +422,15 @@ public class ModelDigitalMiner extends ModelBase setRotation(monitor3, 0.0872665F, 0.2094395F, 0F); } - public void render(float size, boolean on, TextureManager manager) + public void render(float size, boolean on, TextureManager manager, boolean renderMain) { GlStateManager.pushMatrix(); MekanismRenderer.blendOn(); - doRender(size); + if(renderMain) + { + doRender(size); + } manager.bindTexture(on ? OVERLAY_ON : OVERLAY_OFF); GlStateManager.scale(1.001F, 1.001F, 1.001F); diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index 0b53eca39..acddeab2b 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -31,7 +31,7 @@ import mekanism.common.MekanismItems; import mekanism.common.SideData.IOState; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FluidTankTier; -import mekanism.common.base.IEnergyCube; +import mekanism.common.base.ITierItem; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.inventory.InventoryBin; @@ -215,7 +215,7 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(0.35F, 0.1F, 0.0F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner.png")); - digitalMiner.render(0.022F, false, mc.renderEngine); + digitalMiner.render(0.022F, false, mc.renderEngine, true); } return; @@ -224,7 +224,7 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel if(stack.getItem() instanceof ItemBlockEnergyCube) { GlStateManager.pushMatrix(); - EnergyCubeTier tier = ((IEnergyCube)stack.getItem()).getEnergyCubeTier(stack); + EnergyCubeTier tier = EnergyCubeTier.values()[((ITierItem)stack.getItem()).getBaseTier(stack).ordinal()]; IEnergizedItem energized = (IEnergizedItem)stack.getItem(); mc.renderEngine.bindTexture(RenderEnergyCube.baseTexture); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java index e32c1fb77..24b34c263 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java @@ -1,17 +1,54 @@ package mekanism.client.render.tileentity; +import mekanism.client.model.ModelDigitalMiner; import mekanism.client.render.MinerVisualRenderer; import mekanism.common.tile.TileEntityDigitalMiner; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderDigitalMiner extends TileEntitySpecialRenderer { + private ModelDigitalMiner model = new ModelDigitalMiner(); + @Override public void renderTileEntityAt(TileEntityDigitalMiner tileEntity, double x, double y, double z, float partialTick, int destroyStage) { + GlStateManager.pushMatrix(); + GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); + + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner" + (tileEntity.isActive ? "On" : "") + ".png")); + + switch(tileEntity.facing.ordinal()) + { + case 2: + GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.0F, 0.0F, -1.0F); + break; + case 3: + GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.0F, 0.0F, -1.0F); + break; + case 4: + GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.0F, 0.0F, -1.0F); + break; + case 5: + GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.0F, 0.0F, -1.0F); + break; + } + + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + model.render(0.0625F, tileEntity.isActive, rendererDispatcher.renderEngine, false); + GlStateManager.popMatrix(); + if(tileEntity.clientRendering) { MinerVisualRenderer.render(tileEntity); diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index 3fa50b985..bb8ac7506 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -88,19 +88,6 @@ public final class Tier baseMaxEnergy = maxEnergy = max; baseOutput = output = out; } - - public static EnergyCubeTier getFromName(String tierName) - { - for(EnergyCubeTier tier : values()) - { - if(tierName.contains(tier.getBaseTier().getSimpleName())) - { - return tier; - } - } - - return BASIC; - } @Override public void loadConfig() diff --git a/src/main/java/mekanism/common/base/IEnergyCube.java b/src/main/java/mekanism/common/base/IEnergyCube.java deleted file mode 100644 index 3858a86db..000000000 --- a/src/main/java/mekanism/common/base/IEnergyCube.java +++ /dev/null @@ -1,26 +0,0 @@ -package mekanism.common.base; - -import mekanism.common.Tier.EnergyCubeTier; -import net.minecraft.item.ItemStack; - -/** - * Internal interface used when dealing with Energy Cubes and their tiers. - * @author AidanBrady - * - */ -public interface IEnergyCube -{ - /** - * Gets the tier of this energy cube. - * @param itemstack - ItemStack to check - * @return tier - */ - public EnergyCubeTier getEnergyCubeTier(ItemStack itemstack); - - /** - * Sets the tier of this energy cube - * @param itemstack - ItemStack to set - * @param tier - tier to set - */ - public void setEnergyCubeTier(ItemStack itemstack, EnergyCubeTier tier); -} diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 590a15d6d..a62ef6fbd 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -43,6 +43,7 @@ import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving.SpawnPlacementType; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -57,6 +58,7 @@ import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.EnumSkyBlock; +import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.IExtendedBlockState; @@ -106,7 +108,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple { super(Material.iron); setHardness(5F); - setResistance(10F); + setResistance(20F); setCreativeTab(Mekanism.tabMekanism); initCTMs(); @@ -240,6 +242,19 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple } } } + + @Override + public float getExplosionResistance(World world, BlockPos pos, Entity exploder, Explosion explosion) + { + BasicBlockType type = BasicBlockType.get(getBasicBlock(), getMetaFromState(world.getBlockState(pos))); + + if(type == BasicBlockType.REFINED_OBSIDIAN) + { + return 4000F; + } + + return blockResistance; + } public void initCTMs() { diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index 10cae981f..3cb529f1a 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -7,8 +7,8 @@ import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.Tier.EnergyCubeTier; -import mekanism.common.base.IEnergyCube; import mekanism.common.base.ISustainedInventory; +import mekanism.common.base.ITierItem; import mekanism.common.block.states.BlockStateEnergyCube; import mekanism.common.block.states.BlockStateFacing; import mekanism.common.item.ItemBlockEnergyCube; @@ -165,10 +165,10 @@ public class BlockEnergyCube extends BlockContainer for(EnergyCubeTier tier : EnergyCubeTier.values()) { ItemStack discharged = new ItemStack(this); - ((ItemBlockEnergyCube)discharged.getItem()).setEnergyCubeTier(discharged, tier); + ((ItemBlockEnergyCube)discharged.getItem()).setBaseTier(discharged, tier.getBaseTier()); list.add(discharged); ItemStack charged = new ItemStack(this); - ((ItemBlockEnergyCube)charged.getItem()).setEnergyCubeTier(charged, tier); + ((ItemBlockEnergyCube)charged.getItem()).setBaseTier(charged, tier.getBaseTier()); ((ItemBlockEnergyCube)charged.getItem()).setEnergy(charged, tier.maxEnergy); list.add(charged); } @@ -301,8 +301,8 @@ public class BlockEnergyCube extends BlockContainer } } - IEnergyCube energyCube = (IEnergyCube)itemStack.getItem(); - energyCube.setEnergyCubeTier(itemStack, tileEntity.tier); + ITierItem tierItem = (ITierItem)itemStack.getItem(); + tierItem.setBaseTier(itemStack, tileEntity.tier.getBaseTier()); IEnergizedItem energizedItem = (IEnergizedItem)itemStack.getItem(); energizedItem.setEnergy(itemStack, tileEntity.electricityStored); diff --git a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java index 0516dd5f6..4c85c3080 100644 --- a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java +++ b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java @@ -48,8 +48,6 @@ public class SynchronizedBoilerData extends SynchronizedData implements IFluidContainerManager, IHeatTransfer +public class TileEntityBoilerCasing extends TileEntityMultiblock implements IHeatTransfer { /** A client-sided set of valves on this tank's structure that are currently active, used on the client for rendering fluids. */ public Set valveViewing = new HashSet(); @@ -217,7 +215,6 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock