diff --git a/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java b/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java index 52cd0eafd..1b7ec8209 100644 --- a/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java @@ -50,7 +50,7 @@ public class SolarNeutronRecipeHandler extends BaseRecipeHandler @Override public String getGuiTexture() { - return "mekanism:gui/GuiSolarNeutronActivator.png"; + return "mekanism:gui/nei/GuiSolarNeutronActivator.png"; } @Override @@ -82,16 +82,16 @@ public class SolarNeutronRecipeHandler extends BaseRecipeHandler { CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - drawTexturedModalRect(61-xOffset, 39-yOffset, 176, 63, 55, 8); + drawTexturedModalRect(64-xOffset, 39-yOffset, 176, 58, 55, 8); - if(recipe.outputStack != null) + if(recipe.inputStack != null) { - displayGauge(58, 26-xOffset, 14-yOffset, 176, 40, 58, null, recipe.inputStack); + displayGauge(58, 26-xOffset, 14-yOffset, 176, 0, 58, null, recipe.inputStack); } if(recipe.inputStack != null) { - displayGauge(58, 134-xOffset, 14-yOffset, 176, 40, 58, null, recipe.outputStack); + displayGauge(58, 134-xOffset, 14-yOffset, 176, 0, 58, null, recipe.outputStack); } } diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 1dbc518ed..274913fda 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -14,7 +14,6 @@ import mekanism.client.render.tileentity.RenderSalinationController; import mekanism.common.ObfuscatedNames; import mekanism.common.base.ISpecialBounds; import mekanism.common.util.MekanismUtils; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; @@ -35,13 +34,14 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class MekanismRenderer { @@ -91,7 +91,6 @@ public class MekanismRenderer GasRegistry.getGas("sodium").setIcon(event.map.registerIcon("mekanism:LiquidSodium")); GasRegistry.getGas("deuterium").setIcon(event.map.registerIcon("mekanism:LiquidDeuterium")); GasRegistry.getGas("tritium").setIcon(event.map.registerIcon("mekanism:LiquidTritium")); - GasRegistry.getGas("fusionFuelDD").setIcon(event.map.registerIcon("mekanism:LiquidDD")); GasRegistry.getGas("fusionFuelDT").setIcon(event.map.registerIcon("mekanism:LiquidDT")); GasRegistry.getGas("steam").setIcon(event.map.registerIcon("mekanism:LiquidSteam")); GasRegistry.getGas("lithium").setIcon(event.map.registerIcon("mekanism:LiquidLithium")); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 159c7b838..a02cb3221 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1048,7 +1048,6 @@ public class Mekanism GasRegistry.register(new Gas("brine").registerFluid()); GasRegistry.register(new Gas("deuterium")).registerFluid(); GasRegistry.register(new Gas("tritium")).registerFluid(); - GasRegistry.register(new Gas("fusionFuelDD")).registerFluid(); GasRegistry.register(new Gas("fusionFuelDT")).registerFluid(); GasRegistry.register(new Gas("steam")).registerFluid(); GasRegistry.register(new Gas("lithium")).registerFluid(); diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiSolarNeutronActivator.png b/src/main/resources/assets/mekanism/gui/nei/GuiSolarNeutronActivator.png new file mode 100644 index 000000000..af61bb896 Binary files /dev/null and b/src/main/resources/assets/mekanism/gui/nei/GuiSolarNeutronActivator.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidDT.png b/src/main/resources/assets/mekanism/textures/blocks/LiquidDT.png index 0ba76625c..e4ce68d94 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/LiquidDT.png and b/src/main/resources/assets/mekanism/textures/blocks/LiquidDT.png differ