From 8a65923dc64753bfda2ba437ecce36e391d1b359 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 28 Apr 2017 02:53:53 -0400 Subject: [PATCH] Add stock control to Formulaic Assemblicator --- .../client/gui/GuiFormulaicAssemblicator.java | 28 ++++- .../content/assemblicator/RecipeFormula.java | 22 ++++ .../TileEntityFormulaicAssemblicator.java | 118 ++++++++++++++++-- .../gui/guiformulaicassemblicator.png | Bin 7291 -> 7213 bytes .../resources/assets/mekanism/lang/en_us.lang | 3 +- 5 files changed, 155 insertions(+), 16 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index 07ba2f623..c1193f8aa 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -100,7 +100,12 @@ public class GuiFormulaicAssemblicator extends GuiMekanism if(xAxis >= 107 && xAxis <= 123 && yAxis >= 75 && yAxis <= 91) { - drawCreativeTabHoveringText(LangUtils.localize("gui.autoModeToggle") + " " + LangUtils.transOnOff(!tileEntity.autoMode), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.autoModeToggle") + ": " + LangUtils.transOnOff(tileEntity.autoMode), xAxis, yAxis); + } + + if(xAxis >= 26 && xAxis <= 42 && yAxis >= 75 && yAxis <= 91) + { + drawCreativeTabHoveringText(LangUtils.localize("gui.stockControl") + ": " + LangUtils.transOnOff(tileEntity.stockControl), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); @@ -179,9 +184,18 @@ public class GuiFormulaicAssemblicator extends GuiMekanism else { drawTexturedModalRect(guiWidth + 107, guiHeight + 75, 176 + 46, 16, 16, 16); } + + if(xAxis >= 26 && xAxis <= 42 && yAxis >= 75 && yAxis <= 91) + { + drawTexturedModalRect(guiWidth + 26, guiHeight + 75, 176 + 62, 48 + 0, 16, 16); + } + else { + drawTexturedModalRect(guiWidth + 26, guiHeight + 75, 176 + 62, 48 + 16, 16, 16); + } } else { drawTexturedModalRect(guiWidth + 107, guiHeight + 75, 176 + 46, 32, 16, 16); + drawTexturedModalRect(guiWidth + 26, guiHeight + 75, 176 + 62, 48 + 32, 16, 16); } if(tileEntity.operatingTicks > 0) @@ -223,7 +237,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism private boolean canEncode() { return tileEntity.formula == null && !tileEntity.inventory.get(2).isEmpty() && tileEntity.inventory.get(2).getItem() instanceof ItemCraftingFormula && - ((ItemCraftingFormula)tileEntity.inventory.get(2).getItem()).getInventory(tileEntity.inventory.get(2)).isEmpty(); + ((ItemCraftingFormula)tileEntity.inventory.get(2).getItem()).getInventory(tileEntity.inventory.get(2)) == null; } @Override @@ -296,6 +310,16 @@ public class GuiFormulaicAssemblicator extends GuiMekanism Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); } + + if(xAxis >= 26 && xAxis <= 42 && yAxis >= 75 && yAxis <= 91) + { + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); + + ArrayList data = new ArrayList(); + data.add(5); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } } } } diff --git a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java index b088650a1..da88c0f8d 100644 --- a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java +++ b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java @@ -1,5 +1,8 @@ package mekanism.common.content.assemblicator; +import java.util.ArrayList; +import java.util.List; + import mekanism.common.util.MekanismUtils; import mekanism.common.util.RecipeUtils; import mekanism.common.util.StackUtils; @@ -77,6 +80,25 @@ public class RecipeFormula return false; } + public List getIngredientIndices(World world, ItemStack stack) + { + List ret = new ArrayList<>(); + + for(int i = 0; i < 9; i++) + { + dummy.setInventorySlotContents(i, stack); + + if(recipe.matches(dummy, world)) + { + ret.add(i); + } + + dummy.setInventorySlotContents(i, input.get(i)); + } + + return ret; + } + public boolean isValidFormula(World world) { return getRecipe(world) != null; diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index 021ce01e6..59f40c4b5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -3,6 +3,7 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import java.util.List; import mekanism.api.EnumColor; import mekanism.api.IConfigCardAccess; @@ -54,6 +55,9 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im public boolean isRecipe = false; + public boolean stockControl = false; + public boolean needsOrganize = true; //organize on load + public int pulseOperations; public RecipeFormula formula; @@ -65,9 +69,9 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im public TileComponentConfig configComponent; public TileComponentSecurity securityComponent; - public ItemStack lastFormulaStack; + public ItemStack lastFormulaStack = ItemStack.EMPTY; public boolean needsFormulaUpdate = false; - public ItemStack lastOutputStack; + public ItemStack lastOutputStack = ItemStack.EMPTY; public TileEntityFormulaicAssemblicator() { @@ -101,6 +105,12 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im if(!world.isRemote) { + if(formula != null && stockControl && needsOrganize) + { + needsOrganize = false; + organizeStock(); + } + ChargeUtils.discharge(1, this); if(controlType != RedstoneControl.PULSE) @@ -229,12 +239,14 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im } lastOutputStack = MekanismUtils.findMatchingRecipe(dummyInv, world); - isRecipe = lastOutputStack != null; + isRecipe = !lastOutputStack.isEmpty(); } else { isRecipe = formula.matches(world, inventory, 27); - lastOutputStack = isRecipe ? formula.recipe.getRecipeOutput() : null; + lastOutputStack = isRecipe ? formula.recipe.getRecipeOutput() : ItemStack.EMPTY; } + + needsOrganize = true; } } @@ -247,7 +259,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im ItemStack output = lastOutputStack; - if(output != null && tryMoveToOutput(output, false)) + if(!output.isEmpty() && tryMoveToOutput(output, false)) { tryMoveToOutput(output, true); @@ -263,12 +275,12 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im { ItemStack container = stack.getItem().getContainerItem(stack); - if(container != null && container.isItemStackDamageable() && container.getItemDamage() > container.getMaxDamage()) + if(!container.isEmpty() && container.isItemStackDamageable() && container.getItemDamage() > container.getMaxDamage()) { - container = null; + container = ItemStack.EMPTY; } - if(container != null) + if(!container.isEmpty()) { boolean move = tryMoveToOutput(container.copy(), false); @@ -343,7 +355,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im else { boolean found = false; - for(int j = 3; j <= 20; j++) + for(int j = 20; j >= 3; j--) { if(!inventory.get(j).isEmpty() && formula.isIngredientInPos(world, inventory.get(j), i-27)) { @@ -401,6 +413,50 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im markDirty(); } + private void toggleStockControl() + { + if(!world.isRemote && formula != null) + { + stockControl = !stockControl; + + if(stockControl) + { + organizeStock(); + } + } + } + + private void organizeStock() + { + for(int j = 3; j <= 20; j++) + { + for(int i = 20; i > j; i--) + { + if(!inventory.get(i).isEmpty()) + { + if(inventory.get(j).isEmpty()) + { + inventory.set(j, inventory.get(i)); + inventory.set(i, ItemStack.EMPTY); + markDirty(); + return; + } + else if(inventory.get(j).getCount() < inventory.get(j).getMaxStackSize()) + { + if(InventoryUtils.areItemsStackable(inventory.get(i), inventory.get(j))) + { + int newCount = inventory.get(j).getCount() + inventory.get(i).getCount(); + inventory.get(j).setCount(Math.min(inventory.get(j).getMaxStackSize(), newCount)); + inventory.get(i).setCount(Math.max(0, newCount - inventory.get(j).getMaxStackSize())); + markDirty(); + return; + } + } + } + } + } + } + private ItemStack tryMoveToInput(ItemStack stack) { stack = stack.copy(); @@ -411,7 +467,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im { inventory.set(i, stack); - return null; + return ItemStack.EMPTY; } else if(InventoryUtils.areItemsStackable(stack, inventory.get(i)) && inventory.get(i).getCount() < inventory.get(i).getMaxStackSize()) { @@ -422,7 +478,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im if(stack.getCount() == 0) { - return null; + return ItemStack.EMPTY; } } } @@ -468,7 +524,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im private void encodeFormula() { - if(inventory.get(2).isEmpty() && inventory.get(2).getItem() instanceof ItemCraftingFormula) + if(!inventory.get(2).isEmpty() && inventory.get(2).getItem() instanceof ItemCraftingFormula) { ItemCraftingFormula item = (ItemCraftingFormula)inventory.get(2).getItem(); @@ -479,6 +535,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im if(formula.isValidFormula(world)) { item.setInventory(inventory.get(2), formula.input); + markDirty(); } } } @@ -521,7 +578,31 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im return true; } else { - return formula.isIngredient(world, itemstack); + List indices = formula.getIngredientIndices(world, itemstack); + + if(indices.size() > 0) + { + if(stockControl) + { + int filled = 0; + + for(int i = 3; i < 20; i++) + { + if(!inventory.get(i).isEmpty()) + { + if(formula.isIngredientInPos(world, inventory.get(i), indices.get(0))) + { + filled++; + } + } + } + + return filled < indices.size()*2; + } + else { + return true; + } + } } } else if(slotID == 1) @@ -541,6 +622,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im operatingTicks = nbtTags.getInteger("operatingTicks"); controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; pulseOperations = nbtTags.getInteger("pulseOperations"); + stockControl = nbtTags.getBoolean("stockControl"); } @Override @@ -552,6 +634,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im nbtTags.setInteger("operatingTicks", operatingTicks); nbtTags.setInteger("controlType", controlType.ordinal()); nbtTags.setInteger("pulseOperations", pulseOperations); + nbtTags.setBoolean("stockControl", stockControl); return nbtTags; } @@ -589,6 +672,10 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im moveItemsToInput(true); } } + else if(type == 5) + { + toggleStockControl(); + } return; } @@ -601,6 +688,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im operatingTicks = dataStream.readInt(); controlType = RedstoneControl.values()[dataStream.readInt()]; isRecipe = dataStream.readBoolean(); + stockControl = dataStream.readBoolean(); if(dataStream.readBoolean()) { @@ -634,6 +722,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im data.add(operatingTicks); data.add(controlType.ordinal()); data.add(isRecipe); + data.add(stockControl); if(needsFormulaUpdate) { @@ -726,10 +815,13 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im { case SPEED: ticksRequired = MekanismUtils.getTicks(this, BASE_TICKS_REQUIRED); + energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK); + break; case ENERGY: energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK); maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY); setEnergy(Math.min(getMaxEnergy(), getEnergy())); + break; default: break; } diff --git a/src/main/resources/assets/mekanism/gui/guiformulaicassemblicator.png b/src/main/resources/assets/mekanism/gui/guiformulaicassemblicator.png index 12b4246bb645fa74832b89150cd88edcb23f45e1..5664c28d2c4479e67b39fae2758dc2d899e343f2 100644 GIT binary patch literal 7213 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 Gp8pR=q)_kx literal 7291 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 LzQ$*Dhlu|Ihd6(3 diff --git a/src/main/resources/assets/mekanism/lang/en_us.lang b/src/main/resources/assets/mekanism/lang/en_us.lang index d1a4f711c..fca38d866 100644 --- a/src/main/resources/assets/mekanism/lang/en_us.lang +++ b/src/main/resources/assets/mekanism/lang/en_us.lang @@ -544,7 +544,7 @@ gui.heatTransfer=Heat Transfer gui.superheaters=Superheaters gui.boilCapacity=Boil Capacity gui.encodeFormula=Encode Formula -gui.autoModeToggle=Turn Auto-Mode +gui.autoModeToggle=Auto-Mode gui.craftSingle=Craft Single Item gui.craftAvailable=Craft Available Items gui.fillEmpty=Fill/Empty Grid @@ -566,6 +566,7 @@ gui.entityDetection=Entity Detection gui.energyContents=Energy Contents gui.redstoneOutput=Redstone Output gui.maxWaterOutput=Max Water Output +gui.stockControl=Stock Control gui.reactor.injectionRate=Injection Rate