diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 5aa42bd7..bb5bb2a0 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -95,6 +95,7 @@ tile.blockCapacitorBank.tooltipPrefix=Contains tile.blockSagMill.name=SAG Mill tile.blockHyperCube.name=Dimensional Transceiver tile.blockPowerMonitor.name=Power Monitor +tile.blockStill.name=Brewing Vat //Travel tile.blockTravelAnchor.name=Travel Anchor diff --git a/resources/assets/enderio/textures/blocks/stillFront.png b/resources/assets/enderio/textures/blocks/stillFront.png new file mode 100644 index 00000000..dc588e13 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/stillFront.png differ diff --git a/resources/assets/enderio/textures/blocks/stillFrontOn.png b/resources/assets/enderio/textures/blocks/stillFrontOn.png new file mode 100644 index 00000000..2e30c049 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/stillFrontOn.png differ diff --git a/resources/assets/enderio/textures/gui/still.png b/resources/assets/enderio/textures/gui/still.png new file mode 100644 index 00000000..b53d83ea Binary files /dev/null and b/resources/assets/enderio/textures/gui/still.png differ diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 31c5e265..8bae5126 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -60,6 +60,8 @@ import crazypants.enderio.machine.painter.BlockPainter; import crazypants.enderio.machine.power.BlockCapacitorBank; import crazypants.enderio.machine.reservoir.BlockReservoir; import crazypants.enderio.machine.solar.BlockSolarPanel; +import crazypants.enderio.machine.still.BlockStill; +import crazypants.enderio.machine.still.StillRecipeManager; import crazypants.enderio.material.Alloy; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.ItemAlloy; @@ -132,6 +134,7 @@ public class EnderIO { public static BlockCrusher blockCrusher; public static BlockHyperCube blockHyperCube; public static BlockPowerMonitor blockPowerMonitor; + public static BlockStill blockStill; public static BlockElectricLight blockElectricLight; public static BlockLightNode blockLightNode; @@ -174,6 +177,7 @@ public class EnderIO { blockCrusher = BlockCrusher.create(); blockAlloySmelter = BlockAlloySmelter.create(); + blockStill = BlockStill.create(); blockPowerMonitor = BlockPowerMonitor.create(); blockCapacitorBank = BlockCapacitorBank.create(); @@ -295,6 +299,7 @@ public class EnderIO { CrusherRecipeManager.getInstance().loadRecipesFromConfig(); AlloyRecipeManager.getInstance().loadRecipesFromConfig(); + StillRecipeManager.getInstance().loadRecipesFromConfig(); } @EventHandler diff --git a/src/main/java/crazypants/enderio/GuiHandler.java b/src/main/java/crazypants/enderio/GuiHandler.java index 85a9d828..62ad228f 100644 --- a/src/main/java/crazypants/enderio/GuiHandler.java +++ b/src/main/java/crazypants/enderio/GuiHandler.java @@ -1,13 +1,13 @@ package crazypants.enderio; -import cpw.mods.fml.common.network.IGuiHandler; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import java.util.HashMap; import java.util.Map; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.network.IGuiHandler; + public class GuiHandler implements IGuiHandler { public static final int GUI_ID_ENDERFACE = 1; @@ -32,6 +32,7 @@ public class GuiHandler implements IGuiHandler { public static final int GUI_ID_TRAVEL_ACCESSABLE = 18; public static final int GUI_ID_TRAVEL_AUTH = 19; + public static final int GUI_ID_STILL = 20; protected final Map guiHandlers = new HashMap(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index eca4db62..a6a5f230 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -37,6 +37,7 @@ public enum ModObject { blockSagMill, blockHyperCube, blockPowerMonitor, + blockStill, blockElectricLight, blockLightNode, diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineContainer.java b/src/main/java/crazypants/enderio/machine/AbstractMachineContainer.java index 11417283..f4c9b77f 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineContainer.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineContainer.java @@ -15,12 +15,14 @@ public abstract class AbstractMachineContainer extends Container { addMachineSlots(playerInv); - addSlotToContainer(new Slot(te, te.getSlotDefinition().getMinUpgradeSlot(), 12, 60) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return tileEntity.isItemValidForSlot(tileEntity.getSlotDefinition().getMinUpgradeSlot(), itemStack); - } - }); + if(te.getSlotDefinition().getNumInputSlots() == 1) { + addSlotToContainer(new Slot(te, te.getSlotDefinition().getMinUpgradeSlot(), 12, 60) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(tileEntity.getSlotDefinition().getMinUpgradeSlot(), itemStack); + } + }); + } // add players inventory for (int i = 0; i < 3; ++i) { @@ -75,7 +77,7 @@ public abstract class AbstractMachineContainer extends Container { //Check from inv->input then inv->upgrade then inv->hotbar or hotbar->inv if(slotIndex >= startPlayerSlot) { if(!mergeItemStack(origStack, slotDef.getMinInputSlot(), slotDef.getMaxInputSlot() + 1, false)) { - if(!mergeItemStack(origStack, slotDef.getMinUpgradeSlot(), slotDef.getMaxUpgradeSlot() + 1, false)) { + if(slotDef.getNumOutputSlots() > 0 && !mergeItemStack(origStack, slotDef.getMinUpgradeSlot(), slotDef.getMaxUpgradeSlot() + 1, false)) { if(slotIndex <= endPlayerSlot) { if(!mergeItemStack(origStack, startHotBarSlot, endHotBarSlot, false)) { return null; diff --git a/src/main/java/crazypants/enderio/machine/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/GuiMachineBase.java index 2ce94be6..9a8aaff5 100644 --- a/src/main/java/crazypants/enderio/machine/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/GuiMachineBase.java @@ -30,7 +30,7 @@ public abstract class GuiMachineBase extends GuiContainerBase { public GuiMachineBase(AbstractMachineEntity machine, Container container) { super(container); tileEntity = machine; - addToolTip(new GuiToolTip(new Rectangle(POWER_X, POWER_Y, POWER_WIDTH, POWER_HEIGHT), "") { + addToolTip(new GuiToolTip(new Rectangle(getPowerX(), getPowerY(), getPowerWidth(), getPowerHeight()), "") { @Override protected void updateText() { @@ -45,6 +45,22 @@ public abstract class GuiMachineBase extends GuiContainerBase { redstoneButton = new RedstoneModeButton(this, -1, x, y, tileEntity, new BlockCoord(tileEntity)); } + protected int getPowerX() { + return POWER_X; + } + + protected int getPowerY() { + return POWER_Y; + } + + protected int getPowerWidth() { + return POWER_WIDTH; + } + + protected int getPowerHeight() { + return POWER_HEIGHT; + } + @Override public void initGui() { super.initGui(); @@ -56,9 +72,9 @@ public abstract class GuiMachineBase extends GuiContainerBase { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int k = (width - xSize) / 2; int l = (height - ySize) / 2; - int i1 = tileEntity.getEnergyStoredScaled(POWER_HEIGHT); + int i1 = tileEntity.getEnergyStoredScaled(getPowerHeight()); // x, y, u, v, width, height - drawTexturedModalRect(k + POWER_X, l + BOTTOM_POWER_Y - i1, 176, 31, POWER_WIDTH, i1); + drawTexturedModalRect(k + getPowerX(), l + (getPowerY() + getPowerHeight()) - i1, 176, 31, getPowerWidth(), i1); for (int i = 0; i < buttonList.size(); ++i) { GuiButton guibutton = (GuiButton) this.buttonList.get(i); diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipeInput.java b/src/main/java/crazypants/enderio/machine/MachineRecipeInput.java index 6763ab29..981496af 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipeInput.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipeInput.java @@ -1,6 +1,7 @@ package crazypants.enderio.machine; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; public class MachineRecipeInput { @@ -20,10 +21,18 @@ public class MachineRecipeInput { public final int slotNumber; public final ItemStack item; + public final FluidStack fluid; + public MachineRecipeInput(int slotNumber, ItemStack item) { - super(); this.slotNumber = slotNumber; this.item = item; + this.fluid = null; + } + + public MachineRecipeInput(int slotNumber, FluidStack fluid) { + this.slotNumber = slotNumber; + this.item = null; + this.fluid = fluid; } } \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/machine/SlotDefinition.java b/src/main/java/crazypants/enderio/machine/SlotDefinition.java index 53839159..0b8d0929 100644 --- a/src/main/java/crazypants/enderio/machine/SlotDefinition.java +++ b/src/main/java/crazypants/enderio/machine/SlotDefinition.java @@ -42,14 +42,23 @@ public class SlotDefinition { } public int getNumUpgradeSlots() { + if(minUpgradeSlot < 0) { + return 0; + } return Math.max(0, maxUpgradeSlot - minUpgradeSlot + 1); } public int getNumInputSlots() { + if(minInputSlot < 0) { + return 0; + } return Math.max(0, maxInputSlot - minInputSlot + 1); } public int getNumOutputSlots() { + if(minOutputSlot < 0) { + return 0; + } return Math.max(0, maxOutputSlot - minOutputSlot + 1); } diff --git a/src/main/java/crazypants/enderio/machine/alloy/AlloyMachineRecipe.java b/src/main/java/crazypants/enderio/machine/alloy/AlloyMachineRecipe.java index b1b2d897..38b47695 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/AlloyMachineRecipe.java +++ b/src/main/java/crazypants/enderio/machine/alloy/AlloyMachineRecipe.java @@ -31,7 +31,7 @@ public class AlloyMachineRecipe extends AbstractMachineRecipe { stacks.add(mi.item); } } - return AlloyRecipeManager.instance.getRecipeForInputs(stacks.toArray(new ItemStack[stacks.size()])); + return AlloyRecipeManager.instance.getRecipeForInputs(stacks); } @Override diff --git a/src/main/java/crazypants/enderio/machine/alloy/AlloyRecipeManager.java b/src/main/java/crazypants/enderio/machine/alloy/AlloyRecipeManager.java index bc5697cc..aee02f1d 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/AlloyRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/alloy/AlloyRecipeManager.java @@ -2,6 +2,7 @@ package crazypants.enderio.machine.alloy; import java.io.File; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import net.minecraft.item.ItemStack; @@ -100,7 +101,7 @@ public class AlloyRecipeManager { Log.debug("Could not add invalid recipe: " + recipe); return; } - IRecipe rec = getRecipeForInputs(recipe.getInputStacks()); + IRecipe rec = getRecipeForInputs(Arrays.asList(recipe.getInputStacks())); if(rec != null) { Log.warn("Not adding supplied recipe as a recipe already exists for the input: " + recipe); return; @@ -108,7 +109,7 @@ public class AlloyRecipeManager { recipes.add(recipe); } - IRecipe getRecipeForInputs(ItemStack[] inputs) { + IRecipe getRecipeForInputs(List inputs) { for (IAlloyRecipe rec : recipes) { if(rec.isInputForRecipe(inputs)) { return rec; diff --git a/src/main/java/crazypants/enderio/machine/alloy/BasicAlloyRecipe.java b/src/main/java/crazypants/enderio/machine/alloy/BasicAlloyRecipe.java index edfbd0d2..162244ef 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/BasicAlloyRecipe.java +++ b/src/main/java/crazypants/enderio/machine/alloy/BasicAlloyRecipe.java @@ -6,6 +6,7 @@ import java.util.Collections; import java.util.List; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; import crazypants.enderio.ModObject; import crazypants.enderio.crafting.IEnderIoRecipe; import crazypants.enderio.crafting.IRecipeComponent; @@ -108,13 +109,17 @@ public class BasicAlloyRecipe implements IAlloyRecipe { return new ItemStack[] { output.copy() }; } - //@Override @Override - public boolean isValidInput(MachineRecipeInput input) { + public boolean isValidInput(ItemStack input) { if(input == null) { return false; } - return getRecipeComponentFromInput(input.item) != null; + return getRecipeComponentFromInput(input) != null; + } + + @Override + public boolean isValidInput(FluidStack fluid) { + return false; } //@Override @@ -223,13 +228,18 @@ public class BasicAlloyRecipe implements IAlloyRecipe { } @Override - public boolean isInputForRecipe(ItemStack[] test) { + public boolean isInputForRecipe(List test) { if(test == null) { return false; } return recipe.isInputForRecipe(test); } + @Override + public boolean isInputForRecipe(List test, List testFluids) { + return (testFluids == null || testFluids.isEmpty()) && isInputForRecipe(test); + } + @Override public RecipeInput[] getInputs() { return recipe.getInputs(); diff --git a/src/main/java/crazypants/enderio/machine/alloy/IAlloyRecipe.java b/src/main/java/crazypants/enderio/machine/alloy/IAlloyRecipe.java index bb1a2273..6e06ed10 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/IAlloyRecipe.java +++ b/src/main/java/crazypants/enderio/machine/alloy/IAlloyRecipe.java @@ -1,15 +1,12 @@ package crazypants.enderio.machine.alloy; import net.minecraft.item.ItemStack; -import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.recipe.IRecipe; public interface IAlloyRecipe extends IRecipe { boolean isValidRecipeComponents(ItemStack... items); - boolean isValidInput(MachineRecipeInput input); - ItemStack getOutput(); } diff --git a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java index fa2c0066..ad579616 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java @@ -2,6 +2,7 @@ package crazypants.enderio.machine.crusher; import java.io.File; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import net.minecraft.item.ItemStack; @@ -68,7 +69,7 @@ public class CrusherRecipeManager { return null; } for (Recipe recipe : recipes) { - if(recipe.isInputForRecipe(new ItemStack[] { input })) { + if(recipe.isInputForRecipe(Collections.singletonList(input))) { return recipe; } } @@ -84,10 +85,10 @@ public class CrusherRecipeManager { } List newRecipes = config.getRecipes(true); - Log.info("Found " + newRecipes.size() + " valid SAG Mill recipes in config."); + Log.info("Found " + newRecipes.size() + " valid SAG Mill recipes in config."); for (Recipe rec : newRecipes) { addRecipe(rec); - } + } Log.info("Finished processing Alloy Smelter recipes. " + recipes.size() + " recipes avaliable."); } diff --git a/src/main/java/crazypants/enderio/machine/recipe/IRecipe.java b/src/main/java/crazypants/enderio/machine/recipe/IRecipe.java index d625a507..07aea5e5 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/IRecipe.java +++ b/src/main/java/crazypants/enderio/machine/recipe/IRecipe.java @@ -1,19 +1,28 @@ package crazypants.enderio.machine.recipe; +import java.util.List; + import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; public interface IRecipe { - public abstract boolean isValid(); + boolean isValid(); - public abstract float getEnergyRequired(); + float getEnergyRequired(); - public abstract RecipeOutput[] getOutputs(); + RecipeOutput[] getOutputs(); - public abstract RecipeInput[] getInputs(); + RecipeInput[] getInputs(); - public abstract ItemStack[] getInputStacks(); + ItemStack[] getInputStacks(); - public abstract boolean isInputForRecipe(ItemStack[] test); + boolean isInputForRecipe(List test); + + boolean isInputForRecipe(List test, List testFluids); + + boolean isValidInput(ItemStack item); + + boolean isValidInput(FluidStack fluid); } diff --git a/src/main/java/crazypants/enderio/machine/recipe/Recipe.java b/src/main/java/crazypants/enderio/machine/recipe/Recipe.java index ba1a55e7..9273d60b 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/Recipe.java +++ b/src/main/java/crazypants/enderio/machine/recipe/Recipe.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.List; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; public class Recipe implements IRecipe { @@ -27,11 +28,16 @@ public class Recipe implements IRecipe { } @Override - public boolean isInputForRecipe(ItemStack[] test) { + public boolean isInputForRecipe(List test) { + return isInputForRecipe(test, null); + } + + @Override + public boolean isInputForRecipe(List test, List testFluids) { if(test == null) { return false; } - if(test.length != inputs.length) { + if(test.size() != inputs.length) { return false; } List recIns = new ArrayList(Arrays.asList(inputs)); @@ -47,9 +53,42 @@ public class Recipe implements IRecipe { recIns.remove(ri); } } + if(testFluids != null) { + for (FluidStack input : testFluids) { + if(input != null) { + RecipeInput ri = getInputForStack(input); + if(ri == null || ri.getInput() == null) { + return false; + } + if(input.amount < ri.getFluidInput().amount) { + return false; + } + recIns.remove(ri); + } + } + } return recIns.size() == 0; } + @Override + public boolean isValidInput(ItemStack item) { + return getInputForStack(item) != null; + } + + @Override + public boolean isValidInput(FluidStack fluid) { + return getInputForStack(fluid) != null; + } + + private RecipeInput getInputForStack(FluidStack input) { + for (RecipeInput ri : inputs) { + if(ri.isInput(input)) { + return ri; + } + } + return null; + } + private RecipeInput getInputForStack(ItemStack input) { for (RecipeInput ri : inputs) { if(ri.isInput(input)) { diff --git a/src/main/java/crazypants/enderio/machine/recipe/RecipeInput.java b/src/main/java/crazypants/enderio/machine/recipe/RecipeInput.java index 55261915..f83ea402 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/RecipeInput.java +++ b/src/main/java/crazypants/enderio/machine/recipe/RecipeInput.java @@ -1,12 +1,15 @@ package crazypants.enderio.machine.recipe; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; public class RecipeInput { private final ItemStack input; private final boolean useMeta; + private final FluidStack fluid; + public RecipeInput(ItemStack input) { this(input, true); } @@ -14,19 +17,45 @@ public class RecipeInput { public RecipeInput(ItemStack input, boolean useMeta) { this.input = input; this.useMeta = useMeta; + this.fluid = null; + } + + public RecipeInput(FluidStack fluid) { + this.input = null; + this.useMeta = false; + this.fluid = fluid; + } + + public boolean isFluid() { + return fluid != null; } public ItemStack getInput() { return input; } + public FluidStack getFluidInput() { + return fluid; + } + public boolean isInput(ItemStack test) { + if(test == null || input == null) { + return false; + } + if(useMeta) { return test.getItem() == input.getItem() && test.getItemDamage() == input.getItemDamage(); } return test.getItem() == input.getItem(); } + public boolean isInput(FluidStack test) { + if(test == null || fluid == null) { + return false; + } + return test.isFluidEqual(fluid); + } + public ItemStack[] getEquivelentInputs() { return null; } diff --git a/src/main/java/crazypants/enderio/machine/recipe/RecipeOutput.java b/src/main/java/crazypants/enderio/machine/recipe/RecipeOutput.java index 2ebb8073..a264c548 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/RecipeOutput.java +++ b/src/main/java/crazypants/enderio/machine/recipe/RecipeOutput.java @@ -3,9 +3,11 @@ package crazypants.enderio.machine.recipe; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; public class RecipeOutput { + private final FluidStack outputFluid; private final ItemStack output; private final float chance; private float exp; @@ -38,6 +40,14 @@ public class RecipeOutput { this.output = output.copy(); this.chance = chance; this.exp = exp; + outputFluid = null; + } + + public RecipeOutput(FluidStack output) { + this.outputFluid = output; + this.output = null; + chance = 1; + exp = 0; } public float getChance() { @@ -52,4 +62,8 @@ public class RecipeOutput { return output; } + public FluidStack getFluidOutput() { + return outputFluid; + } + } diff --git a/src/main/java/crazypants/enderio/machine/still/BlockStill.java b/src/main/java/crazypants/enderio/machine/still/BlockStill.java new file mode 100644 index 00000000..02e7b470 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/still/BlockStill.java @@ -0,0 +1,55 @@ +package crazypants.enderio.machine.still; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.AbstractMachineBlock; + +public class BlockStill extends AbstractMachineBlock { + + public static BlockStill create() { + BlockStill res = new BlockStill(); + res.init(); + return res; + } + + public BlockStill() { + super(ModObject.blockStill, TileStill.class); + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + // The server needs the container as it manages the adding and removing of + // items, which are then sent to the client for display + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileStill) { + return new ContainerStill(player.inventory, (TileStill) te); + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileStill) { + return new GuiStill(player.inventory, (TileStill) te); + } + return null; + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_STILL; + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + if(active) { + return "enderio:stillFrontOn"; + } + return "enderio:stillFront"; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/still/ContainerStill.java b/src/main/java/crazypants/enderio/machine/still/ContainerStill.java new file mode 100644 index 00000000..108c1128 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/still/ContainerStill.java @@ -0,0 +1,31 @@ +package crazypants.enderio.machine.still; + +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import crazypants.enderio.machine.AbstractMachineContainer; +import crazypants.enderio.machine.AbstractMachineEntity; + +public class ContainerStill extends AbstractMachineContainer { + + public ContainerStill(InventoryPlayer playerInv, AbstractMachineEntity te) { + super(playerInv, te); + } + + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + addSlotToContainer(new Slot(tileEntity, 0, 56, 12) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(0, itemStack); + } + }); + addSlotToContainer(new Slot(tileEntity, 1, 105, 12) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(1, itemStack); + } + }); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/still/GuiStill.java b/src/main/java/crazypants/enderio/machine/still/GuiStill.java new file mode 100644 index 00000000..ca1a1b4c --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/still/GuiStill.java @@ -0,0 +1,57 @@ +package crazypants.enderio.machine.still; + +import net.minecraft.entity.player.InventoryPlayer; + +import org.lwjgl.opengl.GL11; + +import crazypants.enderio.machine.GuiMachineBase; +import crazypants.render.RenderUtil; + +public class GuiStill extends GuiMachineBase { + + private final TileStill still; + + public GuiStill(InventoryPlayer inventory, TileStill te) { + super(te, new ContainerStill(inventory, te)); + still = te; + } + + /** + * Draw the background layer for the GuiContainer (everything behind the + * items) + */ + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderUtil.bindTexture("enderio:textures/gui/still.png"); + int guiLeft = (width - xSize) / 2; + int guiTop = (height - ySize) / 2; + drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + + // int i1 = tileEntity.getProgressScaled(24); + // drawTexturedModalRect(guiLeft + 79, guiTop + 31, 200, 0, 18, i1 + 1); + + if(still.getProgress() < 1 && still.getProgress() > 0) { + int scaled = still.getProgressScaled(12); + drawTexturedModalRect(guiLeft + 89, guiTop + 76 - scaled, 176, 12 - scaled, 14, scaled + 2); + } + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + } + + @Override + protected int getPowerX() { + return 10; + } + + @Override + protected int getPowerY() { + return 13; + } + + @Override + protected int getPowerHeight() { + return 60; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/still/StillMachineRecipe.java b/src/main/java/crazypants/enderio/machine/still/StillMachineRecipe.java new file mode 100644 index 00000000..bd332f04 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/still/StillMachineRecipe.java @@ -0,0 +1,87 @@ +package crazypants.enderio.machine.still; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.crafting.IEnderIoRecipe; +import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.enderio.machine.recipe.AbstractMachineRecipe; +import crazypants.enderio.machine.recipe.IRecipe; + +public class StillMachineRecipe extends AbstractMachineRecipe { + + private StillRecipe nutDistRecipe = new StillRecipe(new FluidStack(FluidRegistry.WATER, FluidContainerRegistry.BUCKET_VOLUME), new FluidStack( + EnderIO.fluidNutrientDistillation, FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(Items.rotten_flesh), new ItemStack(Items.nether_wart)); + + @Override + public String getUid() { + return "StillRecipe"; + } + + @Override + public IRecipe getRecipeForInputs(MachineRecipeInput[] inputs) { + + List items = new ArrayList(); + List fluids = new ArrayList(); + for (MachineRecipeInput mi : inputs) { + if(mi != null) { + if(mi.item != null) { + items.add(mi.item); + } else if(mi.fluid != null) { + fluids.add(mi.fluid); + } + } + } + return StillRecipeManager.instance.getRecipeForInput(items, fluids); + } + + @Override + public boolean isValidInput(MachineRecipeInput input) { + if(input == null) { + return false; + } + return StillRecipeManager.instance.isValidInput(input); + + } + + @Override + public String getMachineName() { + return ModObject.blockStill.unlocalisedName; + } + + @Override + public float getExperianceForOutput(ItemStack output) { + // //return AlloyRecipeManager.instance.getExperianceForOutput(output); + return 0; + } + + @Override + public List getAllRecipes() { + List result = new ArrayList(); + // List recipes = AlloyRecipeManager.getInstance().getRecipes(); + // for (IRecipe cr : recipes) { + // List components = new ArrayList(); + // for (crazypants.enderio.machine.recipe.RecipeInput ri : cr.getInputs()) { + // if(ri.getInput() != null) { + // IRecipeInput input = new RecipeInput(ri.getInput(), -1, ri.getEquivelentInputs()); + // components.add(input); + // } + // } + // + // for (RecipeOutput co : cr.getOutputs()) { + // IRecipeOutput output = new crazypants.enderio.crafting.impl.RecipeOutput(co.getOutput(), co.getChance()); + // components.add(output); + // } + // result.add(new EnderIoRecipe(IEnderIoRecipe.ALLOY_SMELTER_ID, cr.getEnergyRequired(), components)); + // } + return result; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/still/StillRecipe.java b/src/main/java/crazypants/enderio/machine/still/StillRecipe.java new file mode 100644 index 00000000..e6ef1b04 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/still/StillRecipe.java @@ -0,0 +1,124 @@ +package crazypants.enderio.machine.still; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import crazypants.enderio.machine.recipe.IRecipe; +import crazypants.enderio.machine.recipe.RecipeInput; +import crazypants.enderio.machine.recipe.RecipeOutput; + +public class StillRecipe implements IRecipe { + + protected final FluidStack inputFluidStack; + protected final ItemStack[] inputStacks; + protected final FluidStack outputFluidStack; + + protected final RecipeInput[] inputs; + protected final RecipeOutput[] output; + + public StillRecipe(FluidStack inputFluid, FluidStack outputFluid, ItemStack... inputStacks) { + this.inputFluidStack = inputFluid; + this.inputStacks = inputStacks; + this.outputFluidStack = outputFluid; + + List inputList = new ArrayList(3); + if(inputFluidStack != null) { + inputList.add(new RecipeInput(inputFluid)); + } + if(inputStacks != null) { + for (ItemStack in : inputStacks) { + if(in != null) { + inputList.add(new RecipeInput(in)); + } + } + } + inputs = inputList.toArray(new RecipeInput[inputList.size()]); + output = new RecipeOutput[] { new RecipeOutput(outputFluidStack) }; + } + + @Override + public boolean isValid() { + return inputFluidStack != null && inputStacks != null && inputStacks.length > 0 && inputStacks.length < 3 && outputFluidStack != null; + } + + @Override + public float getEnergyRequired() { + return 1000; + } + + @Override + public RecipeOutput[] getOutputs() { + return output; + } + + @Override + public RecipeInput[] getInputs() { + return inputs; + } + + @Override + public ItemStack[] getInputStacks() { + return inputStacks; + } + + @Override + public boolean isValidInput(ItemStack item) { + if(item == null) { + return false; + } + for (RecipeInput ri : inputs) { + if(item != null && ri.isInput(item)) { + return true; + } + } + return false; + } + + @Override + public boolean isValidInput(FluidStack item) { + if(item == null) { + return false; + } + for (RecipeInput ri : inputs) { + if(item.getFluid() != null && item.isFluidEqual(ri.getFluidInput())) { + return true; + } + } + return false; + } + + @Override + public boolean isInputForRecipe(List test) { + return false; + } + + @Override + public boolean isInputForRecipe(List test, List testFluids) { + if(!isValid() || test == null || test.size() != 2 || testFluids == null || testFluids.size() != 1 || testFluids.get(0) == null) { + return false; + } + boolean validFluid = inputFluidStack.isFluidEqual(testFluids.get(0)) && inputFluidStack.amount <= testFluids.get(0).amount; + if(!validFluid) { + return false; + } + + for (int i = 0; i < inputs.length; i++) { + if(!containsInput(inputs[i], test)) { + return false; + } + } + return true; + } + + private boolean containsInput(RecipeInput recipeInput, List test) { + for (ItemStack stack : test) { + if(recipeInput.isInput(stack)) { + return true; + } + } + return false; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/still/StillRecipeManager.java b/src/main/java/crazypants/enderio/machine/still/StillRecipeManager.java new file mode 100644 index 00000000..47c4ac98 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/still/StillRecipeManager.java @@ -0,0 +1,114 @@ +package crazypants.enderio.machine.still; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import crazypants.enderio.EnderIO; +import crazypants.enderio.Log; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.enderio.machine.MachineRecipeRegistry; +import crazypants.enderio.machine.recipe.IRecipe; +import crazypants.enderio.machine.recipe.RecipeConfig; + +public class StillRecipeManager { + + private static final String CORE_FILE_NAME = "StillRecipes_Core.xml"; + private static final String CUSTOM_FILE_NAME = "StillRecipes_User.xml"; + + static final StillRecipeManager instance = new StillRecipeManager(); + + public static StillRecipeManager getInstance() { + return instance; + } + + private final List recipes = new ArrayList(); + + public StillRecipeManager() { + } + + public void loadRecipesFromConfig() { + // RecipeConfig config = RecipeConfig.loadRecipeConfig(CORE_FILE_NAME, CUSTOM_FILE_NAME, null); + // if(config != null) { + // processConfig(config); + // } else { + // Log.error("Could not load recipes for SAG Mill."); + // } + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockStill.unlocalisedName, new StillMachineRecipe()); + addRecipe(new StillRecipe(new FluidStack(FluidRegistry.WATER, FluidContainerRegistry.BUCKET_VOLUME), new FluidStack( + EnderIO.fluidNutrientDistillation, FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(Items.rotten_flesh), new ItemStack(Items.nether_wart))); + } + + public void addCustumRecipes(String xmlDef) { + // RecipeConfig config; + // try { + // config = RecipeConfigParser.parse(xmlDef, null); + // } catch (Exception e) { + // Log.error("Error parsing custom xml"); + // return; + // } + // + // if(config == null) { + // Log.error("Could process custom XML"); + // return; + // } + // processConfig(config); + } + + public IRecipe getRecipeForInput(List input, List inputFluids) { + if(input == null || inputFluids == null) { + return null; + } + for (IRecipe recipe : recipes) { + if(recipe.isInputForRecipe(input, inputFluids)) { + return recipe; + } + } + return null; + } + + private void processConfig(RecipeConfig config) { + // if(config.isDumpItemRegistery()) { + // Util.dumpModObjects(new File(Config.configDirectory, "modObjectsRegistery.txt")); + // } + // if(config.isDumpOreDictionary()) { + // Util.dumpOreNames(new File(Config.configDirectory, "oreDictionaryRegistery.txt")); + // } + // + // List newRecipes = config.getRecipes(true); + // Log.info("Found " + newRecipes.size() + " valid SAG Mill recipes in config."); + // for (Recipe rec : newRecipes) { + // addRecipe(rec); + // } + // Log.info("Finished processing Alloy Smelter recipes. " + recipes.size() + " recipes avaliable."); + } + + public void addRecipe(IRecipe recipe) { + if(recipe == null || !recipe.isValid()) { + Log.debug("Could not add invalid recipe: " + recipe); + return; + } + recipes.add(recipe); + } + + public List getRecipes() { + return recipes; + } + + public boolean isValidInput(MachineRecipeInput input) { + for (IRecipe recipe : recipes) { + if(input.item != null && recipe.isValidInput(input.item)) { + return true; + } else if(input.fluid != null && recipe.isValidInput(input.fluid)) { + return true; + } + } + return false; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/still/TileStill.java b/src/main/java/crazypants/enderio/machine/still/TileStill.java new file mode 100644 index 00000000..faaee474 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/still/TileStill.java @@ -0,0 +1,35 @@ +package crazypants.enderio.machine.still; + +import net.minecraft.item.ItemStack; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.AbstractPoweredTaskEntity; +import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.enderio.machine.SlotDefinition; + +public class TileStill extends AbstractPoweredTaskEntity { + + public TileStill() { + super(new SlotDefinition(0, 1, -1, -1, -1, -1)); + } + + @Override + public String getInventoryName() { + return ModObject.blockStill.unlocalisedName; + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public String getMachineName() { + return ModObject.blockStill.unlocalisedName; + } + + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { + return StillRecipeManager.getInstance().isValidInput(new MachineRecipeInput(i, itemstack)); + } + +}