diff --git a/build.gradle b/build.gradle index ac9652d0..6a54d13b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1695323114 +//version: 1695474595 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -89,6 +89,23 @@ def out = services.get(StyledTextOutputFactory).create('an-output') def projectJavaVersion = JavaLanguageVersion.of(8) boolean disableSpotless = project.hasProperty("disableSpotless") ? project.disableSpotless.toBoolean() : false +boolean disableCheckstyle = project.hasProperty("disableCheckstyle") ? project.disableCheckstyle.toBoolean() : false + +final String CHECKSTYLE_CONFIG = """ + + + + + + + + + + + +""" checkPropertyExists("modName") checkPropertyExists("modId") @@ -140,6 +157,17 @@ if (!disableSpotless) { apply from: Blowdryer.file('spotless.gradle') } +if (!disableCheckstyle) { + apply plugin: 'checkstyle' + tasks.named("checkstylePatchedMc") { enabled = false } + tasks.named("checkstyleMcLauncher") { enabled = false } + tasks.named("checkstyleIdeVirtualMain") { enabled = false } + tasks.named("checkstyleInjectedTags") { enabled = false } + checkstyle { + config = resources.text.fromString(CHECKSTYLE_CONFIG) + } +} + String javaSourceDir = "src/main/java/" String scalaSourceDir = "src/main/scala/" String kotlinSourceDir = "src/main/kotlin/" @@ -765,23 +793,14 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies" } dependencies { - def lwjgl3ifyVersion = '1.4.0' - def asmVersion = '9.4' + def lwjgl3ifyVersion = '1.5.0' if (modId != 'lwjgl3ify') { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.26') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.5') } - java17PatchDependencies('net.minecraft:launchwrapper:1.17.2') {transitive = false} - java17PatchDependencies("org.ow2.asm:asm:${asmVersion}") - java17PatchDependencies("org.ow2.asm:asm-commons:${asmVersion}") - java17PatchDependencies("org.ow2.asm:asm-tree:${asmVersion}") - java17PatchDependencies("org.ow2.asm:asm-analysis:${asmVersion}") - java17PatchDependencies("org.ow2.asm:asm-util:${asmVersion}") - java17PatchDependencies('org.ow2.asm:asm-deprecated:7.1') - java17PatchDependencies("org.apache.commons:commons-lang3:3.12.0") java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false} } diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 23bee5f5..8ebe10a0 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -1,8 +1,6 @@ package crazypants.enderio; -import static crazypants.enderio.EnderIO.MODID; -import static crazypants.enderio.EnderIO.MOD_NAME; -import static crazypants.enderio.EnderIO.VERSION; +import static crazypants.enderio.EnderIO.*; import java.io.BufferedWriter; import java.io.File; @@ -788,7 +786,7 @@ public class EnderIO { @EventHandler public void loadComplete(FMLLoadCompleteEvent event) { processImc(FMLInterModComms.fetchRuntimeMessages(this)); // Some mods send IMCs during PostInit, so we catch - // them here. + // them here. } private static String getXPJuiceName() { diff --git a/src/main/java/crazypants/enderio/api/teleport/ITelePad.java b/src/main/java/crazypants/enderio/api/teleport/ITelePad.java index 0332fba6..aa6a4d33 100644 --- a/src/main/java/crazypants/enderio/api/teleport/ITelePad.java +++ b/src/main/java/crazypants/enderio/api/teleport/ITelePad.java @@ -94,11 +94,10 @@ public interface ITelePad extends ITravelAccessable { /** * Util method to set all coords using a {@link BlockCoord} object. * + * @param coords The coords to set this telepad to. * @see #setX(int) * @see #setY(int) * @see #setZ(int) - * - * @param coords The coords to set this telepad to. */ void setCoords(BlockCoord coords); diff --git a/src/main/java/crazypants/enderio/api/teleport/TeleportEntityEvent.java b/src/main/java/crazypants/enderio/api/teleport/TeleportEntityEvent.java index 7835a837..6235bd52 100644 --- a/src/main/java/crazypants/enderio/api/teleport/TeleportEntityEvent.java +++ b/src/main/java/crazypants/enderio/api/teleport/TeleportEntityEvent.java @@ -14,9 +14,8 @@ import cpw.mods.fml.common.eventhandler.Cancelable; *
  • Staff of travelling
  • *
  • Telepad
  • * - * + *

    * As well as any externally added teleports, assuming they fire this event manually. - * */ @Cancelable public class TeleportEntityEvent extends EntityEvent { diff --git a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java index b49fd663..2b94768a 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java @@ -88,7 +88,7 @@ public abstract class AbstractConduit implements IConduit { * If this is true, it will trigger a reconnection on the next Tick. *

    * Use the method needUpdateConnections() instead of setting this to true. - * + * * @see needUpdateConnections() */ private boolean needUpdateConnections = false; @@ -153,7 +153,7 @@ public abstract class AbstractConduit implements IConduit { } protected ConnectionMode getDefaultConnectionMode() { - return ConnectionMode.IN_OUT; + return ConnectionMode.INPUT; } @Override diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index a1fc362f..d9b971e8 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -47,7 +47,13 @@ import crazypants.enderio.api.tool.ITool; import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.geom.ConduitConnectorType; -import crazypants.enderio.conduit.gui.*; +import crazypants.enderio.conduit.gui.ExternalConnectionContainer; +import crazypants.enderio.conduit.gui.GuiExternalConnection; +import crazypants.enderio.conduit.gui.GuiExternalConnectionSelector; +import crazypants.enderio.conduit.gui.PacketFluidChannel; +import crazypants.enderio.conduit.gui.PacketFluidFilter; +import crazypants.enderio.conduit.gui.PacketOpenConduitUI; +import crazypants.enderio.conduit.gui.PacketSlotVisibility; import crazypants.enderio.conduit.gui.item.PacketExistingItemFilterSnapshot; import crazypants.enderio.conduit.gui.item.PacketModItemFilter; import crazypants.enderio.conduit.liquid.PacketFluidLevel; diff --git a/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java b/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java index 1b2d60d5..b2c6a6f3 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java @@ -55,11 +55,10 @@ public class ConduitDisplayMode { * Use this constructor if you have custom display logic, it will use {@code IConduit.class} as the conduitType, and * the passed name as the override name. * - * @see #ConduitDisplayMode(Class, IWidgetIcon, IWidgetIcon) - * * @param name The override name. * @param widgetSelected The widget to render when this type is selected. * @param widgetUnselected The widget to render when this type is unselected. + * @see #ConduitDisplayMode(Class, IWidgetIcon, IWidgetIcon) */ public ConduitDisplayMode(String name, IWidgetIcon widgetSelected, IWidgetIcon widgetUnselected) { this(IConduit.class, widgetSelected, widgetUnselected); diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index cb9f7e0c..8fb1913b 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -2,7 +2,8 @@ package crazypants.enderio.conduit; import static crazypants.enderio.ModObject.blockPainter; import static crazypants.enderio.material.Alloy.*; -import static crazypants.enderio.material.Material.*; +import static crazypants.enderio.material.Material.CONDUIT_BINDER; +import static crazypants.enderio.material.Material.PHASED_IRON_NUGGET; import static crazypants.enderio.material.endergy.AlloyEndergy.*; import static crazypants.util.RecipeUtil.addShaped; diff --git a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java index b49fbe58..c2c64c92 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java @@ -92,7 +92,7 @@ public class ConduitUtil { } } if (con.getNetwork() != null) { // this should have been destroyed when destroying the neighbours network but - // lets just make + // lets just make // sure con.getNetwork().destroyNetwork(); } diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index d9cf6365..9222ac14 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -50,7 +50,6 @@ import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.redstone.IRedstoneConduit; import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit; import crazypants.enderio.config.Config; -import li.cil.oc.api.network.*; import li.cil.oc.api.network.Message; import li.cil.oc.api.network.Node; import mekanism.api.gas.Gas; diff --git a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java index 507cc395..fd36e110 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java +++ b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java @@ -1,6 +1,7 @@ package crazypants.enderio.conduit.gui; -import java.awt.*; +import java.awt.Color; +import java.awt.Rectangle; import java.util.ArrayList; import javax.annotation.Nonnull; diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java index 8befbc20..95a29c27 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java @@ -1,6 +1,6 @@ package crazypants.enderio.conduit.gui.item; -import java.awt.*; +import java.awt.Color; import javax.annotation.Nonnull; diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java index 8a216c30..7f9005a6 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java @@ -600,11 +600,6 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { } } - @Override - protected ConnectionMode getDefaultConnectionMode() { - return ConnectionMode.INPUT; - } - @Override public Class getBaseConduitType() { return IItemConduit.class; @@ -612,8 +607,7 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { @Override public ItemStack createItem() { - ItemStack result = new ItemStack(EnderIO.itemItemConduit, 1, metaData); - return result; + return new ItemStack(EnderIO.itemItemConduit, 1, metaData); } @Override diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java index 9da6c3e0..58d3bbbd 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java @@ -30,7 +30,7 @@ public interface IItemFilter { /** * Checks if the given item passes the filter or not. - * + * * @param inv the attached inventory - or null when used without an inventory (eg for a GUI) * @param item the item to check * @return true if the item is allowed to pass diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemPowerItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemPowerItemFilter.java index 620a642d..6f878ec4 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemPowerItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemPowerItemFilter.java @@ -13,7 +13,6 @@ import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; /** - * * @author matthias */ public class ItemPowerItemFilter extends Item implements IItemFilterUpgrade, IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java index b878d0ee..31481f0c 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java @@ -19,7 +19,6 @@ import crazypants.enderio.conduit.item.NetworkedInventory; import io.netty.buffer.ByteBuf; /** - * * @author matthias */ public class PowerItemFilter implements IItemFilter { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java index 878d8623..bf170d37 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java @@ -1,6 +1,10 @@ package crazypants.enderio.conduit.liquid; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java index 691c7b5e..d53812b5 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java @@ -1,7 +1,5 @@ package crazypants.enderio.conduit.liquid; -import static com.enderio.core.client.render.CubeRenderer.*; - import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -19,6 +17,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.ForgeDirectionOffsets; import com.enderio.core.common.vecmath.Vector2f; @@ -96,12 +95,12 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe List corners = component.bound .getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); for (Vertex c : corners) { - addVecWithUV(c.xyz, c.uv.x, c.uv.y); + CubeRenderer.addVecWithUV(c.xyz, c.uv.x, c.uv.y); } // back face for (int i = corners.size() - 1; i >= 0; i--) { Vertex c = corners.get(i); - addVecWithUV(c.xyz, c.uv.x, c.uv.y); + CubeRenderer.addVecWithUV(c.xyz, c.uv.x, c.uv.y); } } } @@ -304,7 +303,7 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer implements IRe float transY = (bound.sizeY() - sizeY) / 2; Vector3d translation = new Vector3d(0, transY, 0); - setupVertices(bound.translate(translation)); + CubeRenderer.setupVertices(bound.translate(translation)); } private void calculateRatios(LiquidConduit conduit) { diff --git a/src/main/java/crazypants/enderio/item/ItemRecipes.java b/src/main/java/crazypants/enderio/item/ItemRecipes.java index a67220de..4a844493 100644 --- a/src/main/java/crazypants/enderio/item/ItemRecipes.java +++ b/src/main/java/crazypants/enderio/item/ItemRecipes.java @@ -2,7 +2,7 @@ package crazypants.enderio.item; import static crazypants.enderio.material.Alloy.*; import static crazypants.enderio.material.Material.VIBRANT_CYSTAL; -import static crazypants.enderio.material.endergy.AlloyEndergy.*; +import static crazypants.enderio.material.endergy.AlloyEndergy.STELLAR_ALLOY; import static crazypants.util.RecipeUtil.addShaped; import net.minecraft.init.Blocks; diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java index 59fd328d..7b488ba9 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java @@ -41,9 +41,9 @@ public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, II private CustomCubeRenderer ccr = new CustomCubeRenderer(); private PaintedBlockRenderer paintedRenderer = new PaintedBlockRenderer(this.getRenderId(), null); // passthrough - // renderer for - // paintable - // machines + // renderer for + // paintable + // machines @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java index 699e0d79..ed518644 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java @@ -9,7 +9,10 @@ import com.enderio.core.common.vecmath.VecmathUtil; import crazypants.enderio.EnderIO; import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.power.*; +import crazypants.enderio.power.Capacitors; +import crazypants.enderio.power.ICapacitor; +import crazypants.enderio.power.IInternalPoweredTile; +import crazypants.enderio.power.PowerHandlerUtil; public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity implements IInternalPoweredTile { diff --git a/src/main/java/crazypants/enderio/machine/IMachineRecipe.java b/src/main/java/crazypants/enderio/machine/IMachineRecipe.java index b9d1b70a..d1e06995 100644 --- a/src/main/java/crazypants/enderio/machine/IMachineRecipe.java +++ b/src/main/java/crazypants/enderio/machine/IMachineRecipe.java @@ -12,7 +12,6 @@ import crazypants.enderio.machine.recipe.RecipeBonusType; * progress' recipe for a machine is stored to and retrieved from a machines TileEntity soley based on its UID. * * @author cp - * */ public interface IMachineRecipe { @@ -50,7 +49,7 @@ public interface IMachineRecipe { /** * Returns the output from a single 'cycle' of the recipe (even if the inputs would allow the recipe to be crafted * several times). - * + *

    * This method must not return null. If no output is generated an empty array should be returned. * * @param randomChance a random number to be used as a seed for determining whether '% chance' outputs are returned. diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 887d64e0..cc0da449 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -3,7 +3,6 @@ package crazypants.enderio.machine; import static crazypants.enderio.EnderIO.itemBasicCapacitor; import static crazypants.enderio.material.Alloy.*; import static crazypants.enderio.material.Material.*; -import static crazypants.util.RecipeUtil.*; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -24,6 +23,7 @@ import crazypants.enderio.material.FrankenSkull; import crazypants.enderio.material.MachinePart; import crazypants.enderio.material.Material; import crazypants.enderio.power.Capacitors; +import crazypants.util.RecipeUtil; public class MachineRecipes { @@ -62,13 +62,24 @@ public class MachineRecipes { String silicon = SILICON.oreDict; if (Config.addPeacefulRecipes) { - addShaped(frankenZombie, "gdg", "dzd", "gdg", 'g', "ingotGold", 'd', "gemDiamond", 'z', zombieController); - addShaped(sentientEnder, "ddd", "ded", "dgd", 'g', "blockGold", 'd', "gemDiamond", 'e', enderRes); + RecipeUtil.addShaped( + frankenZombie, + "gdg", + "dzd", + "gdg", + 'g', + "ingotGold", + 'd', + "gemDiamond", + 'z', + zombieController); + RecipeUtil + .addShaped(sentientEnder, "ddd", "ded", "dgd", 'g', "blockGold", 'd', "gemDiamond", 'e', enderRes); } // stirling gen ItemStack stirlingGen = new ItemStack(EnderIO.blockStirlingGenerator, 1, 0); - addShaped( + RecipeUtil.addShaped( stirlingGen, "bbb", "bfb", @@ -85,7 +96,7 @@ public class MachineRecipes { // Combustion Gen ItemStack res = new ItemStack(EnderIO.blockTank, 1, 0); ItemStack comGen = new ItemStack(EnderIO.blockCombustionGenerator, 1, 0); - addShaped( + RecipeUtil.addShaped( comGen, "eee", "rmr", @@ -103,7 +114,7 @@ public class MachineRecipes { // ZombieGen ItemStack zg = new ItemStack(EnderIO.blockZombieGenerator, 1, 0); - addShaped( + RecipeUtil.addShaped( zg, "eee", "qzq", @@ -117,7 +128,7 @@ public class MachineRecipes { // FrankenzombieGen ItemStack fg = new ItemStack(EnderIO.blockFrankenZombieGenerator, 1, 0); - addShaped( + RecipeUtil.addShaped( fg, "eee", "qzq", @@ -131,7 +142,7 @@ public class MachineRecipes { // EnderGen ItemStack eg = new ItemStack(EnderIO.blockEnderGenerator, 1, 0); - addShaped( + RecipeUtil.addShaped( eg, "eee", "qzq", @@ -145,17 +156,18 @@ public class MachineRecipes { // KillerJoe ItemStack kj = new ItemStack(EnderIO.blockKillerJoe, 1, 0); - addShaped(kj, "sss", "qzq", "qqq", 's', darkSteel, 'q', fusedQuartz, 'z', frankenZombie); + RecipeUtil.addShaped(kj, "sss", "qzq", "qqq", 's', darkSteel, 'q', fusedQuartz, 'z', frankenZombie); // Wireless charger ItemStack wirelessCharger = new ItemStack(EnderIO.blockWirelessCharger); // addShaped(wirelessCharger, "svs", "imi", "scs", 's', electricSteel, 'i', silicon, 'm', machineChassi, 'c', // capacitor3, 'v', vibCry); - addShaped(wirelessCharger, "sss", "ses", "scs", 's', electricalSteel, 'c', capacitor3, 'e', enderRes); + RecipeUtil + .addShaped(wirelessCharger, "sss", "ses", "scs", 's', electricalSteel, 'c', capacitor3, 'e', enderRes); // Crafter ItemStack crafter = new ItemStack(EnderIO.blockCrafter, 1, 0); - addShaped( + RecipeUtil.addShaped( crafter, "iti", "imi", @@ -177,7 +189,7 @@ public class MachineRecipes { } else { zombieBit = zombieController; } - addShaped( + RecipeUtil.addShaped( poweredSpawner, "ese", "eme", @@ -202,15 +214,16 @@ public class MachineRecipes { } else { glassSides = "glass"; } - addShaped(reservoir, "gfg", "gcg", "gfg", 'g', glassSides, 'c', Items.cauldron, 'f', fusedQuartz); + RecipeUtil + .addShaped(reservoir, "gfg", "gcg", "gfg", 'g', glassSides, 'c', Items.cauldron, 'f', fusedQuartz); } // Tanks ItemStack basicTank = new ItemStack(EnderIO.blockTank, 1, 0); - addShaped(basicTank, "ibi", "bgb", "ibi", 'g', "glass", 'i', "ingotIron", 'b', Blocks.iron_bars); + RecipeUtil.addShaped(basicTank, "ibi", "bgb", "ibi", 'g', "glass", 'i', "ingotIron", 'b', Blocks.iron_bars); ItemStack advTank = new ItemStack(EnderIO.blockTank, 1, 1); - addShaped( + RecipeUtil.addShaped( advTank, "ibi", "bgb", @@ -225,7 +238,7 @@ public class MachineRecipes { // mill ItemStack crusher = new ItemStack(EnderIO.blockCrusher, 1, 0); if (Config.useHardRecipes) { - addShaped( + RecipeUtil.addShaped( crusher, "ooo", "fmf", @@ -241,7 +254,7 @@ public class MachineRecipes { 'o', Blocks.obsidian); } else { - addShaped( + RecipeUtil.addShaped( crusher, "fff", "imi", @@ -259,7 +272,7 @@ public class MachineRecipes { // alloy smelter ItemStack alloySmelter = new ItemStack(EnderIO.blockAlloySmelter, 1, 0); if (Config.useHardRecipes) { - addShaped( + RecipeUtil.addShaped( alloySmelter, "bfb", "fmf", @@ -273,7 +286,7 @@ public class MachineRecipes { 'f', Blocks.furnace); } else { - addShaped( + RecipeUtil.addShaped( alloySmelter, "bfb", "fmf", @@ -290,7 +303,7 @@ public class MachineRecipes { // Vat ItemStack still = new ItemStack(EnderIO.blockVat, 1, 0); - addShaped( + RecipeUtil.addShaped( still, "eve", "tmt", @@ -310,13 +323,14 @@ public class MachineRecipes { ItemStack capBank1 = BlockItemCapBank .createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.SIMPLE), 0); - addShaped(capBank1, "bcb", "cmc", "bcb", 'b', "ingotIron", 'c', capacitor, 'm', "blockRedstone"); + RecipeUtil.addShaped(capBank1, "bcb", "cmc", "bcb", 'b', "ingotIron", 'c', capacitor, 'm', "blockRedstone"); ItemStack capBank2 = BlockItemCapBank .createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.ACTIVATED), 0); - addShaped(capBank2, "bcb", "cmc", "bcb", 'b', electricalSteel, 'c', capacitor2, 'm', "blockRedstone"); + RecipeUtil + .addShaped(capBank2, "bcb", "cmc", "bcb", 'b', electricalSteel, 'c', capacitor2, 'm', "blockRedstone"); ItemStack capBank3 = BlockItemCapBank .createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.VIBRANT), 0); - addShaped(capBank3, "bcb", "cmc", "bcb", 'b', electricalSteel, 'c', capacitor3, 'm', vibCry); + RecipeUtil.addShaped(capBank3, "bcb", "cmc", "bcb", 'b', electricalSteel, 'c', capacitor3, 'm', vibCry); ConvertOldRecipe convertRecipe = new ConvertOldRecipe(); GameRegistry.addRecipe(convertRecipe); @@ -351,7 +365,7 @@ public class MachineRecipes { // painter ItemStack painter = new ItemStack(EnderIO.blockPainter, 1, 0); if (Config.useHardRecipes) { - addShaped( + RecipeUtil.addShaped( painter, "qqq", "mdm", @@ -367,7 +381,7 @@ public class MachineRecipes { 'd', "gemDiamond"); } else { - addShaped( + RecipeUtil.addShaped( painter, "qdq", "mMm", @@ -391,7 +405,7 @@ public class MachineRecipes { } else { zombieBit = zombieController; } - addShaped( + RecipeUtil.addShaped( farm, "ehe", "eme", @@ -411,7 +425,7 @@ public class MachineRecipes { // transceiver ItemStack transceiver = new ItemStack(EnderIO.blockTransceiver, 1, 0); if (Config.transceiverUseEasyRecipe) { - addShaped( + RecipeUtil.addShaped( transceiver, "oeo", "pdp", @@ -427,7 +441,7 @@ public class MachineRecipes { 'd', Items.diamond); } else { - addShaped( + RecipeUtil.addShaped( transceiver, "oeo", "pdp", @@ -442,7 +456,7 @@ public class MachineRecipes { fusedQuartz, 'd', endCry); - addShapeless(transceiver, new ItemStack(EnderIO.blockHyperCube, 1, 0)); + RecipeUtil.addShapeless(transceiver, new ItemStack(EnderIO.blockHyperCube, 1, 0)); } } @@ -454,7 +468,7 @@ public class MachineRecipes { ItemStack vibSolarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 2); if (Config.useHardRecipes) { - addShaped( + RecipeUtil.addShaped( solarPanel, "efe", "pfp", @@ -469,7 +483,7 @@ public class MachineRecipes { energeticAlloy, 'p', phasedGold); - addShaped( + RecipeUtil.addShaped( advSolarPanel, "efe", "pfp", @@ -484,7 +498,7 @@ public class MachineRecipes { phasedIron, 'p', phasedGold); - addShaped( + RecipeUtil.addShaped( vibSolarPanel, "efe", "pfp", @@ -500,7 +514,7 @@ public class MachineRecipes { 'p', phasedGold); } else { - addShaped( + RecipeUtil.addShaped( solarPanel, "efe", "pfp", @@ -515,7 +529,7 @@ public class MachineRecipes { energeticAlloy, 'c', redstoneAlloy); - addShaped( + RecipeUtil.addShaped( advSolarPanel, "efe", "pfp", @@ -530,7 +544,7 @@ public class MachineRecipes { phasedIron, 'c', electricalSteel); - addShaped( + RecipeUtil.addShaped( vibSolarPanel, "efe", "pfp", @@ -553,7 +567,7 @@ public class MachineRecipes { ItemStack powerConduit = new ItemStack(EnderIO.itemPowerConduit, 1, 0); ItemStack redstoneConduit = new ItemStack(EnderIO.itemRedstoneConduit, 1, 2); ItemStack mJMonitor = new ItemStack(EnderIO.blockPowerMonitor, 1, 0); - addShaped( + RecipeUtil.addShaped( mJMonitor, "sms", "sMs", @@ -571,11 +585,11 @@ public class MachineRecipes { // Enchanter ItemStack enchanter = new ItemStack(EnderIO.blockEnchanter); - addShaped(enchanter, "dbd", "sss", " s ", 'd', "gemDiamond", 'b', Items.book, 's', darkSteel); + RecipeUtil.addShaped(enchanter, "dbd", "sss", " s ", 'd', "gemDiamond", 'b', Items.book, 's', darkSteel); // Vacuum Chest ItemStack vacuumChest = new ItemStack(EnderIO.blockVacuumChest); - addShaped(vacuumChest, "iii", "ici", "ipi", 'i', "ingotIron", 'c', "chestWood", 'p', pulCry); + RecipeUtil.addShaped(vacuumChest, "iii", "ici", "ipi", 'i', "ingotIron", 'c', "chestWood", 'p', pulCry); // Soul Binder Object enderBit; @@ -588,7 +602,7 @@ public class MachineRecipes { ItemStack zombieSkull = new ItemStack(Items.skull, 1, 4); ItemStack skeletonSkull = new ItemStack(Items.skull, 1, 0); ItemStack soulBinder = new ItemStack(EnderIO.blockSoulFuser); - addShaped( + RecipeUtil.addShaped( soulBinder, "ses", "zmc", @@ -609,7 +623,7 @@ public class MachineRecipes { // Attractor ItemStack attractor = new ItemStack(EnderIO.blockAttractor); ItemStack attractorCrystal = new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal()); - addShaped( + RecipeUtil.addShaped( attractor, " c ", "ese", @@ -629,7 +643,7 @@ public class MachineRecipes { EnderIO.blockEndermanSkull, 1, BlockEndermanSkull.SkullType.TORMENTED.ordinal()); - addShaped( + RecipeUtil.addShaped( aversion, " c ", "ese", @@ -646,12 +660,12 @@ public class MachineRecipes { // Experience ItemStack xp = new ItemStack(EnderIO.blockExperianceOblisk); ItemStack xpItem = new ItemStack(EnderIO.itemXpTransfer); - addShaped(xp, " x ", " s ", "sms", 's', soularium, 'm', machineChassi, 'x', xpItem); + RecipeUtil.addShaped(xp, " x ", " s ", "sms", 's', soularium, 'm', machineChassi, 'x', xpItem); // Weather ItemStack weather = new ItemStack(EnderIO.blockWeatherObelisk); ItemStack weatherItem = new ItemStack(EnderIO.itemMaterial, 1, Material.WEATHER_CRYSTAL.ordinal()); - addShaped( + RecipeUtil.addShaped( weather, " x ", "ese", @@ -686,14 +700,14 @@ public class MachineRecipes { EnderIO.blockElectricLight, 1, BlockItemElectricLight.Type.WIRELESS_INV.ordinal()); - addShapeless(wirelessLamp, poweredLamp, enderRes); - addShapeless(wirelessLamp, wirelessLampInv, Blocks.redstone_torch); - addShapeless(wirelessLampInv, poweredLampInv, enderRes); - addShapeless(wirelessLampInv, wirelessLamp, Blocks.redstone_torch); + RecipeUtil.addShapeless(wirelessLamp, poweredLamp, enderRes); + RecipeUtil.addShapeless(wirelessLamp, wirelessLampInv, Blocks.redstone_torch); + RecipeUtil.addShapeless(wirelessLampInv, poweredLampInv, enderRes); + RecipeUtil.addShapeless(wirelessLampInv, wirelessLamp, Blocks.redstone_torch); // inventory panel ItemStack awareness = new ItemStack(EnderIO.itemFunctionUpgrade, 1, FunctionUpgrade.INVENTORY_PANEL.ordinal()); - addShaped( + RecipeUtil.addShaped( awareness, "bsb", "ses", @@ -707,7 +721,7 @@ public class MachineRecipes { 'i', electricalSteel); ItemStack invPanel = new ItemStack(EnderIO.blockInventoryPanel); - addShaped( + RecipeUtil.addShaped( invPanel, "dad", "psp", @@ -727,7 +741,7 @@ public class MachineRecipes { // powered light if (Config.useHardRecipes) { - addShaped( + RecipeUtil.addShaped( poweredLamp, "ggg", "sds", @@ -741,7 +755,7 @@ public class MachineRecipes { 'c', capacitor); } else { - addShaped( + RecipeUtil.addShaped( poweredLamp, "ggg", "sds", @@ -756,19 +770,19 @@ public class MachineRecipes { capacitor); } ItemStack invPoweredLamp = new ItemStack(EnderIO.blockElectricLight, 1, 1); - addShapeless(invPoweredLamp, poweredLamp, Blocks.redstone_torch); - addShapeless(poweredLamp, invPoweredLamp, Blocks.redstone_torch); + RecipeUtil.addShapeless(invPoweredLamp, poweredLamp, Blocks.redstone_torch); + RecipeUtil.addShapeless(poweredLamp, invPoweredLamp, Blocks.redstone_torch); // light ItemStack lamp = new ItemStack(EnderIO.blockElectricLight, 1, 2); - addShaped(lamp, " ", "ggg", "isi", 'g', "glass", 's', "glowstone", 'i', "ingotIron"); + RecipeUtil.addShaped(lamp, " ", "ggg", "isi", 'g', "glass", 's', "glowstone", 'i', "ingotIron"); ItemStack invLamp = new ItemStack(EnderIO.blockElectricLight, 1, 3); - addShapeless(invLamp, lamp, Blocks.redstone_torch); - addShapeless(lamp, invLamp, Blocks.redstone_torch); + RecipeUtil.addShapeless(invLamp, lamp, Blocks.redstone_torch); + RecipeUtil.addShapeless(lamp, invLamp, Blocks.redstone_torch); // MJ Reader - addShaped( + RecipeUtil.addShaped( mJReader, "epe", "gcg", @@ -788,7 +802,7 @@ public class MachineRecipes { // Slice'N'Splice ItemStack sns = new ItemStack(EnderIO.blockSliceAndSplice); - addShaped( + RecipeUtil.addShaped( sns, "iki", "ams", @@ -808,8 +822,28 @@ public class MachineRecipes { ItemStack itemBuffer = Type.getStack(Type.ITEM); ItemStack powerBuffer = Type.getStack(Type.POWER); ItemStack omniBuffer = Type.getStack(Type.OMNI); - addShaped(itemBuffer, "isi", "scs", "isi", 'i', "ingotIron", 's', "ingotElectricalSteel", 'c', "chestWood"); - addShaped(powerBuffer, "isi", "sfs", "isi", 'i', "ingotIron", 's', "ingotElectricalSteel", 'f', machineChassis); - addShapeless(omniBuffer, itemBuffer, powerBuffer); + RecipeUtil.addShaped( + itemBuffer, + "isi", + "scs", + "isi", + 'i', + "ingotIron", + 's', + "ingotElectricalSteel", + 'c', + "chestWood"); + RecipeUtil.addShaped( + powerBuffer, + "isi", + "sfs", + "isi", + 'i', + "ingotIron", + 's', + "ingotElectricalSteel", + 'f', + machineChassis); + RecipeUtil.addShapeless(omniBuffer, itemBuffer, powerBuffer); } } diff --git a/src/main/java/crazypants/enderio/machine/farm/FakeFarmPlayer.java b/src/main/java/crazypants/enderio/machine/farm/FakeFarmPlayer.java index 5f2b8b30..e3eaa485 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FakeFarmPlayer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FakeFarmPlayer.java @@ -20,7 +20,6 @@ import crazypants.enderio.Log; /** * This is not in the FakePlayer hierarchy for reasons. - * */ public class FakeFarmPlayer extends EntityPlayerMP { diff --git a/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java b/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java index 583b88e3..a424ec87 100644 --- a/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java +++ b/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java @@ -120,7 +120,6 @@ public enum Fertilizer { /** * Returns the singleton instance for the fertilizer that was given as parameter. If the given item is no * fertilizer, it will return an instance of Fertilizer.None. - * */ public static Fertilizer getInstance(ItemStack stack) { for (Fertilizer fertilizer : validFertilizers) { @@ -144,7 +143,7 @@ public enum Fertilizer { /** * Tries to apply the given item on the given block using the type-specific method. SFX is played on success. - * + *

    * If the item was successfully applied, the stacksize will be decreased if appropriate. The caller will need to * check for stacksize 0 and null the inventory slot if needed. * diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/NaturaBerryFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/NaturaBerryFarmer.java index 2a0b71f1..d5c045ec 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/NaturaBerryFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/NaturaBerryFarmer.java @@ -37,7 +37,7 @@ public class NaturaBerryFarmer extends PickableFarmer { block = farm.getBlock(checkBlock); if (super.canHarvest(farm, bc, block, meta)) { // redundant check because our canHarvest checks all 5 blocks - // so a bush may be invalid in + // so a bush may be invalid in // the stack of 5 IHarvestResult blockRes = super.harvestBlock(farm, checkBlock, block, meta); diff --git a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java index 2b702fb8..cbe9b6e0 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java @@ -301,7 +301,7 @@ public class TileInventoryPanel extends AbstractMachineEntity implements IFluidH /** * This is called by PacketUpdateExtractionDisabled on the client side - * + * * @param extractionDisabled if extraction is disabled */ void updateExtractionDisabled(boolean extractionDisabled) { diff --git a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java index b121b9d8..c34a6b02 100644 --- a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java @@ -151,7 +151,7 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx /** * Computes the required amount of XP to start the current recipe. - * + * * @return 0 if no XP is required, negative when more than required XP is stored. */ private int getXPRequired() { diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index 210f7b37..0ddc5e00 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -1,11 +1,9 @@ package crazypants.enderio.material; -import static com.enderio.core.common.util.OreDictionaryHelper.*; import static crazypants.enderio.material.Alloy.*; import static crazypants.enderio.material.Material.*; import static crazypants.enderio.material.endergy.AlloyEndergy.*; import static crazypants.enderio.power.Capacitors.*; -import static crazypants.util.RecipeUtil.*; import java.util.ArrayList; @@ -23,6 +21,7 @@ import crazypants.enderio.config.Config; import crazypants.enderio.item.ItemEnderFood.EnderFood; import crazypants.enderio.material.endergy.AlloyEndergy; import crazypants.enderio.power.Capacitors; +import crazypants.util.RecipeUtil; public class MaterialRecipes { @@ -63,7 +62,7 @@ public class MaterialRecipes { // Allow free conversion of additional/legacy oreDict name items into // our item because we only register recipes for the primary oreDict // name. Use a 2-to-2 recipe because the 1-to-n is already in use. - addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName); + RecipeUtil.addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName); } } isPrimaryName = true; @@ -72,7 +71,7 @@ public class MaterialRecipes { if (isPrimaryName) { isPrimaryName = false; } else { - addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName); + RecipeUtil.addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName); } } } @@ -87,7 +86,7 @@ public class MaterialRecipes { // Allow free conversion of additional/legacy oreDict name items into // our item because we only register recipes for the primary oreDict // name. Use a 2-to-2 recipe because the 1-to-n is already in use. - addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName); + RecipeUtil.addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName); } } isPrimaryName = true; @@ -96,7 +95,7 @@ public class MaterialRecipes { if (isPrimaryName) { isPrimaryName = false; } else { - addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName); + RecipeUtil.addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName); } } } @@ -131,9 +130,9 @@ public class MaterialRecipes { OreDictionary.registerOre("itemSkull", new ItemStack(EnderIO.blockEndermanSkull)); // Glass stuff for compatibility - addShaped(new ItemStack(Blocks.glass_pane, 16, 0), "eee", "eee", 'e', pureGlass); - addShapeless(new ItemStack(Blocks.glass), pureGlass); - addShaped(new ItemStack(Items.glass_bottle, 3, 0), "g g", " g ", 'g', pureGlass); + RecipeUtil.addShaped(new ItemStack(Blocks.glass_pane, 16, 0), "eee", "eee", 'e', pureGlass); + RecipeUtil.addShapeless(new ItemStack(Blocks.glass), pureGlass); + RecipeUtil.addShaped(new ItemStack(Items.glass_bottle, 3, 0), "g g", " g ", 'g', pureGlass); Material.registerOres(EnderIO.itemMaterial); MachinePart.registerOres(EnderIO.itemMachinePart); @@ -170,7 +169,7 @@ public class MaterialRecipes { // Capacitors if (Config.useHardRecipes) { - addShaped( + RecipeUtil.addShaped( BASIC_CAPACITOR.getItemStack(), " gr", "gig", @@ -181,7 +180,7 @@ public class MaterialRecipes { "ingotGold", 'i', ingotCopper); - addShaped( + RecipeUtil.addShaped( ACTIVATED_CAPACITOR.getItemStack(), "iii", "cCc", @@ -192,7 +191,7 @@ public class MaterialRecipes { BASIC_CAPACITOR.getItemStack(), 'C', "dustCoal"); - addShaped( + RecipeUtil.addShaped( ENDER_CAPACITOR.getItemStack(), "iii", "cCc", @@ -206,7 +205,7 @@ public class MaterialRecipes { String prismarine = OreDictionary.doesOreNameExist("shardPrismarine") ? "shardPrismarine" : "itemPulsatingCrystal"; - addShaped( + RecipeUtil.addShaped( CRYSTALLINE_CAPACITOR.getItemStack(), "iii", "cCc", @@ -217,7 +216,7 @@ public class MaterialRecipes { capacitorEnder, 'C', prismarine); - addShaped( + RecipeUtil.addShaped( MELODIC_CAPACITOR.getItemStack(), "iii", "cCc", @@ -228,7 +227,7 @@ public class MaterialRecipes { CRYSTALLINE_CAPACITOR.getItemStack(), 'C', endSteel); - addShaped( + RecipeUtil.addShaped( STELLAR_CAPACITOR.getItemStack(), "iii", "cCc", @@ -240,7 +239,7 @@ public class MaterialRecipes { 'C', PRECIENT_CRYSTAL.oreDict); - addShaped( + RecipeUtil.addShaped( SILVER_CAPACITOR.getItemStack(), " sr", "sis", @@ -251,7 +250,7 @@ public class MaterialRecipes { "ingotSilver", 'i', "ingotLead"); - addShaped( + RecipeUtil.addShaped( ENDERGETIC_CAPACITOR.getItemStack(), "iii", "cCc", @@ -262,7 +261,7 @@ public class MaterialRecipes { SILVER_CAPACITOR.getItemStack(), 'C', "dustCoal"); - addShaped( + RecipeUtil.addShaped( ENDERGISED_CAPACITOR.getItemStack(), "iii", "cCc", @@ -275,7 +274,7 @@ public class MaterialRecipes { "glowstone"); } else { - addShaped( + RecipeUtil.addShaped( BASIC_CAPACITOR.getItemStack(), " gr", "gig", @@ -286,7 +285,7 @@ public class MaterialRecipes { "ingotGold", 'i', ingotCopper); - addShaped( + RecipeUtil.addShaped( ACTIVATED_CAPACITOR.getItemStack(), " i ", "cCc", @@ -297,7 +296,7 @@ public class MaterialRecipes { BASIC_CAPACITOR.getItemStack(), 'C', "dustCoal"); - addShaped( + RecipeUtil.addShaped( ENDER_CAPACITOR.getItemStack(), " i ", "cCc", @@ -311,7 +310,7 @@ public class MaterialRecipes { String prismarine = OreDictionary.doesOreNameExist("shardPrismarine") ? "shardPrismarine" : "itemPulsatingCrystal"; - addShaped( + RecipeUtil.addShaped( CRYSTALLINE_CAPACITOR.getItemStack(), " i ", "cCc", @@ -322,7 +321,7 @@ public class MaterialRecipes { capacitorEnder, 'C', prismarine); - addShaped( + RecipeUtil.addShaped( MELODIC_CAPACITOR.getItemStack(), " i ", "cCc", @@ -333,7 +332,7 @@ public class MaterialRecipes { CRYSTALLINE_CAPACITOR.getItemStack(), 'C', endSteel); - addShaped( + RecipeUtil.addShaped( STELLAR_CAPACITOR.getItemStack(), " i ", "cCc", @@ -345,7 +344,7 @@ public class MaterialRecipes { 'C', PRECIENT_CRYSTAL.oreDict); - addShaped( + RecipeUtil.addShaped( SILVER_CAPACITOR.getItemStack(), " sr", "sis", @@ -356,7 +355,7 @@ public class MaterialRecipes { "ingotSilver", 'i', "ingotLead"); - addShaped( + RecipeUtil.addShaped( ENDERGETIC_CAPACITOR.getItemStack(), " i ", "cCc", @@ -367,7 +366,7 @@ public class MaterialRecipes { SILVER_CAPACITOR.getItemStack(), 'C', "dustCoal"); - addShaped( + RecipeUtil.addShaped( ENDERGISED_CAPACITOR.getItemStack(), " i ", "cCc", @@ -383,37 +382,37 @@ public class MaterialRecipes { // Conduit Binder ItemStack cbc = BINDER_COMPOSITE.getStack(8); if (Config.useAlternateBinderRecipe) { - addShaped(cbc, "gcg", "sgs", "gcg", 'g', Blocks.gravel, 's', "sand", 'c', Items.clay_ball); + RecipeUtil.addShaped(cbc, "gcg", "sgs", "gcg", 'g', Blocks.gravel, 's', "sand", 'c', Items.clay_ball); } else { - addShaped(cbc, "ggg", "scs", "ggg", 'g', Blocks.gravel, 's', "sand", 'c', Items.clay_ball); + RecipeUtil.addShaped(cbc, "ggg", "scs", "ggg", 'g', Blocks.gravel, 's', "sand", 'c', Items.clay_ball); } GameRegistry.addSmelting(BINDER_COMPOSITE.getStack(), CONDUIT_BINDER.getStack(4), 0); // Nuggets ItemStack phasedIronNugget = new ItemStack(EnderIO.itemMaterial, 9, Material.PHASED_IRON_NUGGET.ordinal()); - addShapeless(phasedIronNugget, phasedIron); + RecipeUtil.addShapeless(phasedIronNugget, phasedIron); phasedIronNugget = phasedIronNugget.copy(); phasedIronNugget.stackSize = 1; - addShaped(PHASED_IRON.getStackIngot(), "eee", "eee", "eee", 'e', phasedIronNugget); + RecipeUtil.addShaped(PHASED_IRON.getStackIngot(), "eee", "eee", "eee", 'e', phasedIronNugget); ItemStack vibrantNugget = new ItemStack(EnderIO.itemMaterial, 9, Material.VIBRANT_NUGGET.ordinal()); - addShapeless(vibrantNugget, phasedGold); + RecipeUtil.addShapeless(vibrantNugget, phasedGold); vibrantNugget = vibrantNugget.copy(); vibrantNugget.stackSize = 1; - addShaped(PHASED_GOLD.getStackIngot(), "eee", "eee", "eee", 'e', vibrantNugget); + RecipeUtil.addShaped(PHASED_GOLD.getStackIngot(), "eee", "eee", "eee", 'e', vibrantNugget); ItemStack endSteelNugget = new ItemStack(EnderIO.itemMaterial, 9, Material.END_STEEL_NUGGET.ordinal()); - addShapeless(endSteelNugget, endSteel); + RecipeUtil.addShapeless(endSteelNugget, endSteel); endSteelNugget = endSteelNugget.copy(); endSteelNugget.stackSize = 1; - addShaped(END_STEEL.getStackIngot(), "eee", "eee", "eee", 'e', endSteelNugget); + RecipeUtil.addShaped(END_STEEL.getStackIngot(), "eee", "eee", "eee", 'e', endSteelNugget); // Crystals ItemStack pulsCry = new ItemStack(EnderIO.itemMaterial, 1, Material.PULSATING_CYSTAL.ordinal()); - addShaped(pulsCry, "nnn", "ngn", "nnn", 'n', phasedIronNugget, 'g', "gemDiamond"); + RecipeUtil.addShaped(pulsCry, "nnn", "ngn", "nnn", 'n', phasedIronNugget, 'g', "gemDiamond"); ItemStack vibCry = new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()); - addShaped(vibCry, "nnn", "ngn", "nnn", 'n', vibrantNugget, 'g', "gemEmerald"); + RecipeUtil.addShaped(vibCry, "nnn", "ngn", "nnn", 'n', vibrantNugget, 'g', "gemEmerald"); // Smelting ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal()); @@ -426,23 +425,23 @@ public class MaterialRecipes { // Ender Dusts ItemStack enderDust = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal()); - addShaped(new ItemStack(Items.ender_pearl), "eee", "eee", "eee", 'e', enderDust); + RecipeUtil.addShaped(new ItemStack(Items.ender_pearl), "eee", "eee", "eee", 'e', enderDust); // Dark Iron Bars ItemStack diBars = new ItemStack(EnderIO.blockDarkIronBars, 16, 0); - addShaped(diBars, "ddd", "ddd", 'd', darkSteel); + RecipeUtil.addShaped(diBars, "ddd", "ddd", 'd', darkSteel); // Dark Iron Bars ItemStack soBars = new ItemStack(EnderIO.blockSoulariumBars, 16, 0); - addShaped(soBars, "ddd", "ddd", 'd', soularium); + RecipeUtil.addShaped(soBars, "ddd", "ddd", 'd', soularium); // Dark Iron Bars ItemStack esBars = new ItemStack(EnderIO.blockEndSteelBars, 16, 0); - addShaped(esBars, "ddd", "ddd", 'd', endSteel); + RecipeUtil.addShaped(esBars, "ddd", "ddd", 'd', endSteel); // Fused Quartz Frame - addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "stickWood"); - addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "woodStick"); + RecipeUtil.addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "stickWood"); + RecipeUtil.addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "woodStick"); // Machine Chassis @@ -451,10 +450,10 @@ public class MaterialRecipes { ItemStack chassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.MACHINE_CHASSI.ordinal()); String mat = Config.useSteelInChassi == true && steelIngots != null && !steelIngots.isEmpty() ? "ingotSteel" : "ingotIron"; - addShaped(chassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', mat, 'c', capacitor); + RecipeUtil.addShaped(chassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', mat, 'c', capacitor); ItemStack soulchassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.SOUL_MACHINE_CHASSIS.ordinal()); - addShaped( + RecipeUtil.addShaped( soulchassis, "fif", "ici", @@ -470,7 +469,7 @@ public class MaterialRecipes { EnderIO.itemMachinePart, 1, MachinePart.END_STEEL_MACHINE_CHASSIS.ordinal()); - addShaped( + RecipeUtil.addShaped( endchassis, "fif", "ici", @@ -484,8 +483,8 @@ public class MaterialRecipes { // Basic Gear ItemStack gear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal()); - addShaped(gear, "scs", "c c", "scs", 's', "stickWood", 'c', "cobblestone"); - addShaped(gear, "scs", "c c", "scs", 's', "woodStick", 'c', "cobblestone"); + RecipeUtil.addShaped(gear, "scs", "c c", "scs", 's', "stickWood", 'c', "cobblestone"); + RecipeUtil.addShaped(gear, "scs", "c c", "scs", 's', "woodStick", 'c', "cobblestone"); // Weather Crystal ItemStack main = Config.useHardRecipes @@ -502,7 +501,7 @@ public class MaterialRecipes { if (Config.reinforcedObsidianUseDarkSteelBlocks) { corners = Alloy.DARK_STEEL.getOreBlock(); } - addShaped( + RecipeUtil.addShaped( reinfObs, "dbd", "bob", @@ -515,25 +514,39 @@ public class MaterialRecipes { Blocks.obsidian); } - addShaped(EnderIO.blockDarkSteelAnvil, "bbb", " i ", "iii", 'b', DARK_STEEL.getOreBlock(), 'i', darkSteel); + RecipeUtil.addShaped( + EnderIO.blockDarkSteelAnvil, + "bbb", + " i ", + "iii", + 'b', + DARK_STEEL.getOreBlock(), + 'i', + darkSteel); - addShaped(new ItemStack(EnderIO.blockDarkSteelLadder, 12), "b", "b", "b", 'b', EnderIO.blockDarkIronBars); + RecipeUtil.addShaped( + new ItemStack(EnderIO.blockDarkSteelLadder, 12), + "b", + "b", + "b", + 'b', + EnderIO.blockDarkIronBars); for (Alloy alloy : Alloy.values()) { - addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot()); - addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot()); - addShapeless(alloy.getStackIngot(9), alloy.getOreBlock()); + RecipeUtil.addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot()); + RecipeUtil.addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot()); + RecipeUtil.addShapeless(alloy.getStackIngot(9), alloy.getOreBlock()); } for (AlloyEndergy alloy : AlloyEndergy.values()) { - addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot()); - addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot()); - addShapeless(alloy.getStackIngot(9), alloy.getOreBlock()); + RecipeUtil.addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot()); + RecipeUtil.addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot()); + RecipeUtil.addShapeless(alloy.getStackIngot(9), alloy.getOreBlock()); } // DS Rod ItemStack darkRod = new ItemStack(EnderIO.itemMaterial, 1, Material.DARK_STEEL_ROD.ordinal()); - addShaped(darkRod, " ns", "nsn", "sn ", 's', darkSteel, 'n', endSteelNugget); + RecipeUtil.addShaped(darkRod, " ns", "nsn", "sn ", 's', darkSteel, 'n', endSteelNugget); // Food ItemStack flour = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.FLOUR.ordinal()); @@ -542,14 +555,14 @@ public class MaterialRecipes { GameRegistry.addSmelting(flour, bread, 0.35f); ItemStack enderios = EnderFood.ENDERIOS.getStack(); - addShapeless(enderios, Items.bowl, Items.milk_bucket, "cropWheat", "dustEnderPearl"); + RecipeUtil.addShapeless(enderios, Items.bowl, Items.milk_bucket, "cropWheat", "dustEnderPearl"); - if (hasCopper()) { + if (OreDictionaryHelper.hasCopper()) { ItemStack dustCopper = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal()); ItemStack ingotCoppper = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_COPPER); GameRegistry.addSmelting(dustCopper, ingotCoppper, 0); } - if (hasTin()) { + if (OreDictionaryHelper.hasTin()) { ItemStack dustTin = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal()); ItemStack ingotTin = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_TIN); GameRegistry.addSmelting(dustTin, ingotTin, 0); diff --git a/src/main/java/crazypants/enderio/teleport/TravelController.java b/src/main/java/crazypants/enderio/teleport/TravelController.java index 982e6eb5..c4774ea8 100644 --- a/src/main/java/crazypants/enderio/teleport/TravelController.java +++ b/src/main/java/crazypants/enderio/teleport/TravelController.java @@ -18,7 +18,15 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.ChatStyle; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IChatComponent; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovementInput; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java b/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java index 8406252a..33f6ac5a 100644 --- a/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java +++ b/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java @@ -16,7 +16,7 @@ public interface IWailaInfoProvider { /** * Adds the block's info to the WAILA information - * + * * @param tooltip - current list of strings in the WAILA body * @param world * @param x diff --git a/src/main/java/crazypants/enderio/xp/XpUtil.java b/src/main/java/crazypants/enderio/xp/XpUtil.java index 3c5d3909..c11c54fe 100644 --- a/src/main/java/crazypants/enderio/xp/XpUtil.java +++ b/src/main/java/crazypants/enderio/xp/XpUtil.java @@ -4,9 +4,8 @@ import net.minecraft.entity.player.EntityPlayer; /** * Values taken from OpenMods EnchantmentUtils to ensure consistent behavior - * - * @see {@link https://github.com/OpenMods/OpenModsLib/blob/master/src/main/java/openmods/utils/EnchantmentUtils.java} * + * @see {@link https://github.com/OpenMods/OpenModsLib/blob/master/src/main/java/openmods/utils/EnchantmentUtils.java} */ public class XpUtil { diff --git a/src/main/java/crazypants/util/BaublesUtil.java b/src/main/java/crazypants/util/BaublesUtil.java index dc3c0ede..fb8ad38b 100644 --- a/src/main/java/crazypants/util/BaublesUtil.java +++ b/src/main/java/crazypants/util/BaublesUtil.java @@ -66,7 +66,7 @@ public class BaublesUtil { /** * Do NOT modify this inventory on the client side of a singleplayer game! - * + *

    * Wrap it in a ShadowInventory if you need to. */ public IInventory getBaubles(EntityPlayer player) { diff --git a/src/main/java/crazypants/util/EE3Util.java b/src/main/java/crazypants/util/EE3Util.java index 5ad0bcbf..eebf28d2 100644 --- a/src/main/java/crazypants/util/EE3Util.java +++ b/src/main/java/crazypants/util/EE3Util.java @@ -1,9 +1,6 @@ package crazypants.util; -import static crazypants.enderio.material.Material.BINDER_COMPOSITE; -import static crazypants.enderio.material.Material.CONDUIT_BINDER; -import static crazypants.enderio.material.Material.PHASED_IRON_NUGGET; -import static crazypants.enderio.material.Material.SILICON; +import static crazypants.enderio.material.Material.*; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/crazypants/util/GalacticraftUtil.java b/src/main/java/crazypants/util/GalacticraftUtil.java index bd551c6f..f2df7108 100644 --- a/src/main/java/crazypants/util/GalacticraftUtil.java +++ b/src/main/java/crazypants/util/GalacticraftUtil.java @@ -10,9 +10,8 @@ import crazypants.enderio.Log; /** * This is a near-verbatim copy of Galacticraft's API class 'AccessInventoryGC'. - * + *

    * We don't need the extended functionality and already have more APIs included than is good for our sanity. - * */ public class GalacticraftUtil {