From a2f46fbf4afee1026eb7322b048e9c1b2c65f346 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 19 Sep 2014 10:39:26 +0800 Subject: [PATCH 1/8] Lower blast protection cost to same as projectile and fire in the enchanter. --- resources/assets/enderio/config/EnchanterRecipes_Core.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/enderio/config/EnchanterRecipes_Core.xml b/resources/assets/enderio/config/EnchanterRecipes_Core.xml index bcd26182..9a7fa6d0 100644 --- a/resources/assets/enderio/config/EnchanterRecipes_Core.xml +++ b/resources/assets/enderio/config/EnchanterRecipes_Core.xml @@ -22,7 +22,7 @@ for (int i = 0; i < level; i++) { - + From 4ba223250e0e6bf5676a5730c6126a43898e9097 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 19 Sep 2014 10:51:58 +0800 Subject: [PATCH 2/8] Fixed renderering of broken spawners. --- .../spawner/BrokenSpawnerRenderer.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java b/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java index 17e12655..dabf0ae1 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java @@ -21,13 +21,26 @@ public class BrokenSpawnerRenderer implements IItemRenderer { } @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); GL11.glEnable(GL11.GL_ALPHA_TEST); - RenderBlocks rb = (RenderBlocks)data[0]; + + if(type == ItemRenderType.ENTITY) { + GL11.glPushMatrix(); + GL11.glScalef(0.5f, 0.5f, 0.5f); + } + + RenderBlocks rb = (RenderBlocks) data[0]; rb.setOverrideBlockTexture(EnderIO.itemBrokenSpawner.getIconFromDamage(0)); rb.renderBlockAsItem(Blocks.stone, 0, 1); - rb.setOverrideBlockTexture(null); + rb.setOverrideBlockTexture(null); + + if(type == ItemRenderType.ENTITY) { + GL11.glPopMatrix(); + } + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glPopAttrib(); } } From 5b656a566e90364b2abc214017f0a565416beaad Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 19 Sep 2014 11:06:39 +0800 Subject: [PATCH 3/8] Changed rendering of power bar on tools to make it easier to see power level. --- .../enderio/item/darksteel/EnergyUpgrade.java | 1 - .../enderio/item/darksteel/PoweredItemRenderer.java | 12 +++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java index e1872762..99877273 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java @@ -221,7 +221,6 @@ public class EnergyUpgrade extends AbstractUpgrade { public boolean isAbsorbDamageWithPower() { boolean res= RANDOM.nextFloat() < Config.darkSteelPowerDamgeAbsorptionRatio; - System.out.println("EnergyUpgrade.isAbsorbDamageWithPower: "+ res); return res; } diff --git a/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java b/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java index 2d0b8b32..6c1dc289 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java +++ b/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java @@ -66,7 +66,7 @@ public class PoweredItemRenderer implements IItemRenderer { g = 0.4f; b = 1f; y = 13; - renderBar(y, maxDam, maxDam - dispDamage, new Color(200, 100, 10), Color.red); + renderBar2(y, maxDam, maxDam - dispDamage, new Color(200, 100, 10), Color.red); } GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); @@ -77,6 +77,16 @@ public class PoweredItemRenderer implements IItemRenderer { return EnergyUpgrade.loadFromItem(item) == null && item.getItemDamageForDisplay() == 0; } + private void renderBar2(int y, double maxDam, double dispDamage, Color full, Color empty) { + double ratio = dispDamage / maxDam; + Vector4f fg = ColorUtil.toFloat(full); + Vector4f ec = ColorUtil.toFloat(empty); + fg.interpolate(ec, (float) ratio); + int barLength = (int) Math.round(12.0 * (1 - ratio)); + RenderUtil.renderQuad2D(2, y, 0, barLength, 1, fg); + } + + private void renderBar(int y, double maxDam, double dispDamage, Color full, Color empty) { double ratio = dispDamage / maxDam; Vector4f fg = ColorUtil.toFloat(full); From 488bb408b86f5c5700b91dd87cd2c01b8daa7613 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 19 Sep 2014 11:14:53 +0800 Subject: [PATCH 4/8] Made DS axe a leaf chopping machine --- .../crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index 8735ffe4..40476c73 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -11,6 +11,7 @@ import java.util.Set; import net.minecraft.block.Block; import net.minecraft.block.BlockNewLeaf; import net.minecraft.block.BlockOldLeaf; +import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -169,6 +170,9 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I if(evt.entityPlayer.isSneaking() && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelAxePowerUsePerDamagePointMultiHarvest) && isLog(evt.block, evt.metadata)) { evt.newSpeed = evt.originalSpeed / Config.darkSteelAxeSpeedPenaltyMultiHarvest; } + if(evt.block.getMaterial() == Material.leaves) { + evt.newSpeed = 6; + } } @Override From b38984d590b0b5c5c71e79edeef239006d40bf5c Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 19 Sep 2014 11:19:31 +0800 Subject: [PATCH 5/8] Added thaumcraft zombie brains as an ingredient in nut. dist. --- resources/assets/enderio/config/VatRecipes_Core.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/assets/enderio/config/VatRecipes_Core.xml b/resources/assets/enderio/config/VatRecipes_Core.xml index 0258b921..7e0c5992 100644 --- a/resources/assets/enderio/config/VatRecipes_Core.xml +++ b/resources/assets/enderio/config/VatRecipes_Core.xml @@ -17,9 +17,10 @@ The vat always uses 1 MJ per tick, so energy cost also equates to duration. - - + + + From 4404bc862418f029a423334376892bd1eed5a203 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 19 Sep 2014 12:05:58 +0800 Subject: [PATCH 6/8] #1025 Show ingredient multipliers in GUI for vat (including NEI) --- .../enderio/machine/still/GuiVat.java | 42 ++++++++++++++++--- .../machine/still/VatRecipeManager.java | 19 +++++++++ .../enderio/nei/VatRecipeHandler.java | 33 ++++++++------- 3 files changed, 72 insertions(+), 22 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/still/GuiVat.java b/src/main/java/crazypants/enderio/machine/still/GuiVat.java index 3d869dda..6ba57d91 100644 --- a/src/main/java/crazypants/enderio/machine/still/GuiVat.java +++ b/src/main/java/crazypants/enderio/machine/still/GuiVat.java @@ -1,9 +1,13 @@ package crazypants.enderio.machine.still; +import java.awt.Color; import java.awt.Rectangle; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; @@ -15,6 +19,7 @@ import crazypants.enderio.machine.IPoweredTask; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.gui.GuiToolTip; +import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; import crazypants.util.Lang; @@ -67,15 +72,14 @@ public class GuiVat extends GuiMachineBase { int x = 30; int y = 12; if(mode == IoMode.PULL || mode == IoMode.PUSH_PULL) { - renderSlotHighlight(PULL_COLOR,x-2,y-2,15+4,47+4); + renderSlotHighlight(PULL_COLOR, x - 2, y - 2, 15 + 4, 47 + 4); } if(mode == IoMode.PUSH || mode == IoMode.PUSH_PULL) { x = 132; - renderSlotHighlight(PUSH_COLOR,x-2,y-2,15+4,47+4); + renderSlotHighlight(PUSH_COLOR, x - 2, y - 2, 15 + 4, 47 + 4); } } - /** * Draw the background layer for the GuiContainer (everything behind the * items) @@ -116,9 +120,36 @@ public class GuiVat extends GuiMachineBase { int x = guiLeft + 30; int y = guiTop + 12; - RenderUtil.renderGuiTank(vat.inputTank, x, y, zLevel, 15,47); + RenderUtil.renderGuiTank(vat.inputTank, x, y, zLevel, 15, 47); x = guiLeft + 132; - RenderUtil.renderGuiTank(vat.outputTank, x, y, zLevel, 15,47); + RenderUtil.renderGuiTank(vat.outputTank, x, y, zLevel, 15, 47); + + if(vat.getCurrentTask() != null || vat.outputTank.getFluidAmount() > 0) { + + Fluid outputFluid; + if(vat.outputTank.getFluidAmount() > 0) { + outputFluid = vat.outputTank.getFluid().getFluid(); + } else { + ResultStack[] res = vat.getCurrentTask().getRecipe().getCompletedResult(1, vat.getCurrentTask().getInputs()); + outputFluid = res[0].fluid.getFluid(); + } + + float mult; + ItemStack inStack = vat.getStackInSlot(0); + if(inStack != null) { + mult = VatRecipeManager.instance.getMultiplierForInput(inStack, outputFluid); + String str = "x" + mult; + x = guiLeft + 63 - fontRendererObj.getStringWidth(str)/2; + fontRendererObj.drawString(str, x, guiTop + 32, ColorUtil.getRGB(Color.gray), false); + } + inStack = vat.getStackInSlot(1); + if(inStack != null) { + mult = VatRecipeManager.instance.getMultiplierForInput(inStack, outputFluid); + String str = "x" + mult; + x = guiLeft + 113 - fontRendererObj.getStringWidth(str)/2; + fontRendererObj.drawString(str, x, guiTop + 32, ColorUtil.getRGB(Color.gray), false); + } + } RenderUtil.bindTexture(GUI_TEXTURE); super.drawGuiContainerBackgroundLayer(par1, par2, par3); @@ -144,7 +175,6 @@ public class GuiVat extends GuiMachineBase { drawTexturedModalRect(x, y, 0, 256 - 28, 26, 28); } - @Override protected int getPowerX() { return 10; diff --git a/src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java b/src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java index dcc67931..559183b7 100644 --- a/src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java @@ -3,6 +3,9 @@ package crazypants.enderio.machine.still; import java.util.ArrayList; import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; + import crazypants.enderio.Log; import crazypants.enderio.ModObject; import crazypants.enderio.machine.MachineRecipeInput; @@ -11,6 +14,8 @@ import crazypants.enderio.machine.recipe.IRecipe; import crazypants.enderio.machine.recipe.Recipe; import crazypants.enderio.machine.recipe.RecipeConfig; import crazypants.enderio.machine.recipe.RecipeConfigParser; +import crazypants.enderio.machine.recipe.RecipeInput; +import crazypants.enderio.machine.recipe.RecipeOutput; public class VatRecipeManager { @@ -121,5 +126,19 @@ public class VatRecipeManager { } return false; } + + public float getMultiplierForInput(ItemStack input, Fluid output) { + for (IRecipe recipe : recipes) { + RecipeOutput out = recipe.getOutputs()[0]; + if(out.getFluidOutput().getFluid().getID() == output.getID()) { + for(RecipeInput ri : recipe.getInputs()) { + if(ri.isInput(input)) { + return ri.getMulitplier(); + } + } + } + } + return 0; + } } diff --git a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java index d485dc2b..e7839d6f 100644 --- a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java @@ -1,15 +1,18 @@ package crazypants.enderio.nei; +import java.awt.Color; import java.awt.Point; import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; @@ -115,7 +118,7 @@ public class VatRecipeHandler extends TemplateRecipeHandler { if(fluid != null) { if(recipe.isValidInput(fluid)) { addRecipe = true; - } + } } } if(addRecipe) { @@ -124,15 +127,7 @@ public class VatRecipeHandler extends TemplateRecipeHandler { arecipes.add(res); } } - -// List recipes = RecipeReigistry.instance.getRecipesForCrafter(IEnderIoRecipe.VAT_ID); -// for (IEnderIoRecipe recipe : recipes) { -// if(recipe.isInput(ingredient)) { -// InnerVatRecipe res = new InnerVatRecipe(recipe.getRequiredEnergy(), recipe.getInputs(), recipe.getOutputs().get(0).getFluid()); -// res.setIngredientPermutation(res.inputs, ingredient); -// arecipes.add(res); -// } -// } + } @Override @@ -147,19 +142,25 @@ public class VatRecipeHandler extends TemplateRecipeHandler { .renderGuiTank(rec.result, rec.result.amount, rec.result.amount, outTankBounds.x, outTankBounds.y, 0, outTankBounds.width, outTankBounds.height); } - // drawProgressBar(98, 33, 176, 0, 22, 13, 48, 3); - // drawProgressBar(50, 33, 176, 0, 22, 13, 48, 3); - + FontRenderer fr = Minecraft.getMinecraft().fontRenderer; String energyString = PowerDisplayUtil.formatPower(rec.energy) + " " + PowerDisplayUtil.abrevation(); - int width = Minecraft.getMinecraft().fontRenderer.getStringWidth(energyString); + int width = fr.getStringWidth(energyString); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); int col = ColorUtil.getRGBA(0.75f, 1.0f, 1.0f, 1.0f); - Minecraft.getMinecraft().fontRenderer.drawString(energyString, 86 - width / 2, 55, col, true); + fr.drawString(energyString, 86 - width / 2, 55, col, true); GL11.glDisable(GL11.GL_BLEND); GL11.glColor4f(1, 1, 1, 1); + Fluid outputFluid = rec.result.getFluid(); + List stacks = rec.getIngredients(); + for (PositionedStack ps : stacks) { + float mult = VatRecipeManager.getInstance().getMultiplierForInput(ps.item, outputFluid); + String str = "x" + mult; + fr.drawString(str, ps.relx + 8 - fr.getStringWidth(str) / 2, ps.rely + 19, ColorUtil.getRGB(Color.gray), false); + + } } @Override @@ -254,7 +255,7 @@ public class VatRecipeHandler extends TemplateRecipeHandler { @Override public List getIngredients() { - return getCycledIngredients(cycleticks / 20, inputs); + return getCycledIngredients(cycleticks / 30, inputs); } @Override From 26ce6c3452bf71822e960366e2c827b2874fcf08 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 19 Sep 2014 13:29:53 +0800 Subject: [PATCH 7/8] Added ability to add EIO recipes via Forge IMC. --- .../config/AlloySmelterRecipes_Core.xml | 16 +++++++++++++ .../enderio/config/SAGMillRecipes_Core.xml | 15 ++++++++++++ .../assets/enderio/config/VatRecipes_Core.xml | 16 +++++++++++++ src/main/java/crazypants/enderio/EnderIO.java | 24 +++++++++++++++++++ .../machine/alloy/AlloyRecipeManager.java | 2 ++ .../machine/crusher/CrusherRecipeManager.java | 2 ++ .../machine/still/VatMachineRecipe.java | 2 +- .../enderio/machine/still/VatRecipe.java | 11 +++++++-- .../machine/still/VatRecipeManager.java | 2 ++ 9 files changed, 87 insertions(+), 3 deletions(-) diff --git a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml index bd97b552..dcda6c71 100644 --- a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml +++ b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml @@ -25,6 +25,22 @@ iron=0.7 food=0.35 sand/cobble/wood=0.1 + +Recipes can also be added using forge IMC messages. For example, in the init method of a mod: + +String recipe = + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + ""; +FMLInterModComms.sendMessage("EnderIO", "recipe:alloysmelter", recipe); + --> diff --git a/resources/assets/enderio/config/SAGMillRecipes_Core.xml b/resources/assets/enderio/config/SAGMillRecipes_Core.xml index b3d82cc5..dd7616e0 100644 --- a/resources/assets/enderio/config/SAGMillRecipes_Core.xml +++ b/resources/assets/enderio/config/SAGMillRecipes_Core.xml @@ -69,6 +69,21 @@ +Recipes can also be added using forge IMC messages. For example, in the init method of a mod: + +String recipe = + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + ""; +FMLInterModComms.sendMessage("EnderIO", "recipe:sagmill", recipe); + --> diff --git a/resources/assets/enderio/config/VatRecipes_Core.xml b/resources/assets/enderio/config/VatRecipes_Core.xml index 7e0c5992..bfcfcd2d 100644 --- a/resources/assets/enderio/config/VatRecipes_Core.xml +++ b/resources/assets/enderio/config/VatRecipes_Core.xml @@ -11,6 +11,22 @@ Produce: output fluid volume (mb) = IM * inputFluid.multiplier * 1000. The vat always uses 1 MJ per tick, so energy cost also equates to duration. + +Recipes can also be added using forge IMC messages. For example, in the init method of a mod: +String recipe = + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + ""; +FMLInterModComms.sendMessage("EnderIO", "recipe:vat", recipe); + --> diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 7e4e3ba1..f7ea5990 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -3,6 +3,9 @@ package crazypants.enderio; import static crazypants.enderio.EnderIO.MODID; import static crazypants.enderio.EnderIO.MOD_NAME; import static crazypants.enderio.EnderIO.VERSION; + +import com.google.common.collect.ImmutableList; + import net.minecraft.block.material.Material; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -20,10 +23,12 @@ import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartedEvent; import cpw.mods.fml.common.event.FMLServerStoppedEvent; +import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.relauncher.Side; @@ -120,6 +125,7 @@ import crazypants.enderio.material.ItemMachinePart; import crazypants.enderio.material.ItemMaterial; import crazypants.enderio.material.ItemPowderIngot; import crazypants.enderio.material.MaterialRecipes; +import crazypants.enderio.nei.SagMillRecipeHandler; import crazypants.enderio.network.MessageTileNBT; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.teleport.BlockTravelAnchor; @@ -518,6 +524,24 @@ public class EnderIO { } } } + + @EventHandler + public void onImc(IMCEvent evt) { + ImmutableList messages = evt.getMessages(); + for(IMCMessage msg : messages) { + if(msg.isStringMessage()) { + String key = msg.key; + String value = msg.getStringValue(); + if(VatRecipeManager.IMC_KEY.equals(key)) { + VatRecipeManager.getInstance().addCustumRecipes(value); + } else if(CrusherRecipeManager.IMC_KEY.equals(key)) { + CrusherRecipeManager.getInstance().addCustomRecipes(value); + } else if(AlloyRecipeManager.IMC_KEY.equals(key)) { + AlloyRecipeManager.getInstance().addCustumRecipes(value); + } + } + } + } @EventHandler public void serverStarted(FMLServerStartedEvent event) { diff --git a/src/main/java/crazypants/enderio/machine/alloy/AlloyRecipeManager.java b/src/main/java/crazypants/enderio/machine/alloy/AlloyRecipeManager.java index 90eea154..99abfe72 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/AlloyRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/alloy/AlloyRecipeManager.java @@ -28,6 +28,8 @@ import crazypants.util.Util; public class AlloyRecipeManager extends ManyToOneRecipeManager { + public static final String IMC_KEY = "recipe:alloysmelter"; + private static final String CORE_FILE_NAME = "AlloySmelterRecipes_Core.xml"; private static final String CUSTOM_FILE_NAME = "AlloySmelterRecipes_User.xml"; diff --git a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java index f1291528..8258a9b4 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java @@ -24,6 +24,8 @@ import crazypants.util.Util; public class CrusherRecipeManager { + public static final String IMC_KEY = "recipe:sagmill"; + public static final int ORE_ENERGY_COST = 400; public static final int INGOT_ENERGY_COST = 240; diff --git a/src/main/java/crazypants/enderio/machine/still/VatMachineRecipe.java b/src/main/java/crazypants/enderio/machine/still/VatMachineRecipe.java index d67b3a5b..7373cc2a 100644 --- a/src/main/java/crazypants/enderio/machine/still/VatMachineRecipe.java +++ b/src/main/java/crazypants/enderio/machine/still/VatMachineRecipe.java @@ -45,7 +45,7 @@ public class VatMachineRecipe extends AbstractMachineRecipe { result.add(new MachineRecipeInput(0, inputFluidStack)); for (MachineRecipeInput ri : inputs) { - if(!ri.isFluid()) { + if(!ri.isFluid() && ri.item != null) { ItemStack st = ri.item.copy(); st.stackSize = rec.getNumConsumed(ri.item); result.add(new MachineRecipeInput(ri.slotNumber, st)); diff --git a/src/main/java/crazypants/enderio/machine/still/VatRecipe.java b/src/main/java/crazypants/enderio/machine/still/VatRecipe.java index 3cbabdc5..20701ffe 100644 --- a/src/main/java/crazypants/enderio/machine/still/VatRecipe.java +++ b/src/main/java/crazypants/enderio/machine/still/VatRecipe.java @@ -20,6 +20,7 @@ public class VatRecipe implements IRecipe { protected final RecipeInput[] inputs; protected final RecipeOutput[] output; protected final int energyRequired; + private int requiredItems; public VatRecipe(IRecipe recipe) { List fluids = recipe.getInputFluidStacks(); @@ -43,6 +44,13 @@ public class VatRecipe implements IRecipe { output = new RecipeOutput[] { new RecipeOutput(outputFluidStack) }; energyRequired = recipe.getEnergyRequired(); + + requiredItems = 1; + for (RecipeInput ri : inputs) { + if(!ri.isFluid() && ri.getSlotNumber() == 1) { + requiredItems = 2; + } + } } @@ -118,8 +126,7 @@ public class VatRecipe implements IRecipe { } } } - - return found == 3; + return found == requiredItems + 1; } diff --git a/src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java b/src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java index 559183b7..08e8a10b 100644 --- a/src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java @@ -19,6 +19,8 @@ import crazypants.enderio.machine.recipe.RecipeOutput; public class VatRecipeManager { + public static final String IMC_KEY = "recipe:vat"; + private static final String CORE_FILE_NAME = "VatRecipes_Core.xml"; private static final String CUSTOM_FILE_NAME = "VatRecipes_User.xml"; From 963a93b117e3dec9e321c9c1fc6aa645f8f9b0e8 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 19 Sep 2014 14:16:59 +0800 Subject: [PATCH 8/8] Can use right click on DS axe/pick to place non collidable objects within the player bounds (e.g. torches) --- .../item/darksteel/ItemDarkSteelAxe.java | 13 +------ .../item/darksteel/ItemDarkSteelPickaxe.java | 36 ++++++++++++++----- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index 40476c73..a59b71c6 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -191,18 +191,7 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I @Override public boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { - int slot = player.inventory.currentItem + 1; - if(slot < 9 && player.inventory.mainInventory[slot] != null && !(player.inventory.mainInventory[slot].getItem() instanceof IDarkSteelItem)) { - BlockCoord bc = new BlockCoord(x,y,z).getLocation(ForgeDirection.getOrientation(side)); - BoundingBox bb = new BoundingBox(bc); - AxisAlignedBB aabb = bb.getAxisAlignedBB(); - if(aabb.intersectsWith(player.boundingBox)) { - return false; - } - return player.inventory.mainInventory[slot].getItem().onItemUse(player.inventory.mainInventory[slot], player, world, x, y, z, side, par8, - par9, par10); - } - return false; + return ItemDarkSteelPickaxe.doRightClickItemPlace(player, world, x, y, z, side, par8, par9, par10); } private void applyDamage(EntityLivingBase entity, ItemStack item, int damage, boolean isMultiharvest) { diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index e45f5adc..071ec19a 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -11,6 +11,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; @@ -38,7 +39,7 @@ import crazypants.util.Lang; public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem, IItemOfTravel { - private static final Set SHOVEL_BLOCKS = Sets.newHashSet(new Block[] { + private static final Set SHOVEL_BLOCKS = Sets.newHashSet(new Block[] { Blocks.grass, Blocks.dirt, Blocks.sand, Blocks.gravel, Blocks.snow_layer, Blocks.snow, Blocks.clay, Blocks.farmland, Blocks.soul_sand, Blocks.mycelium }); @@ -120,22 +121,39 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine @Override public boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { + return doRightClickItemPlace(player, world, x, y, z, side, par8, par9, par10); + } + static boolean doRightClickItemPlace(EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { int slot = player.inventory.currentItem + 1; - if(slot < 9 && player.inventory.mainInventory[slot] != null && !(player.inventory.mainInventory[slot].getItem() instanceof IDarkSteelItem)) { - BlockCoord bc = new BlockCoord(x,y,z).getLocation(ForgeDirection.getOrientation(side)); - BoundingBox bb = new BoundingBox(bc); - AxisAlignedBB aabb = bb.getAxisAlignedBB(); - if(aabb.intersectsWith(player.boundingBox)) { + if(slot < 9 && player.inventory.mainInventory[slot] != null && !(player.inventory.mainInventory[slot].getItem() instanceof IDarkSteelItem)) { + + if(!canPlaceBlockOnRightClick(player, world, x, y, z, side, slot)) { return false; - } + } return player.inventory.mainInventory[slot].getItem().onItemUse(player.inventory.mainInventory[slot], player, world, x, y, z, side, par8, par9, par10); } - return false; } + static boolean canPlaceBlockOnRightClick(EntityPlayer player, World world, int x, int y, int z, int side, int slot) { + BlockCoord placeCoord = new BlockCoord(x, y, z).getLocation(ForgeDirection.getOrientation(side)); + ItemStack toUse = player.inventory.mainInventory[slot]; + AxisAlignedBB aabb; + Block blk = Block.getBlockFromItem(toUse.getItem()); + if(blk != null) { + aabb = blk.getCollisionBoundingBoxFromPool(world, placeCoord.x, placeCoord.y, placeCoord.z); + } else { + BoundingBox bb = new BoundingBox(placeCoord); + aabb = bb.getAxisAlignedBB(); + } + if(aabb != null && aabb.intersectsWith(player.boundingBox)) { + return false; + } + return true; + } + private void applyDamage(EntityLivingBase entity, ItemStack item, int damage) { EnergyUpgrade eu = EnergyUpgrade.loadFromItem(item); @@ -149,7 +167,7 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine } item.setItemDamage(damage); } - if(eu != null) { + if(eu != null) { eu.writeToItem(item); }