diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/util')
23 files changed, 370 insertions, 316 deletions
diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java index f8ae3e4cba..ab11dccd4e 100644 --- a/src/Java/gtPlusPlus/core/util/Utils.java +++ b/src/Java/gtPlusPlus/core/util/Utils.java @@ -16,12 +16,8 @@ import java.util.Timer; import java.util.TimerTask; import org.apache.commons.lang3.EnumUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.relauncher.FMLRelaunchLog; import gregtech.GT_Mod; import gregtech.api.enums.Materials; import gregtech.api.enums.TC_Aspects; @@ -30,10 +26,10 @@ import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_Utility; import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.proxy.ClientProxy; import gtPlusPlus.core.util.array.Pair; import gtPlusPlus.core.util.fluid.FluidUtils; import gtPlusPlus.core.util.item.ItemUtils; @@ -73,7 +69,7 @@ public class Utils { static class ShortTimerTask extends TimerTask { @Override public void run() { - Utils.LOG_WARNING("Timer expired."); + Logger.WARNING("Timer expired."); } } @@ -109,47 +105,47 @@ public class Utils { // Adds in Compat for older GT Versions which Misspell aspects. try { if (EnumUtils.isValidEnum(TC_Aspects.class, "COGNITIO")) { - Utils.LOG_WARNING("TC Aspect found - " + aspect); + Logger.WARNING("TC Aspect found - " + aspect); returnValue = new TC_AspectStack(TC_Aspects.valueOf("COGNITIO"), size); } else { - Utils.LOG_INFO("Fallback TC Aspect found - " + aspect + Logger.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 (final NoSuchFieldError r) { - Utils.LOG_INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus"); + Logger.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. try { if (EnumUtils.isValidEnum(TC_Aspects.class, "EXANIMUS")) { - Utils.LOG_WARNING("TC Aspect found - " + aspect); + Logger.WARNING("TC Aspect found - " + aspect); returnValue = new TC_AspectStack(TC_Aspects.valueOf("EXANIMUS"), size); } else { - Utils.LOG_INFO("Fallback TC Aspect found - " + aspect + Logger.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 (final NoSuchFieldError r) { - Utils.LOG_INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus"); + Logger.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. try { if (EnumUtils.isValidEnum(TC_Aspects.class, "PRAECANTATIO")) { - Utils.LOG_WARNING("TC Aspect found - " + aspect); + Logger.WARNING("TC Aspect found - " + aspect); returnValue = new TC_AspectStack(TC_Aspects.valueOf("PRAECANTATIO"), size); } else { - Utils.LOG_INFO("Fallback TC Aspect found - " + aspect + Logger.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 (final NoSuchFieldError r) { - Utils.LOG_INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus"); + Logger.INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus"); } } else { - Utils.LOG_WARNING("TC Aspect found - " + aspect); + Logger.WARNING("TC Aspect found - " + aspect); returnValue = new TC_AspectStack(TC_Aspects.valueOf(aspect), size); } @@ -175,73 +171,6 @@ public class Utils { || (target.getItemDamage() == input.getItemDamage()))); } - // Logging Functions - private static final Logger modLogger = makeLogger(); - - // Generate GT++ Logger - public static Logger makeLogger() { - final Logger gtPlusPlusLogger = LogManager.getLogger("GT++"); - return gtPlusPlusLogger; - } - - public static final Logger getLogger(){ - return modLogger; - } - - // Non-Dev Comments - public static void LOG_INFO(final String s) { - // if (CORE.DEBUG){ - modLogger.info(s); - // } - } - - // Non-Dev Comments - public static void LOG_MACHINE_INFO(final String s) { - - boolean localPlayer = false; - try { - if (ClientProxy.playerName != null){ - if (ClientProxy.playerName.toLowerCase().contains("draknyte1")){ - localPlayer = true; - } - } - } - catch (final Throwable t){ - - } - - if (CORE.ConfigSwitches.MACHINE_INFO || localPlayer) { - final String name1 = gtPlusPlus.core.util.reflect.ReflectionUtils.getMethodName(2); - modLogger.info("Machine Info: " + s + " | " + name1); - } - } - - // Developer Comments - public static void LOG_WARNING(final String s) { - if (CORE.DEBUG) { - modLogger.warn(s); - } - } - - // Errors - public static void LOG_ERROR(final String s) { - if (CORE.DEBUG) { - modLogger.fatal(s); - } - } - - // Developer Logger - public static void LOG_SPECIFIC_WARNING(final String whatToLog, final String msg, final int line) { - // if (!CORE.DEBUG){ - FMLLog.warning("GT++ |" + line + "| " + whatToLog + " | " + msg); - // } - } - - // Non-Dev Comments - public static void LOG_ASM(final String s) { - FMLRelaunchLog.info("", s); - } - //Register an event to both busses. public static void registerEvent(Object o){ MinecraftForge.EVENT_BUS.register(o); @@ -293,7 +222,7 @@ public class Utils { if (!currentWorld.isRemote) { try { correctTool = currentBlock.getHarvestTool(0); - Utils.LOG_WARNING(correctTool); + Logger.WARNING(correctTool); } catch (final NullPointerException e) { @@ -434,8 +363,8 @@ public class Utils { // 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) + "."); + Logger.WARNING("Made " + temp + " - Hopefully it's not a mess."); + Logger.WARNING("It will decode into " + Integer.decode(temp) + "."); return Integer.decode(temp); } @@ -486,7 +415,7 @@ public class Utils { code = code + code + 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()); + Logger.WARNING("" + Integer.toHexString(0x1000000 | i).substring(1).toUpperCase()); } return hexColorMap; } @@ -517,7 +446,7 @@ public class Utils { public static Integer appenedHexNotationToInteger(final int hexAsStringOrInt) { final String hexChar = "0x"; String result; - Utils.LOG_WARNING(String.valueOf(hexAsStringOrInt)); + Logger.WARNING(String.valueOf(hexAsStringOrInt)); result = hexChar + String.valueOf(hexAsStringOrInt); return Integer.getInteger(result); } @@ -546,21 +475,21 @@ public class Utils { private static short cellID = 15; public static ItemStack createInternalNameAndFluidCell(final String s) { - Utils.LOG_WARNING("1"); + Logger.WARNING("1"); final InternalName yourName = EnumHelper.addEnum(InternalName.class, s, new Class[0], new Object[0]); - Utils.LOG_WARNING("2 " + yourName.name()); + Logger.WARNING("2 " + yourName.name()); final ItemCell item = (ItemCell) Ic2Items.cell.getItem(); - Utils.LOG_WARNING("3 " + item.getUnlocalizedName()); + Logger.WARNING("3 " + item.getUnlocalizedName()); try { - Utils.LOG_WARNING("4"); + Logger.WARNING("4"); final Class<? extends ItemCell> clz = item.getClass(); - Utils.LOG_WARNING("5 " + clz.getSimpleName()); + Logger.WARNING("5 " + clz.getSimpleName()); final Method methode = clz.getDeclaredMethod("addCell", int.class, InternalName.class, Block[].class); - Utils.LOG_WARNING("6 " + methode.getName()); + Logger.WARNING("6 " + methode.getName()); methode.setAccessible(true); - Utils.LOG_WARNING("7 " + methode.isAccessible()); + Logger.WARNING("7 " + methode.isAccessible()); final ItemStack temp = (ItemStack) methode.invoke(item, cellID++, yourName, new Block[0]); - Utils.LOG_WARNING("Successfully created " + temp.getDisplayName() + "s."); + Logger.WARNING("Successfully created " + temp.getDisplayName() + "s."); FluidContainerRegistry.registerFluidContainer(FluidUtils.getFluidStack(s.toLowerCase(), 1000), temp.copy(), Ic2Items.cell.copy()); ItemUtils.addItemToOreDictionary(temp.copy(), "cell" + s); @@ -572,21 +501,21 @@ public class Utils { } public static ItemStack createInternalNameAndFluidCellNoOreDict(final String s) { - Utils.LOG_WARNING("1"); + Logger.WARNING("1"); final InternalName yourName = EnumHelper.addEnum(InternalName.class, s, new Class[0], new Object[0]); - Utils.LOG_WARNING("2 " + yourName.name()); + Logger.WARNING("2 " + yourName.name()); final ItemCell item = (ItemCell) Ic2Items.cell.getItem(); - Utils.LOG_WARNING("3 " + item.getUnlocalizedName()); + Logger.WARNING("3 " + item.getUnlocalizedName()); try { - Utils.LOG_WARNING("4"); + Logger.WARNING("4"); final Class<? extends ItemCell> clz = item.getClass(); - Utils.LOG_WARNING("5 " + clz.getSimpleName()); + Logger.WARNING("5 " + clz.getSimpleName()); final Method methode = clz.getDeclaredMethod("addCell", int.class, InternalName.class, Block[].class); - Utils.LOG_WARNING("6 " + methode.getName()); + Logger.WARNING("6 " + methode.getName()); methode.setAccessible(true); - Utils.LOG_WARNING("7 " + methode.isAccessible()); + Logger.WARNING("7 " + methode.isAccessible()); final ItemStack temp = (ItemStack) methode.invoke(item, cellID++, yourName, new Block[0]); - Utils.LOG_WARNING("Successfully created " + temp.getDisplayName() + "s."); + Logger.WARNING("Successfully created " + temp.getDisplayName() + "s."); FluidContainerRegistry.registerFluidContainer(FluidUtils.getFluidStack(s.toLowerCase(), 1000), temp.copy(), Ic2Items.cell.copy()); // ItemUtils.addItemToOreDictionary(temp.copy(), "cell"+s); @@ -739,7 +668,7 @@ public class Utils { final float damage = material.vToolQuality; final int efficiency = material.vToolQuality; // int enchantability = material.mEnchantmentToolsLevel; - Utils.LOG_INFO("ToolMaterial stats for " + material.getLocalizedName() + " | harvestLevel:" + harvestLevel + Logger.INFO("ToolMaterial stats for " + material.getLocalizedName() + " | harvestLevel:" + harvestLevel + " | durability:" + durability + " | toolQuality:" + damage + " | toolSpeed:" + damage); final ToolMaterial temp = EnumHelper.addToolMaterial(name, harvestLevel, durability, efficiency, damage, 0); return temp; @@ -814,7 +743,7 @@ public class Utils { .append("'").toString()); NBTUtils.createIntegerTagCompound(rStack, "stats", "mMeta", vMeta); CORE.sBookList.put(aMapping, rStack); - Utils.LOG_INFO("Creating book: " + aTitle + " by " + aAuthor + ". Using Meta " + vMeta + "."); + Logger.INFO("Creating book: " + aTitle + " by " + aAuthor + ". Using Meta " + vMeta + "."); return GT_Utility.copy(new Object[] { rStack }); } diff --git a/src/Java/gtPlusPlus/core/util/array/AutoMap.java b/src/Java/gtPlusPlus/core/util/array/AutoMap.java new file mode 100644 index 0000000000..ea5e1dd25e --- /dev/null +++ b/src/Java/gtPlusPlus/core/util/array/AutoMap.java @@ -0,0 +1,77 @@ +package gtPlusPlus.core.util.array; + +import java.io.Serializable; +import java.util.*; + +public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable { + + /** + * The Internal Map + */ + private Map<Integer, V> mInternalMap = new HashMap<Integer, V>(); + + /** + * The Internal ID + */ + private int mInternalID = 0; + private static final long serialVersionUID = 3771412318075131790L; + + @Override + public Iterator<V> iterator() { + return values().iterator(); + } + + public synchronized boolean setValue(V object){ + int mOriginalID = this.mInternalID; + put(object); + if (this.mInternalMap.get(mOriginalID).equals(object) || mOriginalID > this.mInternalID){ + return true; + } + else { + return false; + } + } + + public synchronized V put(V object){ + return set(object); + } + + public synchronized V set(V object){ + return mInternalMap.put(mInternalID++, object); + } + + public synchronized V get(int id){ + return mInternalMap.get(id); + } + + public synchronized Collection<V> values(){ + return mInternalMap.values(); + } + + public synchronized int size(){ + return mInternalMap.size(); + } + + public synchronized int hashcode(){ + return mInternalMap.hashCode(); + } + + public synchronized boolean containsKey(int key){ + return mInternalMap.containsKey(key); + } + + public synchronized boolean containsValue(V value){ + return mInternalMap.containsValue(value); + } + + public synchronized boolean isEmpty(){ + return mInternalMap.isEmpty(); + } + + public synchronized boolean clear(){ + this.mInternalID = 0; + this.mInternalMap.clear(); + return true; + } + +} diff --git a/src/Java/gtPlusPlus/core/util/array/Quad.java b/src/Java/gtPlusPlus/core/util/array/Quad.java new file mode 100644 index 0000000000..417c3b6ebc --- /dev/null +++ b/src/Java/gtPlusPlus/core/util/array/Quad.java @@ -0,0 +1,33 @@ +package gtPlusPlus.core.util.array; + +public class Quad<K,V,C,R> { + + private final K key; + private final V value; + private final C value2; + private final R value3; + + public Quad(final K key, final V value, final C value2, final R value3){ + this.key = key; + this.value = value; + this.value2 = value2; + this.value3 = value3; + } + + final public K getKey(){ + return this.key; + } + + final public V getValue_1(){ + return this.value; + } + + final public C getValue_2(){ + return this.value2; + } + + final public R getValue_3(){ + return this.value3; + } + +}
\ No newline at end of file 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 a35d2c26de..35c8f5caad 100644 --- a/src/Java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java +++ b/src/Java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java @@ -5,9 +5,9 @@ import static net.minecraftforge.event.entity.player.PlayerInteractEvent.Action. import java.util.List; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import gtPlusPlus.api.objects.Logger; 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; @@ -29,7 +29,7 @@ public class DEBUG_ITEM_ShapeSpawner extends BaseItemGeneric{ 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"); + Logger.INFO("Constructing the shape for the "+"VACUUM FREEZER"); final Thread thread = new Thread(new DEBUG_TimerThread(world, player)); thread.start(); } diff --git a/src/Java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java b/src/Java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java index a0690c9440..778809b486 100644 --- a/src/Java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java +++ b/src/Java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java @@ -2,7 +2,7 @@ package gtPlusPlus.core.util.debug; import java.util.concurrent.TimeUnit; -import gtPlusPlus.core.util.Utils; +import gtPlusPlus.api.objects.Logger; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -28,9 +28,9 @@ public class DEBUG_TimerThread implements Runnable { final int stepX = Minecraft.getMinecraft().objectMouseOver.blockX; final int stepY = Minecraft.getMinecraft().objectMouseOver.blockY; final int stepZ = Minecraft.getMinecraft().objectMouseOver.blockZ; - Utils.LOG_INFO("Clicked on a Block @ "+"[X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]"+" with xDir:"+xDir+" zDir:"+zDir); + Logger.INFO("Clicked on a Block @ "+"[X:"+stepX+"][Y:"+stepY+"][Z:"+stepZ+"]"+" with xDir:"+xDir+" zDir:"+zDir); this.world.setBlock(stepX, stepY, stepZ, Blocks.bedrock,0,3); - Utils.LOG_INFO("Makng it Bedrock for future investment."); + Logger.INFO("Makng it Bedrock for future investment."); //for (int i = -1; i <= 1; i++) { //stepX = stepX+i; for (int i = stepX-1; i <= (stepX+1); i++){ @@ -44,12 +44,12 @@ public class DEBUG_TimerThread implements Runnable { //stepZ = stepZ+j; //for (int h = -1; h <= 1; h++) { //stepY = stepY+h; - Utils.LOG_INFO("Placing Block @ "+"[X:"+i+"][Y:"+h+"][Z:"+j+"]"+" with xDir:"+xDir+" zDir:"+zDir); + Logger.INFO("Placing Block @ "+"[X:"+i+"][Y:"+h+"][Z:"+j+"]"+" with xDir:"+xDir+" zDir:"+zDir); if ((h != 0) || ((((xDir + i) != 0) || ((zDir + j) != 0)) && ((i != 0) || (j != 0)))) { this.world.setBlock(i, h, j, Blocks.stone,0,3); } else { - Utils.LOG_INFO("Not even sure what this is for, but I got here."); + Logger.INFO("Not even sure what this is for, but I got here."); } try { TimeUnit.MILLISECONDS.sleep(500); diff --git a/src/Java/gtPlusPlus/core/util/enchanting/EnchantingUtils.java b/src/Java/gtPlusPlus/core/util/enchanting/EnchantingUtils.java index 76336d4298..288ca2e2cc 100644 --- a/src/Java/gtPlusPlus/core/util/enchanting/EnchantingUtils.java +++ b/src/Java/gtPlusPlus/core/util/enchanting/EnchantingUtils.java @@ -1,6 +1,6 @@ package gtPlusPlus.core.util.enchanting; -import gtPlusPlus.core.util.Utils; +import gtPlusPlus.api.objects.Logger; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -78,7 +78,7 @@ public class EnchantingUtils { //Xp Fluids public static FluidStack getMobEssence(final int amount){ - Utils.LOG_WARNING("Trying to get a fluid stack of Mob Essence."); + Logger.WARNING("Trying to get a fluid stack of Mob Essence."); try { return FluidRegistry.getFluidStack("mobessence", amount).copy(); } @@ -89,7 +89,7 @@ public class EnchantingUtils { } public static FluidStack getLiquidXP(final int amount){ - Utils.LOG_WARNING("Trying to get a fluid stack of Liquid XP."); + Logger.WARNING("Trying to get a fluid stack of Liquid XP."); try { return FluidRegistry.getFluidStack("xpjuice", amount).copy(); } diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java index 611c7fe897..444f35a46f 100644 --- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java +++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java @@ -4,6 +4,7 @@ import gregtech.api.enums.Dyes; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.util.GT_LanguageManager; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.fluids.GenericFluid; import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.item.base.cell.BaseItemCell; @@ -26,7 +27,7 @@ import net.minecraftforge.fluids.IFluidContainerItem; public class FluidUtils { public static FluidStack getFluidStack(final String fluidName, final int amount){ - Utils.LOG_WARNING("Trying to get a fluid stack of "+fluidName); + Logger.WARNING("Trying to get a fluid stack of "+fluidName); try { return FluidRegistry.getFluidStack(fluidName, amount).copy(); } @@ -37,7 +38,7 @@ public class FluidUtils { } public static FluidStack getFluidStack(final FluidStack vmoltenFluid, final int fluidAmount) { - Utils.LOG_WARNING("Trying to get a fluid stack of "+vmoltenFluid.getFluid().getName()); + Logger.WARNING("Trying to get a fluid stack of "+vmoltenFluid.getFluid().getName()); try { return FluidRegistry.getFluidStack(vmoltenFluid.getFluid().getName(), fluidAmount).copy(); } @@ -47,7 +48,7 @@ public class FluidUtils { } public static FluidStack getFluidStack(final Fluid vFluid, final int fluidAmount) { - Utils.LOG_WARNING("Trying to get a fluid stack of "+vFluid.getName()); + Logger.WARNING("Trying to get a fluid stack of "+vFluid.getName()); try { return FluidRegistry.getFluidStack(vFluid.getName(), fluidAmount).copy(); } @@ -57,7 +58,7 @@ public class FluidUtils { } public static FluidStack[] getFluidStackArray(final String fluidName, final int amount){ - Utils.LOG_WARNING("Trying to get a fluid stack of "+fluidName); + Logger.WARNING("Trying to get a fluid stack of "+fluidName); try { final FluidStack[] singleFluid = {FluidRegistry.getFluidStack(fluidName, amount)}; return singleFluid; @@ -69,7 +70,7 @@ public class FluidUtils { } public static FluidStack[] getFluidStackArray(final FluidStack fluidName, final int amount){ - Utils.LOG_WARNING("Trying to get a fluid stack of "+fluidName); + Logger.WARNING("Trying to get a fluid stack of "+fluidName); try { final FluidStack[] singleFluid = {FluidRegistry.getFluidStack(fluidName.getLocalizedName(), amount)}; return singleFluid; @@ -244,13 +245,13 @@ public class FluidUtils { if (aMaterial.getLocalizedName().toLowerCase().contains("clay") || (aMaterial.getComposites().size()>1) || aMaterial.getLocalizedName().toLowerCase().contains("wrought")){ return null; } - Utils.LOG_INFO("Generating a "+aMaterial.getLocalizedName()+" Plasma Cell"); + Logger.INFO("Generating a "+aMaterial.getLocalizedName()+" Plasma Cell"); if (aMaterial.vComponentCount != 1){ - Utils.LOG_INFO("Compound made from: "); + Logger.INFO("Compound made from: "); for (final MaterialStack x : aMaterial.getComposites()){ - Utils.LOG_INFO(x.getStackMaterial().getLocalizedName()); + Logger.INFO(x.getStackMaterial().getLocalizedName()); } - Utils.LOG_INFO("Material is a composite, not generating plasma."); + Logger.INFO("Material is a composite, not generating plasma."); return null; } @@ -410,7 +411,7 @@ public class FluidUtils { public final static Fluid generateFluid(final String unlocalizedName, final String localizedName, final int MeltingPoint, final short[] RGBA){ if ((FluidUtils.getFluidStack("molten"+"."+unlocalizedName.toLowerCase(), 1) == null) && (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+Utils.sanitizeString(localizedName), 1) != null)){ - Utils.LOG_WARNING("Generating our own fluid."); + Logger.WARNING("Generating our own fluid."); //Generate a Cell if we need to if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1) == null){ @@ -439,7 +440,7 @@ public class FluidUtils { ); return gtFluid; } - Utils.LOG_INFO("FLUID GENERATION FAILED FOR "+localizedName); + Logger.INFO("FLUID GENERATION FAILED FOR "+localizedName); return null; } @@ -452,7 +453,7 @@ public class FluidUtils { dustStack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+Utils.sanitizeString(localizedName), 1); } if ((FluidUtils.getFluidStack(unlocalizedName.toLowerCase(), 1) == null)/* && ((dustStack != null) || (dustStack2 != null))*/){ - Utils.LOG_WARNING("Generating our own fluid."); + Logger.WARNING("Generating our own fluid."); //Generate a Cell if we need to if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1) == null){ @@ -494,14 +495,14 @@ public class FluidUtils { return gtFluid; } - Utils.LOG_INFO("FLUID GENERATION FAILED FOR "+localizedName); + Logger.INFO("FLUID GENERATION FAILED FOR "+localizedName); return null; } public final static Fluid generateFluidNoPrefix(final String unlocalizedName, final String localizedName, final int MeltingPoint, final short[] RGBA){ Fluid gtFluid; if (FluidUtils.getFluidStack(unlocalizedName.toLowerCase(), 1) == null){ - Utils.LOG_WARNING("Generating our own fluid."); + Logger.WARNING("Generating our own fluid."); gtFluid = FluidUtils.addGTFluidNoPrefix( unlocalizedName, localizedName, diff --git a/src/Java/gtPlusPlus/core/util/geo/GeoUtils.java b/src/Java/gtPlusPlus/core/util/geo/GeoUtils.java index e1dba3b22d..84528e0cd5 100644 --- a/src/Java/gtPlusPlus/core/util/geo/GeoUtils.java +++ b/src/Java/gtPlusPlus/core/util/geo/GeoUtils.java @@ -5,7 +5,7 @@ import java.net.*; import org.apache.http.client.utils.URIBuilder; -import gtPlusPlus.core.util.Utils; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.networking.NetworkUtils; public class GeoUtils { @@ -19,7 +19,7 @@ public class GeoUtils { return "Offline."; } } catch (Throwable T){ - Utils.LOG_INFO("Failed to initialise GeoUtils."); + Logger.INFO("Failed to initialise GeoUtils."); return "Failed."; } } @@ -78,7 +78,7 @@ public class GeoUtils { return result; //Catch block for bad connection } catch (IOException e) { - Utils.LOG_INFO("Method 1 - Failed."); + Logger.INFO("Method 1 - Failed."); } //Secondary method @@ -87,19 +87,19 @@ public class GeoUtils { return r.replaceAll("(\\r|\\n)", ""); //Catch block for bad connection } catch (java.io.IOException e) { - Utils.LOG_INFO("Method 2 - Failed."); + Logger.INFO("Method 2 - Failed."); } } //Catch block for all the Bad URI/URL building catch (URISyntaxException | MalformedURLException e1) { if (e1 instanceof URISyntaxException){ - Utils.LOG_INFO("Bad URI Syntax for builder."); + Logger.INFO("Bad URI Syntax for builder."); } else { - Utils.LOG_INFO("Malformed URL."); + Logger.INFO("Malformed URL."); } - Utils.LOG_INFO("Country Check - Failed."); + Logger.INFO("Country Check - Failed."); } return "Error getting users Country. "+ipAddress; } diff --git a/src/Java/gtPlusPlus/core/util/gregtech/recipehandlers/GregtechRecipe.java b/src/Java/gtPlusPlus/core/util/gregtech/recipehandlers/GregtechRecipe.java index 8ba355d57f..9bc5ee804d 100644 --- a/src/Java/gtPlusPlus/core/util/gregtech/recipehandlers/GregtechRecipe.java +++ b/src/Java/gtPlusPlus/core/util/gregtech/recipehandlers/GregtechRecipe.java @@ -3,23 +3,23 @@ package gtPlusPlus.core.util.gregtech.recipehandlers; import java.lang.reflect.Method; import gregtech.api.util.GT_ModHandler; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import net.minecraft.item.ItemStack; public final class GregtechRecipe { public LibraryProxy ourProxy; public GregtechRecipe(){ - Utils.LOG_INFO("Initializing a recipe handler for different versions of Gregtech 5."); + Logger.INFO("Initializing a recipe handler for different versions of Gregtech 5."); try { if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ this.ourProxy = new LibProxy1(); - Utils.LOG_INFO("Selecting GT 5.7/5.8 Recipe Set"); + Logger.INFO("Selecting GT 5.7/5.8 Recipe Set"); } if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ this.ourProxy = new LibProxy2(); - Utils.LOG_INFO("Selecting GT 5.9 Recipe Set"); + Logger.INFO("Selecting GT 5.9 Recipe Set"); } } catch (final NoSuchMethodException e) { this.ourProxy = null; @@ -27,7 +27,7 @@ public final class GregtechRecipe { } public boolean addSmeltingAndAlloySmeltingRecipe(final ItemStack aInput, final ItemStack aOutput) { - Utils.LOG_WARNING("Adding a GT Furnace/Alloy Smelter Recipe"+"| Input:"+aInput.getDisplayName()+" | Output:"+aOutput.getDisplayName()+" |"); + Logger.WARNING("Adding a GT Furnace/Alloy Smelter Recipe"+"| Input:"+aInput.getDisplayName()+" | Output:"+aOutput.getDisplayName()+" |"); return this.ourProxy.addSmeltingAndAlloySmeltingRecipe(aInput, aOutput); } @@ -47,7 +47,7 @@ class LibProxy1 extends LibraryProxy { @Override public boolean addSmeltingAndAlloySmeltingRecipe(final ItemStack aInput, final ItemStack aOutput) { try { - Utils.LOG_INFO("Trying with Gt 5.7/5.8 Method."); + Logger.INFO("Trying with Gt 5.7/5.8 Method."); return (boolean) this.m1.invoke(null, aInput, aOutput); } catch (final Exception e) { throw new RuntimeException(e); @@ -65,7 +65,7 @@ class LibProxy2 extends LibraryProxy { @Override public boolean addSmeltingAndAlloySmeltingRecipe(final ItemStack aInput, final ItemStack aOutput) { try { - Utils.LOG_INFO("Trying with Gt 5.9 Method."); + Logger.INFO("Trying with Gt 5.9 Method."); return (boolean) this.m2.invoke(null, aInput, aOutput, true); } catch (final Exception e) { throw new RuntimeException(e); diff --git a/src/Java/gtPlusPlus/core/util/inventory/InventoryUtils.java b/src/Java/gtPlusPlus/core/util/inventory/InventoryUtils.java index 51ae393c06..779f9b14c1 100644 --- a/src/Java/gtPlusPlus/core/util/inventory/InventoryUtils.java +++ b/src/Java/gtPlusPlus/core/util/inventory/InventoryUtils.java @@ -20,7 +20,7 @@ public class InventoryUtils { { for (int i1 = 0; i1 < ((IInventory) tileentity).getSizeInventory(); ++i1) { - ItemStack itemstack = (ItemStack) ((IInventory) tileentity).getStackInSlot(i1); + ItemStack itemstack = ((IInventory) tileentity).getStackInSlot(i1); if (itemstack != null) { @@ -38,11 +38,11 @@ public class InventoryUtils { } itemstack.stackSize -= j1; - entityitem = new EntityItem(world, (double)((float)x + f), (double)((float)y + f1), (double)((float)z + f2), new ItemStack(itemstack.getItem(), j1, itemst |