diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/api/objects')
5 files changed, 29 insertions, 29 deletions
diff --git a/src/main/java/gtPlusPlus/api/objects/Logger.java b/src/main/java/gtPlusPlus/api/objects/Logger.java index 0178bb141a..8b5efa1536 100644 --- a/src/main/java/gtPlusPlus/api/objects/Logger.java +++ b/src/main/java/gtPlusPlus/api/objects/Logger.java @@ -4,8 +4,8 @@ import org.apache.logging.log4j.LogManager; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.relauncher.FMLRelaunchLog; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.preloader.CORE_Preloader; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.preloader.PreloaderCore; import gtPlusPlus.preloader.asm.AsmConfig; public class Logger { @@ -37,8 +37,8 @@ public class Logger { // Non-Dev Comments public static void MACHINE_INFO(String s, Object... args) { if (enabled) { - boolean localPlayer = CORE_Preloader.DEV_ENVIRONMENT; - if (CORE.ConfigSwitches.MACHINE_INFO || localPlayer) { + boolean localPlayer = PreloaderCore.DEV_ENVIRONMENT; + if (GTPPCore.ConfigSwitches.MACHINE_INFO || localPlayer) { final String name1 = gtPlusPlus.core.util.reflect.ReflectionUtils.getMethodName(2); modLogger.info("Machine Info: " + s + " | " + name1, args); } @@ -48,7 +48,7 @@ public class Logger { // Developer Comments public static void WARNING(final String s) { if (enabled) { - if (CORE_Preloader.DEBUG_MODE) { + if (PreloaderCore.DEBUG_MODE) { modLogger.warn(s); } } @@ -57,7 +57,7 @@ public class Logger { // Errors public static void ERROR(final String s) { if (enabled) { - if (CORE_Preloader.DEBUG_MODE) { + if (PreloaderCore.DEBUG_MODE) { modLogger.fatal(s); } } @@ -95,7 +95,7 @@ public class Logger { */ public static void DEBUG_BEES(final String s) { if (enabled) { - if (CORE_Preloader.DEV_ENVIRONMENT || CORE_Preloader.DEBUG_MODE) { + if (PreloaderCore.DEV_ENVIRONMENT || PreloaderCore.DEBUG_MODE) { modLogger.info("[Debug][Bees] " + s); } } @@ -106,7 +106,7 @@ public class Logger { */ public static void MATERIALS(final String s) { if (enabled) { - if (CORE_Preloader.DEV_ENVIRONMENT || CORE_Preloader.DEBUG_MODE) { + if (PreloaderCore.DEV_ENVIRONMENT || PreloaderCore.DEBUG_MODE) { modLogger.info("[Materials] " + s); } } @@ -117,7 +117,7 @@ public class Logger { */ public static void DEBUG_MATERIALS(final String s) { if (enabled) { - if (CORE_Preloader.DEV_ENVIRONMENT || CORE_Preloader.DEBUG_MODE) { + if (PreloaderCore.DEV_ENVIRONMENT || PreloaderCore.DEBUG_MODE) { modLogger.info("[Debug][Materials] " + s); } } @@ -128,7 +128,7 @@ public class Logger { */ public static void REFLECTION(final String s) { if (enabled) { - if (CORE_Preloader.DEV_ENVIRONMENT || CORE_Preloader.DEBUG_MODE) { + if (PreloaderCore.DEV_ENVIRONMENT || PreloaderCore.DEBUG_MODE) { modLogger.info("[Reflection] " + s); } } @@ -139,7 +139,7 @@ public class Logger { */ public static void WORLD(final String s) { if (enabled) { - if (CORE_Preloader.DEV_ENVIRONMENT || CORE_Preloader.DEBUG_MODE) { + if (PreloaderCore.DEV_ENVIRONMENT || PreloaderCore.DEBUG_MODE) { modLogger.info("[WorldGen] " + s); } } @@ -148,7 +148,7 @@ public class Logger { public static void RECIPE(String string) { if (enabled) { if ( - /* CORE_Preloader.DEV_ENVIRONMENT || */ CORE_Preloader.DEBUG_MODE) { + /* CORE_Preloader.DEV_ENVIRONMENT || */ PreloaderCore.DEBUG_MODE) { modLogger.info("[Recipe] " + string); } } diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java index fc71869d9e..cdbf2c43e2 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java @@ -7,7 +7,7 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gregtech.common.covers.CoverInfo; import gtPlusPlus.core.tileentities.base.TileEntityBase; import gtPlusPlus.core.util.data.ArrayUtils; @@ -69,7 +69,7 @@ public class BTF_Inventory implements ISidedInventory { @Override public ItemStack decrStackSize(int aIndex, int aAmount) { ItemStack tStack = this.getStackInSlot(aIndex); - ItemStack rStack = GT_Utility.copy(new Object[] { tStack }); + ItemStack rStack = GTUtility.copy(new Object[] { tStack }); if (tStack != null) { if (tStack.stackSize <= aAmount) { if (this.setStackToZeroInsteadOfNull(aIndex)) { @@ -115,7 +115,7 @@ public class BTF_Inventory implements ISidedInventory { public boolean canInsertItem(int aIndex, ItemStack aStack, int ordinalSide) { return this.isValidSlot(aIndex) && aStack != null && aIndex < this.mInventory.length - && (this.mInventory[aIndex] == null || GT_Utility.areStacksEqual(aStack, this.mInventory[aIndex])) + && (this.mInventory[aIndex] == null || GTUtility.areStacksEqual(aStack, this.mInventory[aIndex])) && this.allowPutStack(this.mTile, aIndex, ForgeDirection.getOrientation(ordinalSide), aStack); } @@ -133,7 +133,7 @@ public class BTF_Inventory implements ISidedInventory { public boolean allowPutStack(TileEntityBase aBaseMetaTileEntity, int aIndex, ForgeDirection side, ItemStack aStack) { return (aIndex >= 0 && aIndex < this.getSizeInventory()) - && (this.mInventory[aIndex] == null || GT_Utility.areStacksEqual(this.mInventory[aIndex], aStack)); + && (this.mInventory[aIndex] == null || GTUtility.areStacksEqual(this.mInventory[aIndex], aStack)); } @Override @@ -197,7 +197,7 @@ public class BTF_Inventory implements ISidedInventory { for (int s = 0; s < this.getSizeInventory(); s++) { if (mInventory != null && mInventory[s] != null) { ItemStack slot = mInventory[s]; - if (slot == null || (slot != null && GT_Utility.areStacksEqual(aInput, slot) + if (slot == null || (slot != null && GTUtility.areStacksEqual(aInput, slot) && slot.stackSize != slot.getItem() .getItemStackLimit(slot))) { if (slot == null) { diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java index c5c903cd1f..031e40508a 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.Mods.GTPlusPlus; import net.minecraftforge.fluids.Fluid; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; public class FluidGT6 extends Fluid implements Runnable { @@ -15,8 +15,8 @@ public class FluidGT6 extends Fluid implements Runnable { super(aName); this.mRGBa = aRGBa; this.mTextureName = aTextureName; - if (GregTech_API.sGTBlockIconload != null) { - GregTech_API.sGTBlockIconload.add(this); + if (GregTechAPI.sGTBlockIconload != null) { + GregTechAPI.sGTBlockIconload.add(this); } } @@ -28,6 +28,6 @@ public class FluidGT6 extends Fluid implements Runnable { @Override public void run() { - this.setIcons(GregTech_API.sBlockIcons.registerIcon(GTPlusPlus.ID + ":" + "fluids/fluid." + this.mTextureName)); + this.setIcons(GregTechAPI.sBlockIcons.registerIcon(GTPlusPlus.ID + ":" + "fluids/fluid." + this.mTextureName)); } } diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java index d68ef1a93f..e03fbc3c12 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java @@ -2,7 +2,7 @@ package gtPlusPlus.api.objects.minecraft; import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import gtPlusPlus.api.interfaces.RunnableWithInfo; -import gtPlusPlus.core.handler.COMPAT_HANDLER; +import gtPlusPlus.core.handler.CompatHandler; public abstract class ItemPackage implements RunnableWithInfo<String> { @@ -12,9 +12,9 @@ public abstract class ItemPackage implements RunnableWithInfo<String> { public ItemPackage(boolean hasExtraLateRun) { // Register for late run - COMPAT_HANDLER.mObjectsToRunInPostInit.put(this); + CompatHandler.mObjectsToRunInPostInit.put(this); if (hasExtraLateRun) { - COMPAT_HANDLER.mObjectsToRunInOnLoadComplete.put(this); + CompatHandler.mObjectsToRunInOnLoadComplete.put(this); } init(); } @@ -47,7 +47,7 @@ public abstract class ItemPackage implements RunnableWithInfo<String> { /** * Override this to handle GT Recipe map manipulation after they're Baked. - * + * * @param event - the {@link FMLLoadCompleteEvent}. * @return - Did we do anything? */ diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java b/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java index 58a7affa90..60bf94632c 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java @@ -6,12 +6,12 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gtPlusPlus.core.util.Utils; /** * A Server Side safe object that can hold {@link IIcon}s. - * + * * @author Alkalus * */ @@ -50,7 +50,7 @@ public class SafeTexture implements Runnable { private SafeTexture(String aTexturePath) { mTextureName = aTexturePath; mHash = getKey(aTexturePath).hashCode(); - GregTech_API.sGTBlockIconload.add(this); + GregTechAPI.sGTBlockIconload.add(this); } @SideOnly(Side.CLIENT) @@ -60,6 +60,6 @@ public class SafeTexture implements Runnable { @Override public void run() { - mHashToIconCache.put(getKey(mTextureName).hashCode(), GregTech_API.sBlockIcons.registerIcon(mTextureName)); + mHashToIconCache.put(getKey(mTextureName).hashCode(), GregTechAPI.sBlockIcons.registerIcon(mTextureName)); } } |