diff options
Diffstat (limited to 'src/main/java/goodgenerator/crossmod/nei')
6 files changed, 23 insertions, 52 deletions
diff --git a/src/main/java/goodgenerator/crossmod/nei/ComponentAssemblyLineHandler.java b/src/main/java/goodgenerator/crossmod/nei/ComponentAssemblyLineHandler.java index d365434c3f..9fe3b3a8bb 100644 --- a/src/main/java/goodgenerator/crossmod/nei/ComponentAssemblyLineHandler.java +++ b/src/main/java/goodgenerator/crossmod/nei/ComponentAssemblyLineHandler.java @@ -13,8 +13,6 @@ public class ComponentAssemblyLineHandler extends GT_NEI_DefaultHandler { public ComponentAssemblyLineHandler(GT_Recipe.GT_Recipe_Map aRecipeMap) { super(aRecipeMap); - this.transferRects.remove(new RecipeTransferRect(new Rectangle(65, 13, 36, 18), getOverlayIdentifier())); - this.transferRects.add(new RecipeTransferRect(new Rectangle(69, 18, 9, 34), getOverlayIdentifier())); if (!NEI_Config.isAdded) { FMLInterModComms.sendRuntimeMessage( GT_Values.GT, diff --git a/src/main/java/goodgenerator/crossmod/nei/ExtremeHeatExchangerHandler.java b/src/main/java/goodgenerator/crossmod/nei/ExtremeHeatExchangerHandler.java index d2bc69d90b..dcdc240b8a 100644 --- a/src/main/java/goodgenerator/crossmod/nei/ExtremeHeatExchangerHandler.java +++ b/src/main/java/goodgenerator/crossmod/nei/ExtremeHeatExchangerHandler.java @@ -16,8 +16,6 @@ public class ExtremeHeatExchangerHandler extends GT_NEI_DefaultHandler { public ExtremeHeatExchangerHandler(GT_Recipe.GT_Recipe_Map aRecipeMap) { super(aRecipeMap); - this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect( - new Rectangle(65, 13, 36, 18), this.getOverlayIdentifier())); if (!NEI_Config.isAdded) { FMLInterModComms.sendRuntimeMessage( GT_Values.GT, @@ -39,19 +37,25 @@ public class ExtremeHeatExchangerHandler extends GT_NEI_DefaultHandler { FluidStack[] Inputs = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mFluidInputs; FluidStack[] Outputs = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mFluidOutputs; int Threshold = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue; + int y = getDescriptionYOffset(); drawText( 10, - 73, + y, StatCollector.translateToLocal("value.extreme_heat_exchanger.0") + " " + GT_Utility.formatNumbers(Inputs[0].amount) + " L/s", -16777216); - drawText(10, 83, StatCollector.translateToLocal("value.extreme_heat_exchanger.1"), -16777216); - drawText(10, 93, GT_Utility.formatNumbers(Outputs[0].amount / 160) + " L/s", -16777216); - drawText(10, 103, StatCollector.translateToLocal("value.extreme_heat_exchanger.2"), -16777216); - drawText(10, 113, GT_Utility.formatNumbers(Outputs[1].amount / 160) + " L/s", -16777216); + y += 10; + drawText(10, y, StatCollector.translateToLocal("value.extreme_heat_exchanger.1"), -16777216); + y += 10; + drawText(10, y, GT_Utility.formatNumbers(Outputs[0].amount / 160) + " L/s", -16777216); + y += 10; + drawText(10, y, StatCollector.translateToLocal("value.extreme_heat_exchanger.2"), -16777216); + y += 10; + drawText(10, y, GT_Utility.formatNumbers(Outputs[1].amount / 160) + " L/s", -16777216); + y += 10; drawText( 10, - 123, + y, StatCollector.translateToLocal("value.extreme_heat_exchanger.4") + " " + Threshold + " L/s", -16777216); } diff --git a/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java b/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java index a4879e9ff6..d50d53177d 100644 --- a/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java +++ b/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java @@ -12,7 +12,7 @@ public class IMCForNEI { sendHandler("goodgenerator.crossmod.nei.ExtremeHeatExchangerHandler", "gregtech:gt.blockmachines:32017"); sendCatalyst("gg.recipe.extreme_heat_exchanger", "gregtech:gt.blockmachines:32017"); - sendHandler("goodgenerator.crossmod.nei.PreciseAssemblerHandler", "gregtech:gt.blockmachines:32018"); + sendHandler("gg.recipe.precise_assembler", "gregtech:gt.blockmachines:32018"); sendCatalyst("gg.recipe.precise_assembler", "gregtech:gt.blockmachines:32018"); sendCatalyst("gt.recipe.assembler", "gregtech:gt.blockmachines:32018"); diff --git a/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java b/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java index 70b31e51ad..a9f52d3fed 100644 --- a/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java +++ b/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java @@ -16,7 +16,6 @@ public class NEI_Config implements IConfigureNEI { NEI_Config.isAdded = false; new NeutronActivatorHandler(MyRecipeAdder.instance.NA); new ExtremeHeatExchangerHandler(MyRecipeAdder.instance.XHE); - new PreciseAssemblerHandler(MyRecipeAdder.instance.PA); new ComponentAssemblyLineHandler(MyRecipeAdder.instance.COMPASSLINE_RECIPES); NEI_Config.isAdded = true; } diff --git a/src/main/java/goodgenerator/crossmod/nei/NeutronActivatorHandler.java b/src/main/java/goodgenerator/crossmod/nei/NeutronActivatorHandler.java index ab2aedf2fc..44a1574778 100644 --- a/src/main/java/goodgenerator/crossmod/nei/NeutronActivatorHandler.java +++ b/src/main/java/goodgenerator/crossmod/nei/NeutronActivatorHandler.java @@ -15,8 +15,6 @@ public class NeutronActivatorHandler extends GT_NEI_DefaultHandler { public NeutronActivatorHandler(GT_Recipe.GT_Recipe_Map aRecipeMap) { super(aRecipeMap); - this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect( - new Rectangle(65, 13, 36, 18), this.getOverlayIdentifier())); if (!NEI_Config.isAdded) { FMLInterModComms.sendRuntimeMessage( GT_Values.GT, @@ -38,23 +36,28 @@ public class NeutronActivatorHandler extends GT_NEI_DefaultHandler { int tDuration = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mDuration; int minNKE = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue % 10000; int maxNKE = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue / 10000; + int y = getDescriptionYOffset(); drawText( 10, - 73, + y, this.trans("158", "Time: ") + GT_Utility.formatNumbers((float) tDuration / 20.0) + this.trans("161", " secs"), -16777216); - drawText(10, 83, StatCollector.translateToLocal("value.neutron_activator.0"), -16777216); + y += 10; + drawText(10, y, StatCollector.translateToLocal("value.neutron_activator.0"), -16777216); + y += 10; drawText( 10, - 93, + y, GT_Utility.formatNumbers(minNKE) + StatCollector.translateToLocal("value.neutron_activator.2"), -16777216); - drawText(10, 103, StatCollector.translateToLocal("value.neutron_activator.1"), -16777216); + y += 10; + drawText(10, y, StatCollector.translateToLocal("value.neutron_activator.1"), -16777216); + y += 10; drawText( 10, - 113, + y, GT_Utility.formatNumbers(maxNKE) + StatCollector.translateToLocal("value.neutron_activator.2"), -16777216); } diff --git a/src/main/java/goodgenerator/crossmod/nei/PreciseAssemblerHandler.java b/src/main/java/goodgenerator/crossmod/nei/PreciseAssemblerHandler.java deleted file mode 100644 index 5d1797a834..0000000000 --- a/src/main/java/goodgenerator/crossmod/nei/PreciseAssemblerHandler.java +++ /dev/null @@ -1,33 +0,0 @@ -package goodgenerator.crossmod.nei; - -import codechicken.nei.recipe.GuiCraftingRecipe; -import codechicken.nei.recipe.GuiUsageRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; -import cpw.mods.fml.common.event.FMLInterModComms; -import gregtech.api.enums.GT_Values; -import gregtech.api.util.GT_Recipe; -import gregtech.nei.GT_NEI_DefaultHandler; -import java.awt.*; - -public class PreciseAssemblerHandler extends GT_NEI_DefaultHandler { - - public PreciseAssemblerHandler(GT_Recipe.GT_Recipe_Map aRecipeMap) { - super(aRecipeMap); - this.transferRects.remove(new RecipeTransferRect(new Rectangle(65, 13, 36, 18), getOverlayIdentifier())); - this.transferRects.add(new RecipeTransferRect(new Rectangle(75, 19, 26, 18), getOverlayIdentifier())); - if (!NEI_Config.isAdded) { - FMLInterModComms.sendRuntimeMessage( - GT_Values.GT, - "NEIPlugins", - "register-crafting-handler", - "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); - GuiCraftingRecipe.craftinghandlers.add(this); - GuiUsageRecipe.usagehandlers.add(this); - } - } - - @Override - public TemplateRecipeHandler newInstance() { - return new PreciseAssemblerHandler(this.mRecipeMap); - } -} |