From 06ba6fd933c58a9426139d5ccfad34d3336ecd19 Mon Sep 17 00:00:00 2001 From: Towdium Date: Mon, 18 Apr 2016 14:11:26 +0800 Subject: [PATCH] add recent record & procedure mode with crash fix --- README.md | 2 + build.gradle | 2 +- .../JustEnoughCalculation.java | 32 +++-- .../core/Calculator.java | 5 +- .../core/CostRecord.java | 32 ++++- .../gui/commom/GuiTooltipScreen.java | 58 +++++---- .../gui/commom/recipe/ContainerRecipe.java | 15 +++ .../gui/commom/recipe/GuiRecipe.java | 4 +- .../guis/calculator/ContainerCalculator.java | 25 +++- .../gui/guis/calculator/GuiCalculator.java | 114 +++++++++++++++--- .../recipeViewer/ContainerRecipeViewer.java | 15 +++ .../assets/je_calculation/lang/en_US.lang | 9 +- .../assets/je_calculation/lang/zh_CN.lang | 1 + .../textures/gui/guiCalculator.png | Bin 16735 -> 16770 bytes src/main/resources/mcmod.info | 2 +- 15 files changed, 249 insertions(+), 67 deletions(-) diff --git a/README.md b/README.md index 79aec14..af4a48b 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,8 @@ cases. Have fun! * Personal preference record * Support for percentage in recipes * Check Player's inventory for missed gradients +* View the crafting procedure +* Recent records #### Planed features diff --git a/build.gradle b/build.gradle index 50e6288..4eceb25 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-0.1.3" +version = "1.7.10-0.3.0" group= "pers.towdium.justEnoughCalculation" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "je_calculation" diff --git a/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java b/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java index e93d50b..32954f5 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java @@ -1,8 +1,5 @@ package pers.towdium.justEnoughCalculation; -import codechicken.nei.api.API; -import codechicken.nei.api.IConfigureNEI; -import codechicken.nei.recipe.DefaultOverlayHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -11,17 +8,14 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; -import net.minecraft.client.gui.Gui; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; +import net.minecraftforge.oredict.ShapedOreRecipe; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import pers.towdium.justEnoughCalculation.gui.commom.recipe.GuiRecipe; -import pers.towdium.justEnoughCalculation.gui.guis.recipeEditor.GuiRecipeEditor; import pers.towdium.justEnoughCalculation.item.ItemCalculator; import pers.towdium.justEnoughCalculation.network.IProxy; import pers.towdium.justEnoughCalculation.network.packets.PacketCalculatorUpdate; @@ -29,6 +23,8 @@ import pers.towdium.justEnoughCalculation.network.packets.PacketRecipeUpdate; import pers.towdium.justEnoughCalculation.network.packets.PacketSyncRecord; import java.io.File; +import java.lang.reflect.Field; +import java.util.ArrayList; /** * @author Towdium @@ -50,7 +46,7 @@ public class JustEnoughCalculation{ public static class Reference { public static final String MODID = "je_calculation"; public static final String MODNAME = "Just Enough Calculation"; - public static final String VERSION = "0.1.3"; + public static final String VERSION = "0.3.0"; } @Mod.EventHandler @@ -70,7 +66,23 @@ public class JustEnoughCalculation{ Minecraft.getMinecraft().getRenderItem().getItemModelMesher(). register(itemCalculator, 0, new ModelResourceLocation(Reference.MODID + ":" + itemCalculator.getUnlocalizedName().substring(5), "inventory")); }*/ - GameRegistry.addRecipe(new ItemStack(itemCalculator), "SIS", "SRS", "SRS", 'S', new ItemStack(Blocks.stone, 1, 0), 'I', new ItemStack(Items.dye, 1, 0), 'R', Items.redstone); + ShapedOreRecipe recipe = new ShapedOreRecipe(new ItemStack(itemCalculator), "SIS", "SRS", "SOS", 'S', "stone", 'I', "dyeBlack", 'R', "dustRedstone", 'O', "ingotIron"){ + { + try { + Field f = ShapedOreRecipe.class.getDeclaredField("input"); + f.setAccessible(true); + Object[] o = (Object[]) f.get(this); + if(o[1] instanceof ArrayList){ + ArrayList buffer = (ArrayList) o[1]; + ArrayList a = new ArrayList(buffer); + Item i = GameRegistry.findItem("Botania", "dye"); + a.add(new ItemStack(i,1,15)); + o[1] = a; + } + } catch (Exception ignored) {} + } + }; + GameRegistry.addRecipe(recipe); proxy.init(); //DefaultOverlayHandler diff --git a/src/main/java/pers/towdium/justEnoughCalculation/core/Calculator.java b/src/main/java/pers/towdium/justEnoughCalculation/core/Calculator.java index c7999fa..31420a4 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/core/Calculator.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/core/Calculator.java @@ -31,7 +31,10 @@ public class Calculator { // all the recipes for one item LOOP1: for(Recipe recipe : JustEnoughCalculation.proxy.getPlayerHandler().getAllRecipeOf(itemRecord.toItemStack(), null)){ - CostRecord record = new CostRecord(costRecords.get(costRecords.size()-1), new CostRecord(recipe, getCount(itemRecord, recipe), itemRecord.approx)); + long times = getCount(itemRecord, recipe); + ItemRecord buffer = itemRecord.copy(); + buffer.amount = recipe.getOutputAmount(buffer.toItemStack())*times; + CostRecord record = new CostRecord(costRecords.get(costRecords.size()-1), new CostRecord(recipe, times, itemRecord.approx, buffer)); for(CostRecord costRecord : costRecords){ if(costRecord.equals(record)){ continue LOOP1; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/core/CostRecord.java b/src/main/java/pers/towdium/justEnoughCalculation/core/CostRecord.java index b18e1e0..ff28376 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/core/CostRecord.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/core/CostRecord.java @@ -11,21 +11,24 @@ import java.util.List; * @author Towdium */ public class CostRecord{ - List output; - List input; - List catalyst; + private List output; + private List input; + private List catalyst; + private List procedure; public CostRecord(ItemRecord itemRecord){ output = new ArrayList<>(); input = new ArrayList<>(); catalyst = new LinkedList<>(); + procedure = new ArrayList<>(); input.add(itemRecord); } - public CostRecord(Recipe recipe, long count, boolean approx){ + public CostRecord(Recipe recipe, long count, boolean approx, ItemRecord dest){ output = new ArrayList<>(); input = new ArrayList<>(); catalyst = new LinkedList<>(); + procedure = new ArrayList<>(); boolean b = recipe.isApprox() || approx; for(ItemStack itemStack : recipe.output){ if(itemStack != null){ @@ -44,6 +47,7 @@ public class CostRecord{ catalyst.add(record); } } + procedure.add(dest); } /** @@ -63,6 +67,13 @@ public class CostRecord{ for (ItemRecord record : costRecord1.catalyst){ catalyst.add(record.copy()); } + procedure = new ArrayList<>(); + for (ItemRecord record : costRecord1.procedure){ + procedure.add(record.copy()); + } + for (ItemRecord record : costRecord2.procedure){ + procedure.add(record.copy()); + } // merge output LOOP: for(ItemRecord itemRecordAdd : costRecord2.output){ @@ -120,7 +131,7 @@ public class CostRecord{ } } - public ImmutableList getCancellableItems(){ + ImmutableList getCancellableItems(){ ImmutableList.Builder builder = new ImmutableList.Builder<>(); for(ItemRecord itemRecord : input){ if(!itemRecord.isLocked() && itemRecord.amount != 0){ @@ -140,6 +151,17 @@ public class CostRecord{ return builder.build(); } + public ImmutableList getProcedureStack(){ + ImmutableList.Builder builder = new ImmutableList.Builder<>(); + for (int i = procedure.size()-1; i >=0; i--) { + ItemRecord itemRecord = procedure.get(i); + if (itemRecord.amount != 0) { + builder.add(itemRecord.toItemStack()); + } + } + return builder.build(); + } + public ImmutableList getInputStack(){ ImmutableList.Builder builder = new ImmutableList.Builder<>(); for(ItemRecord itemRecord : input){ diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiTooltipScreen.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiTooltipScreen.java index 5a58e77..ac6a44d 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiTooltipScreen.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiTooltipScreen.java @@ -30,6 +30,8 @@ import javax.annotation.concurrent.Immutable; */ public abstract class GuiTooltipScreen extends GuiJustEnoughCalculation implements INEIGuiHandler { + int mousedOverButtonId = -1; + /** Show a white "?" in the top right part of any button with a tooltip assigned to it */ public static boolean ShowTooltipButtonEffect = true; @@ -57,12 +59,33 @@ public abstract class GuiTooltipScreen extends GuiJustEnoughCalculation implemen super(inventorySlotsIn, parent); } + @Override + protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { + super.drawGuiContainerForegroundLayer(p_146979_1_, p_146979_2_); + if(ShowTooltipButtonEffect) + RenderTooltipButtonEffect(); + if (ShowTooltipButtonMouseoverEffect && GetButtonTooltip(mousedOverButtonId) != null) + for(Object button : buttonList){ + if(((GuiButton) button).id == mousedOverButtonId){ + RenderTooltipButtonMouseoverEffect(((GuiButton) button)); + } + } + } + public void drawScreen(int mouseX, int mouseY, float f) { + for (Object button : buttonList) { + if (IsButtonMouseovered(mouseX, mouseY, ((GuiButton) button))) { + mousedOverButtonId = ((GuiButton) button).id; + break; + } + } + + super.drawScreen(mouseX, mouseY, f); RenderHelper.disableStandardItemLighting(); DrawTooltipScreen(mouseX, mouseY); - InventoryPlayer inventoryplayer = this.mc.thePlayer.inventory; + /*InventoryPlayer inventoryplayer = this.mc.thePlayer.inventory; Field field; Slot theSlot = null; try { @@ -81,7 +104,8 @@ public abstract class GuiTooltipScreen extends GuiJustEnoughCalculation implemen //GuiContainerManager.itemDisplayNameMultiline(itemstack1, this, true); drawHoveringText(GuiContainerManager.itemDisplayNameMultiline(itemstack1, this, true), mouseX, mouseY, fontRendererObj); } - RenderHelper.enableStandardItemLighting(); + RenderHelper.enableStandardItemLighting();*/ + mousedOverButtonId = -1; } @Override @@ -103,22 +127,12 @@ public abstract class GuiTooltipScreen extends GuiJustEnoughCalculation implemen */ protected void DrawTooltipScreen(int mouseX, int mouseY) { - if(ShowTooltipButtonEffect) - RenderTooltipButtonEffect(); - int mousedOverButtonId = -1; + + //find out which button is being mouseovered - for (Object button : buttonList) { - if (IsButtonMouseovered(mouseX, mouseY, ((GuiButton) button))) { - mousedOverButtonId = ((GuiButton) button).id; - if (ShowTooltipButtonMouseoverEffect && GetButtonTooltip(mousedOverButtonId) != null) - RenderTooltipButtonMouseoverEffect(((GuiButton) button)); - - break; - } - } //calculate how long this button has been mouseovered for if(mousedOverButtonId > -1) @@ -165,10 +179,10 @@ public abstract class GuiTooltipScreen extends GuiJustEnoughCalculation implemen GuiButton button = ((GuiButton) buttonObj); if (GetButtonTooltip(button.id) != null) { - boolean flag = mc.fontRenderer.getUnicodeFlag(); - mc.fontRenderer.setUnicodeFlag(true); - mc.fontRenderer.drawStringWithShadow("?", button.xPosition + button.getButtonWidth() - 7, button.yPosition + 1, 14737632); - mc.fontRenderer.setUnicodeFlag(flag); + boolean flag = fontRendererObj.getUnicodeFlag(); + fontRendererObj.setUnicodeFlag(true); + fontRendererObj.drawStringWithShadow("?", button.xPosition + button.getButtonWidth() - 7 -guiLeft, button.yPosition + 1 - guiTop, 14737632); + fontRendererObj.setUnicodeFlag(flag); } } } @@ -178,10 +192,10 @@ public abstract class GuiTooltipScreen extends GuiJustEnoughCalculation implemen */ private void RenderTooltipButtonMouseoverEffect(GuiButton button) { - boolean flag = mc.fontRenderer.getUnicodeFlag(); - mc.fontRenderer.setUnicodeFlag(true); - mc.fontRenderer.drawStringWithShadow(FontCodes.AQUA + "?", button.xPosition+button.getButtonWidth()-7, button.yPosition+1, 14737632); - mc.fontRenderer.setUnicodeFlag(flag); + boolean flag = fontRendererObj.getUnicodeFlag(); + fontRendererObj.setUnicodeFlag(true); + fontRendererObj.drawStringWithShadow(FontCodes.AQUA + "?", button.xPosition+button.getButtonWidth()-7 - guiLeft, button.yPosition+1 - guiTop, 14737632); + fontRendererObj.setUnicodeFlag(flag); } /** diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/ContainerRecipe.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/ContainerRecipe.java index 50ec4bc..ea44bf9 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/ContainerRecipe.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/ContainerRecipe.java @@ -32,6 +32,21 @@ public class ContainerRecipe extends Container { } } + @Override + public Slot getSlot(int p_75139_1_) { + if(p_75139_1_ <= 15) + return super.getSlot(p_75139_1_); + else + return null; + } + + @Override + public void putStackInSlot(int p_75141_1_, ItemStack p_75141_2_) { + if(getSlot(p_75141_1_) != null){ + super.putStackInSlot(p_75141_1_, p_75141_2_); + } + } + @Override public ItemStack slotClick(int slotId, int clickedButton, int mode, EntityPlayer playerIn) { if(slotId<0 || slotId>=16){ diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/GuiRecipe.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/GuiRecipe.java index 1cbca6d..c36dc38 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/GuiRecipe.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/GuiRecipe.java @@ -75,6 +75,8 @@ public class GuiRecipe extends GuiTooltipScreen { } } + + /*@Override protected void mouseClicked(int mouseX, int mouseY, int mouseButton){ super.mouseClicked(mouseX, mouseY, mouseButton); @@ -164,7 +166,7 @@ public class GuiRecipe extends GuiTooltipScreen { @Override public boolean handleDragNDrop(GuiContainer guiContainer, int i, int i1, ItemStack itemStack, int i2) { - JustEnoughCalculation.log.info(itemStack.toString()); + //JustEnoughCalculation.log.info(itemStack.toString()); ItemStack buffer = itemStack.copy(); ItemStackWrapper.NBT.setBool(buffer, "je_calculation", true); buffer.stackSize=1; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/ContainerCalculator.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/ContainerCalculator.java index ba31b6c..df773fe 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/ContainerCalculator.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/ContainerCalculator.java @@ -18,12 +18,33 @@ public class ContainerCalculator extends Container { this.inventoryCalculator = new InventoryCalculator(itemCalculator); addSlotToContainer(new Slot(inventoryCalculator, 0,9,9)); int i, left, top; - i = 1; left = 8; top = 64; - for(int a = 0; a < 4; a++){ + i = 1; left = 8; top = 80; + for(int a = 0; a < 3; a++){ for(int b =0; b < 9; b++){ addSlotToContainer(new Slot(inventoryCalculator,i+9*a+b,left+b*18,top+a*18)); } } + i = 28; left = 8; top = 32; + for(int a = 0; a < 1; a++){ + for(int b =0; b < 6; b++){ + addSlotToContainer(new Slot(inventoryCalculator,i+9*a+b,left+b*18,top+a*18)); + } + } + } + + @Override + public Slot getSlot(int p_75139_1_) { + if(p_75139_1_ <= 33) + return super.getSlot(p_75139_1_); + else + return null; + } + + @Override + public void putStackInSlot(int p_75141_1_, ItemStack p_75141_2_) { + if(getSlot(p_75141_1_) != null){ + super.putStackInSlot(p_75141_1_, p_75141_2_); + } } @Override diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/GuiCalculator.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/GuiCalculator.java index b91ac8e..782a4f7 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/GuiCalculator.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/GuiCalculator.java @@ -3,6 +3,7 @@ package pers.towdium.justEnoughCalculation.gui.guis.calculator; import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.ICraftingHandler; import codechicken.nei.recipe.TemplateRecipeHandler; +import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; @@ -22,6 +23,7 @@ import pers.towdium.justEnoughCalculation.gui.guis.recipeEditor.GuiRecipeEditor; import pers.towdium.justEnoughCalculation.gui.guis.recipePicker.GuiRecipePicker; import pers.towdium.justEnoughCalculation.gui.guis.recipeViewer.ContainerRecipeViewer; import pers.towdium.justEnoughCalculation.gui.guis.recipeViewer.GuiRecipeViewer; +import pers.towdium.justEnoughCalculation.network.packets.PacketCalculatorUpdate; import pers.towdium.justEnoughCalculation.network.packets.PacketSyncRecord; import java.util.*; @@ -30,6 +32,7 @@ import java.util.*; * @author Towdium */ public class GuiCalculator extends GuiTooltipScreen{ + static int recentLen = 6; GuiTextField textFieldAmount; GuiButton buttonLeft; GuiButton buttonRight; @@ -45,12 +48,12 @@ public class GuiCalculator extends GuiTooltipScreen{ EnumMode mode = EnumMode.INPUT; ItemStack buffer; - public enum EnumMode {INPUT, OUTPUT, CATALYST} + public enum EnumMode {INPUT, PROCEDURE, OUTPUT, CATALYST} public GuiCalculator(ContainerCalculator containerCalculator){ super(containerCalculator, null); JustEnoughCalculation.networkWrapper.sendToServer(new PacketSyncRecord()); - items = new HashMap<>(36); + items = new HashMap<>(27); } @Override @@ -58,21 +61,25 @@ public class GuiCalculator extends GuiTooltipScreen{ super.initGui(); buttonLeft = new GuiButton(4, guiLeft+7, guiTop+139, 20, 20, "<"); buttonRight = new GuiButton(5, guiLeft+65, guiTop+139, 20, 20, ">"); - buttonEdit = new GuiButton(3, guiLeft+89, guiTop+7, 38, 20, StatCollector.translateToLocal("gui.calculator.edit")); - buttonCalculate = new GuiButton(1, guiLeft+7, guiTop+31, 78, 20, StatCollector.translateToLocal("gui.calculator.calculate")); - buttonView = new GuiButton(7, guiLeft+131, guiTop+7, 38, 20, StatCollector.translateToLocal("gui.calculator.view")); + buttonEdit = new GuiButton(3, guiLeft+59, guiTop+53, 48, 20, StatCollector.translateToLocal("gui.calculator.edit")); + buttonCalculate = new GuiButton(1, guiLeft+111, guiTop+7, 58, 20, StatCollector.translateToLocal("gui.calculator.calculate")); + buttonView = new GuiButton(7, guiLeft+111, guiTop+53, 58, 20, StatCollector.translateToLocal("gui.calculator.view")); buttonList.add(buttonCalculate); - buttonList.add(new GuiButton(2, guiLeft+89, guiTop+31, 80, 20, StatCollector.translateToLocal("gui.calculator.add"))); + buttonList.add(new GuiButton(2, guiLeft+7, guiTop+53, 48, 20, StatCollector.translateToLocal("gui.calculator.add"))); buttonList.add(buttonEdit); buttonList.add(buttonView); buttonList.add(buttonLeft); buttonList.add(buttonRight); buttonMode = new GuiButton(6, guiLeft+89, guiTop+139, 80, 20, StatCollector.translateToLocal("gui.calculator.input")); buttonList.add(buttonMode); - textFieldAmount = new GuiTextField(fontRendererObj, guiLeft+39, guiTop+8, 45, 18); + textFieldAmount = new GuiTextField(fontRendererObj, guiLeft+39, guiTop+8, 67, 18); Slot dest = inventorySlots.getSlot(0); ItemStack itemStack = ((ContainerCalculator)inventorySlots).getPlayer().getHeldItem(); dest.inventory.setInventorySlotContents(dest.getSlotIndex(), ItemStackWrapper.NBT.getItem(itemStack, "dest")); + ItemStack calculatorItem = ((ContainerCalculator) inventorySlots).getPlayer().getHeldItem(); + for(int i=0; i 27 && s.getStack() != null){ + inventorySlots.putStackInSlot(0, s.getStack()); + } + JustEnoughCalculation.proxy.getPlayerHandler().syncItemCalculator(inventorySlots.getSlot(0).getStack(), textFieldAmount.getText()); //Slot slot = getSlotUnderMouse(mouseX, mouseY); /*if(slot != null && slot.getSlotIndex() == 0 && mouseButton == 0){ setActiveSlot(slot.getSlotIndex()); @@ -211,7 +247,7 @@ public class GuiCalculator extends GuiTooltipScreen{ super.keyTyped(typedChar, keyCode); } } - }else { + } else { JustEnoughCalculation.proxy.getPlayerHandler().syncItemCalculator(inventorySlots.getSlot(0).getStack(), textFieldAmount.getText()); } } @@ -221,6 +257,9 @@ public class GuiCalculator extends GuiTooltipScreen{ case OUTPUT: buttonMode.displayString = StatCollector.translateToLocal("gui.calculator.output"); break; + case PROCEDURE: + buttonMode.displayString = StatCollector.translateToLocal("gui.calculator.procedure"); + break; case INPUT: buttonMode.displayString = StatCollector.translateToLocal("gui.calculator.input"); break; @@ -239,14 +278,17 @@ public class GuiCalculator extends GuiTooltipScreen{ if(costRecord != null){ switch (mode){ case OUTPUT: - total = (costRecord.getOutputStack().size()+35)/36; - fillSlotsWith(costRecord.getOutputStack(), (page-1)*36);break; + total = (costRecord.getOutputStack().size()+26)/27; + fillSlotsWith(costRecord.getOutputStack(), (page-1)*27);break; + case PROCEDURE: + total = (costRecord.getProcedureStack().size()+26)/27; + fillSlotsWith(costRecord.getProcedureStack(), (page-1)*27);break; case INPUT: - total = (costRecord.getInputStack().size()+35)/36; - fillSlotsWith(costRecord.getInputStack(), (page-1)*36);break; + total = (costRecord.getInputStack().size()+26)/27; + fillSlotsWith(costRecord.getInputStack(), (page-1)*27);break; case CATALYST: - total = (costRecord.getCatalystStack().size()+35)/36; - fillSlotsWith(costRecord.getCatalystStack(), (page-1)*36);break; + total = (costRecord.getCatalystStack().size()+26)/27; + fillSlotsWith(costRecord.getCatalystStack(), (page-1)*27);break; } }else { fillSlotsWith(new ArrayList(), 0); @@ -282,7 +324,7 @@ public class GuiCalculator extends GuiTooltipScreen{ protected void fillSlotsWith(List itemStacks, int start){ int pos = 1; - for(int i=start; i5rlqCn zT3DDQ=~|c>r|6m)Sy-AHrlh19rI>C0#rlSYD3y}~I4#g@@#j8i$TI(Fw*6!oTfKS~ zB~KT}kcwMx?jFp&Z6MO{@VL_Il$N+d&gljRWUQS1*>*UcmvV_Zd`>{J%~m9B{c)UT?p1JejlmjI9h`q19Zm^VTwavm;OY*YnkFdsbs-o&2_j?ZfHImnVlNUTsV4 zIDY)N#PL8Dt2vAoKO7kt7#Y4*^FJs*{&?eU?x{h$?yhCc6KME(;O)X|ujH6_urRPN z2rxK+ltCB`+B-M1d{BD6XXXFr;tVe`w5@+~FueI79nFw%{Qix-J2^R+7&sUd7#bKD z>gDeojc4@I49wo@wc$9!lR3GMS@jsfCfzt_+aPzIRb%N96W?cd68fI&T`*<%%%0sD zmF;smYW18w)p|iJ?Zq{HExQIk(R={-3I}XzMj4r5ufeYCMMp z1O*>kxQS<ous@@#NRBOp_njiTXl(*uW6MB*2i+uJ?{Tz^gOr^&@e^<1*JY zU0t%*y1M+?__0a0@l535IoGY3c%e?p*0t2Q z14n}@(3fQ=`W&9EspGqz?5<{0XW3*8kWl&zU|B1PH1i$~`(&YwSj z?FH#O_wPru%wYt%9_Dv94u%ir;@?@eY?rlQ21jp&`{!oIm*xBlOQ+oWS+i}&hRenc zUp{2k_VqCUfv2mV%Q~loCIGymZ&m;R delta 836 zcmZo_X1w3TxM2%3uaT~iMTmicm5H&Hsm0`j%$BGko7q{;GpZOGn;9e~nV9M(rRMVP8t9s(B^xE1rW&OsS*C3M#rlSYD3y}~IIXymY~Ae7ebSI+FY{vS$uhQj z_00c0T^vIyZoRpCuy=NVh{HwqCt)#8X8*dcG_;7XRMb|9Ix)+sK-xi2?^(LwM9H%r zE=Cq@1?RMamZZO|-qGCoDdxy*nGO6$zqIGu?_2k+cy>_NzW3oXKYy-{e)CYl|MJoK zn_thL8}rw7;(d38rCUzj*`%}h{qLinPi?w$HnOg;{^Mrz!v;H&V}J5J=r5F+%QgGj zw%nNY*I(@NV+q^AT=21(fq{uZ=DXy9>eATt-<(22*M8d~_Jf^qhTa`h6W_;@%s)67 zI2aTd8bIox4F94cmJe!6x2*nuUY}vZqP;nv1Q{$I!g(a2f@i79o#3sb6_)kpy5|sA9?-jBk>ihwDPvkwtQw|qrUWs zSFJ0|mbE=&0%XAU~~~=~gcLI|c?u zpt87(Ur`3vs@VcWTqm|C7VIdvVBPSjXr~2l+2Yr`I_}5koo15fH?S7^_GPnm?PgPc zxkbz@@{E%O9StV0caWd_$-$o)Xcy40s&Y4G#4|83{Qu9)AiMDX>&dUWe*(D-p00i_ I>zopr0CpfyhX4Qo diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 896a726..d689226 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "je_calculation", "name": "Just Enough Calculation", "description": "A simple mod to help you with recipe calculation.", - "version": "0.1.3", + "version": "0.3.0", "mcversion": "1.7.10", "url": "https://github.com/Towdium/JustEnoughCalculation", "updateUrl": "http://minecratft.curseforge.com/projects/just-enough-calculation",