From ae21012d216df71f31aed6fbc9d76215fc24ceed Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 4 Mar 2017 12:58:47 +1000 Subject: + New texture for the slow builders ring. + Added the Alkalus Disk. $ Fixed Frame Box Assembler Recipes. $ Fixed Missing 7Li material. $ Fixed Tiered Tanks not showing their capacity in the tooltip. $ Fixed tooltips for alloys containing Bronze or Steel. $ Fixed Clay Pipe Extruder Recipes. - Removed a handful of Plasma cells for misc. materials. % Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements. % Cleaned up The Entire Project. --- src/Java/gtPlusPlus/core/util/BaseHandler.java | 6 +- src/Java/gtPlusPlus/core/util/ClassUtils.java | 18 +- src/Java/gtPlusPlus/core/util/Log.java | 42 +- src/Java/gtPlusPlus/core/util/LoggingUtils.java | 52 +- src/Java/gtPlusPlus/core/util/Quality.java | 21 +- src/Java/gtPlusPlus/core/util/Utils.java | 376 +++-- .../gtPlusPlus/core/util/UtilsChatFormatting.java | 282 ++-- src/Java/gtPlusPlus/core/util/UtilsRarity.java | 30 +- src/Java/gtPlusPlus/core/util/UtilsText.java | 4 +- .../gtPlusPlus/core/util/array/ArrayUtils.java | 14 +- src/Java/gtPlusPlus/core/util/array/Pair.java | 22 +- src/Java/gtPlusPlus/core/util/array/Triplet.java | 28 +- .../core/util/debug/DEBUG_BLOCK_ShapeSpawner.java | 61 +- .../gtPlusPlus/core/util/debug/DEBUG_INIT.java | 6 +- .../core/util/debug/DEBUG_ITEM_ShapeSpawner.java | 34 +- .../util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java | 1653 +++++++++++--------- .../core/util/debug/DEBUG_ScreenOverlay.java | 14 +- .../core/util/debug/DEBUG_TimerThread.java | 59 +- .../core/util/debug/UtilityGL11Debug.java | 618 ++++---- .../gtPlusPlus/core/util/entity/EntityUtils.java | 40 +- src/Java/gtPlusPlus/core/util/fluid/FluidGT6.java | 38 +- .../gtPlusPlus/core/util/fluid/FluidUtils.java | 168 +- .../gregtech/recipehandlers/GregtechRecipe.java | 35 +- src/Java/gtPlusPlus/core/util/item/ItemUtils.java | 285 ++-- .../core/util/materials/MaterialUtils.java | 85 +- src/Java/gtPlusPlus/core/util/math/MathUtils.java | 236 +-- .../core/util/networking/NetworkUtils.java | 118 +- .../core/util/particles/BlockBreakParticles.java | 8 +- .../util/particles/EntityParticleFXMysterious.java | 18 +- .../gtPlusPlus/core/util/player/PlayerCache.java | 79 +- .../gtPlusPlus/core/util/player/PlayerUtils.java | 78 +- .../gtPlusPlus/core/util/player/UtilsMining.java | 84 +- .../gtPlusPlus/core/util/recipe/RecipeUtils.java | 145 +- .../core/util/recipe/shapeless/ShapelessUtils.java | 15 +- .../core/util/reflect/ClientProxyFinder.java | 42 +- .../core/util/reflect/ReflectionUtils.java | 38 +- src/Java/gtPlusPlus/core/util/wrapper/var.java | 110 +- 37 files changed, 2556 insertions(+), 2406 deletions(-) (limited to 'src/Java/gtPlusPlus/core/util') diff --git a/src/Java/gtPlusPlus/core/util/BaseHandler.java b/src/Java/gtPlusPlus/core/util/BaseHandler.java index 63f22f3763..9457dc363f 100644 --- a/src/Java/gtPlusPlus/core/util/BaseHandler.java +++ b/src/Java/gtPlusPlus/core/util/BaseHandler.java @@ -3,9 +3,9 @@ package gtPlusPlus.core.util; public abstract class BaseHandler { public abstract void preInit(); - + public abstract void init(); - + public abstract void postInit(); - + } diff --git a/src/Java/gtPlusPlus/core/util/ClassUtils.java b/src/Java/gtPlusPlus/core/util/ClassUtils.java index dfd8ec898b..20ca894211 100644 --- a/src/Java/gtPlusPlus/core/util/ClassUtils.java +++ b/src/Java/gtPlusPlus/core/util/ClassUtils.java @@ -10,31 +10,31 @@ public class ClassUtils { // There is therefore no more risk of code throwing NoClassDefFoundException. executeCodeLinkingToDependency(); }*/ - public static boolean isPresent(String className) { + public static boolean isPresent(final String className) { try { Class.forName(className); return true; - } catch (Throwable ex) { + } catch (final Throwable ex) { // Class or one of its dependencies is not present... return false; } } - public static Method getMethodViaReflection(Class lookupClass, String methodName, boolean invoke) throws Exception{ - Class lookup = lookupClass.getClass(); - Method m = lookup.getDeclaredMethod(methodName); - m.setAccessible(true);// Abracadabra + public static Method getMethodViaReflection(final Class lookupClass, final String methodName, final boolean invoke) throws Exception{ + final Class lookup = lookupClass.getClass(); + final Method m = lookup.getDeclaredMethod(methodName); + m.setAccessible(true);// Abracadabra if (invoke){ m.invoke(lookup);// now its OK } return m; } - public static Class getNonPublicClass(String className){ + public static Class getNonPublicClass(final String className){ Class c = null; try { c = Class.forName(className); - } catch (ClassNotFoundException e) { + } catch (final ClassNotFoundException e) { // TODO Auto-generated catch block e.printStackTrace(); } @@ -59,7 +59,7 @@ public class ClassUtils { constructor.setAccessible(true);//ABRACADABRA! try { - Object o = constructor.newInstance(); + final Object o = constructor.newInstance(); return (Class) o; } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { diff --git a/src/Java/gtPlusPlus/core/util/Log.java b/src/Java/gtPlusPlus/core/util/Log.java index ea7076e453..aa0231b954 100644 --- a/src/Java/gtPlusPlus/core/util/Log.java +++ b/src/Java/gtPlusPlus/core/util/Log.java @@ -5,25 +5,25 @@ import org.apache.logging.log4j.Logger; public final class Log { - public static final Logger LOGGER = LogManager.getLogger("MiscUtils"); - - public static void warn(String msg) - { - LOGGER.warn(msg); - } - - public static void error(String msg) - { - LOGGER.error(msg); - } - - public static void info(String msg) - { - LOGGER.info(msg); - } - - public static void debug(String msg) - { - LOGGER.debug(msg); - } + public static final Logger LOGGER = LogManager.getLogger("MiscUtils"); + + public static void warn(final String msg) + { + LOGGER.warn(msg); + } + + public static void error(final String msg) + { + LOGGER.error(msg); + } + + public static void info(final String msg) + { + LOGGER.info(msg); + } + + public static void debug(final String msg) + { + LOGGER.debug(msg); + } } diff --git a/src/Java/gtPlusPlus/core/util/LoggingUtils.java b/src/Java/gtPlusPlus/core/util/LoggingUtils.java index 607771bc8e..3e8219d53a 100644 --- a/src/Java/gtPlusPlus/core/util/LoggingUtils.java +++ b/src/Java/gtPlusPlus/core/util/LoggingUtils.java @@ -5,47 +5,47 @@ import java.util.Date; public class LoggingUtils { - public static void profileLog(Object o){ - try { + public static void profileLog(final Object o){ + try { String content; - File file = new File("GregtechTimingsTC.txt"); + final File file = new File("GregtechTimingsTC.txt"); // if file doesnt exists, then create it if (!file.exists()) { file.createNewFile(); - FileWriter fw = new FileWriter(file.getAbsoluteFile(), true); - BufferedWriter bw = new BufferedWriter(fw); + final FileWriter fw = new FileWriter(file.getAbsoluteFile(), true); + final BufferedWriter bw = new BufferedWriter(fw); bw.write("============================================================"); bw.write(System.lineSeparator()); bw.close(); - } + } if (o instanceof String){ content = (String) o; - } - else { - content = o.toString(); - } - FileWriter fw = new FileWriter(file.getAbsoluteFile(), true); - BufferedWriter bw = new BufferedWriter(fw); + } + else { + content = o.toString(); + } + final FileWriter fw = new FileWriter(file.getAbsoluteFile(), true); + final BufferedWriter bw = new BufferedWriter(fw); bw.write(content); bw.write(System.lineSeparator()); bw.close(); System.out.println("Data Logged."); - } catch (IOException e) { + } catch (final IOException e) { System.out.println("Data logging failed."); } - } - - public static boolean logCurrentSystemTime(String message){ - Date date = new Date(System.currentTimeMillis()); - try { - profileLog(message+" | "+date.toString()); - return true; - } - catch (Throwable r) { - return false; - } - } - + + public static boolean logCurrentSystemTime(final String message){ + final Date date = new Date(System.currentTimeMillis()); + try { + profileLog(message+" | "+date.toString()); + return true; + } + catch (final Throwable r) { + return false; + } + + } + } diff --git a/src/Java/gtPlusPlus/core/util/Quality.java b/src/Java/gtPlusPlus/core/util/Quality.java index 1ce29c7a58..b866b2e28b 100644 --- a/src/Java/gtPlusPlus/core/util/Quality.java +++ b/src/Java/gtPlusPlus/core/util/Quality.java @@ -4,13 +4,13 @@ import gtPlusPlus.core.util.math.MathUtils; import net.minecraft.util.EnumChatFormatting; public enum Quality { - + // Magic Blue // Rare Yellow // Set Green // Unique Gold/Purple // Trade-off Brown - + POOR("Poor", EnumChatFormatting.GRAY), COMMON("Common", EnumChatFormatting.WHITE), UNCOMMON("Uncommon", EnumChatFormatting.DARK_GREEN), @@ -31,27 +31,28 @@ public enum Quality { } public String getQuality() { - return LOOT; + return this.LOOT; } - + protected EnumChatFormatting getColour(){ - return COLOUR; + return this.COLOUR; } - + public String formatted(){ return this.COLOUR+this.LOOT; } - + public static Quality getRandomQuality(){ - int lootChance = MathUtils.randInt(0, 100); + final int lootChance = MathUtils.randInt(0, 100); if (lootChance <= 10){return Quality.POOR;} else if (lootChance <= 45){return Quality.COMMON;} else if (lootChance <= 65){return Quality.UNCOMMON;} else if (lootChance <= 82){return Quality.MAGIC;} else if (lootChance <= 92){return Quality.EPIC;} else if (lootChance <= 97){return Quality.RARE;} - else if (lootChance <= 99){return Quality.ARTIFACT;} - else return null; + else if (lootChance <= 99){return Quality.ARTIFACT;} else { + return null; + } } } diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java index db8ed87231..72441660d2 100644 --- a/src/Java/gtPlusPlus/core/util/Utils.java +++ b/src/Java/gtPlusPlus/core/util/Utils.java @@ -1,6 +1,16 @@ package gtPlusPlus.core.util; -import gregtech.api.enums.*; +import java.awt.Color; +import java.awt.Graphics; +import java.lang.reflect.Method; +import java.util.*; + +import org.apache.commons.lang3.EnumUtils; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.FMLLog; +import gregtech.api.enums.Materials; +import gregtech.api.enums.TC_Aspects; import gregtech.api.enums.TC_Aspects.TC_AspectStack; import gtPlusPlus.GTplusplus; import gtPlusPlus.core.lib.CORE; @@ -12,14 +22,7 @@ import gtPlusPlus.core.util.math.MathUtils; import ic2.core.Ic2Items; import ic2.core.init.InternalName; import ic2.core.item.resources.ItemCell; - -import java.awt.Color; -import java.awt.Graphics; -import java.lang.reflect.Method; -import java.util.*; - import net.minecraft.block.Block; -import net.minecraft.block.Block.SoundType; import net.minecraft.entity.Entity; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemStack; @@ -31,11 +34,6 @@ import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fluids.*; import net.minecraftforge.oredict.OreDictionary; -import org.apache.commons.lang3.EnumUtils; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; - public class Utils { public static final int WILDCARD_VALUE = Short.MAX_VALUE; @@ -55,27 +53,27 @@ public class Utils { if (CORE.MASTER_VERSION.toLowerCase().equals("offline")){ return false; - } + } if (CORE.MASTER_VERSION.equals(CORE.VERSION.toLowerCase())){ return true; - } + } return false; } - public static TC_AspectStack getTcAspectStack (TC_Aspects aspect, long size){ + public static TC_AspectStack getTcAspectStack (final TC_Aspects aspect, final long size){ return getTcAspectStack(aspect.name(), (int) size); } - public static TC_AspectStack getTcAspectStack (String aspect, long size){ + public static TC_AspectStack getTcAspectStack (final String aspect, final long size){ return getTcAspectStack(aspect, (int) size); } - public static TC_AspectStack getTcAspectStack (TC_Aspects aspect, int size){ + public static TC_AspectStack getTcAspectStack (final TC_Aspects aspect, final int size){ return getTcAspectStack(aspect.name(), size); } - public static TC_AspectStack getTcAspectStack (String aspect, int size){ + public static TC_AspectStack getTcAspectStack (final String aspect, final int size){ TC_AspectStack returnValue = null; @@ -89,13 +87,13 @@ public class Utils { else { Utils.LOG_INFO("Fallback TC Aspect found - "+aspect+" - PLEASE UPDATE GREGTECH TO A NEWER VERSION TO REMOVE THIS MESSAGE - THIS IS NOT AN ERROR"); returnValue = new TC_AspectStack(TC_Aspects.valueOf("COGNITO"), size); - } - } catch (NoSuchFieldError r){ + } + } catch (final NoSuchFieldError r){ Utils.LOG_INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus"); } } else if (aspect.toUpperCase().equals("EXANIMUS")){ - //Adds in Compat for older GT Versions which Misspell aspects. + //Adds in Compat for older GT Versions which Misspell aspects. try { if (EnumUtils.isValidEnum(TC_Aspects.class, "EXANIMUS")){ Utils.LOG_WARNING("TC Aspect found - "+aspect); @@ -104,15 +102,15 @@ public class Utils { else { Utils.LOG_INFO("Fallback TC Aspect found - "+aspect+" - PLEASE UPDATE GREGTECH TO A NEWER VERSION TO REMOVE THIS MESSAGE - THIS IS NOT AN ERROR"); returnValue = new TC_AspectStack(TC_Aspects.valueOf("EXAMINIS"), size); - } - } catch (NoSuchFieldError r){ + } + } catch (final NoSuchFieldError r){ Utils.LOG_INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus"); } } else if (aspect.toUpperCase().equals("PRAECANTATIO")){ - //Adds in Compat for older GT Versions which Misspell aspects. + //Adds in Compat for older GT Versions which Misspell aspects. try { if (EnumUtils.isValidEnum(TC_Aspects.class, "PRAECANTATIO")){ Utils.LOG_WARNING("TC Aspect found - "+aspect); @@ -121,10 +119,10 @@ public class Utils { else { Utils.LOG_INFO("Fallback TC Aspect found - "+aspect+" - PLEASE UPDATE GREGTECH TO A NEWER VERSION TO REMOVE THIS MESSAGE - THIS IS NOT AN ERROR"); returnValue = new TC_AspectStack(TC_Aspects.valueOf("PRAECANTIO"), size); - } - } catch (NoSuchFieldError r){ + } + } catch (final NoSuchFieldError r){ Utils.LOG_INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus"); - } + } } else { Utils.LOG_WARNING("TC Aspect found - "+aspect); @@ -134,11 +132,11 @@ public class Utils { return returnValue; } - public static boolean containsMatch(boolean strict, ItemStack[] inputs, ItemStack... targets) + public static boolean containsMatch(final boolean strict, final ItemStack[] inputs, final ItemStack... targets) { - for (ItemStack input : inputs) + for (final ItemStack input : inputs) { - for (ItemStack target : targets) + for (final ItemStack target : targets) { if (itemMatches(target, input, strict)) { @@ -149,67 +147,67 @@ public class Utils { return false; } - public static boolean itemMatches(ItemStack target, ItemStack input, boolean strict) + public static boolean itemMatches(final ItemStack target, final ItemStack input, final boolean strict) { - if (input == null || target == null) + if ((input == null) || (target == null)) { return false; } - return (target.getItem() == input.getItem() && ((target.getItemDamage() == WILDCARD_VALUE && !strict) || target.getItemDamage() == input.getItemDamage())); + return ((target.getItem() == input.getItem()) && (((target.getItemDamage() == WILDCARD_VALUE) && !strict) || (target.getItemDamage() == input.getItemDamage()))); } - //Non-Dev Comments - public static void LOG_INFO(String s){ + //Non-Dev Comments + public static void LOG_INFO(final String s){ //if (CORE.DEBUG){ FMLLog.info("GT++: "+s); //} } - //Non-Dev Comments - public static void LOG_MACHINE_INFO(String s){ + //Non-Dev Comments + public static void LOG_MACHINE_INFO(final String s){ if (CORE.configSwitches.MACHINE_INFO || ClientProxy.playerName.toLowerCase().contains("draknyte1")){ - FMLLog.info("GT++: Machine Info: "+s); + FMLLog.info("GT++: Machine Info: "+s); } } //Developer Comments - public static void LOG_WARNING(String s){ + public static void LOG_WARNING(final String s){ if (CORE.DEBUG){ FMLLog.warning("GT++: "+s); } } //Errors - public static void LOG_ERROR(String s){ + public static void LOG_ERROR(final String s){ if (CORE.DEBUG){ FMLLog.severe("GT++: "+s); } } //Developer Logger - public static void LOG_SPECIFIC_WARNING(String whatToLog, String msg, int line){ - //if (!CORE.DEBUG){ + public static void LOG_SPECIFIC_WARNING(final String whatToLog, final String msg, final int line){ + //if (!CORE.DEBUG){ FMLLog.warning("GT++ |"+line+"| "+whatToLog+" | "+msg); - //} + //} } - public static void paintBox(Graphics g, int MinA, int MinB, int MaxA, int MaxB){ - g.drawRect (MinA, MinB, MaxA, MaxB); + public static void paintBox(final Graphics g, final int MinA, final int MinB, final int MaxA, final int MaxB){ + g.drawRect (MinA, MinB, MaxA, MaxB); } // Send a message to all players on the server - public static void sendServerMessage(String translationKey) { + public static void sendServerMessage(final String translationKey) { sendServerMessage(new ChatComponentText(translationKey)); } // Send a message to all players on the server - public static void sendServerMessage(IChatComponent chatComponent) { + public static void sendServerMessage(final IChatComponent chatComponent) { MinecraftServer.getServer().getConfigurationManager().sendChatMsg(chatComponent); } /** * Returns if that Liquid is IC2Steam. */ - public static boolean isIC2Steam(FluidStack aFluid) { + public static boolean isIC2Steam(final FluidStack aFluid) { if (aFluid == null) { return false; } @@ -219,7 +217,7 @@ public class Utils { /** * Returns a Liquid Stack with given amount of IC2Steam. */ - public static FluidStack getIC2Steam(long aAmount) { + public static FluidStack getIC2Steam(final long aAmount) { return FluidRegistry.getFluidStack("ic2steam", (int)aAmount); } @@ -231,17 +229,17 @@ public class Utils { 'A',slot_1,'B',slot_2,'C',slot_3, 'D',slot_4,'E',slot_5,'F',slot_6, 'G',slot_7,'H',slot_8,'I',slot_9 - }); + }); }*/ - public static String checkCorrectMiningToolForBlock(Block currentBlock, World currentWorld){ + public static String checkCorrectMiningToolForBlock(final Block currentBlock, final World currentWorld){ String correctTool = ""; - if (!currentWorld.isRemote){ + if (!currentWorld.isRemote){ try { correctTool = currentBlock.getHarvestTool(0); Utils.LOG_WARNING(correctTool); - } catch (NullPointerException e){ + } catch (final NullPointerException e){ } } @@ -250,17 +248,17 @@ public class Utils { } /** - * + * * @param colourStr e.g. "#FFFFFF" * @return String - formatted "rgb(0,0,0)" */ - public static String hex2RgbFormatted(String hexString) { - Color c = new Color( - Integer.valueOf(hexString.substring(1, 3), 16), - Integer.valueOf(hexString.substring(3, 5), 16), + public static String hex2RgbFormatted(final String hexString) { + final Color c = new Color( + Integer.valueOf(hexString.substring(1, 3), 16), + Integer.valueOf(hexString.substring(3, 5), 16), Integer.valueOf(hexString.substring(5, 7), 16)); - StringBuffer sb = new StringBuffer(); + final StringBuffer sb = new StringBuffer(); sb.append("rgb("); sb.append(c.getRed()); sb.append(","); @@ -272,11 +270,11 @@ public class Utils { } /** - * + * * @param colourStr e.g. "#FFFFFF" - * @return + * @return */ - public static Color hex2Rgb(String colorStr) { + public static Color hex2Rgb(final String colorStr) { return new Color( Integer.valueOf( colorStr.substring( 1, 3 ), 16 ), Integer.valueOf( colorStr.substring( 3, 5 ), 16 ), @@ -284,72 +282,72 @@ public class Utils { } /** - * + * * @param colourInt e.g. 0XFFFFFF * @return Colour */ - public static Color hex2Rgb(int colourInt) { + public static Color hex2Rgb(final int colourInt) { return Color.decode(String.valueOf(colourInt)); } /** - * + * * @param colourInt e.g. 0XFFFFFF * @return short[] */ - public static short[] hex2RgbShort(int colourInt) { - Color rgb = Color.decode(String.valueOf(colourInt)); - short[] rgba = {(short) rgb.getRed(), (short) rgb.getGreen(), (short) rgb.getBlue(), (short) rgb.getAlpha()}; + public static short[] hex2RgbShort(final int colourInt) { + final Color rgb = Color.decode(String.valueOf(colourInt)); + final short[] rgba = {(short) rgb.getRed(), (short) rgb.getGreen(), (short) rgb.getBlue(), (short) rgb.getAlpha()}; return rgba; } - public static Timer ShortTimer(int seconds) { + public static Timer ShortTimer(final int seconds) { Timer timer; timer = new Timer(); timer.schedule(new ShortTimerTask(), seconds * 1000); return timer; } - public static String byteToHex(byte b) { - int i = b & 0xFF; + public static String byteToHex(final byte b) { + final int i = b & 0xFF; return Integer.toHexString(i); } - public static Object[] convertListToArray(List sourceList) { - Object[] targetArray = sourceList.toArray(new Object[sourceList.size()]); + public static Object[] convertListToArray(final List sourceList) { + final Object[] targetArray = sourceList.toArray(new Object[sourceList.size()]); return targetArray; } - public static List convertArrayToFixedSizeList(Object[] sourceArray) { - List targetList = Arrays.asList(sourceArray); + public static List convertArrayToFixedSizeList(final Object[] sourceArray) { + final List targetList = Arrays.asList(sourceArray); return targetList; } - public static List convertArrayToList(Object[] sourceArray) { - List targetList = new ArrayList(Arrays.asList(sourceArray)); + public static List convertArrayToList(final Object[] sourceArray) { + final List targetList = new ArrayList<>(Arrays.asList(sourceArray)); return targetList; } - public static List convertArrayListToList(ArrayList sourceArray) { - List targetList = new ArrayList(Arrays.asList(sourceArray)); + public static List convertArrayListToList(final ArrayList sourceArray) { + final List targetList = new ArrayList<>(Arrays.asList(sourceArray)); return targetList; } - public static void spawnCustomParticle(Entity entity){ + public static void spawnCustomParticle(final Entity entity){ GTplusplus.proxy.generateMysteriousParticles(entity); - } + } - public static void spawnFX(World world, int x, int y, int z, String particleName, Object particleName2){ + public static void spawnFX(final World world, final int x, final int y, final int z, final String particleName, Object particleName2){ if (!world.isRemote){ - if (particleName2 == null || particleName2.equals("")){ + if ((particleName2 == null) || particleName2.equals("")){ particleName2 = particleName; } - int l = MathUtils.randInt(0, 4); - double d0 = (double)((float)x + 0.5F); - double d1 = (double)((float)y + 0.7F); - double d2 = (double)((float)z + 0.5F); - double d3 = 0.2199999988079071D; - double d4 = 0.27000001072883606D; + final int l = MathUtils.randInt(0, 4); + final double d0 = x + 0.5F; + final double d1 = y + 0.7F; + final double d2 = z + 0.5F; + final double d3 = 0.2199999988079071D; + final double d4 = 0.27000001072883606D; if (l == 1) { @@ -377,14 +375,14 @@ public class Utils { } } - public static int rgbtoHexValue(int r, int g, int b){ - if (r > 255 || g > 255 || b > 255 || r < 0 || g < 0 || b < 0){ + public static int rgbtoHexValue(final int r, final int g, final int b){ + if ((r > 255) || (g > 255) || (b > 255) || (r < 0) || (g < 0) || (b < 0)){ return 0; } - Color c = new Color(r,g,b); - String temp = Integer.toHexString( c.getRGB() & 0xFFFFFF ).toUpperCase(); + final Color c = new Color(r,g,b); + String temp = Integer.toHexString( c.getRGB() & 0xFFFFFF ).toUpperCase(); - //System.out.println( "hex: " + Integer.toHexString( c.getRGB() & 0xFFFFFF ) + " hex value:"+temp); + //System.out.println( "hex: " + Integer.toHexString( c.getRGB() & 0xFFFFFF ) + " hex value:"+temp); temp = Utils.appenedHexNotationToString(String.valueOf(temp)); Utils.LOG_WARNING("Made "+temp+" - Hopefully it's not a mess."); Utils.LOG_WARNING("It will decode into "+Integer.decode(temp)+"."); @@ -394,26 +392,26 @@ public class Utils { /* * http://javadevnotes.com/java-left-pad-string-with-zeros-examples */ - public static String leftPadWithZeroes(String originalString, int length) { - StringBuilder sb = new StringBuilder(); - while (sb.length() + originalString.length() < length) { + public static String leftPadWithZeroes(final String originalString, final int length) { + final StringBuilder sb = new StringBuilder(); + while ((sb.length() + originalString.length()) < length) { sb.append('0'); } sb.append(originalString); - String paddedString = sb.toString(); + final String paddedString = sb.toString(); return paddedString; } /* * Original Code by Chandana Napagoda - https://cnapagoda.blogspot.com.au/2011/03/java-hex-color-code-generator.html - */ - public static Map hexColourGenerator(int colorCount){ - int maxColorValue = 16777215; + */ + public static Map hexColourGenerator(final int colorCount){ + final int maxColorValue = 16777215; // this is decimal value of the "FFFFFF" - int devidedvalue = maxColorValue/colorCount; + final int devidedvalue = maxColorValue/colorCount; int countValue = 0; - HashMap hexColorMap = new HashMap(); - for(int a=0; a < colorCount && maxColorValue >= countValue ; a++){ + final HashMap hexColorMap = new HashMap<>(); + for(int a=0; (a < colorCount) && (maxColorValue >= countValue) ; a++){ if(a != 0){ countValue+=devidedvalue; hexColorMap.put(a,Integer.toHexString( 0x10000 | countValue).substring(1).toUpperCase()); @@ -428,33 +426,33 @@ public class Utils { /* * Original Code by Chandana Napagoda - https://cnapagoda.blogspot.com.au/2011/03/java-hex-color-code-generator.html */ - public static Map hexColourGeneratorRandom(int colorCount){ - HashMap hexColorMap = new HashMap(); + public static Map hexColourGeneratorRandom(final int colorCount){ + final HashMap hexColorMap = new HashMap<>(); for(int a=0;a < colorCount; a++){ String code = ""+(int)(Math.random()*256); code = code+code+code; - int i = Integer.parseInt(code); + final int i = Integer.parseInt(code); hexColorMap.put(a,Integer.toHexString( 0x1000000 | i).substring(1).toUpperCase()); Utils.LOG_WARNING(""+Integer.toHexString( 0x1000000 | i).substring(1).toUpperCase()); } return hexColorMap; } - public static String appenedHexNotationToString(Object hexAsStringOrInt){ - String hexChar = "0x"; + public static String appenedHexNotationToString(final Object hexAsStringOrInt){ + final String hexChar = "0x"; String result; if (hexAsStringOrInt.getClass() == String.class){ if (((String) hexAsStringOrInt).length() != 6){ - String temp = leftPadWithZeroes((String) hexAsStringOrInt, 6); + final String temp = leftPadWithZeroes((String) hexAsStringOrInt, 6); result = temp; } result = hexChar+hexAsStringOrInt; return result; } - else if (hexAsStringOrInt.getClass() == Integer.class){ + else if (hexAsStringOrInt.getClass() == Integer.class){ if (((String) hexAsStringOrInt).length() != 6){ - String temp = leftPadWithZeroes((String) hexAsStringOrInt, 6); + final String temp = leftPadWithZeroes((String) hexAsStringOrInt, 6); result = temp; } result = hexChar+String.valueOf(hexAsStringOrInt); @@ -465,22 +463,22 @@ public class Utils { } } - public static Integer appenedHexNotationToInteger(int hexAsStringOrInt){ - String hexChar = "0x"; + public static Integer appenedHexNotationToInteger(final int hexAsStringOrInt){ + final String hexChar = "0x"; String result; Utils.LOG_WARNING(String.valueOf(hexAsStringOrInt)); result = hexChar+String.valueOf(hexAsStringOrInt); return Integer.getInteger(result); } - public static boolean doesEntryExistAlreadyInOreDictionary(String OreDictName){ + public static boolean doesEntryExistAlreadyInOreDictionary(final String OreDictName){ if (OreDictionary.getOres(OreDictName).size() != 0) { return true; } return false; } - public static boolean invertBoolean(boolean booleans){ + public static boolean invertBoolean(final boolean booleans){ if (booleans == true){ return false; } @@ -488,34 +486,34 @@ public class Utils { } private static short cellID = 15; - public static ItemStack createInternalNameAndFluidCell(String s){ + public static ItemStack createInternalNameAndFluidCell(final String s){ Utils.LOG_WARNING("1"); - InternalName yourName = EnumHelper.addEnum(InternalName.class, s, new Class[0], new Object[0]); + final InternalName yourName = EnumHelper.addEnum(InternalName.class, s, new Class[0], new Object[0]); Utils.LOG_WARNING("2 "+yourName.name()); - ItemCell item = (ItemCell)Ic2Items.cell.getItem(); + final ItemCell item = (ItemCell)Ic2Items.cell.getItem(); Utils.LOG_WARNING("3 "+item.getUnlocalizedName()); try { Utils.LOG_WARNING("4"); - Class clz = item.getClass(); + final Class clz = item.getClass(); Utils.LOG_WARNING("5 "+clz.getSimpleName()); - Method methode = clz.getDeclaredMethod("addCell", int.class, InternalName.class, Block[].class); + final Method methode = clz.getDeclaredMethod("addCell", int.class, InternalName.class, Block[].class); Utils.LOG_WARNING("6 "+methode.getName()); methode.setAccessible(true); Utils.LOG_WARNING("7 "+methode.isAccessible()); - ItemStack temp = (ItemStack) methode.invoke(item, cellID++, yourName, new Block[0]); + final ItemStack temp = (ItemStack) methode.invoke(item, cellID++, yourName, new Block[0]); Utils.LOG_WARNING("Successfully created "+temp.getDisplayName()+"s."); FluidContainerRegistry.registerFluidContainer(FluidUtils.getFluidStack(s.toLowerCase(), 0), temp.copy(), Ic2Items.cell.copy()); ItemUtils.addItemToOreDictionary(temp.copy(), "cell"+s); return temp; } - catch(Exception e){ + catch(final Exception e){ e.printStackTrace(); } return null; } - public static String sanitizeString(String input){ + public static String sanitizeString(final String input){ String temp; String output; @@ -533,39 +531,39 @@ public class Utils { temp = temp.replace("[", ""); temp = temp.replace("]", ""); temp = temp.replace(" ", ""); - output = temp; + output = temp; return output; } - - public static String[] parseVersion(String version){ + + public static String[] parseVersion(final String version){ return parseVersion(version, "//."); } - - public static String[] parseVersion(String version, String delimiter){ - String[] versionArray = version.split(delimiter); + + public static String[] parseVersion(final String version, final String delimiter){ + final String[] versionArray = version.split(delimiter); return versionArray; } - - public static Versioning compareModVersion (String currentVersion, String expectedVersion){ + + public static Versioning compareModVersion (final String currentVersion, final String expectedVersion){ return compareModVersion(currentVersion, expectedVersion, "//."); } - - public static Versioning compareModVersion (String currentVersion, String expectedVersion, String delimiter){ - String[] a = parseVersion(currentVersion, delimiter); - String[] b = parseVersion(expectedVersion, delimiter); - int[] c = new int[a.length]; - int[] d = new int[b.length]; + + public static Versioning compareModVersion (final String currentVersion, final String expectedVersion, final String delimiter){ + final String[] a = parseVersion(currentVersion, delimiter); + final String[] b = parseVersion(expectedVersion, delimiter); + final int[] c = new int[a.length]; + final int[] d = new int[b.length]; for (int r=0;r d[r]){ e[r] = Versioning.NEWER; } @@ -576,7 +574,7 @@ public class Utils { e[r] = Versioning.EQUAL; } } - + for (int r=0;r formattingCodeMapping = new HashMap(); - /** Maps a name (e.g., 'underline') to its corresponding enum value (e.g., UNDERLINE). */ - private static final Map nameMapping = new HashMap(); - /** - * Matches formatting codes that indicate that the client should treat the following text as bold, recolored, - * obfuscated, etc. - */ - private static final Pattern formattingCodePattern = Pattern.compile("(?i)" + String.valueOf('\u00a7') + "[0-9A-FK-OR]"); - /** The formatting code that produces this format. */ - private final char formattingCode; - private final boolean fancyStyling; - /** - * The control string (section sign + formatting code) that can be inserted into client-side text to display - * subsequent text in this format. - */ - private final String controlString; - - private UtilsChatFormatting(char p_i1336_3_) - { - this(p_i1336_3_, false); - } - - private UtilsChatFormatting(char p_i1337_3_, boolean p_i1337_4_) - { - this.formattingCode = p_i1337_3_; - this.fancyStyling = p_i1337_4_; - this.controlString = "\u00a7" + p_i1337_3_; - } - - /** - * Gets the formatting code that produces this format. - */ - public char getFormattingCode() - { - return this.formattingCode; - } - - /** - * False if this is just changing the color or resetting; true otherwise. - */ - public boolean isFancyStyling() - { - return this.fancyStyling; - } - - /** - * Checks if typo is a color. - */ - public boolean isColor() - { - return !this.fancyStyling && this != RESET; - } - - /** - * Gets the friendly name of this value. - */ - public String getFriendlyName() - { - return this.name().toLowerCase(); - } - - @Override + BLACK('0'), + DARK_BLUE('1'), + DARK_GREEN('2'), + DARK_AQUA('3'), + DARK_RED('4'), + DARK_PURPLE('5'), + GOLD('6'), + GRAY('7'), + DARK_GRAY('8'), + BLUE('9'), + GREEN('a'), + AQUA('b'), + RED('c'), + LIGHT_PURPLE('d'), + YELLOW('e'), + WHITE('f'), + OBFUSCATED('k', true), + BOLD('l', true), + STRIKETHROUGH('m', true), + UNDERLINE('n', true), + ITALIC('o', true), + RESET('r'); + /** Maps a formatting code (e.g., 'f') to its corresponding enum value (e.g., WHITE). */ + private static final Map formattingCodeMapping = new HashMap<>(); + /** Maps a name (e.g., 'underline') to its corresponding enum value (e.g., UNDERLINE). */ + private static final Map nameMapping = new HashMap<>(); + /** + * Matches formatting codes that indicate that the client should treat the following text as bold, recolored, + * obfuscated, etc. + */ + private static final Pattern formattingCodePattern = Pattern.compile("(?i)" + String.valueOf('\u00a7') + "[0-9A-FK-OR]"); + /** The formatting code that produces this format. */ + private final char formattingCode; + private final boolean fancyStyling; + /** + * The control string (section sign + formatting code) that can be inserted into client-side text to display + * subsequent text in this format. + */ + private final String controlString; + + private UtilsChatFormatting(final char p_i1336_3_) + { + this(p_i1336_3_, false); + } + + private UtilsChatFormatting(final char p_i1337_3_, final boolean p_i1337_4_) + { + this.formattingCode = p_i1337_3_; + this.fancyStyling = p_i1337_4_; + this.controlString = "\u00a7" + p_i1337_3_; + } + + /** + * Gets the formatting code that produces this format. + */ + public char getFormattingCode() + { + return this.formattingCode; + } + + /** + * False if this is just changing the color or resetting; true otherwise. + */ + public boolean isFancyStyling() + { + return this.fancyStyling; + } + + /** + * Checks if typo is a color. + */ + public boolean isColor() + { + return !this.fancyStyling && (this != RESET); + } + + /** + * Gets the friendly name of this value. + */ + public String getFriendlyName() + { + return this.name().toLowerCase(); + } + + @Override public String toString() - { - return this.controlString; - } - - /** - * Returns a copy of the given string, with formatting codes stripped away. - */ - @SideOnly(Side.CLIENT) - public static String getTextWithoutFormattingCodes(String p_110646_0_) - { - return p_110646_0_ == null ? null : formattingCodePattern.matcher(p_110646_0_).replaceAll(""); - } - - /** - * Gets a value by its friendly name; null if the given name does not map to a defined value. - */ - public static UtilsChatFormatting getValueByName(String p_96300_0_) - { - return p_96300_0_ == null ? null : (UtilsChatFormatting)nameMapping.get(p_96300_0_.toLowerCase()); - } - - /** - * Gets all the valid values. Args: @param par0: Whether or not to include color values. @param par1: Whether or not - * to include fancy-styling values (anything that isn't a color value or the "reset" value). - */ - public static Collection getValidValues(boolean p_96296_0_, boolean p_96296_1_) - { - ArrayList arraylist = new ArrayList(); - UtilsChatFormatting[] aenumchatformatting = values(); - int i = aenumchatformatting.length; - - for (int j = 0; j < i; ++j) - { - UtilsChatFormatting enumchatformatting = aenumchatformatting[j]; - - if ((!enumchatformatting.isColor() || p_96296_0_) && (!enumchatformatting.isFancyStyling() || p_96296_1_)) - { - arraylist.add(enumchatformatting.getFriendlyName()); - } - } - - return arraylist; - } - - static - { - UtilsChatFormatting[] var0 = values(); - int var1 = var0.length; - - for (int var2 = 0; var2 < var1; ++var2) - { - UtilsChatFormatting var3 = var0[var2]; - formattingCodeMapping.put(Character.valueOf(var3.getFormattingCode()), var3); - nameMapping.put(var3.getFriendlyName(), var3); - } - } + { + return this.controlString; + } + + /** + * Returns a copy of the given string, with formatting codes stripped away. + */ + @SideOnly(Side.CLIENT) + public static String getTextWithoutFormattingCodes(final String p_110646_0_) + { + return p_110646_0_ == null ? null : formattingCodePattern.matcher(p_110646_0_).replaceAll(""); + } + + /** + * Gets a value by its friendly name; null if the given name does not map to a defined value. + */ + public static UtilsChatFormatting getValueByName(final String p_96300_0_) + { + return p_96300_0_ == null ? null : (UtilsChatFormatting)nameMapping.get(p_96300_0_.toLowerCase()); + } + + /** + * Gets all the valid values. Args: @param par0: Whether or not to include color values. @param par1: Whether or not + * to include fancy-styling values (anything that isn't a color value or the "reset" value). + */ + public static Collection getValidValues(final boolean p_96296_0_, final boolean p_96296_1_) + { + final ArrayList arraylist = new ArrayList<>(); + final UtilsChatFormatting[] aenumchatformatting = values(); + final int i = aenumchatformatting.length; + + for (int j = 0; j < i; ++j) + { + final UtilsChatFormatting enumchatformatting = aenumchatformatting[j]; + + if ((!enumchatformatting.isColor() || p_96296_0_) && (!enumchatformatting.isFancyStyling() || p_96296_1_)) + { + arraylist.add(enumchatformatting.getFriendlyName()); + } + } + + return arraylist; + } + + static + { + final UtilsChatFormatting[] var0 = values(); + final int var1 = var0.length; + + for (int var2 = 0; var2 < var1; ++var2) + { + final UtilsChatFormatting var3 = var0[var2]; + formattingCodeMapping.put(Character.valueOf(var3.getFormattingCode()), var3); + nameMapping.put(var3.getFriendlyName(), var3); + } + } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/util/UtilsRarity.java b/src/Java/gtPlusPlus/core/util/UtilsRarity.java index 19339b7717..78f3a10bdb 100644 --- a/src/Java/gtPlusPlus/core/util/UtilsRarity.java +++ b/src/Java/gtPlusPlus/core/util/UtilsRarity.java @@ -4,20 +4,20 @@ import net.minecraft.util.EnumChatFormatting; public enum UtilsRarity { - T1_poor(EnumChatFormatting.GRAY, "Poor"), - T2_normal(EnumChatFormatting.WHITE, "Common"), - T3_uncommon(EnumChatFormatting.GREEN, "Uncommon"), - T4_magic(EnumChatFormatting.BLUE, "Magic"), - T5_rare(EnumChatFormatting.LIGHT_PURPLE, "Rare"), - T6_epic(EnumChatFormatting.YELLOW, "Epic"), - T8_unique(EnumChatFormatting.GOLD, "Unique"); - - public final EnumChatFormatting rarityColor; - public final String rarityName; + T1_poor(EnumChatFormatting.GRAY, "Poor"), + T2_normal(EnumChatFormatting.WHITE, "Common"), + T3_uncommon(EnumChatFormatting.GREEN, "Uncommon"), + T4_magic(EnumChatFormatting.BLUE, "Magic"), + T5_rare(EnumChatFormatting.LIGHT_PURPLE, "Rare"), + T6_epic(EnumChatFormatting.YELLOW, "Epic"), + T8_unique(EnumChatFormatting.GOLD, "Unique"); - private UtilsRarity(EnumChatFormatting rarity, String name) - { - this.rarityColor = rarity; - this.rarityName = name; - } + public final EnumChatFormatting rarityColor; + public final String rarityName; + + private UtilsRarity(final EnumChatFormatting rarity, final String name) + { + this.rarityColor = rarity; + this.rarityName = name; + } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/util/UtilsText.java b/src/Java/gtPlusPlus/core/util/UtilsText.java index e91fa95e4c..6d26676ce3 100644 --- a/src/Java/gtPlusPlus/core/util/UtilsText.java +++ b/src/Java/gtPlusPlus/core/util/UtilsText.java @@ -20,13 +20,13 @@ public enum UtilsText { white('f'); private char colourValue; - private UtilsText (char value) + private UtilsText (final char value) { this.colourValue = value; } public String colour() { - return "§"+colourValue; + return "�"+this.colourValue; } } diff --git a/src/Java/gtPlusPlus/core/util/array/ArrayUtils.java b/src/Java/gtPlusPlus/core/util/array/ArrayUtils.java index ea02aaf1da..910c4597af 100644 --- a/src/Java/gtPlusPlus/core/util/array/ArrayUtils.java +++ b/src/Java/gtPlusPlus/core/util/array/ArrayUtils.java @@ -4,15 +4,15 @@ import java.util.Arrays; public class ArrayUtils { - public static void expandArray(Object[] someArray, Object newValueToAdd) { + public static void expandArray(final Object[] someArray, final Object newValueToAdd) { Object[] series = someArray; - series = addElement(series, newValueToAdd); + series = addElement(series, newValueToAdd); } - private static Object[] addElement(Object[] series, Object newValueToAdd) { - series = Arrays.copyOf(series, series.length + 1); - series[series.length - 1] = newValueToAdd; - return series; + private static Object[] addElement(Object[] series, final Object newValueToAdd) { + series = Arrays.copyOf(series, series.length + 1); + series[series.length - 1] = newValueToAdd; + return series; } - + } diff --git a/src/Java/gtPlusPlus/core/util/array/Pair.java b/src/Java/gtPlusPlus/core/util/array/Pair.java index 94437e6779..ec5971c449 100644 --- a/src/Java/gtPlusPlus/core/util/array/Pair.java +++ b/src/Java/gtPlusPlus/core/util/array/Pair.java @@ -1,21 +1,21 @@ package gtPlusPlus.core.util.array; -public class Pair { - - private final K key; - private final V value; - +public class Pair { + + private final K key; + private final V value; + public Pair(final K key, final V value){ this.key = key; this.value = value; } - + final public K getKey(){ - return key; - } - + return this.key; + } + final public V getValue(){ - return value; - } + return this.value; + } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/util/array/Triplet.java b/src/Java/gtPlusPlus/core/util/array/Triplet.java index 07f29ae6c8..2130491d5b 100644 --- a/src/Java/gtPlusPlus/core/util/array/Triplet.java +++ b/src/Java/gtPlusPlus/core/util/array/Triplet.java @@ -1,27 +1,27 @@ package gtPlusPlus.core.util.array; -public class Triplet { - - private final K key; - private final V value; +public class Triplet { + + private final K key; + private final V value; private final C count; - + public Triplet(final K key, final V value, final C value2){ this.key = key; this.value = value; this.count = value2; } - + final public K getKey(){ - return key; - } - + return this.key; + } + final public V getValue(){ - return value; - } - + return this.value; + } + final public C getSecondValue(){ - return count; - } + return this.count; + } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/util/debug/DEBUG_BLOCK_ShapeSpawner.java b/src/Java/gtPlusPlus/core/util/debug/DEBUG_BLOCK_ShapeSpawner.java index 74df9f90ba..28a47d9b14 100644 --- a/src/Java/gtPlusPlus/core/util/debug/DEBUG_BLOCK_ShapeSpawner.java +++ b/src/Java/gtPlusPlus/core/util/debug/DEBUG_BLOCK_ShapeSpawner.java @@ -11,20 +11,21 @@ public class DEBUG_BLOCK_ShapeSpawner extends DEBUG_MULTIBLOCK_ShapeSpawner { private static boolean controller; - public DEBUG_BLOCK_ShapeSpawner(int aID, String aName, String aNameRegional) { + public DEBUG_BLOCK_ShapeSpawner(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public DEBUG_BLOCK_ShapeSpawner(String aName) { + public DEBUG_BLOCK_ShapeSpawner(final String aName) { super(aName); } @Override - public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { return new DEBUG_BLOCK_ShapeSpawner(this.mName); } - + + @Override public String[] getDescription() { return new String[]{ "Controller Block for the Testing", @@ -33,73 +34,73 @@ public class DEBUG_BLOCK_ShapeSpawner extends DEBUG_MULTIBLOCK_ShapeSpawner { @Override - public ITexture[] getTexture(IGregTechTileEntity arg0, byte arg1, - byte arg2, byte arg3, boolean arg4, boolean arg5) { + public ITexture[] getTexture(final IGregTechTileEntity arg0, final byte arg1, + final byte arg2, final byte arg3, final boolean arg4, final boolean arg5) { // TODO Auto-generated method stub return null; } @Override - public boolean isCorrectMachinePart(ItemStack aStack) { + public boolean isCorrectMachinePart(final ItemStack aStack) { // TODO Auto-generated method stub return false; } @Override - public boolean checkRecipe(ItemStack aStack) { + public boolean checkRecipe(final ItemStack aStack) { // TODO Auto-generated method stub return false; } @Override - public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { - - int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; - int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; - + public boolean checkMachine(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) { + + final int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; + final int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; + if (!aBaseMetaTileEntity.getAirOffset(xDir, 0, zDir)) { return false; } - + int stepX = aBaseMetaTileEntity.getXCoord(); - int stepY = aBaseMetaTileEntity.getYCoord(); + final int stepY = aBaseMetaTileEntity.getYCoord(); int stepZ = aBaseMetaTileEntity.getZCoord(); - int temp = 0; + final int temp = 0; - Utils.LOG_INFO("Starting Block located @ "+"[X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]"); + Utils.LOG_INFO("Starting Block located @ "+"[X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]"); - int tAmount = 0; + final int tAmount = 0; switch (xDir) { case -1: stepX++; - Utils.LOG_INFO("Modifying stepX + accomodate a "+xDir+" xDir - [X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]"); + Utils.LOG_INFO("Modifying stepX + accomodate a "+xDir+" xDir - [X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]"); break; case 1: stepX--; - Utils.LOG_INFO("Modifying stepX - accomodate a "+xDir+" xDir - [X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]"); + Utils.LOG_INFO("Modifying stepX - accomodate a "+xDir+" xDir - [X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]"); break; } switch (zDir) { case -1: stepZ++; - Utils.LOG_INFO("Modifying stepZ + accomodate a "+zDir+" zDir - [X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]"); + Utils.LOG_INFO("Modifying stepZ + accomodate a "+zDir+" zDir - [X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]"); break; case 1: stepZ--; - Utils.LOG_INFO("Modifying stepZ - accomodate a "+zDir+" zDir - [X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]"); + Utils.LOG_INFO("Modifying stepZ - accomodate a "+zDir+" zDir - [X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]"); break; } - for (int i = stepX-1; i <= stepX+1; i++){ - for (int j = stepZ-1; j <= stepZ+1; j++){ - for (int h = stepY-1; h <= stepY+1; h++){ + for (int i = stepX-1; i <= (stepX+1); i++){ + for (int j = stepZ-1; j <= (stepZ+1); j++){ + for (int h = stepY-1; h <= (stepY+1); h++){ Utils.LOG_INFO("Block Facing - X:"+xDir+" Z:"+zDir); Utils.LOG_INFO("(h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))"); - Utils.LOG_INFO(" "+(h != 0)+" || "+(((xDir + i != 0)+" || "+(zDir + j != 0))+" && "+((i != 0)+" || "+(j != 0)))); + Utils.LOG_INFO(" "+(h != 0)+" || "+((((xDir + i) != 0)+" || "+((zDir + j) != 0))+" && "+((i != 0)+" || "+(j != 0)))); } } } @@ -107,19 +108,19 @@ public class DEBUG_BLOCK_ShapeSpawner extends DEBUG_MULTIBLOCK_ShapeSpawner { } @Override - public int getMaxEfficiency(ItemStack aStack) { + public int getMaxEfficiency(final ItemStack aStack) { // TODO Auto-generated method stub return 0; } @Override - public int getPollutionPerTick(ItemStack aStack) { + public int getPollutionPerTick(final ItemStack aStack) { // TODO Auto-generated method stub return 0; } @Override - public int getDamageToComponent(ItemStack aStack) { + public int getDamageToComponent(final ItemStack aStack) { // TODO Auto-generated method stub return 0; } @@ -131,7 +132,7 @@ public class DEBUG_BLOCK_ShapeSpawner extends DEBUG_MULTIBLOCK_ShapeSpawner { } @Override - public boolean explodesOnComponentBreak(ItemStack aStack) { + public boolean explodesOnComponentBreak(final ItemStack aStack) { // TODO Auto-generated method stub return false; } diff --git a/src/Java/gtPlusPlus/core/util/debug/DEBUG_INIT.java b/src/Java/gtPlusPlus/core/util/debug/DEBUG_INIT.java index 440949471c..8ac31a038f 100644 --- a/src/Java/gtPlusPlus/core/util/debug/DEBUG_INIT.java +++ b/src/Java/gtPlusPlus/core/util/debug/DEBUG_INIT.java @@ -1,12 +1,12 @@ package gtPlusPlus.core.util.debug; +import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.base.BaseItemWithCharge; import gtPlusPlus.core.item.general.BedLocator_Base; import gtPlusPlus.core.lib.CORE; import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.registry.GameRegistry; public class DEBUG_INIT { @@ -21,7 +21,7 @@ public class DEBUG_INIT { ModItems.itemDebugShapeSpawner = new DEBUG_ITEM_ShapeSpawner("itemDebugShapeSpawner", AddToCreativeTab.tabMisc, 1, 500); GameRegistry.registerItem(ModItems.itemDebugShapeSpawner, "itemDebugShapeSpawner"); ModItems.itemBedLocator_Base = new BedLocator_Base("itemBedLocator_Base"); - GameRegistry.registerItem(ModItems.itemBedLocator_Base, "itemBedLocator_Base"); + GameRegistry.registerItem(ModItems.itemBedLocator_Base, "itemBedLocator_Base"); ModItems.itemBaseItemWithCharge = new BaseItemWithCharge("itemBaseItemWithCharge", 0, 1000); GameRegistry.registerItem(ModItems.itemBaseItemWithCharge, "itemBaseItemWithCharge"); } @@ -37,7 +37,7 @@ public class DEBUG_INIT { } public static void registerHandlers(){ - MinecraftForge.EVENT_BUS.register(new DEBUG_ScreenOverlay()); + MinecraftForge.EVENT_BUS.register(new DEBUG_ScreenOverlay()); } } diff --git a/src/Java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java b/src/Java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java index bfaa7404e1..a35d2c26de 100644 --- a/src/Java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java +++ b/src/Java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java @@ -1,19 +1,19 @@ package gtPlusPlus.core.util.debug; import static net.minecraftforge.event.entity.player.PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.BaseItemGeneric; -import gtPlusPlus.core.util.Utils; import java.util.List; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.item.base.BaseItemGeneric; +import gtPlusPlus.core.util.Utils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class DEBUG_ITEM_ShapeSpawner extends BaseItemGeneric{ @@ -26,30 +26,32 @@ public class DEBUG_ITEM_ShapeSpawner extends BaseItemGeneric{ } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player){ - + public ItemStack onItemRightClick(final ItemStack stack, final World world, final EntityPlayer player){ + if (!world.isRemote){ Utils.LOG_INFO("Constructing the shape for the "+"VACUUM FREEZER"); - Thread thread = new Thread(new DEBUG_TimerThread(world, player)); - thread.start(); + final Thread thread = new Thread(new DEBUG_TimerThread(world, player)); + thread.start(); } - return stack; + return stack; } - - - + + + @SuppressWarnings("static-method") @SubscribeEvent - public void playerInteractEventHandler(PlayerInteractEvent event) + public void playerInteractEventHandler(final PlayerInteractEvent event) { - if (event.isCanceled() || event.world.isRemote || event.action != RIGHT_CLICK_BLOCK) return; + if (event.isCanceled() || event.world.isRemote || (event.action != RIGHT_CLICK_BLOCK)) { + return; + } } @SuppressWarnings({ "unchecked", "rawtypes" }) @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { list.add(EnumChatFormatting.GOLD+"For Testing Gregtech Shapes!"); super.addInformation(stack, aPlayer, list, bool); - } + } } diff --git a/src/Java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java b/src/Java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java index 8e4c34bf1a..d31fb10b84 100644 --- a/src/Java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java +++ b/src/Java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java @@ -1,6 +1,9 @@ package gtPlusPlus.core.util.debug; import static gregtech.api.enums.GT_Values.V; + +import java.util.ArrayList; + import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.*; @@ -15,9 +18,6 @@ import gregtech.api.objects.GT_ItemStack; import gregtech.api.util.*; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.common.items.GT_MetaGenerated_Tool_01; - -import java.util.ArrayList; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -26,768 +26,887 @@ import net.minecraftforge.fluids.FluidStack; public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity { - public static boolean disableMaintenance; - public boolean mMachine = false, mWrench = false, mScrewdriver = false, mSoftHammer = false, mHardHammer = false, mSolderingTool = false, mCrowbar = false, mRunningOnLoad = false; - public int mPollution = 0, mProgresstime = 0, mMaxProgresstime = 0, mEUt = 0, mEfficiencyIncrease = 0, mUpdate = 0, mStartUpCheck = 100, mRuntime = 0, mEfficiency = 0; - public ItemStack[] mOutputItems = null; - public FluidStack[] mOutputFluids = null; - public ArrayList mInputHatches = new ArrayList(); - public ArrayList mOutputHatches = new ArrayList(); - public ArrayList mInputBusses = new ArrayList(); - public ArrayList mOutputBusses = new ArrayList(); - public ArrayList mDynamoHatches = new ArrayList(); - public ArrayList mMufflerHatches = new ArrayList(); - public ArrayList mEnergyHatches = new ArrayList(); - public ArrayList mMaintenanceHatches = new ArrayList(); - - public DEBUG_MULTIBLOCK_ShapeSpawner(int aID, String aName, String aNameRegional) { - super(aID, aName, aNameRegional, 2); - this.disableMaintenance = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "MultiBlockMachines.disableMaintenance", false); - } - - public DEBUG_MULTIBLOCK_ShapeSpawner(String aName) { - super(aName, 2); - this.disableMaintenance = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "MultiBlockMachines.disableMaintenance", false); - } - - public static boolean isValidMetaTileEntity(MetaTileEntity aMetaTileEntity) { - return aMetaTileEntity.getBaseMetaTileEntity() != null && aMetaTileEntity.getBaseMetaTileEntity().getMetaTileEntity() == aMetaTileEntity && !aMetaTileEntity.getBaseMetaTileEntity().isDead(); - } - - @Override - public boolean allowCoverOnSide(byte aSide, GT_ItemStack aCoverID) { - return aSide != getBaseMetaTileEntity().getFrontFacing(); - } - - @Override - public boolean isSimpleMachine() { - return false; - } - - @Override - public boolean isFacingValid(byte aFacing) { - return true; - } - - @Override - public boolean isAccessAllowed(EntityPlayer aPlayer) { - r