diff --git a/docs/Development.md b/docs/Development.md index 77a145031..b1661558b 100644 --- a/docs/Development.md +++ b/docs/Development.md @@ -1,43 +1,41 @@ # Development -Mekanism is developed for Minecraft 1.6.2 using Minecraft Forge. +Mekanism is developed for Minecraft 1.7.10 using Minecraft Forge. ## Prerequisites -* Minecraft Forge for MC 1.6.2 -* Dev build of CodeChickenCore for MC 1.6.2 -* Dev build of NEI for MC 1.6.2 +* Gradle - Version 1.12 is known to work, your mileage with other versions may vary ## Directory Structure -* /common - Source code - - / _other_ _mod_ _apis_ - - /mekanism - - /{api,client,common} - Core Mekanism mod - - /generators - Generators Mod - - /tools - Tools Mod +* /src - Source code + - /api/java/_other_mod_apis_ + - /main - our code + - /java/mekanism - Our code + - /{api,client,common} - Core Mekanism mod + - /generators - Generators Mod + - /tools - Tools Mod + - /resources/assets - Our textures and other non-code assets * /docs - Documentation * /etc - logo and mcmod.info for each package -* /resources - Non-code assets for the core mod ## Packaging structure ### Mekanism.jar -* /assets - From /resources/assets -* / _other_ _mod_ _apis_ - .class files from /common/ _other_ _mod_ _apis_ -* /mekanism/{api,client,common} - .class files from /common/mekanism/{api,client,common} +* /assets - From /src/main/resources/assets +* /mekanism/{api,client,common} - .class files from /src/main/java/mekanism/{api,client,common} * logo.png - from /etc/core * mcmod.info - from /etc/core ### MekanismGenerators.jar -* /mekanism/generators - .class files from /common/mekanism/generators +* /mekanism/generators - .class files from /src/main/java/mekanism/generators * logo.png - from /etc/generators * mcmod.info - from /etc/generators ### MekanismTools.jar -* /mekanism/tools - .class files from /common/mekanism/tools +* /mekanism/tools - .class files from /src/main/java/mekanism/tools * logo.png - from /etc/tools * mcmod.info - from /etc/tools diff --git a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java index 2ca6467e3..534042bd1 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -55,27 +55,33 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer model.render(0.0625F); GL11.glPopMatrix(); - GL11.glPushMatrix(); - GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "EnergyCore.png")); + if(tileEntity.getEnergy()/tileEntity.getMaxEnergy() > 0.1) + { - MekanismRenderer.blendOn(); - MekanismRenderer.glowOn(); + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "EnergyCore.png")); - EnumColor c = tileEntity.tier.color; + MekanismRenderer.blendOn(); + MekanismRenderer.glowOn(); - GL11.glPushMatrix(); - GL11.glScalef(0.4F, 0.4F, 0.4F); - GL11.glColor4f(c.getColor(0), c.getColor(1), c.getColor(2), (float)(tileEntity.getEnergy()/tileEntity.getMaxEnergy())); - GL11.glTranslatef(0, (float)Math.sin(Math.toRadians((MekanismClient.ticksPassed + partialTick) * 3)) / 7, 0); - GL11.glRotatef((MekanismClient.ticksPassed + partialTick) * 4, 0, 1, 0); - GL11.glRotatef(36F + (MekanismClient.ticksPassed + partialTick) * 4, 0, 1, 1); - core.render(0.0625F); - GL11.glPopMatrix(); + EnumColor c = tileEntity.tier.color; - MekanismRenderer.glowOff(); - MekanismRenderer.blendOff(); - GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glScalef(0.4F, 0.4F, 0.4F); + GL11.glColor4f(c.getColor(0), c.getColor(1), c.getColor(2), (float) (tileEntity.getEnergy() / tileEntity.getMaxEnergy())); + GL11.glTranslatef(0, (float) Math.sin(Math.toRadians((MekanismClient.ticksPassed + partialTick) * 3)) / 7, 0); + GL11.glRotatef((MekanismClient.ticksPassed + partialTick) * 4, 0, 1, 0); + GL11.glRotatef(36F + (MekanismClient.ticksPassed + partialTick) * 4, 0, 1, 1); + core.render(0.0625F); + GL11.glPopMatrix(); + + + MekanismRenderer.glowOff(); + MekanismRenderer.blendOff(); + + GL11.glPopMatrix(); + } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index 3be93a045..3afa34029 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -99,7 +99,7 @@ public class TileEntityChemicalInfuser extends TileEntityElectricBlock implement if(inventory[1] != null && (rightTank.getGas() == null || rightTank.getStored() < rightTank.getMaxGas())) { - rightTank.receive(GasTransmission.removeGas(inventory[1], leftTank.getGasType(), rightTank.getNeeded()), true); + rightTank.receive(GasTransmission.removeGas(inventory[1], rightTank.getGasType(), rightTank.getNeeded()), true); } if(inventory[2] != null && centerTank.getGas() != null)