From e49275235b5efa988c34f86f9b263ad829965a8e Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sat, 13 Jun 2015 08:32:19 +0200 Subject: [PATCH 1/7] #2579 protect against blocks without a registered name, also compile the patterns just once --- .../enderio/machine/farm/FarmersRegistry.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java b/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java index b47672e7..60b61bb2 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java @@ -10,6 +10,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; public final class FarmersRegistry { @@ -209,15 +210,18 @@ public final class FarmersRegistry { @SuppressWarnings("unchecked") private static void addGrowableOres() { String mod = "B0bGrowsOre"; - String[] growableOres = { "(.+)Reed", "oreGrowable(.+)" }; + if (!Loader.isModLoaded(mod)) { + return; + } + Pattern[] growableOres = { Pattern.compile("(.+)Reed"), Pattern.compile("oreGrowable(.+)") }; Iterator blockIter = Block.blockRegistry.iterator(); while (blockIter.hasNext()) { Block block = blockIter.next(); String name = Block.blockRegistry.getNameForObject(block); - if (name.startsWith(mod)) { - for (String blockName : growableOres) { - if (Pattern.compile(blockName).matcher(name).find()) { + if (name != null && name.startsWith(mod)) { + for (Pattern blockPattern : growableOres) { + if (blockPattern.matcher(name).find()) { FarmersCommune.joinCommune(new StemFarmer(block, new ItemStack(block))); } } From 5dfd976d43cfa2938de71e8a54845fa95b11469b Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sun, 14 Jun 2015 11:54:36 +0200 Subject: [PATCH 2/7] try to fix javadoc --- build.gradle | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build.gradle b/build.gradle index da6adfbe..8fa34274 100644 --- a/build.gradle +++ b/build.gradle @@ -111,6 +111,14 @@ task exportJavadoc(type: Javadoc) { source = sourceSets.main.allSource } +if (JavaVersion.current().isJava8Compatible()) { + allprojects { + tasks.withType(Javadoc) { + options.addStringOption('Xdoclint:none', '-quiet') + } + } +} + build.dependsOn sourceJar, deobfJar, apiJar, exportJavadoc publishing { From e3e3d26885b3f80ce6fb403c0f18724adf00c4b5 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sun, 14 Jun 2015 11:55:25 +0200 Subject: [PATCH 3/7] #2582 fix recipe typos --- src/main/java/crazypants/enderio/material/Alloy.java | 2 +- src/main/java/crazypants/enderio/material/MaterialRecipes.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/crazypants/enderio/material/Alloy.java b/src/main/java/crazypants/enderio/material/Alloy.java index 694419a2..8b5865f2 100644 --- a/src/main/java/crazypants/enderio/material/Alloy.java +++ b/src/main/java/crazypants/enderio/material/Alloy.java @@ -44,7 +44,7 @@ public enum Alloy { } public ItemStack getStackBlock() { - return getStackIngot(1); + return getStackBlock(1); } public ItemStack getStackBlock(int size) { diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index a51113a6..c02d02b1 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -93,7 +93,7 @@ public class MaterialRecipes { ItemStack capacitor = new ItemStack(itemBasicCapacitor, 1, 0); //Conduit Binder - ItemStack cbc = CONDUIT_BINDER.getStack(8); + ItemStack cbc = BINDER_COMPOSITE.getStack(8); if (Config.useAlternateBinderRecipe) { addShaped(cbc, "gcg", "sgs", "gcg", 'g', Blocks.gravel, 's', Blocks.sand, 'c', Items.clay_ball); } else { From ae2c783e1efa30d8528b449ddd5f5743e43be07f Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sun, 14 Jun 2015 22:29:38 +0200 Subject: [PATCH 4/7] #2584 don't crash on empty fluid containers --- src/main/java/crazypants/util/FluidUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/crazypants/util/FluidUtil.java b/src/main/java/crazypants/util/FluidUtil.java index e7ff8df1..117af4b9 100644 --- a/src/main/java/crazypants/util/FluidUtil.java +++ b/src/main/java/crazypants/util/FluidUtil.java @@ -250,7 +250,8 @@ public class FluidUtil { if (source != null && source.getItem() != null) { if (source.getItem() instanceof IFluidContainerItem) { - IFluidTank targetTank = tank.getInputTank(((IFluidContainerItem) source.getItem()).getFluid(source)); + FluidStack fluid = ((IFluidContainerItem) source.getItem()).getFluid(source); + IFluidTank targetTank = fluid != null ? tank.getInputTank(fluid) : null; if (targetTank != null) { FluidStack target = targetTank.getFluid(); int maxDrain = targetTank.getCapacity() - (target != null ? target.amount : 0); From fe3b56c9243d1d39c29f4f0826a63c0c94d4f3ba Mon Sep 17 00:00:00 2001 From: HenryLoenwind Date: Wed, 17 Jun 2015 01:46:44 +0200 Subject: [PATCH 5/7] Fix: Combustion Generator Input Tank Handling * Combustion Generator Input Tank Handling wasn't implementing the interface correctly, leading to NPEs * re #2584 --- .../combustion/TileCombustionGenerator.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java index 134cbfee..cbcea4de 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java @@ -419,11 +419,13 @@ public class TileCombustionGenerator extends AbstractGeneratorEntity implements @Override public FluidTank getInputTank(FluidStack forFluidType) { - if (FluidFuelRegister.instance.getCoolant(forFluidType.getFluid()) != null) { - return coolantTank; - } - if (FluidFuelRegister.instance.getFuel(forFluidType.getFluid()) != null) { - return fuelTank; + if (forFluidType != null) { + if (FluidFuelRegister.instance.getCoolant(forFluidType.getFluid()) != null) { + return coolantTank; + } + if (FluidFuelRegister.instance.getFuel(forFluidType.getFluid()) != null) { + return fuelTank; + } } return null; } From 75b677a91d0d737c8c012be224048208ce9e4c7c Mon Sep 17 00:00:00 2001 From: HenryLoenwind Date: Wed, 17 Jun 2015 17:33:08 +0200 Subject: [PATCH 6/7] Fix: Telepad multipart * Allow coords to be set on any block of the multiblock, not just the master * Prevent maxPower to be 0 --- .../crazypants/enderio/teleport/telepad/TileTelePad.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java index 34bb5ac3..ab5e38d5 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java @@ -346,6 +346,9 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei int distance = new BlockCoord(this).distance(target); double base = Math.log((0.005 * distance) + 1); this.maxPower = (int) (base * Config.telepadPowerCoefficient); + if (this.maxPower <= 0) { + this.maxPower = 1; + } } else { this.maxPower = Config.telepadPowerInterdimensional; } @@ -523,7 +526,7 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei this.target = coords; this.coordsChanged = true; } else { - this.master.setCoords(coords); + this.master.setCoords_internal(coords); } } } From 4203014011106de74911fe3c7a6554c35488b399 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Wed, 17 Jun 2015 22:46:52 +0200 Subject: [PATCH 7/7] #2591 add some peaceful recipe alternatives --- src/main/java/crazypants/enderio/config/Config.java | 3 +++ src/main/java/crazypants/enderio/machine/MachineRecipes.java | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 78b94845..05d0bab3 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -104,6 +104,7 @@ public final class Config { public static File configDirectory; public static boolean useHardRecipes = false; + public static boolean addPeacefulRecipes = false; public static boolean allowExternalTickSpeedup = true; public static boolean useSteelInChassi = false; @@ -586,6 +587,8 @@ public final class Config { useHardRecipes = config.get(sectionRecipe.name, "useHardRecipes", useHardRecipes, "When enabled machines cost significantly more.") .getBoolean(useHardRecipes); + addPeacefulRecipes = config.get(sectionRecipe.name, "addPeacefulRecipes", addPeacefulRecipes, "When enabled peaceful recipes are added for soulbinder based crafting components.") + .getBoolean(addPeacefulRecipes); soulBinderRequiresEndermanSkull = config.getBoolean("soulBinderRequiresEndermanSkull", sectionRecipe.name, soulBinderRequiresEndermanSkull, "When true the Soul Binder requires an Enderman Skull to craft"); allowTileEntitiesAsPaintSource = config.get(sectionRecipe.name, "allowTileEntitiesAsPaintSource", allowTileEntitiesAsPaintSource, diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index c0d3aeae..c1bdb7c1 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -56,6 +56,11 @@ public class MachineRecipes { String binder = CONDUIT_BINDER.oreDict; String silicon = SILICON.oreDict; + if (Config.addPeacefulRecipes) { + addShaped(frankenZombie, "gdg", "dzd", "gdg", 'g', Items.gold_ingot, 'd', Items.diamond, 'z', zombieController); + addShaped(sentientEnder, "ddd", "ded", "dgd", 'g', Blocks.gold_block, 'd', Items.diamond, 'e', enderRes); + } + //stirling gen ItemStack stirlingGen = new ItemStack(EnderIO.blockStirlingGenerator, 1, 0); addShaped(stirlingGen, "bbb", "bfb", "gpg", 'b', Blocks.stonebrick, 'f', Blocks.furnace, 'p', Blocks.piston, 'g', basicGear);