diff options
Diffstat (limited to 'src/main/java/gtPlusPlus')
537 files changed, 12778 insertions, 12998 deletions
diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java index b024e0e88a..ef6b1759e9 100644 --- a/src/main/java/gtPlusPlus/GTplusplus.java +++ b/src/main/java/gtPlusPlus/GTplusplus.java @@ -3,7 +3,7 @@ package gtPlusPlus; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.Names; import static gregtech.api.enums.Mods.Thaumcraft; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes; +import static gtPlusPlus.core.lib.GTPPCore.ConfigSwitches.enableCustomCapes; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -27,6 +27,7 @@ import cpw.mods.fml.common.event.FMLServerStoppingEvent; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.FishPondFakeRecipe; @@ -40,22 +41,22 @@ import gtPlusPlus.core.config.ConfigHandler; import gtPlusPlus.core.handler.BookHandler; import gtPlusPlus.core.handler.PacketHandler; import gtPlusPlus.core.handler.Recipes.RegistrationHandler; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.LocaleUtils; -import gtPlusPlus.plugin.manager.Core_Manager; -import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; +import gtPlusPlus.plugin.manager.CoreManager; +import gtPlusPlus.xmod.gregtech.common.MetaGTProxy; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_BlastSmelterGT_GTNH; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MultisUsingFluidInsteadOfCells; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenBlastSmelterGTNH; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenMultisUsingFluidInsteadOfCells; import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects; @Mod( modid = Names.G_T_PLUS_PLUS, - name = CORE.name, - version = CORE.VERSION, + name = GTPPCore.name, + version = GTPPCore.VERSION, dependencies = "required-after:Forge;" + " after:TConstruct;" + " after:dreamcraft;" + " after:IC2;" @@ -146,7 +147,7 @@ public class GTplusplus implements ActionListener { public void preInit(final FMLPreInitializationEvent event) { INIT_PHASE.PRE_INIT.setPhaseActive(true); // Load all class objects within the plugin package. - Core_Manager.veryEarlyInit(); + CoreManager.veryEarlyInit(); PacketHandler.init(); if (!Utils.isServer()) { @@ -160,12 +161,12 @@ public class GTplusplus implements ActionListener { ConfigHandler.handleConfigFile(event); // Check for Dev - CORE.DEVENV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); + GTPPCore.DEVENV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); proxy.preInit(event); - Logger.INFO("Setting up our own GT_Proxy."); - Meta_GT_Proxy.preInit(); - Core_Manager.preInit(); + Logger.INFO("Setting up our own GTProxy."); + MetaGTProxy.preInit(); + CoreManager.preInit(); } // Init @@ -174,10 +175,10 @@ public class GTplusplus implements ActionListener { INIT_PHASE.INIT.setPhaseActive(true); proxy.init(event); proxy.registerNetworkStuff(); - Meta_GT_Proxy.init(); - Core_Manager.init(); + MetaGTProxy.init(); + CoreManager.init(); // Used by foreign players to generate .lang files for translation. - if (CORE.ConfigSwitches.dumpItemAndBlockData) { + if (GTPPCore.ConfigSwitches.dumpItemAndBlockData) { LocaleUtils.generateFakeLocaleFile(); } } @@ -188,8 +189,8 @@ public class GTplusplus implements ActionListener { INIT_PHASE.POST_INIT.setPhaseActive(true); proxy.postInit(event); BookHandler.runLater(); - Meta_GT_Proxy.postInit(); - Core_Manager.postInit(); + MetaGTProxy.postInit(); + CoreManager.postInit(); Logger.INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"); Logger.INFO( @@ -201,16 +202,16 @@ public class GTplusplus implements ActionListener { Logger.INFO("Finally, we are finished. Have some cripsy bacon as a reward."); // Log free GT++ Meta IDs - if (CORE.DEVENV) { + if (GTPPCore.DEVENV) { // 750 - 999 are reserved for Alkalus. for (int i = 750; i < 1000; i++) { - if (gregtech.api.GregTech_API.METATILEENTITIES[i] == null) { + if (GregTechAPI.METATILEENTITIES[i] == null) { Logger.INFO("MetaID " + i + " is free."); } } // 30000 - 31999 are reserved for Alkalus. for (int i = 30000; i < 32000; i++) { - if (gregtech.api.GregTech_API.METATILEENTITIES[i] == null) { + if (GregTechAPI.METATILEENTITIES[i] == null) { Logger.INFO("MetaID " + i + " is free."); } } @@ -225,13 +226,13 @@ public class GTplusplus implements ActionListener { if (Thaumcraft.isModLoaded()) { event.registerServerCommand(new CommandDumpAspects()); } - Core_Manager.serverStart(); + CoreManager.serverStart(); INIT_PHASE.STARTED.setPhaseActive(true); } @Mod.EventHandler public synchronized void serverStopping(final FMLServerStoppingEvent event) { - Core_Manager.serverStop(); + CoreManager.serverStop(); } @Override @@ -255,25 +256,25 @@ public class GTplusplus implements ActionListener { int[] mInvalidCount = new int[] { 0, 0, 0, 0, 0, 0, 0 }; - RecipeGen_BlastSmelterGT_GTNH.generateGTNHBlastSmelterRecipesFromEBFList(); + RecipeGenBlastSmelterGTNH.generateGTNHBlastSmelterRecipesFromEBFList(); FishPondFakeRecipe.generateFishPondRecipes(); SemiFluidFuelHandler.generateFuels(); - mInvalidCount[0] = RecipeGen_MultisUsingFluidInsteadOfCells + mInvalidCount[0] = RecipeGenMultisUsingFluidInsteadOfCells .generateRecipesNotUsingCells(RecipeMaps.centrifugeRecipes, GTPPRecipeMaps.centrifugeNonCellRecipes); - mInvalidCount[1] = RecipeGen_MultisUsingFluidInsteadOfCells + mInvalidCount[1] = RecipeGenMultisUsingFluidInsteadOfCells .generateRecipesNotUsingCells(RecipeMaps.electrolyzerRecipes, GTPPRecipeMaps.electrolyzerNonCellRecipes); - mInvalidCount[2] = RecipeGen_MultisUsingFluidInsteadOfCells + mInvalidCount[2] = RecipeGenMultisUsingFluidInsteadOfCells .generateRecipesNotUsingCells(RecipeMaps.vacuumFreezerRecipes, GTPPRecipeMaps.advancedFreezerRecipes); - mInvalidCount[3] = RecipeGen_MultisUsingFluidInsteadOfCells + mInvalidCount[3] = RecipeGenMultisUsingFluidInsteadOfCells .generateRecipesNotUsingCells(RecipeMaps.mixerRecipes, GTPPRecipeMaps.mixerNonCellRecipes); - mInvalidCount[4] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells( + mInvalidCount[4] = RecipeGenMultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells( GTPPRecipeMaps.chemicalDehydratorRecipes, GTPPRecipeMaps.chemicalDehydratorNonCellRecipes); - mInvalidCount[5] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells( + mInvalidCount[5] = RecipeGenMultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells( GTPPRecipeMaps.coldTrapRecipes, GTPPRecipeMaps.nuclearSaltProcessingPlantRecipes); - mInvalidCount[6] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells( + mInvalidCount[6] = RecipeGenMultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells( GTPPRecipeMaps.reactorProcessingUnitRecipes, GTPPRecipeMaps.nuclearSaltProcessingPlantRecipes); } 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)); } } diff --git a/src/main/java/gtPlusPlus/api/recipe/ChemicalPlantFrontend.java b/src/main/java/gtPlusPlus/api/recipe/ChemicalPlantFrontend.java index beede78173..48f055f4f8 100644 --- a/src/main/java/gtPlusPlus/api/recipe/ChemicalPlantFrontend.java +++ b/src/main/java/gtPlusPlus/api/recipe/ChemicalPlantFrontend.java @@ -13,7 +13,7 @@ import gregtech.api.recipe.NEIRecipePropertiesBuilder; import gregtech.api.recipe.RecipeMapFrontend; import gregtech.api.util.MethodsReturnNonnullByDefault; import gregtech.common.gui.modularui.UIHelper; -import gregtech.nei.GT_NEI_DefaultHandler; +import gregtech.nei.GTNEIDefaultHandler; import gtPlusPlus.core.util.minecraft.ItemUtils; @ParametersAreNonnullByDefault @@ -47,7 +47,7 @@ public class ChemicalPlantFrontend extends RecipeMapFrontend { @Override protected List<String> handleNEIItemInputTooltip(List<String> currentTip, - GT_NEI_DefaultHandler.FixedPositionedStack pStack) { + GTNEIDefaultHandler.FixedPositionedStack pStack) { if (ItemUtils.isCatalyst(pStack.item)) { currentTip.add(GRAY + "Does not always get consumed in the process"); currentTip.add(GRAY + "Higher tier pipe casings allow this item to last longer"); @@ -58,7 +58,7 @@ public class ChemicalPlantFrontend extends RecipeMapFrontend { } @Override - protected void drawNEIOverlayForInput(GT_NEI_DefaultHandler.FixedPositionedStack stack) { + protected void drawNEIOverlayForInput(GTNEIDefaultHandler.FixedPositionedStack stack) { if (ItemUtils.isCatalyst(stack.item)) { drawNEIOverlayText("NC*", stack); } else { diff --git a/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java b/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java index 6958f71080..e6610c40df 100644 --- a/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java +++ b/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java @@ -1,6 +1,6 @@ package gtPlusPlus.api.recipe; -import static gregtech.api.util.GT_RecipeConstants.LFTR_OUTPUT_POWER; +import static gregtech.api.util.GTRecipeConstants.LFTR_OUTPUT_POWER; import java.util.Arrays; import java.util.Collections; @@ -9,28 +9,28 @@ import net.minecraft.util.StatCollector; import com.gtnewhorizons.modularui.common.widget.ProgressBar; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMapBackend; import gregtech.api.recipe.RecipeMapBuilder; import gregtech.api.recipe.maps.FluidOnlyFrontend; import gregtech.api.recipe.maps.FuelBackend; import gregtech.api.recipe.maps.LargeNEIFrontend; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gregtech.nei.formatter.FuelSpecialValueFormatter; import gregtech.nei.formatter.HeatingCoilSpecialValueFormatter; import gregtech.nei.formatter.SimpleSpecialValueFormatter; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntityTreeFarm; +import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTETreeFarm; public class GTPPRecipeMaps { public static final RecipeMap<RecipeMapBackend> cokeOvenRecipes = RecipeMapBuilder.of("gtpp.recipe.cokeoven") .maxIO(2, 9, 1, 1) .minInputs(1, 0) - .progressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN) + .progressBar(GTUITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN) .build(); public static final RecipeMap<RecipeMapBackend> multiblockMassFabricatorRecipes = RecipeMapBuilder .of("gtpp.recipe.matterfab2") @@ -43,13 +43,13 @@ public class GTPPRecipeMaps { recipeInfo -> Collections.singletonList( StatCollector.translateToLocalFormatted( "GT5U.nei.fuel", - GT_Utility.formatNumbers(recipeInfo.recipe.mSpecialValue * 3000L)))) + GTUtility.formatNumbers(recipeInfo.recipe.mSpecialValue * 3000L)))) .build(); public static final RecipeMap<RecipeMapBackend> quantumForceTransformerRecipes = RecipeMapBuilder .of("gtpp.recipe.quantumforcesmelter") .maxIO(6, 6, 6, 6) .minInputs(1, 0) - .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE) + .progressBar(GTUITextures.PROGRESSBAR_ARROW_MULTIPLE) .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("GT5U.nei.tier")) .frontend(QuantumForceTransformerFrontend::new) .disableOptimize() @@ -57,7 +57,7 @@ public class GTPPRecipeMaps { public static final RecipeMap<RecipeMapBackend> chemicalDehydratorRecipes = RecipeMapBuilder .of("gtpp.recipe.chemicaldehydrator") .maxIO(2, 9, 1, 1) - .progressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN) + .progressBar(GTUITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN) .disableOptimize() .build(); public static final RecipeMap<RecipeMapBackend> vacuumFurnaceRecipes = RecipeMapBuilder.of("gtpp.recipe.vacfurnace") @@ -82,7 +82,7 @@ public class GTPPRecipeMaps { final long eut = recipeInfo.recipe.getMetadataOrDefault(LFTR_OUTPUT_POWER, 0); final int duration = recipeInfo.recipe.mDuration; return Arrays.asList( - StatCollector.translateToLocalFormatted("gtpp.nei.lftr.power", GT_Utility.formatNumbers(eut)), + StatCollector.translateToLocalFormatted("gtpp.nei.lftr.power", GTUtility.formatNumbers(eut)), StatCollector .translateToLocalFormatted("gtpp.nei.lftr.dynamo", MathUtils.formatNumbers(duration * eut)), StatCollector @@ -109,25 +109,25 @@ public class GTPPRecipeMaps { .build(); public static final RecipeMap<RecipeMapBackend> coldTrapRecipes = RecipeMapBuilder.of("gtpp.recipe.coldtrap") .maxIO(2, 9, 1, 1) - .progressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN) + .progressBar(GTUITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN) .build(); public static final RecipeMap<RecipeMapBackend> reactorProcessingUnitRecipes = RecipeMapBuilder .of("gtpp.recipe.reactorprocessingunit") .maxIO(2, 9, 1, 1) - .progressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN) + .progressBar(GTUITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN) .build(); public static final RecipeMap<RecipeMapBackend> simpleWasherRecipes = RecipeMapBuilder .of("gtpp.recipe.simplewasher") .maxIO(1, 1, 1, 0) .slotOverlays( - (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_CAULDRON : null) - .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE) + (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_CAULDRON : null) + .progressBar(GTUITextures.PROGRESSBAR_ARROW_MULTIPLE) .build(); public static final RecipeMap<RecipeMapBackend> molecularTransformerRecipes = RecipeMapBuilder .of("gtpp.recipe.moleculartransformer") .maxIO(1, 1, 0, 0) .slotOverlays( - (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_MICROSCOPE + (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_MICROSCOPE : null) .neiHandlerInfo( builder -> builder @@ -139,16 +139,16 @@ public class GTPPRecipeMaps { .slotOverlays((index, isFluid, isOutput, isSpecial) -> { if (isFluid) { if (isOutput) { - return GT_UITextures.OVERLAY_SLOT_VIAL_2; + return GTUITextures.OVERLAY_SLOT_VIAL_2; } - return GT_UITextures.OVERLAY_SLOT_MOLECULAR_3; + return GTUITextures.OVERLAY_SLOT_MOLECULAR_3; } if (isOutput) { - return GT_UITextures.OVERLAY_SLOT_VIAL_1; + return GTUITextures.OVERLAY_SLOT_VIAL_1; } - return GT_UITextures.OVERLAY_SLOT_MOLECULAR_1; + return GTUITextures.OVERLAY_SLOT_MOLECULAR_1; }) - .progressBar(GTPP_UITextures.PROGRESSBAR_FLUID_REACTOR, ProgressBar.Direction.CIRCULAR_CW) + .progressBar(GTPPUITextures.PROGRESSBAR_FLUID_REACTOR, ProgressBar.Direction.CIRCULAR_CW) .progressBarPos(82, 24) .neiSpecialInfoFormatter(recipeInfo -> { int tier = recipeInfo.recipe.mSpecialValue + 1; @@ -184,8 +184,8 @@ public class GTPPRecipeMaps { public static final RecipeMap<RecipeMapBackend> fishPondRecipes = RecipeMapBuilder.of("gtpp.recipe.fishpond") .maxIO(1, 1, 0, 0) .slotOverlays( - (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_CAULDRON : null) - .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE) + (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GTUITextures.OVERLAY_SLOT_CAULDRON : null) + .progressBar(GTUITextures.PROGRESSBAR_ARROW_MULTIPLE) .build(); public static final RecipeMap<RecipeMapBackend> spargeTowerFakeRecipes = RecipeMapBuilder .of("gtpp.recipe.spargetower") @@ -199,18 +199,18 @@ public class GTPPRecipeMaps { public static final RecipeMap<RecipeMapBackend> centrifugeNonCellRecipes = RecipeMapBuilder .of("gtpp.recipe.multicentrifuge") .maxIO(6, 6, 6, 6) - .progressBar(GT_UITextures.PROGRESSBAR_EXTRACT) + .progressBar(GTUITextures.PROGRESSBAR_EXTRACT) .frontend(LargeNEIFrontend::new) .build(); public static final RecipeMap<RecipeMapBackend> electrolyzerNonCellRecipes = RecipeMapBuilder .of("gtpp.recipe.multielectro") .maxIO(6, 6, 6, 6) - .progressBar(GT_UITextures.PROGRESSBAR_EXTRACT) + .progressBar(GTUITextures.PROGRESSBAR_EXTRACT) .frontend(LargeNEIFrontend::new) .build(); public static final RecipeMap<RecipeMapBackend> mixerNonCellRecipes = RecipeMapBuilder.of("gtpp.recipe.multimixer") .maxIO(9, 9, 6, 6) - .progressBar(GT_UITextures.PROGRESSBAR_MIXER, ProgressBar.Direction.CIRCULAR_CW) + .progressBar(GTUITextures.PROGRESSBAR_MIXER, ProgressBar.Direction.CIRCULAR_CW) .frontend(LargeNEIFrontend::new) .build(); public static final RecipeMap<RecipeMapBackend> chemicalDehydratorNonCellRecipes = RecipeMapBuilder @@ -230,11 +230,7 @@ public class GTPPRecipeMaps { .build(); public static final RecipeMap<RecipeMapBackend> treeGrowthSimulatorFakeRecipes = RecipeMapBuilder .of("gtpp.recipe.treefarm") - .maxIO( - GregtechMetaTileEntityTreeFarm.Mode.values().length, - GregtechMetaTileEntityTreeFarm.Mode.values().length, - 0, - 0) + .maxIO(MTETreeFarm.Mode.values().length, MTETreeFarm.Mode.values().length, 0, 0) .minInputs(1, 0) .useSpecialSlot() .frontend(TGSFrontend::new) diff --git a/src/main/java/gtPlusPlus/api/recipe/MillingFrontend.java b/src/main/java/gtPlusPlus/api/recipe/MillingFrontend.java index 26e2ab2ec9..eab57490bc 100644 --- a/src/main/java/gtPlusPlus/api/recipe/MillingFrontend.java +++ b/src/main/java/gtPlusPlus/api/recipe/MillingFrontend.java @@ -12,7 +12,7 @@ import gregtech.api.recipe.BasicUIPropertiesBuilder; import gregtech.api.recipe.NEIRecipePropertiesBuilder; import gregtech.api.recipe.RecipeMapFrontend; import gregtech.api.util.MethodsReturnNonnullByDefault; -import gregtech.nei.GT_NEI_DefaultHandler; +import gregtech.nei.GTNEIDefaultHandler; import gtPlusPlus.core.util.minecraft.ItemUtils; @ParametersAreNonnullByDefault @@ -26,7 +26,7 @@ public class MillingFrontend extends RecipeMapFrontend { @Override protected List<String> handleNEIItemInputTooltip(List<String> currentTip, - GT_NEI_DefaultHandler.FixedPositionedStack pStack) { + GTNEIDefaultHandler.FixedPositionedStack pStack) { if (ItemUtils.isMillingBall(pStack.item)) { currentTip.add(GRAY + StatCollector.translateToLocal("gtpp.nei.milling.not_consumed")); } else { @@ -36,7 +36,7 @@ public class MillingFrontend extends RecipeMapFrontend { } @Override - protected void drawNEIOverlayForInput(GT_NEI_DefaultHandler.FixedPositionedStack stack) { + protected void drawNEIOverlayForInput(GTNEIDefaultHandler.FixedPositionedStack stack) { if (ItemUtils.isMillingBall(stack.item)) { drawNEIOverlayText("NC*", stack); } else { diff --git a/src/main/java/gtPlusPlus/api/recipe/QuantumForceTransformerFrontend.java b/src/main/java/gtPlusPlus/api/recipe/QuantumForceTransformerFrontend.java index 93f19af9e8..6146856ecb 100644 --- a/src/main/java/gtPlusPlus/api/recipe/QuantumForceTransformerFrontend.java +++ b/src/main/java/gtPlusPlus/api/recipe/QuantumForceTransformerFrontend.java @@ -7,8 +7,8 @@ import gregtech.api.recipe.BasicUIPropertiesBuilder; import gregtech.api.recipe.NEIRecipePropertiesBuilder; import gregtech.api.recipe.maps.LargeNEIFrontend; import gregtech.api.util.MethodsReturnNonnullByDefault; -import gregtech.nei.GT_NEI_DefaultHandler; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_QuantumForceTransformer; +import gregtech.nei.GTNEIDefaultHandler; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEQuantumForceTransformer; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @@ -20,17 +20,17 @@ public class QuantumForceTransformerFrontend extends LargeNEIFrontend { } public String getChanceFormat(int chance) { - return GT_NEI_DefaultHandler.FixedPositionedStack.chanceFormat.format((float) chance / 10000); + return GTNEIDefaultHandler.FixedPositionedStack.chanceFormat.format((float) chance / 10000); } @Override - public void drawNEIOverlays(GT_NEI_DefaultHandler.CachedDefaultRecipe neiCachedRecipe) { + public void drawNEIOverlays(GTNEIDefaultHandler.CachedDefaultRecipe neiCachedRecipe) { // Replicates the default behaviour, but since we cannot actually modify the mChance variable we need to // essentially re-implement it. - int chance = GregtechMetaTileEntity_QuantumForceTransformer.getBaseOutputChance(neiCachedRecipe.mRecipe); + int chance = MTEQuantumForceTransformer.getBaseOutputChance(neiCachedRecipe.mRecipe); String chanceFormat = getChanceFormat(chance); for (PositionedStack stack : neiCachedRecipe.mOutputs) { - if (stack instanceof GT_NEI_DefaultHandler.FixedPositionedStack) { + if (stack instanceof GTNEIDefaultHandler.FixedPositionedStack) { super.drawNEIOverlayText(chanceFormat, stack); } } diff --git a/src/main/java/gtPlusPlus/api/recipe/TGSFrontend.java b/src/main/java/gtPlusPlus/api/recipe/TGSFrontend.java index e57ebaf5f9..e7253b6ea5 100644 --- a/src/main/java/gtPlusPlus/api/recipe/TGSFrontend.java +++ b/src/main/java/gtPlusPlus/api/recipe/TGSFrontend.java @@ -15,14 +15,14 @@ import com.gtnewhorizons.modularui.api.math.Pos2d; import gregtech.api.recipe.BasicUIPropertiesBuilder; import gregtech.api.recipe.NEIRecipePropertiesBuilder; import gregtech.api.recipe.RecipeMapFrontend; -import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GTRecipe; import gregtech.api.util.MethodsReturnNonnullByDefault; import gregtech.common.gui.modularui.UIHelper; -import gregtech.nei.GT_NEI_DefaultHandler; +import gregtech.nei.GTNEIDefaultHandler; import gregtech.nei.RecipeDisplayInfo; import gregtech.nei.formatter.INEISpecialInfoFormatter; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntityTreeFarm; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntityTreeFarm.Mode; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTETreeFarm; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTETreeFarm.Mode; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @@ -80,15 +80,15 @@ public class TGSFrontend extends RecipeMapFrontend { @Override public List<String> handleNEIItemTooltip(ItemStack stack, List<String> currentTip, - GT_NEI_DefaultHandler.CachedDefaultRecipe neiCachedRecipe) { + GTNEIDefaultHandler.CachedDefaultRecipe neiCachedRecipe) { /* * This gets a little complicated, because we want to assign tooltips to inputs/outputs based on which mode * (saw, shears, etc.) they correspond to. But CachedDefaultRecipe does not retain this information for us. This * is because some recipes don't output any items for some modes. For example, if a recipe only yields logs and - * leaves, then the outputs of GT_Recipe will be {log, null, leaves}. However, in CachedDefaultRecipe this gets + * leaves, then the outputs of GTRecipe will be {log, null, leaves}. However, in CachedDefaultRecipe this gets * condensed to just {log, leaves}, with null values omitted. So to figure out which item came from which mode, - * we need to step through both of these arrays simultaneously and match non-null inputs/outputs in GT_Recipe to + * we need to step through both of these arrays simultaneously and match non-null inputs/outputs in GTRecipe to * inputs/outputs in CachedDefaultRecipe. */ @@ -99,7 +99,7 @@ public class TGSFrontend extends RecipeMapFrontend { return currentTip; } - GT_Recipe.GT_Recipe_WithAlt recipe = (GT_Recipe.GT_Recipe_WithAlt) neiCachedRecipe.mRecipe; + GTRecipe.GTRecipe_WithAlt recipe = (GTRecipe.GTRecipe_WithAlt) neiCachedRecipe.mRecipe; // Inputs int slot = 0; @@ -107,7 +107,7 @@ public class TGSFrontend extends RecipeMapFrontend { if (mode < recipe.mOreDictAlt.length && recipe.mOreDictAlt[mode] != null) { // There is a valid input in this mode. if (slot < neiCachedRecipe.mInputs.size() && stack == neiCachedRecipe.mInputs.get(slot).item) { - int toolMultiplier = GregtechMetaTileEntityTreeFarm.getToolMultiplier(stack, Mode.values()[mode]); + int toolMultiplier = MTETreeFarm.getToolMultiplier(stack, Mode.values()[mode]); currentTip.add(EnumChatFormatting.YELLOW + tooltipInputs[mode]); if (toolMultiplier > 0) { currentTip.add(EnumChatFormatting.YELLOW + tooltipMultiplier + " " + toolMultiplier + "x"); diff --git a/src/main/java/gtPlusPlus/core/block/ModBlocks.java b/src/main/java/gtPlusPlus/core/block/ModBlocks.java index 417b342f7e..6169581257 100644 --- a/src/main/java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/main/java/gtPlusPlus/core/block/ModBlocks.java @@ -5,19 +5,19 @@ import net.minecraftforge.fluids.Fluid; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.general.BlockCompressedObsidian; -import gtPlusPlus.core.block.general.FluidTankInfinite; -import gtPlusPlus.core.block.general.HellFire; -import gtPlusPlus.core.block.general.LightGlass; -import gtPlusPlus.core.block.general.MiningExplosives; +import gtPlusPlus.core.block.general.BlockFluidTankInfinite; +import gtPlusPlus.core.block.general.BlockHellFire; +import gtPlusPlus.core.block.general.BlockLightGlass; +import gtPlusPlus.core.block.general.BlockMiningExplosives; import gtPlusPlus.core.block.general.antigrief.BlockWitherProof; -import gtPlusPlus.core.block.machine.CircuitProgrammer; -import gtPlusPlus.core.block.machine.DecayablesChest; -import gtPlusPlus.core.block.machine.FishTrap; -import gtPlusPlus.core.block.machine.Machine_PestKiller; -import gtPlusPlus.core.block.machine.Machine_PooCollector; -import gtPlusPlus.core.block.machine.Machine_ProjectTable; -import gtPlusPlus.core.block.machine.Machine_SuperJukebox; -import gtPlusPlus.core.block.machine.VolumetricFlaskSetter; +import gtPlusPlus.core.block.machine.BlockCircuitProgrammer; +import gtPlusPlus.core.block.machine.BlockDecayablesChest; +import gtPlusPlus.core.block.machine.BlockFishTrap; +import gtPlusPlus.core.block.machine.BlockFlaskSetter; +import gtPlusPlus.core.block.machine.BlockPestKiller; +import gtPlusPlus.core.block.machine.BlockPooCollector; +import gtPlusPlus.core.block.machine.BlockProjectTable; +import gtPlusPlus.core.block.machine.BlockSuperJukebox; import gtPlusPlus.core.fluids.FluidRegistryHandler; public final class ModBlocks { @@ -68,31 +68,31 @@ public final class ModBlocks { public static void registerBlocks() { Logger.INFO("Registering Blocks."); - MatterFabricatorEffectBlock = new LightGlass(false); + MatterFabricatorEffectBlock = new BlockLightGlass(false); // Fluids FluidRegistryHandler.registerFluids(); // Workbench - blockFishTrap = new FishTrap(); - blockInfiniteFLuidTank = new FluidTankInfinite(); - blockMiningExplosive = new MiningExplosives(); - blockHellfire = new HellFire(); - blockProjectTable = new Machine_ProjectTable(); + blockFishTrap = new BlockFishTrap(); + blockInfiniteFLuidTank = new BlockFluidTankInfinite(); + blockMiningExplosive = new BlockMiningExplosives(); + blockHellfire = new BlockHellFire(); + blockProjectTable = new BlockProjectTable(); blockWitherGuard = new BlockWitherProof(); blockCompressedObsidian = new BlockCompressedObsidian(); - blockCircuitProgrammer = new CircuitProgrammer(); + blockCircuitProgrammer = new BlockCircuitProgrammer(); - blockDecayablesChest = new DecayablesChest(); + blockDecayablesChest = new BlockDecayablesChest(); - blockCustomJukebox = new Machine_SuperJukebox(); + blockCustomJukebox = new BlockSuperJukebox(); - blockPooCollector = new Machine_PooCollector(); + blockPooCollector = new BlockPooCollector(); - blockPestKiller = new Machine_PestKiller(); + blockPestKiller = new BlockPestKiller(); - blockVolumetricFlaskSetter = new VolumetricFlaskSetter(); + blockVolumetricFlaskSetter = new BlockFlaskSetter(); } } diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java index c39565ea41..bace2937fd 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java @@ -30,7 +30,7 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.CubicObject; import gtPlusPlus.api.objects.minecraft.SafeTexture; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.InventoryUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -63,7 +63,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * Does this {@link Block} require special {@link ItemBlock} handling? - * + * * @return The {@link Class} that will be used for this {@link Block}. */ public Class<? extends ItemBlock> getItemBlockClass() { @@ -72,28 +72,28 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * A lazy way to declare the unlocal name for the block, makes boilerplating easy. - * + * * @return The internal name for this block. */ public abstract String getUnlocalBlockName(); /** * Lazy Boilerplating. - * + * * @return Block Hardness. */ protected abstract float initBlockHardness(); /** * Lazy Boilerplating. - * + * * @return Block Resistance. */ protected abstract float initBlockResistance(); /** * Lazy Boilerplating. - * + * * @return The {@link CreativeTab} this Block is shown on. */ protected abstract CreativeTabs initCreativeTab(); @@ -128,7 +128,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * The String used for texture pathing. - * + * * @return Sanitized {@link String}, containing no spaces or illegal characters. */ private String getTileEntityNameForTexturePathing() { @@ -172,9 +172,9 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement // Default Path Name, this will make us look inside 'miscutils\textures\blocks' final String aPrefixTexPath = GTPlusPlus.ID + ":"; // Default Path Name, this will make us look in the subdirectory for this Tile Entity. - final String aTexPathMid = "TileEntities" + CORE.SEPERATOR + final String aTexPathMid = "TileEntities" + GTPPCore.SEPERATOR + getTileEntityNameForTexturePathing() - + CORE.SEPERATOR; + + GTPPCore.SEPERATOR; // Construct a full path String aTexPathBuilt = aPrefixTexPath + aTexPathMid; // File Name Suffixes, without meta tags diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java index b07c6d1529..abd83d7171 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -16,11 +16,11 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TextureSet; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.base.itemblock.ItemBlockGtBlock; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; @@ -58,7 +58,7 @@ public class BlockBaseModular extends BasicBlock { registerComponent(); sBlockCache.put(material.getUnlocalizedName() + "." + blockType.name(), this); thisBlockMaterialTranslatedName = material.getTranslatedName(); - GT_LanguageManager.addStringLocalization("gtplusplus." + getUnlocalizedName() + ".name", getProperName()); + GTLanguageManager.addStringLocalization("gtplusplus." + getUnlocalizedName() + ".name", getProperName()); } protected BlockBaseModular(final String unlocalizedName, final String blockMaterialString, @@ -79,13 +79,13 @@ public class BlockBaseModular extends BasicBlock { ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture() + unlocalizedName)); if (fx == 0) { - GT_OreDictUnificator + GTOreDictUnificator .registerOre("block" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this)); } else if (fx == 1) { - GT_OreDictUnificator + GTOreDictUnificator .registerOre("frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this)); } else if (fx == 2) { - GT_OreDictUnificator + GTOreDictUnificator .registerOre("frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this)); } } @@ -172,7 +172,7 @@ public class BlockBaseModular extends BasicBlock { @Override public String getLocalizedName() { - return GT_LanguageManager.getTranslation("gtplusplus." + getUnlocalizedName() + ".name") + return GTLanguageManager.getTranslation("gtplusplus." + getUnlocalizedName() + ".name") .replace("%s", "%temp") .replace("%material", this.thisBlockMaterialTranslatedName) .replace("%temp", "%s"); @@ -198,7 +198,7 @@ public class BlockBaseModular extends BasicBlock { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iIcon) { - if (!CORE.ConfigSwitches.useGregtechTextures || this.blockMaterial == null + if (!GTPPCore.ConfigSwitches.useGregtechTextures || this.blockMaterial == null || this.thisBlock == BlockTypes.ORE) { this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + this.thisBlock.getTexture()); } diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java index 1813090810..b0ee1c0c77 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -18,12 +18,12 @@ import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.interfaces.ITexturedBlock; import gtPlusPlus.core.client.renderer.CustomOreBlockRenderer; import gtPlusPlus.core.item.base.itemblock.ItemBlockOre; @@ -31,8 +31,8 @@ import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture; -import gtPlusPlus.xmod.gregtech.api.objects.GTPP_RenderedTexture; +import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture; +import gtPlusPlus.xmod.gregtech.api.objects.GTPPRenderedTexture; public class BlockBaseOre extends BasicBlock implements ITexturedBlock { @@ -60,7 +60,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { this, ItemBlockOre.class, Utils.sanitizeString("ore" + Utils.sanitizeString(this.blockMaterial.getLocalizedName()))); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( "ore" + Utils.sanitizeString(this.blockMaterial.getLocalizedName()), ItemUtils.getSimpleStack(this)); } catch (Throwable t) { @@ -115,10 +115,10 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { @Override public ITexture[] getTexture(Block block, ForgeDirection side) { if (this.blockMaterial != null) { - GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture( + GTPPRenderedTexture aIconSet = new GTPPRenderedTexture( blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], this.blockMaterial.getRGBA()); - return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet }; + return new ITexture[] { new GTPPCopiedBlockTexture(Blocks.stone, 0, 0), aIconSet }; } if (hiddenTextureArray == null) { @@ -134,7 +134,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { hiddenTextureArray = new IIconContainer[6]; } } - return new ITexture[] { new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] { 240, 240, 240, 0 }) }; + return new ITexture[] { new GTPPRenderedTexture(hiddenTextureArray[0], new short[] { 240, 240, 240, 0 }) }; } @Override @@ -167,7 +167,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { if (shouldSilkTouch) { drops.add(ItemUtils.simpleMetaStack(this, metadata, 1)); } else { - switch (GT_Mod.gregtechproxy.oreDropSystem) { + switch (GTMod.gregtechproxy.oreDropSystem) { case Item -> { drops.add( ItemUtils.getItemStackOfAmountFromOreDictNoBroken( diff --git a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java b/src/main/java/gtPlusPlus/core/block/general/BlockFluidTankInfinite.java index 41a581394b..a300b83577 100644 --- a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockFluidTankInfinite.java @@ -23,7 +23,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.tileentities.general.TileEntityInfiniteFluid; import gtPlusPlus.core.util.minecraft.PlayerUtils; -public class FluidTankInfinite extends BlockContainer { +public class BlockFluidTankInfinite extends BlockContainer { @SideOnly(Side.CLIENT) private IIcon textureTop; @@ -34,7 +34,7 @@ public class FluidTankInfinite extends BlockContainer { @SideOnly(Side.CLIENT) private IIcon textureFront; - public FluidTankInfinite() { + public BlockFluidTankInfinite() { super(Material.iron); this.setBlockName("blockInfiniteFluidTank"); this.setCreativeTab(AddToCreativeTab.tabMachines); diff --git a/src/main/java/gtPlusPlus/core/block/general/HellFire.java b/src/main/java/gtPlusPlus/core/block/general/BlockHellFire.java index 4e8d94328d..b18a2d4b86 100644 --- a/src/main/java/gtPlusPlus/core/block/general/HellFire.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockHellFire.java @@ -33,7 +33,7 @@ import gregtech.api.objects.XSTR; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.math.MathUtils; -public class HellFire extends BlockFire { +public class BlockHellFire extends BlockFire { private final int[] field_149849_a = new int[Short.MAX_VALUE]; @@ -42,7 +42,7 @@ public class HellFire extends BlockFire { @SideOnly(Side.CLIENT) private IIcon[] IIconArray; - public HellFire() { + public BlockHellFire() { this.setTickRandomly(true); this.setLightLevel(1F); this.setLightOpacity(0); diff --git a/src/main/java/gtPlusPlus/core/block/general/LightGlass.java b/src/main/java/gtPlusPlus/core/block/general/BlockLightGlass.java index b6facce45f..1e4df5c399 100644 --- a/src/main/java/gtPlusPlus/core/block/general/LightGlass.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockLightGlass.java @@ -20,7 +20,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab; /* * public class LightGlass extends BlockBreakable { */ -public class LightGlass extends BlockAir { +public class BlockLightGlass extends BlockAir { private int state = 0; private final int a = 255; @@ -29,7 +29,7 @@ public class LightGlass extends BlockAir { private int b = 0; private int hex; - public LightGlass(final boolean bool) { + public BlockLightGlass(final boolean bool) { super(); this.setCreativeTab(AddToCreativeTab.tabBlock); this.setBlockName("blockMFEffect"); diff --git a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java b/src/main/java/gtPlusPlus/core/block/general/BlockMiningExplosives.java index 7579907e9d..20b6fff9e6 100644 --- a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockMiningExplosives.java @@ -22,7 +22,7 @@ import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.entity.EntityPrimedMiningExplosive; -public class MiningExplosives extends BlockTNT { +public class BlockMiningExplosives extends BlockTNT { @SideOnly(Side.CLIENT) private IIcon textureTop; @@ -30,7 +30,7 @@ public class MiningExplosives extends BlockTNT { @SideOnly(Side.CLIENT) private IIcon textureBottom; - public MiningExplosives() { + public BlockMiningExplosives() { this.setBlockName("blockMiningExplosives"); GameRegistry.registerBlock(this, "blockMiningExplosives"); this.setCreativeTab(AddToCreativeTab.tabMachines); diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java index dc6c92f065..4110c02fe3 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java @@ -177,7 +177,7 @@ public class BlockSuperLight extends BlockContainer { // Turning Lights off else if (!enable && aLight > 0) { aBlocksToUpdate.put(new BlockPos(xOff, yOff, zOff, this.worldObj)); - if (aBlockGet instanceof LightGlass) { + if (aBlockGet instanceof BlockLightGlass) { Logger.INFO("Dimmed air."); this.worldObj.setBlock(xOff, yOff, zOff, Blocks.air, 0, 3); } diff --git a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/block/machine/BlockCircuitProgrammer.java index f6cd34aec1..191a2a8f92 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockCircuitProgrammer.java @@ -13,7 +13,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.common.items.MetaGeneratedTool01; import gtPlusPlus.GTplusplus; import gtPlusPlus.api.objects.minecraft.CubicObject; import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip; @@ -22,7 +22,7 @@ import gtPlusPlus.core.handler.GuiHandler; import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer; import gtPlusPlus.core.util.minecraft.PlayerUtils; -public class CircuitProgrammer extends BasicTileBlockWithTooltip { +public class BlockCircuitProgrammer extends BasicTileBlockWithTooltip { /** * Determines which tooltip is displayed within the itemblock. @@ -34,7 +34,7 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip { return this.mTooltipID; } - public CircuitProgrammer() { + public BlockCircuitProgrammer() { super(Material.iron); } @@ -53,7 +53,7 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip { try { final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName()); final Item mHandItem = mHandStack.getItem(); - if (((mHandItem instanceof GT_MetaGenerated_Tool_01) + if (((mHandItem instanceof MetaGeneratedTool01) && ((mHandItem.getDamage(mHandStack) == 22) || (mHandItem.getDamage(mHandStack) == 150)))) { final TileEntityCircuitProgrammer tile = (TileEntityCircuitProgrammer) world.getTileEntity(x, y, z); if (tile != null) { diff --git a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java b/src/main/java/gtPlusPlus/core/block/machine/BlockDecayablesChest.java index 16d038bea9..2bcd9afb5f 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockDecayablesChest.java @@ -27,7 +27,7 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest; import gtPlusPlus.core.util.minecraft.InventoryUtils; -public class DecayablesChest extends BlockContainer implements ITileTooltip { +public class BlockDecayablesChest extends BlockContainer implements ITileTooltip { @SideOnly(Side.CLIENT) private IIcon textureTop; @@ -48,7 +48,7 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip { return this.mTooltipID; } - public DecayablesChest() { + public BlockDecayablesChest() { super(Material.iron); this.setBlockName("blockDecayablesChest"); this.setCreativeTab(AddToCreativeTab.tabMachines); diff --git a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java b/src/main/java/gtPlusPlus/core/block/machine/BlockFishTrap.java index 0ec1ac629a..0a91c76d60 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockFishTrap.java @@ -25,7 +25,7 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; import gtPlusPlus.core.util.minecraft.InventoryUtils; -public class FishTrap extends BlockContainer implements ITileTooltip { +public class BlockFishTrap extends BlockContainer implements ITileTooltip { @SideOnly(Side.CLIENT) private IIcon textureTop; @@ -46,7 +46,7 @@ public class FishTrap extends BlockContainer implements ITileTooltip { return this.mTooltipID; } - public FishTrap() { + public BlockFishTrap() { super(Material.iron); this.setBlockName("blockFishTrap"); this.setHardness(5f); diff --git a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/block/machine/BlockFlaskSetter.java index 1bca4a5c5f..510caf3e14 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockFlaskSetter.java @@ -14,7 +14,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.common.items.MetaGeneratedTool01; import gtPlusPlus.GTplusplus; import gtPlusPlus.api.objects.minecraft.CubicObject; import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip; @@ -24,7 +24,7 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter; import gtPlusPlus.core.util.minecraft.PlayerUtils; -public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { +public class BlockFlaskSetter extends BasicTileBlockWithTooltip { /** * Determines which tooltip is displayed within the itemblock. @@ -41,7 +41,7 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { return ItemBlockBasicTile.class; } - public VolumetricFlaskSetter() { + public BlockFlaskSetter() { super(Material.iron); } @@ -60,7 +60,7 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { try { final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName()); final Item mHandItem = mHandStack.getItem(); - if (((mHandItem instanceof GT_MetaGenerated_Tool_01) + if (((mHandItem instanceof MetaGeneratedTool01) && ((mHandItem.getDamage(mHandStack) == 22) || (mHandItem.getDamage(mHandStack) == 150)))) { final TileEntityVolumetricFlaskSetter tile = (TileEntityVolumetricFlaskSetter) world .getTileEntity(x, y, z); diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java b/src/main/java/gtPlusPlus/core/block/machine/BlockPestKiller.java index bf98a22500..95e7f3bc56 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockPestKiller.java @@ -26,7 +26,7 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller; import gtPlusPlus.core.util.minecraft.InventoryUtils; -public class Machine_PestKiller extends BlockContainer implements ITileTooltip { +public class BlockPestKiller extends BlockContainer implements ITileTooltip { @SideOnly(Side.CLIENT) private IIcon textureTop; @@ -47,7 +47,7 @@ public class Machine_PestKiller extends BlockContainer implements ITileTooltip { return this.mTooltipID; } - public Machine_PestKiller() { + public BlockPestKiller() { super(Material.wood); this.setBlockName("blockPestKiller"); this.setHardness(5f); diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java b/src/main/java/gtPlusPlus/core/block/machine/BlockPooCollector.java index 4f1b679fcf..6a371a3284 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockPooCollector.java @@ -27,7 +27,7 @@ import gtPlusPlus.core.tileentities.machines.TileEntityPooCollector; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; -public class Machine_PooCollector extends BlockContainer { +public class BlockPooCollector extends BlockContainer { @SideOnly(Side.CLIENT) private IIcon textureTop; @@ -41,7 +41,7 @@ public class Machine_PooCollector extends BlockContainer { @SideOnly(Side.CLIENT) private IIcon textureSide2; - public Machine_PooCollector() { + public BlockPooCollector() { super(Material.iron); this.setHardness(5f); this.setResistance(1f); diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/main/java/gtPlusPlus/core/block/machine/BlockProjectTable.java index 4f0d0d7d60..1537aec736 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockProjectTable.java @@ -31,7 +31,7 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils; import ic2.core.item.tool.ItemToolWrench; @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = Mods.Names.ENDER_I_O) -public class Machine_ProjectTable extends BlockContainer implements ITileTooltip { +public class BlockProjectTable extends BlockContainer implements ITileTooltip { @SideOnly(Side.CLIENT) private IIcon textureTop; @@ -52,7 +52,7 @@ public class Machine_ProjectTable extends BlockContainer implements ITileTooltip return this.mTooltipID; } - public Machine_ProjectTable() { + public BlockProjectTable() { super(Material.iron); this.setBlockName("blockProjectBench"); this.setCreativeTab(AddToCreativeTab.tabMachines); diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java b/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java index 6b3c87fac4..4440d2920a 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java @@ -22,15 +22,15 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.GTplusplus; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.handler.GuiHandler; -import gtPlusPlus.core.inventories.Inventory_SuperJukebox; +import gtPlusPlus.core.inventories.InventorySuperJukebox; import gtPlusPlus.core.util.math.MathUtils; -public class Machine_SuperJukebox extends BlockJukebox { +public class BlockSuperJukebox extends BlockJukebox { @SideOnly(Side.CLIENT) private IIcon mIcon; @@ -47,7 +47,7 @@ public class Machine_SuperJukebox extends BlockJukebox { } } - public Machine_SuperJukebox() { + public BlockSuperJukebox() { this.setBlockName("blockSuperJukebox"); this.setCreativeTab(CreativeTabs.tabRedstone); setHardness(2.0F); @@ -184,7 +184,7 @@ public class Machine_SuperJukebox extends BlockJukebox { public int numPlayersUsing; private ItemStack mCurrentlyPlayingStack; - private final Inventory_SuperJukebox inventoryContents; + private final InventorySuperJukebox inventoryContents; private String customName; /* @@ -202,7 +202,7 @@ public class Machine_SuperJukebox extends BlockJukebox { public boolean a_TEST_BOOL_VAR_4; public TileEntitySuperJukebox() { - this.inventoryContents = new Inventory_SuperJukebox(); + this.inventoryContents = new InventorySuperJukebox(); } @Override @@ -283,7 +283,7 @@ public class Machine_SuperJukebox extends BlockJukebox { this.markDirty(); } - public Inventory_SuperJukebox getInventory() { + public InventorySuperJukebox getInventory() { return this.inventoryContents; } @@ -341,13 +341,13 @@ public class Machine_SuperJukebox extends BlockJukebox { .getInventory()) { if (g != null && aSlotCounter <= 17) { Logger.INFO("b3 - " + g.getDisplayName()); - if (GT_Utility.areStacksEqual(g, aRecordToPlay, true)) { + if (GTUtility.areStacksEqual(g, aRecordToPlay, true)) { IInventory aThisInv = this.getInventory(); if (aThisInv.getStackInSlot(20) != null) { openDiscDrive(); } - GT_Utility.moveStackFromSlotAToSlotB( + GTUtility.moveStackFromSlotAToSlotB( aThisInv, aThisInv, aSlotCounter, @@ -417,7 +417,7 @@ public class Machine_SuperJukebox extends BlockJukebox { .getInventory()[i]; if (g == null && aSlotCounter >= 0) { IInventory aThisInv = this.getInventory(); - GT_Utility + GTUtility .moveStackFromSlotAToSlotB(aThisInv, aThisInv, 20, i, (byte) 1, (byte) 1, (byte) 1, (byte) 1); vanillaStopJukebox(); Logger.INFO("b++"); diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java index c691bac144..aa6bfa9288 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java @@ -14,7 +14,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.client.model.ModelDecayChest; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest; @SideOnly(Side.CLIENT) @@ -71,7 +71,7 @@ public class RenderDecayChest extends TileEntitySpecialRenderer { f1 = 1.0F - f1; f1 = 1.0F - f1 * f1 * f1; - mChestModel.chestLid.rotateAngleX = -(f1 * CORE.PI / 2.0F); + mChestModel.chestLid.rotateAngleX = -(f1 * GTPPCore.PI / 2.0F); mChestModel.renderAll(); GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glPopMatrix(); diff --git a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java index bf42a0792d..56ba05f21f 100644 --- a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java +++ b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java @@ -23,7 +23,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.NBTUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.CORE_Preloader; +import gtPlusPlus.preloader.PreloaderCore; import gtPlusPlus.preloader.asm.AsmConfig; public class CommandEnableDebugWhileRunning implements ICommand { @@ -84,8 +84,8 @@ public class CommandEnableDebugWhileRunning implements ICommand { Logger.INFO("Toggling Debug Mode."); final EntityPlayer P = CommandUtils.getPlayer(S); if (PlayerUtils.isPlayerOP(P)) { - CORE_Preloader.DEBUG_MODE = !CORE_Preloader.DEBUG_MODE; - PlayerUtils.messagePlayer(P, "Toggled GT++ Debug Mode - Enabled: " + CORE_Preloader.DEBUG_MODE); + PreloaderCore.DEBUG_MODE = !PreloaderCore.DEBUG_MODE; + PlayerUtils.messagePlayer(P, "Toggled GT++ Debug Mode - Enabled: " + PreloaderCore.DEBUG_MODE); } } else if (argString[0].toLowerCase() .equals("logging")) { diff --git a/src/main/java/gtPlusPlus/core/commands/CommandMath.java b/src/main/java/gtPlusPlus/core/commands/CommandMath.java index f23e45a359..276e7874e7 100644 --- a/src/main/java/gtPlusPlus/core/commands/CommandMath.java +++ b/src/main/java/gtPlusPlus/core/commands/CommandMath.java @@ -10,7 +10,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.MiningUtils; public class CommandMath implements ICommand { @@ -72,7 +72,7 @@ public class CommandMath implements ICommand { || P.getCommandSenderName() .toLowerCase() .equals("draknyte1") - || CORE.DEVENV) { + || GTPPCore.DEVENV) { return true; } return false; diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java index 90b4c99ed8..b358548e15 100644 --- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java @@ -27,8 +27,8 @@ import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.entity.InternalEntityRegistry; import gtPlusPlus.core.handler.BookHandler; import gtPlusPlus.core.handler.BurnableFuelHandler; -import gtPlusPlus.core.handler.COMPAT_HANDLER; -import gtPlusPlus.core.handler.COMPAT_IntermodStaging; +import gtPlusPlus.core.handler.CompatHandler; +import gtPlusPlus.core.handler.CompatIntermodStaging; import gtPlusPlus.core.handler.GuiHandler; import gtPlusPlus.core.handler.events.EnderDragonDeathHandler; import gtPlusPlus.core.handler.events.EntityDeathHandler; @@ -36,14 +36,14 @@ import gtPlusPlus.core.handler.events.GeneralTooltipEventHandler; import gtPlusPlus.core.handler.events.PlayerSleepEventHandler; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.bauble.BaseBauble; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.tileentities.ModTileEntities; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.CORE_Preloader; +import gtPlusPlus.preloader.PreloaderCore; import gtPlusPlus.xmod.gregtech.api.util.SpecialBehaviourTooltipHandler; import gtPlusPlus.xmod.ic2.CustomInternalName; @@ -56,9 +56,9 @@ public class CommonProxy { public void preInit(final FMLPreInitializationEvent e) { Logger.INFO("Doing some house cleaning."); - if (!CORE_Preloader.DEBUG_MODE) { + if (!PreloaderCore.DEBUG_MODE) { Logger.WARNING("Development mode not enabled."); - } else if (CORE_Preloader.DEBUG_MODE) { + } else if (PreloaderCore.DEBUG_MODE) { Logger.INFO("Development mode enabled."); } else { Logger.WARNING("Development mode not set."); @@ -70,7 +70,7 @@ public class CommonProxy { ModItems.init(); ModBlocks.init(); CI.preInit(); - COMPAT_IntermodStaging.preInit(e); + CompatIntermodStaging.preInit(e); BookHandler.run(); // Registration of entities and renderers Logger.INFO("[Proxy] Calling Entity registration."); @@ -97,15 +97,15 @@ public class CommonProxy { Utils.registerEvent(new EntityDeathHandler()); // Compat Handling - COMPAT_HANDLER.registerMyModsOreDictEntries(); - COMPAT_HANDLER.intermodOreDictionarySupport(); - COMPAT_IntermodStaging.init(e); + CompatHandler.registerMyModsOreDictEntries(); + CompatHandler.intermodOreDictionarySupport(); + CompatIntermodStaging.init(e); } public void postInit(final FMLPostInitializationEvent e) { // Make Burnables burnable - if (!CORE.burnables.isEmpty()) { + if (!GTPPCore.burnables.isEmpty()) { BurnableFuelHandler fuelHandler = new BurnableFuelHandler(); GameRegistry.registerFuelHandler(fuelHandler); Logger.INFO( @@ -115,28 +115,28 @@ public class CommonProxy { // Compat Handling Logger.INFO("Removing recipes from other mods."); - COMPAT_HANDLER.RemoveRecipesFromOtherMods(); + CompatHandler.RemoveRecipesFromOtherMods(); Logger.INFO("Initialising Handler, Then Adding Recipes"); - COMPAT_HANDLER.InitialiseHandlerThenAddRecipes(); + CompatHandler.InitialiseHandlerThenAddRecipes(); Logger.INFO("Loading Intermod staging."); - COMPAT_IntermodStaging.postInit(e); + CompatIntermodStaging.postInit(e); Logger.INFO("Loading queued recipes."); - COMPAT_HANDLER.runQueuedRecipes(); + CompatHandler.runQueuedRecipes(); Logger.INFO("Registering custom mob drops."); registerCustomMobDrops(); // Moved last, to prevent recipes being generated post initialisation. Logger.INFO("Loading Gregtech API recipes."); - COMPAT_HANDLER.startLoadingGregAPIBasedRecipes(); + CompatHandler.startLoadingGregAPIBasedRecipes(); } public void serverStarting(final FMLServerStartingEvent e) { - COMPAT_HANDLER.InitialiseLateHandlerThenAddRecipes(); + CompatHandler.InitialiseLateHandlerThenAddRecipes(); } public void onLoadComplete(FMLLoadCompleteEvent event) { - COMPAT_IntermodStaging.onLoadComplete(event); - COMPAT_HANDLER.onLoadComplete(event); + CompatIntermodStaging.onLoadComplete(event); + CompatHandler.onLoadComplete(event); } public void registerNetworkStuff() { diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/main/java/gtPlusPlus/core/common/compat/CompatBaubles.java index e90596c876..02b6edf453 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java +++ b/src/main/java/gtPlusPlus/core/common/compat/CompatBaubles.java @@ -1,16 +1,16 @@ package gtPlusPlus.core.common.compat; import static gregtech.api.enums.Mods.Baubles; -import static gregtech.client.GT_TooltipHandler.Tier.EV; -import static gregtech.client.GT_TooltipHandler.Tier.HV; -import static gregtech.client.GT_TooltipHandler.Tier.IV; -import static gregtech.client.GT_TooltipHandler.Tier.LV; -import static gregtech.client.GT_TooltipHandler.Tier.LuV; -import static gregtech.client.GT_TooltipHandler.Tier.MV; -import static gregtech.client.GT_TooltipHandler.Tier.UHV; -import static gregtech.client.GT_TooltipHandler.Tier.UV; -import static gregtech.client.GT_TooltipHandler.Tier.ZPM; -import static gregtech.client.GT_TooltipHandler.registerTieredTooltip; +import static gregtech.client.GTTooltipHandler.Tier.EV; +import static gregtech.client.GTTooltipHandler.Tier.HV; +import static gregtech.client.GTTooltipHandler.Tier.IV; +import static gregtech.client.GTTooltipHandler.Tier.LV; +import static gregtech.client.GTTooltipHandler.Tier.LuV; +import static gregtech.client.GTTooltipHandler.Tier.MV; +import static gregtech.client.GTTooltipHandler.Tier.UHV; +import static gregtech.client.GTTooltipHandler.Tier.UV; +import static gregtech.client.GTTooltipHandler.Tier.ZPM; +import static gregtech.client.GTTooltipHandler.registerTieredTooltip; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -22,7 +22,7 @@ import gtPlusPlus.core.item.bauble.FireProtectionBauble; import gtPlusPlus.core.item.general.ItemCloakingDevice; import gtPlusPlus.core.item.general.ItemHealingDevice; -public class COMPAT_Baubles { +public class CompatBaubles { public static void run() { if (Baubles.isModLoaded()) { diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java b/src/main/java/gtPlusPlus/core/common/compat/CompatExtraUtils.java index f61c70ab5b..3d188bd9c0 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java +++ b/src/main/java/gtPlusPlus/core/common/compat/CompatExtraUtils.java @@ -2,13 +2,13 @@ package gtPlusPlus.core.common.compat; import net.minecraft.item.ItemStack; -import gtPlusPlus.core.recipe.RECIPES_Tools; +import gtPlusPlus.core.recipe.RecipesTools; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class COMPAT_ExtraUtils { +public class CompatExtraUtils { public static void OreDict() { - RECIPES_Tools.RECIPE_DivisionSigil = new ItemStack(ItemUtils.getItemFromFQRN("ExtraUtilities:divisionSigil")); + RecipesTools.RECIPE_DivisionSigil = new ItemStack(ItemUtils.getItemFromFQRN("ExtraUtilities:divisionSigil")); run(); } diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java b/src/main/java/gtPlusPlus/core/common/compat/CompatHarvestCraft.java index 9a9557e418..5e4baf5c88 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java +++ b/src/main/java/gtPlusPlus/core/common/compat/CompatHarvestCraft.java @@ -2,7 +2,7 @@ package gtPlusPlus.core.common.compat; import gtPlusPlus.xmod.pamsharvest.fishtrap.FishTrapHandler; -public class COMPAT_HarvestCraft { +public class CompatHarvestCraft { public static void OreDict() { run(); diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/main/java/gtPlusPlus/core/common/compat/CompatIC2.java index c442251a0e..c6662800b2 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java +++ b/src/main/java/gtPlusPlus/core/common/compat/CompatIC2.java @@ -1,14 +1,14 @@ package gtPlusPlus.core.common.compat; -import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue; +import static gtPlusPlus.core.handler.CompatHandler.RemoveRecipeQueue; import net.minecraft.item.ItemStack; -import gtPlusPlus.core.lib.CORE.ConfigSwitches; +import gtPlusPlus.core.lib.GTPPCore.ConfigSwitches; import gtPlusPlus.core.recipe.ShapedRecipeObject; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class COMPAT_IC2 { +public class CompatIC2 { private static ItemStack itemCropnalyzer = ItemUtils.simpleMetaStack("IC2:itemCropnalyzer", 0, 1); private static ItemStack itemSolarHelmet = ItemUtils.simpleMetaStack("IC2:itemSolarHelmet", 0, 1); diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java b/src/main/java/gtPlusPlus/core/common/compat/CompatThaumcraft.java index d9c9fec08e..8e06c95c67 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java +++ b/src/main/java/gtPlusPlus/core/common/compat/CompatThaumcraft.java @@ -2,11 +2,11 @@ package gtPlusPlus.core.common.compat; import static gregtech.api.enums.Mods.ForbiddenMagic; -import gregtech.api.util.GT_OreDictUnificator; -import gtPlusPlus.core.lib.CORE.ConfigSwitches; +import gregtech.api.util.GTOreDictUnificator; +import gtPlusPlus.core.lib.GTPPCore.ConfigSwitches; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class COMPAT_Thaumcraft { +public class CompatThaumcraft { public static void OreDict() { @@ -19,28 +19,27 @@ public class COMPAT_Thaumcraft { for (int i = 0; i <= 6; i++) { ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard " + i, i); - GT_OreDictUnificator - .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1)); + GTOreDictUnificator.registerOre("shardAny", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1)); ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard " + i, i); - GT_OreDictUnificator + GTOreDictUnificator .registerOre("gemInfusedAnything", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1)); } if (ForbiddenMagic.isModLoaded()) { for (int i = 0; i <= 6; i++) { ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "shardAny", "FM Shard " + i, i); - GT_OreDictUnificator + GTOreDictUnificator .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1)); ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "gemInfusedAnything", "FM Shard " + i, i); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( "gemInfusedAnything", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1)); } ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "shardAny", "FM Gluttony Shard", 0); - GT_OreDictUnificator + GTOreDictUnificator .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1)); ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "gemInfusedAnything", "FM Gluttony Shard", 0); - GT_OreDictUnificator + GTOreDictUnificator .registerOre("gemInfusedAnything", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1)); } } diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java b/src/main/java/gtPlusPlus/core/common/compat/CompatWitchery.java index f6fdd87eec..3003749c79 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java +++ b/src/main/java/gtPlusPlus/core/common/compat/CompatWitchery.java @@ -4,10 +4,10 @@ import static gregtech.api.enums.Mods.Witchery; import net.minecraft.item.ItemStack; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class COMPAT_Witchery { +public class CompatWitchery { public static void OreDict() { run(); @@ -21,8 +21,8 @@ public class COMPAT_Witchery { .getItemStackWithMeta(Witchery.isModLoaded(), "witchery:ingredient", "Koboldite Nugget", 149, 1); ItemStack aKobolditeIngot = ItemUtils .getItemStackWithMeta(Witchery.isModLoaded(), "witchery:ingredient", "Koboldite Ingot", 150, 1); - if (aKobolditeDust != null) GT_OreDictUnificator.registerOre("dust" + "Koboldite", aKobolditeDust); - if (aKobolditeNugget != null) GT_OreDictUnificator.registerOre("nugget" + "Koboldite", aKobolditeNugget); - if (aKobolditeIngot != null) GT_OreDictUnificator.registerOre("ingot" + "Koboldite", aKobolditeIngot); + if (aKobolditeDust != null) GTOreDictUnificator.registerOre("dust" + "Koboldite", aKobolditeDust); + if (aKobolditeNugget != null) GTOreDictUnificator.registerOre("nugget" + "Koboldite", aKobolditeNugget); + if (aKobolditeIngot != null) GTOreDictUnificator.registerOre("ingot" + "Koboldite", aKobolditeIngot); } } diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java index 22bd775e6d..d214bd8a52 100644 --- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java @@ -1,10 +1,10 @@ package gtPlusPlus.core.config; import static gregtech.api.enums.Mods.GregTech; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.*; -import static gtPlusPlus.core.lib.CORE.EVERGLADESBIOME_ID; -import static gtPlusPlus.core.lib.CORE.EVERGLADES_ID; -import static gtPlusPlus.core.lib.CORE.turbineCutoffBase; +import static gtPlusPlus.core.lib.GTPPCore.ConfigSwitches.*; +import static gtPlusPlus.core.lib.GTPPCore.EVERGLADESBIOME_ID; +import static gtPlusPlus.core.lib.GTPPCore.EVERGLADES_ID; +import static gtPlusPlus.core.lib.GTPPCore.turbineCutoffBase; import java.io.File; diff --git a/src/main/java/gtPlusPlus/core/container/Container_CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/container/ContainerCircuitProgrammer.java index f1e84f439f..9afccfb0f4 100644 --- a/src/main/java/gtPlusPlus/core/container/Container_CircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/container/ContainerCircuitProgrammer.java @@ -14,7 +14,7 @@ import gtPlusPlus.core.slots.SlotIntegratedCircuit; import gtPlusPlus.core.slots.SlotNoInput; import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer; -public class Container_CircuitProgrammer extends Container { +public class ContainerCircuitProgrammer extends Container { protected TileEntityCircuitProgrammer tile_entity; public final InventoryCircuitProgrammer inventoryChest; @@ -32,7 +32,7 @@ public class Container_CircuitProgrammer extends Container { public static int FullSlotNumber = InventorySlotNumber + StorageSlotNumber; // All // slots - public Container_CircuitProgrammer(final InventoryPlayer inventory, final TileEntityCircuitProgrammer te) { + public ContainerCircuitProgrammer(final InventoryPlayer inventory, final TileEntityCircuitProgrammer te) { this.tile_entity = te; this.inventoryChest = te.getInventory(); diff --git a/src/main/java/gtPlusPlus/core/container/Container_FishTrap.java b/src/main/java/gtPlusPlus/core/container/ContainerFishTrap.java index 881311897f..1a9344c08c 100644 --- a/src/main/java/gtPlusPlus/core/container/Container_FishTrap.java +++ b/src/main/java/gtPlusPlus/core/container/ContainerFishTrap.java @@ -12,7 +12,7 @@ import gtPlusPlus.core.inventories.InventoryFishTrap; import gtPlusPlus.core.slots.SlotNoInput; import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; -public class Container_FishTrap extends Container { +public class ContainerFishTrap extends Container { protected TileEntityFishTrap tile_entity; public final InventoryFishTrap inventoryChest; @@ -30,7 +30,7 @@ public class Container_FishTrap extends Container { private final int[] slotStorage = new int[15]; - public Container_FishTrap(final InventoryPlayer inventory, final TileEntityFishTrap te) { + public ContainerFishTrap(final InventoryPlayer inventory, final TileEntityFishTrap te) { this.tile_entity = te; this.inventoryChest = te.getInventory(); diff --git a/src/main/java/gtPlusPlus/core/container/Container_PestKiller.java b/src/main/java/gtPlusPlus/core/container/ContainerPestKiller.java index 315f34595e..6f63a1d04e 100644 --- a/src/main/java/gtPlusPlus/core/container/Container_PestKiller.java +++ b/src/main/java/gtPlusPlus/core/container/ContainerPestKiller.java @@ -18,7 +18,7 @@ import gtPlusPlus.core.slots.SlotGeneric; import gtPlusPlus.core.slots.SlotNoInput; import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller; -public class Container_PestKiller extends Container { +public class ContainerPestKiller extends Container { public TileEntityPestKiller tile_entity; public final InventoryPestKiller inventoryChest; @@ -34,7 +34,7 @@ public class Container_PestKiller extends Container { public static int FullSlotNumber = InventorySlotNumber + StorageSlotNumber; // All // slots - public Container_PestKiller(final InventoryPlayer inventory, final TileEntityPestKiller te) { + public ContainerPestKiller(final InventoryPlayer inventory, final TileEntityPestKiller te) { this.tile_entity = te; this.inventoryChest = te.getInventory(); te.openInventory(); diff --git a/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java b/src/main/java/gtPlusPlus/core/container/ContainerProjectTable.java index 1702be19ab..306c6f0026 100644 --- a/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java +++ b/src/main/java/gtPlusPlus/core/container/ContainerProjectTable.java @@ -20,7 +20,7 @@ import gtPlusPlus.core.slots.SlotDataStick; import gtPlusPlus.core.slots.SlotNoInput; import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable; -public class Container_ProjectTable extends Container { +public class ContainerProjectTable extends Container { /** The crafting matrix inventory (3x3). */ public InventoryCrafting craftMatrix = new InventoryCrafting(this, 3, 3); @@ -39,7 +39,7 @@ public class Container_ProjectTable extends Container { private final int[] slotOutputs = new int[2]; private final int[] slotGrid = new int[9]; - public Container_ProjectTable(final InventoryPlayer inventory, final TileEntityProjectTable tile) { + public ContainerProjectTable(final InventoryPlayer inventory, final TileEntityProjectTable tile) { this.tile_entity = tile; this.inventoryGrid = tile.inventoryGrid; this.inventoryOutputs = tile.inventoryOutputs; diff --git a/src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java b/src/main/java/gtPlusPlus/core/container/ContainerSuperJukebox.java index ab7525c897..45782f1384 100644 --- a/src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/container/ContainerSuperJukebox.java @@ -12,15 +12,15 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.block.machine.Machine_SuperJukebox.TileEntitySuperJukebox; -import gtPlusPlus.core.inventories.Inventory_SuperJukebox; +import gtPlusPlus.core.block.machine.BlockSuperJukebox.TileEntitySuperJukebox; +import gtPlusPlus.core.inventories.InventorySuperJukebox; import gtPlusPlus.core.slots.SlotJukebox; import gtPlusPlus.core.slots.SlotNoInput; -public class Container_SuperJukebox extends Container { +public class ContainerSuperJukebox extends Container { protected TileEntitySuperJukebox tile_entity; - public final Inventory_SuperJukebox inventoryChest; + public final InventorySuperJukebox inventoryChest; private final World worldObj; private final int posX; @@ -37,7 +37,7 @@ public class Container_SuperJukebox extends Container { public static int FullSlotNumber = InventorySlotNumber + StorageSlotNumber; // All // slots - public Container_SuperJukebox(final InventoryPlayer inventory, final TileEntitySuperJukebox te) { + public ContainerSuperJukebox(final InventoryPlayer inventory, final TileEntitySuperJukebox te) { this.tile_entity = te; this.inventoryChest = te.getInventory(); diff --git a/src/main/java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/container/ContainerVolumetricFlaskSetter.java index 0315967263..bf1f8c4133 100644 --- a/src/main/java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/container/ContainerVolumetricFlaskSetter.java @@ -12,16 +12,16 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.inventories.Inventory_VolumetricFlaskSetter; +import gtPlusPlus.core.inventories.InventoryVolumetricFlaskSetter; import gtPlusPlus.core.slots.SlotNoInput; import gtPlusPlus.core.slots.SlotVolumetricFlask; import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter; import gtPlusPlus.core.util.Utils; -public class Container_VolumetricFlaskSetter extends Container { +public class ContainerVolumetricFlaskSetter extends Container { public TileEntityVolumetricFlaskSetter mTileEntity; - public final Inventory_VolumetricFlaskSetter inventoryChest; + public final InventoryVolumetricFlaskSetter inventoryChest; public int mCustomValue; private int oCustomValue; @@ -40,7 +40,7 @@ public class Container_VolumetricFlaskSetter extends Container { public static int FullSlotNumber = InventorySlotNumber + StorageSlotNumber; // All // slots - public Container_VolumetricFlaskSetter(final InventoryPlayer inventory, final TileEntityVolumetricFlaskSetter te) { + public ContainerVolumetricFlaskSetter(final InventoryPlayer inventory, final TileEntityVolumetricFlaskSetter te) { this.mTileEntity = te; this.inventoryChest = te.getInventory(); diff --git a/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java index fa0d3844b2..d801bb46ed 100644 --- a/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java +++ b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java @@ -2,7 +2,7 @@ package gtPlusPlus.core.creative; import net.minecraft.creativetab.CreativeTabs; -import gregtech.api.util.GT_CreativeTab; +import gregtech.api.util.GTCreativeTab; public class AddToCreativeTab { @@ -15,11 +15,11 @@ public class AddToCreativeTab { public static void initialiseTabs() { // GT_CreativeTab - tabBlock = new GT_CreativeTab("GTPP_BLOCKS", "GT++ Blocks"); - tabMisc = new GT_CreativeTab("GTPP_MISC", "GT++ Misc"); - tabTools = new GT_CreativeTab("GTPP_TOOLS", "GT++ Tools"); - tabMachines = new GT_CreativeTab("GTPP_MACHINES", "GT++ Machines"); - tabOther = new GT_CreativeTab("GTPP_OTHER", "GT++ Other"); - tabBOP = new GT_CreativeTab("GTPP_OTHER_2", "GT++ Other II"); + tabBlock = new GTCreativeTab("GTPP_BLOCKS", "GT++ Blocks"); + tabMisc = new GTCreativeTab("GTPP_MISC", "GT++ Misc"); + tabTools = new GTCreativeTab("GTPP_TOOLS", "GT++ Tools"); + tabMachines = new GTCreativeTab("GTPP_MACHINES", "GT++ Machines"); + tabOther = new GTCreativeTab("GTPP_OTHER", "GT++ Other"); + tabBOP = new GTCreativeTab("GTPP_OTHER_2", "GT++ Other II"); } } diff --git a/src/main/java/gtPlusPlus/core/gui/GUI_Base_Tile_Entity.java b/src/main/java/gtPlusPlus/core/gui/GUIBaseTileEntity.java index 379827a1db..9e4dc6a6cc 100644 --- a/src/main/java/gtPlusPlus/core/gui/GUI_Base_Tile_Entity.java +++ b/src/main/java/gtPlusPlus/core/gui/GUIBaseTileEntity.java @@ -3,11 +3,11 @@ package gtPlusPlus.core.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Container; -public abstract class GUI_Base_Tile_Entity extends GuiContainer { +public abstract class GUIBaseTileEntity extends GuiContainer { public final Container mContainer; - public GUI_Base_Tile_Entity(Container aContainer) { + public GUIBaseTileEntity(Container aContainer) { super(aContainer); mContainer = aContainer; } diff --git a/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java b/src/main/java/gtPlusPlus/core/gui/beta/GUIIDRegistry.java index 7da3d1a35c..f6d899d247 100644 --- a/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java +++ b/src/main/java/gtPlusPlus/core/gui/beta/GUIIDRegistry.java @@ -6,28 +6,28 @@ import java.util.Map; import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils; -public class Gui_ID_Registry { +public class GUIIDRegistry { - private static final Map<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classMap = new HashMap<>(); - private static final Map<Integer, MU_GuiId> idMap = new HashMap<>(); + private static final Map<Class<? extends IGuiManagerMiscUtils>, MUGuild> classMap = new HashMap<>(); + private static final Map<Integer, MUGuild> idMap = new HashMap<>(); private static int nextId = 0; static {} - private static void registerGuiHandlers(final Gui_Types MU_GuiType, + private static void registerGuiHandlers(final GUITypes MU_GuiType, final List<Class<? extends IGuiManagerMiscUtils>> guiHandlerClasses) { for (final Class<? extends IGuiManagerMiscUtils> tileGuiHandlerClass : guiHandlerClasses) { - final MU_GuiId guiId = new MU_GuiId(nextId++, MU_GuiType, tileGuiHandlerClass); + final MUGuild guiId = new MUGuild(nextId++, MU_GuiType, tileGuiHandlerClass); classMap.put(tileGuiHandlerClass, guiId); idMap.put(Integer.valueOf(guiId.getId()), guiId); } } - public static MU_GuiId getGuiIdForGuiHandler(final IGuiManagerMiscUtils guiHandler) { + public static MUGuild getGuiIdForGuiHandler(final IGuiManagerMiscUtils guiHandler) { final Class<? extends IGuiManagerMiscUtils> guiHandlerClass = guiHandler.getClass(); - MU_GuiId guiId = classMap.get(guiHandlerClass); + MUGuild guiId = classMap.get(guiHandlerClass); if (guiId == null) { - for (final Map.Entry<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classGuiIdEntry : classMap + for (final Map.Entry<Class<? extends IGuiManagerMiscUtils>, MUGuild> classGuiIdEntry : classMap .entrySet()) { if (((Class<?>) classGuiIdEntry.getKey()).isAssignableFrom(guiHandlerClass)) { guiId = classGuiIdEntry.getValue(); @@ -41,7 +41,7 @@ public class Gui_ID_Registry { return guiId; } - public static MU_GuiId getGuiId(final int id) { + public static MUGuild getGuiId(final int id) { return idMap.get(Integer.valueOf(id)); } } diff --git a/src/main/java/gtPlusPlus/core/gui/beta/Gui_Types.java b/src/main/java/gtPlusPlus/core/gui/beta/GUITypes.java index f0bf946b23..124e2fc276 100644 --- a/src/main/java/gtPlusPlus/core/gui/beta/Gui_Types.java +++ b/src/main/java/gtPlusPlus/core/gui/beta/GUITypes.java @@ -1,10 +1,10 @@ package gtPlusPlus.core.gui.beta; -public enum Gui_Types { +public enum GUITypes { Item, Tile, Entity; - private Gui_Types() {} + private GUITypes() {} } diff --git a/src/main/java/gtPlusPlus/core/gui/beta/MU_GuiId.java b/src/main/java/gtPlusPlus/core/gui/beta/MUGuild.java index 8b15f5b937..7b599bd716 100644 --- a/src/main/java/gtPlusPlus/core/gui/beta/MU_GuiId.java +++ b/src/main/java/gtPlusPlus/core/gui/beta/MUGuild.java @@ -2,19 +2,19 @@ package gtPlusPlus.core.gui.beta; import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils; -public class MU_GuiId { +public class MUGuild { private final int id; - private final Gui_Types MU_GuiType; + private final GUITypes MU_GuiType; private final Class<? extends IGuiManagerMiscUtils> guiHandlerClass; - MU_GuiId(final int id, final Gui_Types MU_GuiType, final Class<? extends IGuiManagerMiscUtils> guiHandlerClass) { + MUGuild(final int id, final GUITypes MU_GuiType, final Class<? extends IGuiManagerMiscUtils> guiHandlerClass) { this.id = id; this.MU_GuiType = MU_GuiType; this.guiHandlerClass = guiHandlerClass; } - public Gui_Types getGuiType() { + public GUITypes getGuiType() { return this.MU_GuiType; } diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/gui/machine/GUICircuitProgrammer.java index 71d3b36470..f429c22af0 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUICircuitProgrammer.java @@ -10,18 +10,18 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.container.Container_CircuitProgrammer; +import gtPlusPlus.core.container.ContainerCircuitProgrammer; import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer; @SideOnly(Side.CLIENT) -public class GUI_CircuitProgrammer extends GuiContainer { +public class GUICircuitProgrammer extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( GTPlusPlus.ID, "textures/gui/CircuitProgrammer.png"); - public GUI_CircuitProgrammer(final InventoryPlayer player_inventory, final TileEntityCircuitProgrammer te) { - super(new Container_CircuitProgrammer(player_inventory, te)); + public GUICircuitProgrammer(final InventoryPlayer player_inventory, final TileEntityCircuitProgrammer te) { + super(new ContainerCircuitProgrammer(player_inventory, te)); } @Override diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java b/src/main/java/gtPlusPlus/core/gui/machine/GUIFishTrap.java index d57ef408d0..36146867dd 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUIFishTrap.java @@ -10,18 +10,18 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.container.Container_FishTrap; +import gtPlusPlus.core.container.ContainerFishTrap; import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; @SideOnly(Side.CLIENT) -public class GUI_FishTrap extends GuiContainer { +public class GUIFishTrap extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( GTPlusPlus.ID, "textures/gui/FishTrap.png"); - public GUI_FishTrap(final InventoryPlayer player_inventory, final TileEntityFishTrap te) { - super(new Container_FishTrap(player_inventory, te)); + public GUIFishTrap(final InventoryPlayer player_inventory, final TileEntityFishTrap te) { + super(new ContainerFishTrap(player_inventory, te)); } @Override diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java b/src/main/java/gtPlusPlus/core/gui/machine/GUIPestKiller.java index bed8707fc4..0f3e1fc832 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUIPestKiller.java @@ -16,21 +16,21 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.container.Container_PestKiller; -import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.container.ContainerPestKiller; +import gtPlusPlus.core.material.MaterialMisc; import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller; import gtPlusPlus.core.util.math.MathUtils; @SideOnly(Side.CLIENT) -public class GUI_PestKiller extends GuiContainer { +public class GUIPestKiller extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( GTPlusPlus.ID, "textures/gui/PestKiller.png"); private final TileEntityPestKiller mTileKiller; - public GUI_PestKiller(final InventoryPlayer player_inventory, final TileEntityPestKiller te) { - super(new Container_PestKiller(player_inventory, te)); + public GUIPestKiller(final InventoryPlayer player_inventory, final TileEntityPestKiller te) { + super(new ContainerPestKiller(player_inventory, te)); mTileKiller = te; } @@ -60,7 +60,7 @@ public class GUI_PestKiller extends GuiContainer { private void drawFluidTank(IFluidTank tank, int x, int y) { Color startGrad = new Color(50, 50, 50); Color endGrad = new Color(20, 20, 20); - Container_PestKiller aCont = (Container_PestKiller) this.inventorySlots; + ContainerPestKiller aCont = (ContainerPestKiller) this.inventorySlots; double aPercentage = 0; double aDivisor = (100 / 16); @@ -119,7 +119,7 @@ public class GUI_PestKiller extends GuiContainer { aFrameHeight = (int) (aPercentage / aDivisor); // Logger.INFO("Frame Height = "+aFrameHeight); } - short[] aRGB = MISC_MATERIALS.HYDROGEN_CYANIDE.getRGB(); + short[] aRGB = MaterialMisc.HYDROGEN_CYANIDE.getRGB(); startGrad = new Color(aRGB[0], aRGB[1], aRGB[2]); endGrad = new Color(Math.max(aRGB[0], 0), Math.max(aRGB[1], 0), Math.max(aRGB[2], 0)); drawGradientRect(x, y + (16 - aFrameHeight), x + 16, y + 16, startGrad.getRGB(), endGrad.getRGB()); diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java b/src/main/java/gtPlusPlus/core/gui/machine/GUIProjectTable.java index 3707855641..2175c033f5 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUIProjectTable.java @@ -11,18 +11,18 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.container.Container_ProjectTable; +import gtPlusPlus.core.container.ContainerProjectTable; import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable; @SideOnly(Side.CLIENT) -public class GUI_ProjectTable extends GuiContainer { +public class GUIProjectTable extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( GTPlusPlus.ID, "textures/gui/ProjectTable.png"); - public GUI_ProjectTable(final InventoryPlayer player_inventory, final TileEntityProjectTable tile) { - super(new Container_ProjectTable(player_inventory, tile)); + public GUIProjectTable(final InventoryPlayer player_inventory, final TileEntityProjectTable tile) { + super(new ContainerProjectTable(player_inventory, tile)); } @Override diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java b/src/main/java/gtPlusPlus/core/gui/machine/GUISuperJukebox.java index 9afa2b4ce1..9158667aff 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUISuperJukebox.java @@ -12,21 +12,21 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.block.machine.Machine_SuperJukebox.TileEntitySuperJukebox; -import gtPlusPlus.core.container.Container_SuperJukebox; -import gtPlusPlus.core.gui.GUI_Base_Tile_Entity; +import gtPlusPlus.core.block.machine.BlockSuperJukebox.TileEntitySuperJukebox; +import gtPlusPlus.core.container.ContainerSuperJukebox; +import gtPlusPlus.core.gui.GUIBaseTileEntity; @SideOnly(Side.CLIENT) -public class GUI_SuperJukebox extends GUI_Base_Tile_Entity { +public class GUISuperJukebox extends GUIBaseTileEntity { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( GTPlusPlus.ID, "textures/gui/SuperJukebox.png"); - private final Container_SuperJukebox mThisContainer; + private final ContainerSuperJukebox mThisContainer; - public GUI_SuperJukebox(final InventoryPlayer player_inventory, final TileEntitySuperJukebox te) { - super(new Container_SuperJukebox(player_inventory, te)); - mThisContainer = (Container_SuperJukebox) this.mContainer; + public GUISuperJukebox(final InventoryPlayer player_inventory, final TileEntitySuperJukebox te) { + super(new ContainerSuperJukebox(player_inventory, te)); + mThisContainer = (ContainerSuperJukebox) this.mContainer; } // This method is called when the Gui is first called! diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/gui/machine/GUIVolumetricFlaskSetter.java index 6595b510c0..3e1a735f7e 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUIVolumetricFlaskSetter.java @@ -12,24 +12,24 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.container.Container_VolumetricFlaskSetter; +import gtPlusPlus.core.container.ContainerVolumetricFlaskSetter; import gtPlusPlus.core.gui.widget.GuiValueField; import gtPlusPlus.core.handler.PacketHandler; -import gtPlusPlus.core.network.packet.Packet_VolumetricFlaskGui; +import gtPlusPlus.core.network.packet.PacketVolumetricFlaskGui; import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter; @SideOnly(Side.CLIENT) -public class GUI_VolumetricFlaskSetter extends GuiContainer { +public class GUIVolumetricFlaskSetter extends GuiContainer { private static final ResourceLocation mGuiTextures = new ResourceLocation( GTPlusPlus.ID, "textures/gui/VolumetricFlaskSetter.png"); - private Container_VolumetricFlaskSetter mContainer; + private ContainerVolumetricFlaskSetter mContainer; private boolean mIsOpen = false; private GuiValueField mText; private TileEntityVolumetricFlaskSetter mTile; - public GUI_VolumetricFlaskSetter(Container_VolumetricFlaskSetter aContainer) { + public GUIVolumetricFlaskSetter(ContainerVolumetricFlaskSetter aContainer) { super(aContainer); mContainer = aContainer; mTile = mContainer.mTileEntity; @@ -192,7 +192,7 @@ public class GUI_VolumetricFlaskSetter extends GuiContainer { public void sendUpdateToServer() { if (getText().length() > 0) { - PacketHandler.sendToServer(new Packet_VolumetricFlaskGui(mTile, parse(getText()))); + PacketHandler.sendToServer(new PacketVolumetricFlaskGui(mTile, parse(getText()))); } } @@ -213,7 +213,7 @@ public class GUI_VolumetricFlaskSetter extends GuiContainer { // Check TextBox Value is correct if (getText().length() > 0) { int aCustomValue = parse(getText()); - int aTileValue = ((Container_VolumetricFlaskSetter) mContainer).mCustomValue; + int aTileValue = ((ContainerVolumetricFlaskSetter) mContainer).mCustomValue; if (mContainer != null) { if (aTileValue != aCustomValue) { setText(aTileValue); diff --git a/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java b/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java index 698aa1951a..26e7d907d3 100644 --- a/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java +++ b/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java @@ -5,19 +5,19 @@ import java.lang.reflect.Field; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiTextField; -import gtPlusPlus.core.gui.machine.GUI_VolumetricFlaskSetter; +import gtPlusPlus.core.gui.machine.GUIVolumetricFlaskSetter; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.CORE_Preloader; +import gtPlusPlus.preloader.PreloaderCore; public class GuiValueField extends GuiTextField { private final FontRenderer mFontRenderer; private final int mScreenLocationX; private final int mScreenLocationY; - private final GUI_VolumetricFlaskSetter mGUI; + private final GUIVolumetricFlaskSetter mGUI; public GuiValueField(FontRenderer aFontRenderer, int aX, int aY, int aScreenLocationX, int aScreenLocationY, - int aWidth, int aHeight, GUI_VolumetricFlaskSetter aGUI) { + int aWidth, int aHeight, GUIVolumetricFlaskSetter aGUI) { super(aFontRenderer, aX, aY, aWidth, aHeight); mFontRenderer = aFontRenderer; mScreenLocationX = aScreenLocationX; @@ -33,7 +33,7 @@ public class GuiValueField extends GuiTextField { public boolean isBackgroundDrawingEnabled() { Field enableBackgroundDrawing = ReflectionUtils.getField( GuiTextField.class, - !CORE_Preloader.DEV_ENVIRONMENT ? "field_146215_m" : "enableBackgroundDrawing"); + !PreloaderCore.DEV_ENVIRONMENT ? "field_146215_m" : "enableBackgroundDrawing"); if (enableBackgroundDrawing != null) { return ReflectionUtils.getFieldValue(enableBackgroundDrawing, this); } @@ -42,7 +42,7 @@ public class GuiValueField extends GuiTextField { public int getLineScrollOffset() { Field lineScrollOffset = ReflectionUtils - .getField(GuiTextField.class, !CORE_Preloader.DEV_ENVIRONMENT ? "field_146225_q" : "lineScrollOffset"); + .getField(GuiTextField.class, !PreloaderCore.DEV_ENVIRONMENT ? "field_146225_q" : "lineScrollOffset"); if (lineScrollOffset != null) { return (int) ReflectionUtils.getFieldValue(lineScrollOffset, this); } diff --git a/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java b/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java index 41513163a0..0611be5d19 100644 --- a/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java @@ -17,13 +17,13 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemSmeltedEvent; import gregtech.api.enums.Materials; -import gregtech.api.util.GT_Log; +import gregtech.api.util.GTLog; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.material.MaterialsAlloy; +import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -41,7 +41,7 @@ public class AchievementHandler { public AchievementHandler() { Logger.INFO("Initializing GT++ achievements"); - GT_Log.out.println("Initializing GT++ achievements"); + GTLog.out.println("Initializing GT++ achievements"); // register first this.registerAchievement( @@ -74,11 +74,17 @@ public class AchievementHandler { true); // Material Advancement - this.registerAchievement("dust.potin", 0, 2, ALLOY.POTIN.getDust(1), aBaseAchievementName, false); - this.registerAchievement("dust.eglin", 0, 4, ALLOY.EGLIN_STEEL.getDust(1), "dust.potin", false); - this.registerAchievement("dust.staballoy", 0, 6, ALLOY.STABALLOY.getDust(1), "dust.eglin", false); - this.registerAchievement("dust.quantum", 0, 8, ALLOY.QUANTUM.getDust(1), "dust.staballoy", true); - this.registerAchievement("dust.hypogen", 0, 10, ELEMENT.STANDALONE.HYPOGEN.getDust(1), "dust.quantum", true); + this.registerAchievement("dust.potin", 0, 2, MaterialsAlloy.POTIN.getDust(1), aBaseAchievementName, false); + this.registerAchievement("dust.eglin", 0, 4, MaterialsAlloy.EGLIN_STEEL.getDust(1), "dust.potin", false); + this.registerAchievement("dust.staballoy", 0, 6, MaterialsAlloy.STABALLOY.getDust(1), "dust.eglin", false); + this.registerAchievement("dust.quantum", 0, 8, MaterialsAlloy.QUANTUM.getDust(1), "dust.staballoy", true); + this.registerAchievement( + "dust.hypogen", + 0, + 10, + MaterialsElements.STANDALONE.HYPOGEN.getDust(1), + "dust.quantum", + true); // Blocks this.registerAchievement( @@ -253,9 +259,9 @@ public class AchievementHandler { } achievement.registerStat(); - if (CORE.DEVENV) { - GT_Log.out.println("achievement." + textId + "="); - GT_Log.out.println("achievement." + textId + ".desc="); + if (GTPPCore.DEVENV) { + GTLog.out.println("achievement." + textId + "="); + GTLog.out.println("achievement." + textId + ".desc="); } this.achievementList.put(textId, achievement); @@ -275,7 +281,7 @@ public class AchievementHandler { /** * A generic handler that will give an achievement for an item. Useful to only write this once, then call it from * all handlers. - * + * * @param aStack - The Itemstack to check for achievements. * @param aPlayer - The player to unlock for. */ diff --git a/src/main/java/gtPlusPlus/core/handler/BookHandler.java b/src/main/java/gtPlusPlus/core/handler/BookHandler.java index 5725c1c710..d030dab591 100644 --- a/src/main/java/gtPlusPlus/core/handler/BookHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/BookHandler.java @@ -9,9 +9,9 @@ import java.util.Map; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.enums.GTValues; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -250,34 +250,34 @@ public class BookHandler { "Valid Tiered Machine Casings:" + "\n" + "\n" + "1 - " - + GT_Values.VN[0] + + GTValues.VN[0] + "\n" + "2 - " - + GT_Values.VN[1] + + GTValues.VN[1] + "\n" + "3 - " - + GT_Values.VN[2] + + GTValues.VN[2] + "\n" + "4 - " - + GT_Values.VN[3] + + GTValues.VN[3] + "\n" + "5 - " - + GT_Values.VN[4] + + GTValues.VN[4] + "\n" + "6 - " - + GT_Values.VN[5] + + GTValues.VN[5] + "\n" + "7 - " - + GT_Values.VN[6] + + GTValues.VN[6] + "\n" + "8 - " - + GT_Values.VN[7] + + GTValues.VN[7] + "\n" + "9 - " - + GT_Values.VN[8] + + GTValues.VN[8] + "\n" + "10 - " - + GT_Values.VN[9], + + GTValues.VN[9], // Pipe Casings """ @@ -430,10 +430,10 @@ public class BookHandler { new ItemStack[] { ItemUtils.getSimpleStack(Items.writable_book), ItemUtils.getSimpleStack(Items.lava_bucket) }, ItemBookWritten_ThermalBoiler); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( ItemBookWritten_MultiMachineManual, - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "Xw", 'X', ItemUtils.getSimpleStack(Items.writable_book) }); RecipeUtils.addShapelessGregtechRecipe( new ItemStack[] { ItemUtils.getSimpleStack(Items.writable_book), @@ -450,8 +450,8 @@ public class BookHandler { for (int i = 0; i < mBookKeeperCount; i++) { ItemStack bookstack = ItemUtils.simpleMetaStack(ModItems.itemCustomBook, i, 1); - GT_OreDictUnificator.registerOre("bookWritten", bookstack); - GT_OreDictUnificator.registerOre("craftingBook", bookstack); + GTOreDictUnificator.registerOre("bookWritten", bookstack); + GTOreDictUnificator.registerOre("craftingBook", bookstack); } } diff --git a/src/main/java/gtPlusPlus/core/handler/BurnableFuelHandler.java b/src/main/java/gtPlusPlus/core/handler/BurnableFuelHandler.java index 8e3377b5f9..9228643bfc 100644 --- a/src/main/java/gtPlusPlus/core/handler/BurnableFuelHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/BurnableFuelHandler.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; import cpw.mods.fml.common.IFuelHandler; import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; public class BurnableFuelHandler implements IFuelHandler { @@ -13,7 +13,7 @@ public class BurnableFuelHandler implements IFuelHandler { @Override public int getBurnTime(ItemStack aStack) { // Iterate over my burnables. - for (Pair<Integer, ItemStack> temp : CORE.burnables) { + for (Pair<Integer, ItemStack> temp : GTPPCore.burnables) { int aStackID = Item.getIdFromItem(aStack.getItem()); int burnID = Item.getIdFromItem( temp.getValue() diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java deleted file mode 100644 index af09762c08..0000000000 --- a/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java +++ /dev/null @@ -1,50 +0,0 @@ -package gtPlusPlus.core.handler; - -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLLoadCompleteEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import gtPlusPlus.recipes.RecipeRemovals; -import gtPlusPlus.xmod.bartcrops.HANDLER_CropsPlusPlus; -import gtPlusPlus.xmod.bop.HANDLER_BiomesOPlenty; -import gtPlusPlus.xmod.forestry.HANDLER_FR; -import gtPlusPlus.xmod.gregtech.HANDLER_GT; -import gtPlusPlus.xmod.ic2.HANDLER_IC2; -import gtPlusPlus.xmod.railcraft.HANDLER_Railcraft; -import gtPlusPlus.xmod.thermalfoundation.HANDLER_TF; -import gtPlusPlus.xmod.tinkers.HANDLER_Tinkers; - -public class COMPAT_IntermodStaging { - - public static void preInit(FMLPreInitializationEvent preinit) { - HANDLER_GT.preInit(); - HANDLER_TF.preInit(); - HANDLER_FR.preInit(); - HANDLER_IC2.preInit(); - HANDLER_BiomesOPlenty.preInit(); - HANDLER_CropsPlusPlus.preInit(preinit); - HANDLER_Railcraft.preInit(); - } - - public static void init(FMLInitializationEvent init) { - HANDLER_GT.init(); - HANDLER_TF.init(); - } - - public static void postInit(FMLPostInitializationEvent postinit) { - HANDLER_GT.postInit(); - HANDLER_TF.postInit(); - HANDLER_FR.postInit(); - HANDLER_IC2.postInit(); - HANDLER_BiomesOPlenty.postInit(); - HANDLER_Tinkers.postInit(); - HANDLER_CropsPlusPlus.postInit(postinit); - HANDLER_Railcraft.postInit(); - RecipeRemovals.postInit(); - } - - public static void onLoadComplete(FMLLoadCompleteEvent event) { - HANDLER_GT.onLoadComplete(event); - RecipeRemovals.onLoadComplete(); - } -} diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/CompatHandler.java index 8e780c724e..83426c18c4 100644 --- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/main/java/gtPlusPlus/core/handler/CompatHandler.java @@ -12,32 +12,32 @@ import java.util.Set; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.event.FMLLoadCompleteEvent; -import gregtech.api.enums.GT_Values; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.enums.GTValues; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.ItemPackage; -import gtPlusPlus.core.common.compat.COMPAT_ExtraUtils; -import gtPlusPlus.core.common.compat.COMPAT_HarvestCraft; -import gtPlusPlus.core.common.compat.COMPAT_IC2; -import gtPlusPlus.core.common.compat.COMPAT_Thaumcraft; -import gtPlusPlus.core.common.compat.COMPAT_Witchery; +import gtPlusPlus.core.common.compat.CompatExtraUtils; +import gtPlusPlus.core.common.compat.CompatHarvestCraft; +import gtPlusPlus.core.common.compat.CompatIC2; +import gtPlusPlus.core.common.compat.CompatThaumcraft; +import gtPlusPlus.core.common.compat.CompatWitchery; import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler; import gtPlusPlus.core.handler.Recipes.RegistrationHandler; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; -import gtPlusPlus.core.recipe.RECIPES_GREGTECH; -import gtPlusPlus.core.recipe.RECIPES_LaserEngraver; +import gtPlusPlus.core.recipe.RecipesGregTech; +import gtPlusPlus.core.recipe.RecipesLaserEngraver; import gtPlusPlus.core.recipe.ShapedRecipeObject; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_FluidCanning; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling; -import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_ChemicalSkips; -import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_GTNH; -import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_GlueLine; -import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_Nuclear; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenFluidCanning; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenRecycling; +import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoaderChemicalSkips; +import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoaderGTNH; +import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoaderGlueLine; +import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoaderNuclear; import gtPlusPlus.xmod.gregtech.registration.gregtech.Gregtech4Content; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAdvancedBoilers; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAlgaeContent; @@ -102,7 +102,7 @@ import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTreeFarmerTE; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechWaterPump; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechWirelessChargers; -public class COMPAT_HANDLER { +public class CompatHandler { public static Queue<Object> RemoveRecipeQueue = new LinkedList<>(); public static Queue<ShapedRecipeObject> AddRecipeQueue = new LinkedList<>(); @@ -114,8 +114,8 @@ public class COMPAT_HANDLER { // In-house for (int i = 1; i <= 10; i++) { - GT_OreDictUnificator.registerOre( - "bufferCore_" + GT_Values.VN[i - 1], + GTOreDictUnificator.registerOre( + "bufferCore_" + GTValues.VN[i - 1], new ItemStack(ItemUtils.getItemFromFQRN("miscutils:item.itemBufferCore" + i))); } } @@ -126,7 +126,7 @@ public class COMPAT_HANDLER { * --- 859 to 868 --- 911 to 940 */ - new RECIPES_LaserEngraver(); + new RecipesLaserEngraver(); GregtechEnergyBuffer.run(); GregtechLFTR.run(); GregtechNuclearSaltProcessingPlant.run(); @@ -195,17 +195,17 @@ public class COMPAT_HANDLER { // InterMod public static void intermodOreDictionarySupport() { if (Thaumcraft.isModLoaded()) { - COMPAT_Thaumcraft.OreDict(); + CompatThaumcraft.OreDict(); } if (ExtraUtilities.isModLoaded()) { - COMPAT_ExtraUtils.OreDict(); + CompatExtraUtils.OreDict(); } if (PamsHarvestCraft.isModLoaded()) { - COMPAT_HarvestCraft.OreDict(); + CompatHarvestCraft.OreDict(); } - COMPAT_IC2.OreDict(); + CompatIC2.OreDict(); if (Witchery.isModLoaded()) { - COMPAT_Witchery.OreDict(); + CompatWitchery.OreDict(); } } @@ -226,11 +226,11 @@ public class COMPAT_HANDLER { public static void startLoadingGregAPIBasedRecipes() { // Add hand-made recipes - RECIPES_GREGTECH.run(); - RecipeLoader_GTNH.generate(); - RecipeLoader_Nuclear.generate(); - RecipeLoader_GlueLine.generate(); - RecipeLoader_ChemicalSkips.generate(); + RecipesGregTech.run(); + RecipeLoaderGTNH.generate(); + RecipeLoaderNuclear.generate(); + RecipeLoaderGlueLine.generate(); + RecipeLoaderChemicalSkips.generate(); // Add autogenerated Recipes from Item Components for (Set<RunnableWithInfo<Material>> m : MaterialGenerator.mRecipeMapsToGenerate) { for (RunnableWithInfo<Material> r : m) { @@ -247,11 +247,11 @@ public class COMPAT_HANDLER { } } } - RecipeGen_Recycling.executeGenerators(); + RecipeGenRecycling.executeGenerators(); runQueuedMisc(); // Do Fluid Canning Last, because they're not executed on demand, but rather queued. - RecipeGen_FluidCanning.init(); + RecipeGenFluidCanning.init(); } public static void onLoadComplete(FMLLoadCompleteEvent event) { diff --git a/src/main/java/gtPlusPlus/core/handler/CompatIntermodStaging.java b/src/main/java/gtPlusPlus/core/handler/CompatIntermodStaging.java new file mode 100644 index 0000000000..7d08318c55 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/handler/CompatIntermodStaging.java @@ -0,0 +1,50 @@ +package gtPlusPlus.core.handler; + +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import gtPlusPlus.recipes.RecipeRemovals; +import gtPlusPlus.xmod.bartcrops.CropsPlusPlusHandler; +import gtPlusPlus.xmod.bop.BiomesOPlentyHandler; +import gtPlusPlus.xmod.forestry.ForestryHandler; +import gtPlusPlus.xmod.gregtech.HandlerGT; +import gtPlusPlus.xmod.ic2.HandlerIC2; +import gtPlusPlus.xmod.railcraft.HandlerRailcraft; +import gtPlusPlus.xmod.thermalfoundation.HandlerTF; +import gtPlusPlus.xmod.tinkers.HandlerTinkers; + +public class CompatIntermodStaging { + + public static void preInit(FMLPreInitializationEvent preinit) { + HandlerGT.preInit(); + HandlerTF.preInit(); + ForestryHandler.preInit(); + HandlerIC2.preInit(); + BiomesOPlentyHandler.preInit(); + CropsPlusPlusHandler.preInit(preinit); + HandlerRailcraft.preInit(); + } + + public static void init(FMLInitializationEvent init) { + HandlerGT.init(); + HandlerTF.init(); + } + + public static void postInit(FMLPostInitializationEvent postinit) { + HandlerGT.postInit(); + HandlerTF.postInit(); + ForestryHandler.postInit(); + HandlerIC2.postInit(); + BiomesOPlentyHandler.postInit(); + HandlerTinkers.postInit(); + CropsPlusPlusHandler.postInit(postinit); + HandlerRailcraft.postInit(); + RecipeRemovals.postInit(); + } + + public static void onLoadComplete(FMLLoadCompleteEvent event) { + HandlerGT.onLoadComplete(event); + RecipeRemovals.onLoadComplete(); + } +} diff --git a/src/main/java/gtPlusPlus/core/handler/GuiHandler.java b/src/main/java/gtPlusPlus/core/handler/GuiHandler.java index 4509fbea04..4479fa8add 100644 --- a/src/main/java/gtPlusPlus/core/handler/GuiHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/GuiHandler.java @@ -9,21 +9,21 @@ import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; import gtPlusPlus.GTplusplus; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.block.machine.Machine_SuperJukebox.TileEntitySuperJukebox; -import gtPlusPlus.core.container.Container_CircuitProgrammer; -import gtPlusPlus.core.container.Container_FishTrap; -import gtPlusPlus.core.container.Container_PestKiller; -import gtPlusPlus.core.container.Container_ProjectTable; -import gtPlusPlus.core.container.Container_SuperJukebox; -import gtPlusPlus.core.container.Container_VolumetricFlaskSetter; -import gtPlusPlus.core.gui.beta.Gui_ID_Registry; -import gtPlusPlus.core.gui.beta.MU_GuiId; -import gtPlusPlus.core.gui.machine.GUI_CircuitProgrammer; -import gtPlusPlus.core.gui.machine.GUI_FishTrap; -import gtPlusPlus.core.gui.machine.GUI_PestKiller; -import gtPlusPlus.core.gui.machine.GUI_ProjectTable; -import gtPlusPlus.core.gui.machine.GUI_SuperJukebox; -import gtPlusPlus.core.gui.machine.GUI_VolumetricFlaskSetter; +import gtPlusPlus.core.block.machine.BlockSuperJukebox.TileEntitySuperJukebox; +import gtPlusPlus.core.container.ContainerCircuitProgrammer; +import gtPlusPlus.core.container.ContainerFishTrap; +import gtPlusPlus.core.container.ContainerPestKiller; +import gtPlusPlus.core.container.ContainerProjectTable; +import gtPlusPlus.core.container.ContainerSuperJukebox; +import gtPlusPlus.core.container.ContainerVolumetricFlaskSetter; +import gtPlusPlus.core.gui.beta.GUIIDRegistry; +import gtPlusPlus.core.gui.beta.MUGuild; +import gtPlusPlus.core.gui.machine.GUICircuitProgrammer; +import gtPlusPlus.core.gui.machine.GUIFishTrap; +import gtPlusPlus.core.gui.machine.GUIPestKiller; +import gtPlusPlus.core.gui.machine.GUIProjectTable; +import gtPlusPlus.core.gui.machine.GUISuperJukebox; +import gtPlusPlus.core.gui.machine.GUIVolumetricFlaskSetter; import gtPlusPlus.core.interfaces.IGuiManager; import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer; import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; @@ -63,7 +63,7 @@ public class GuiHandler implements IGuiHandler { if (te != null) { if (ID == GUI1) { - return new Container_ProjectTable(player.inventory, (TileEntityProjectTable) te); + return new ContainerProjectTable(player.inventory, (TileEntityProjectTable) te); } else if (ID == GUI2) {} } @@ -72,15 +72,15 @@ public class GuiHandler implements IGuiHandler { Logger.INFO("sad"); // return new Container_WorkbenchAdvanced(player.inventory, (TileEntityWorkbenchAdvanced) te); } else if (ID == GUI6) { - return new Container_FishTrap(player.inventory, (TileEntityFishTrap) te); + return new ContainerFishTrap(player.inventory, (TileEntityFishTrap) te); } else if (ID == GUI8) { - return new Container_CircuitProgrammer(player.inventory, (TileEntityCircuitProgrammer) te); + return new ContainerCircuitProgrammer(player.inventory, (TileEntityCircuitProgrammer) te); } else if (ID == GUI14) { - return new Container_SuperJukebox(player.inventory, (TileEntitySuperJukebox) te); + return new ContainerSuperJukebox(player.inventory, (TileEntitySuperJukebox) te); } else if (ID == GUI15) { - return new Container_PestKiller(player.inventory, (TileEntityPestKiller) te); + return new ContainerPestKiller(player.inventory, (TileEntityPestKiller) te); } else if (ID == GUI18) { - return new Container_VolumetricFlaskSetter(player.inventory, (TileEntityVolumetricFlaskSetter) te); + return new ContainerVolumetricFlaskSetter(player.inventory, (TileEntityVolumetricFlaskSetter) te); } } @@ -104,22 +104,22 @@ public class GuiHandler implements IGuiHandler { final TileEntity te = world.getTileEntity(x, y, z); if (te != null) { if (ID == GUI1) { - return new GUI_ProjectTable(player.inventory, (TileEntityProjectTable) te); + return new GUIProjectTable(player.inventory, (TileEntityProjectTable) te); } } if (te != null) { if (ID == GUI6) { - return new GUI_FishTrap(player.inventory, (TileEntityFishTrap) te); + return new GUIFishTrap(player.inventory, (TileEntityFishTrap) te); } else if (ID == GUI8) { - return new GUI_CircuitProgrammer(player.inventory, (TileEntityCircuitProgrammer) te); + return new GUICircuitProgrammer(player.inventory, (TileEntityCircuitProgrammer) te); } else if (ID == GUI14) { - return new GUI_SuperJukebox(player.inventory, (TileEntitySuperJukebox) te); + return new GUISuperJukebox(player.inventory, (TileEntitySuperJukebox) te); } else if (ID == GUI15) { - return new GUI_PestKiller(player.inventory, (TileEntityPestKiller) te); + return new GUIPestKiller(player.inventory, (TileEntityPestKiller) te); } else if (ID == GUI18) { - return new GUI_VolumetricFlaskSetter( - new Container_VolumetricFlaskSetter(player.inventory, (TileEntityVolumetricFlaskSetter) te)); + return new GUIVolumetricFlaskSetter( + new ContainerVolumetricFlaskSetter(player.inventory, (TileEntityVolumetricFlaskSetter) te)); } } @@ -144,7 +144,7 @@ public class GuiHandler implements IGuiHandler { } private static int encodeGuiData(final IGuiManager guiHandler, final short data) { - final MU_GuiId guiId = Gui_ID_Registry.getGuiIdForGuiHandler(guiHandler); + final MUGuild guiId = GUIIDRegistry.getGuiIdForGuiHandler(guiHandler); return (data << 16) | guiId.getId(); } diff --git a/src/main/java/gtPlusPlus/core/handler/PacketHandler.java b/src/main/java/gtPlusPlus/core/handler/PacketHandler.java index af6a376f1a..735d381706 100644 --- a/src/main/java/gtPlusPlus/core/handler/PacketHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/PacketHandler.java @@ -12,8 +12,8 @@ import cpw.mods.fml.relauncher.Side; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.network.handler.AbstractClientMessageHandler; import gtPlusPlus.core.network.packet.AbstractPacket; -import gtPlusPlus.core.network.packet.Packet_VolumetricFlaskGui; -import gtPlusPlus.core.network.packet.Packet_VolumetricFlaskGui2; +import gtPlusPlus.core.network.packet.PacketVolumetricFlaskGui; +import gtPlusPlus.core.network.packet.PacketVolumetricFlaskGui2; import gtPlusPlus.core.util.reflect.ReflectionUtils; public class PacketHandler { @@ -23,8 +23,8 @@ public class PacketHandler { private static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel(GTPlusPlus.ID); public static final void init() { - registerMessage(Packet_VolumetricFlaskGui.class, Packet_VolumetricFlaskGui.class); - registerMessage(Packet_VolumetricFlaskGui2.class, Packet_VolumetricFlaskGui2.class); + registerMessage(PacketVolumetricFlaskGui.class, PacketVolumetricFlaskGui.class); + registerMessage(PacketVolumetricFlaskGui2.class, PacketVolumetricFlaskGui2.class); } /** diff --git a/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java b/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java index e50a76d5d5..769973f617 100644 --- a/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java +++ b/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java @@ -2,7 +2,7 @@ package gtPlusPlus.core.handler.Recipes; import net.minecraft.item.ItemStack; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -24,8 +24,8 @@ public class DecayableRecipe { @Override public boolean equals(Object o) { if (o instanceof DecayableRecipe i) { - if (i.mTime == this.mTime && GT_Utility.areStacksEqual(mInput, i.mInput) - && GT_Utility.areStacksEqual(mOutput, i.mOutput)) { + if (i.mTime == this.mTime && GTUtility.areStacksEqual(mInput, i.mInput) + && GTUtility.areStacksEqual(mOutput, i.mOutput)) { return true; } } diff --git a/src/main/java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java b/src/main/java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java index 9eb3a1826e..aa83b3bcca 100644 --- a/src/main/java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java @@ -1,7 +1,7 @@ package gtPlusPlus.core.handler.Recipes; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.handler.COMPAT_HANDLER; +import gtPlusPlus.core.handler.CompatHandler; import gtPlusPlus.core.recipe.ShapedRecipeObject; public class LateRegistrationHandler { @@ -14,7 +14,7 @@ public class LateRegistrationHandler { } private static void init() { - for (final ShapedRecipeObject item : COMPAT_HANDLER.AddRecipeQueue) { + for (final ShapedRecipeObject item : CompatHandler.AddRecipeQueue) { item.buildRecipe(); } try { diff --git a/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java b/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java index abf7300f7a..437e3ea0c3 100644 --- a/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java @@ -1,10 +1,10 @@ package gtPlusPlus.core.handler.Recipes; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.handler.COMPAT_HANDLER; -import gtPlusPlus.core.recipe.RECIPES_General; -import gtPlusPlus.core.recipe.RECIPES_Machines; -import gtPlusPlus.core.recipe.RECIPE_Batteries; +import gtPlusPlus.core.handler.CompatHandler; +import gtPlusPlus.core.recipe.RecipesBatteries; +import gtPlusPlus.core.recipe.RecipesGeneral; +import gtPlusPlus.core.recipe.RecipesMachines; public class RegistrationHandler { @@ -16,10 +16,10 @@ public class RegistrationHandler { } private static void init() { - RECIPES_General.loadRecipes(); - RECIPES_Machines.loadRecipes(); - RECIPE_Batteries.loadRecipes(); + RecipesGeneral.loadRecipes(); + RecipesMachines.loadRecipes(); + RecipesBatteries.loadRecipes(); Logger.INFO("Loaded: " + recipesSuccess + " Failed: " + recipesFailed); - COMPAT_HANDLER.areInitItemsLoaded = true; + CompatHandler.areInitItemsLoaded = true; } } diff --git a/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java b/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java index 07b027faa1..008f0db0d4 100644 --- a/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java @@ -4,7 +4,7 @@ import net.minecraft.entity.boss.EntityDragon; import net.minecraftforge.event.entity.living.LivingDropsEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -34,22 +34,25 @@ public class EnderDragonDeathHandler { if (mHEE && mHardcoreDragonClass != null && mHardcoreDragonClass.isInstance(event.entityLiving)) { for (int y = 0; y < MathUtils.randInt(100, 250); y++) { int aAmount = MathUtils.randInt(5, 25); - event.entityLiving - .entityDropItem(ELEMENT.STANDALONE.DRAGON_METAL.getNugget(aAmount), MathUtils.randFloat(0, 1)); + event.entityLiving.entityDropItem( + MaterialsElements.STANDALONE.DRAGON_METAL.getNugget(aAmount), + MathUtils.randFloat(0, 1)); aCountTotal = +aAmount; } } else if (mDE && mChaoseDragonClass != null && mChaoseDragonClass.isInstance(event.entityLiving)) { for (int y = 0; y < MathUtils.randInt(100, 200); y++) { int aAmount = MathUtils.randInt(1, 5); - event.entityLiving - .entityDropItem(ELEMENT.STANDALONE.DRAGON_METAL.getIngot(aAmount), MathUtils.randFloat(0, 1)); + event.entityLiving.entityDropItem( + MaterialsElements.STANDALONE.DRAGON_METAL.getIngot(aAmount), + MathUtils.randFloat(0, 1)); aCountTotal = +aAmount; } } else if (event.entityLiving instanceof EntityDragon) { for (int y = 0; y < MathUtils.randInt(25, 50); y++) { int aAmount = MathUtils.randInt(1, 10); - event.entityLiving - .entityDropItem(ELEMENT.STANDALONE.DRAGON_METAL.getNugget(aAmount), MathUtils.randFloat(0, 1)); + event.entityLiving.entityDropItem( + MaterialsElements.STANDALONE.DRAGON_METAL.getNugget(aAmount), + MathUtils.randFloat(0, 1)); aCountTotal = +aAmount; } } diff --git a/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java index 0ca315cc72..b01d9d6190 100644 --- a/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java @@ -18,12 +18,12 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.CORE_Preloader; +import gtPlusPlus.preloader.PreloaderCore; public class PlayerSleepEventHandler { private static Field sEffectDuration = ReflectionUtils - .getField(PotionEffect.class, !CORE_Preloader.DEV_ENVIRONMENT ? "field_76460_b" : "duration"); + .getField(PotionEffect.class, !PreloaderCore.DEV_ENVIRONMENT ? "field_76460_b" : "duration"); private static ArrayList<Potion> sPositiveEffects = new ArrayList<>(); private static ArrayList<Potion> sNegativeEffects = new ArrayList<>(); diff --git a/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java b/src/main/java/gtPlusPlus/core/handler/workbench/WorkbenchCraftingHandler.java index 6933c0f82d..1d8b2ed68d 100644 --- a/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/workbench/WorkbenchCraftingHandler.java @@ -15,16 +15,16 @@ import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.world.World; -public class Workbench_CraftingHandler { +public class WorkbenchCraftingHandler { - private static final Workbench_CraftingHandler instance = new Workbench_CraftingHandler(); + private static final WorkbenchCraftingHandler instance = new WorkbenchCraftingHandler(); private final List<IRecipe> recipes = new ArrayList<>(); - public static final Workbench_CraftingHandler getInstance() { + public static final WorkbenchCraftingHandler getInstance() { return instance; } - public Workbench_CraftingHandler() { + public WorkbenchCraftingHandler() { // just a example recipe so you know how to add them this.addRecipe( diff --git a/src/main/java/gtPlusPlus/core/inventories/Inventory_DecayablesChest.java b/src/main/java/gtPlusPlus/core/inventories/InventoryDecayablesChest.java index 4817545c27..6466996cc9 100644 --- a/src/main/java/gtPlusPlus/core/inventories/Inventory_DecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventoryDecayablesChest.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -public class Inventory_DecayablesChest implements IInventory { +public class InventoryDecayablesChest implements IInventory { private final String name = "DecayablesChest"; diff --git a/src/main/java/gtPlusPlus/core/inventories/Inventory_EggBox.java b/src/main/java/gtPlusPlus/core/inventories/InventoryEggBox.java index 04a95a4f9a..545988347e 100644 --- a/src/main/java/gtPlusPlus/core/inventories/Inventory_EggBox.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventoryEggBox.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -public class Inventory_EggBox implements IInventory { +public class InventoryEggBox implements IInventory { private final String name = "EggBox"; diff --git a/src/main/java/gtPlusPlus/core/inventories/Inventory_SuperJukebox.java b/src/main/java/gtPlusPlus/core/inventories/InventorySuperJukebox.java index bd44e89776..89f733f5ac 100644 --- a/src/main/java/gtPlusPlus/core/inventories/Inventory_SuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventorySuperJukebox.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -public class Inventory_SuperJukebox implements IInventory { +public class InventorySuperJukebox implements IInventory { private final String name = "Sir Mixalot"; diff --git a/src/main/java/gtPlusPlus/core/inventories/Inventory_VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/inventories/InventoryVolumetricFlaskSetter.java index 25a03aa212..0b16011181 100644 --- a/src/main/java/gtPlusPlus/core/inventories/Inventory_VolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventoryVolumetricFlaskSetter.java @@ -8,7 +8,7 @@ import net.minecraft.nbt.NBTTagList; import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper; -public class Inventory_VolumetricFlaskSetter implements IInventory { +public class InventoryVolumetricFlaskSetter implements IInventory { private final String name = "Volumetric Flask Setter"; diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index 2253b024a7..cdb61a5e46 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -5,7 +5,7 @@ import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc; import net.minecraft.item.EnumRarity; @@ -17,14 +17,14 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; import gtPlusPlus.core.block.base.BlockBaseModular; -import gtPlusPlus.core.common.compat.COMPAT_Baubles; +import gtPlusPlus.core.common.compat.CompatBaubles; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes; import gtPlusPlus.core.item.base.BaseItemDamageable; @@ -34,7 +34,7 @@ import gtPlusPlus.core.item.base.dusts.BaseItemDust; import gtPlusPlus.core.item.base.foil.BaseItemFoil; import gtPlusPlus.core.item.base.gears.BaseItemSmallGear; import gtPlusPlus.core.item.base.ingots.BaseItemIngot; -import gtPlusPlus.core.item.base.ingots.BaseItemIngot_OLD; +import gtPlusPlus.core.item.base.ingots.BaseItemIngotOld; import gtPlusPlus.core.item.base.plates.BaseItemPlate; import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble; import gtPlusPlus.core.item.bauble.BatteryPackBaseBauble; @@ -48,10 +48,10 @@ import gtPlusPlus.core.item.chemistry.RocketFuels; import gtPlusPlus.core.item.chemistry.StandardBaseParticles; import gtPlusPlus.core.item.crafting.ItemDummyResearch; import gtPlusPlus.core.item.food.BaseItemMetaFood; -import gtPlusPlus.core.item.general.BufferCore; import gtPlusPlus.core.item.general.ItemAirFilter; import gtPlusPlus.core.item.general.ItemBasicScrubberTurbine; import gtPlusPlus.core.item.general.ItemBlueprint; +import gtPlusPlus.core.item.general.ItemBufferCore; import gtPlusPlus.core.item.general.ItemEmpty; import gtPlusPlus.core.item.general.ItemGenericToken; import gtPlusPlus.core.item.general.ItemHalfCompleteCasings; @@ -64,17 +64,17 @@ import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoilWire; import gtPlusPlus.core.item.general.spawn.ItemCustomSpawnEgg; import gtPlusPlus.core.item.init.ItemsFoods; import gtPlusPlus.core.item.materials.DustDecayable; -import gtPlusPlus.core.item.tool.misc.GregtechPump; +import gtPlusPlus.core.item.tool.misc.ItemGregtechPump; import gtPlusPlus.core.item.wearable.WearableLoader; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; -import gtPlusPlus.core.material.NONMATERIAL; -import gtPlusPlus.core.material.nuclear.FLUORIDES; -import gtPlusPlus.core.material.nuclear.NUCLIDE; +import gtPlusPlus.core.material.MaterialMisc; +import gtPlusPlus.core.material.MaterialsAlloy; +import gtPlusPlus.core.material.MaterialsElements; +import gtPlusPlus.core.material.MaterialsOther; +import gtPlusPlus.core.material.nuclear.MaterialsFluorides; +import gtPlusPlus.core.material.nuclear.MaterialsNuclides; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.StringUtils; @@ -82,7 +82,7 @@ import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.everglades.GTplusplus_Everglades; +import gtPlusPlus.everglades.GTPPEverglades; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems; @@ -181,7 +181,7 @@ public final class ModItems { public static Item dustRadium226; public static Item dustProtactinium233; - public static GregtechPump toolGregtechPump; + public static ItemGregtechPump toolGregtechPump; public static ItemGenericToken itemGenericToken; @@ -219,11 +219,7 @@ public final class ModItems { Logger.INFO("Items!"); // Default item used when recipes fail, handy for debugging. Let's make sure they exist when this class is // called upon. - AAA_Broken = new BaseItemIngot_OLD( - "AAA_Broken", - "Errors - Tell Alkalus", - Utils.rgbtoHexValue(128, 128, 128), - 0); + AAA_Broken = new BaseItemIngotOld("AAA_Broken", "Errors - Tell Alkalus", Utils.rgbtoHexValue(128, 128, 128), 0); ZZZ_Empty = new ItemEmpty(); } @@ -277,33 +273,33 @@ public final class ModItems { // Elements generate first so they can be used in compounds. // Missing Elements - MaterialGenerator.generate(ELEMENT.getInstance().SELENIUM); // LFTR byproduct - MaterialGenerator.generate(ELEMENT.getInstance().BROMINE); - MaterialGenerator.generate(ELEMENT.getInstance().KRYPTON); // LFTR byproduct - MaterialGenerator.generate(ELEMENT.getInstance().STRONTIUM); - MaterialGenerator.generate(ELEMENT.getInstance().ZIRCONIUM); - MaterialGenerator.generate(ELEMENT.getInstance().RUTHENIUM); - MaterialGenerator.generate(ELEMENT.getInstance().IODINE); // LFTR byproduct - MaterialGenerator.generate(ELEMENT.getInstance().HAFNIUM); - MaterialGenerator.generate(ELEMENT.getInstance().DYSPROSIUM); - MaterialGenerator.generate(ELEMENT.getInstance().ERBIUM); - MaterialGenerator.generate(ELEMENT.getInstance().PRASEODYMIUM); - MaterialGenerator.generate(ELEMENT.getInstance().TELLURIUM); // LFTR byproduct - MaterialGenerator.generate(ELEMENT.getInstance().RHODIUM); - MaterialGenerator.generate(ELEMENT.getInstance().RHENIUM); - MaterialGenerator.generate(ELEMENT.getInstance().THALLIUM); - MaterialGenerator.generate(ELEMENT.getInstance().GERMANIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().SELENIUM); // LFTR byproduct + MaterialGenerator.generate(MaterialsElements.getInstance().BROMINE); + MaterialGenerator.generate(MaterialsElements.getInstance().KRYPTON); // LFTR byproduct + MaterialGenerator.generate(MaterialsElements.getInstance().STRONTIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().ZIRCONIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().RUTHENIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().IODINE); // LFTR byproduct + MaterialGenerator.generate(MaterialsElements.getInstance().HAFNIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().DYSPROSIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().ERBIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().PRASEODYMIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().TELLURIUM); // LFTR byproduct + MaterialGenerator.generate(MaterialsElements.getInstance().RHODIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().RHENIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().THALLIUM); + MaterialGenerator.generate(MaterialsElements.getInstance().GERMANIUM); // RADIOACTIVE ELEMENTS - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().POLONIUM, false); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().POLONIUM, false); // MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().RADON, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().RADIUM, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PROMETHIUM, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PROTACTINIUM, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().CURIUM, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().CALIFORNIUM, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().NEPTUNIUM, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().FERMIUM, false); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().RADIUM, false); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().PROMETHIUM, false); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().PROTACTINIUM, false); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().CURIUM, false); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().CALIFORNIUM, false); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().NEPTUNIUM, false); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().FERMIUM, false); // Nuclear Isotopes @@ -314,168 +310,168 @@ public final class ModItems { // neutron cross-section of lithium-7 (about 45 millibarns) makes high separation of lithium-7 from natural // lithium a // strong requirement for the possible use in lithium fluoride reactors. - MaterialGenerator.generate(ELEMENT.getInstance().LITHIUM7, false); + MaterialGenerator.generate(MaterialsElements.getInstance().LITHIUM7, false); // Thorium-232 is the most stable isotope of Thorium, purified for nuclear fuel use in this case. - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().THORIUM232); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().THORIUM232); // Production of 233U (through the neutron irradiation of 232Th) invariably produces small amounts of 232U // as an impurity // because of parasitic (n,2n) reactions on uranium-233 itself, or on protactinium-233, or on thorium-232: - MaterialGenerator.generate(ELEMENT.getInstance().URANIUM232); + MaterialGenerator.generate(MaterialsElements.getInstance().URANIUM232); // Uranium-233 is a fissile isotope of uranium that is bred from thorium-232 as part of the thorium fuel // cycle. - MaterialGenerator.generate(ELEMENT.getInstance().URANIUM233); + MaterialGenerator.generate(MaterialsElements.getInstance().URANIUM233); // Plutonium-238 is a very powerful alpha emitter. This makes the plutonium-238 isotope suitable for usage // in radioisotope thermoelectric generators (RTGs) // and radioisotope heater units - one gram of plutonium-238 generates approximately 0.5 W of thermal power. - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PLUTONIUM238, false); + MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().PLUTONIUM238, false); // Custom Materials that will have standalone refinery processes - MaterialGenerator.generate(ELEMENT.STANDALONE.ADVANCED_NITINOL, false); - MaterialGenerator.generate(ELEMENT.STANDALONE.ASTRAL_TITANIUM); - MaterialGenerator.generate(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN); - MaterialGenerator.generate(ELEMENT.STANDALONE.HYPOGEN); - MaterialGenerator.generate(ELEMENT.STANDALONE.CHRONOMATIC_GLASS); + MaterialGenerator.generate(MaterialsElements.STANDALONE.ADVANCED_NITINOL, false); + MaterialGenerator.generate(MaterialsElements.STANDALONE.ASTRAL_TITANIUM); + MaterialGenerator.generate(MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN); + MaterialGenerator.generate(MaterialsElements.STANDALONE.HYPOGEN); + MaterialGenerator.generate(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS); // Custom Materials that are from Runescape - MaterialGenerator.generate(ELEMENT.STANDALONE.BLACK_METAL); - MaterialGenerator.generate(ELEMENT.STANDALONE.WHITE_METAL); - MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.STANDALONE.GRANITE); - MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.STANDALONE.RUNITE); - MaterialGenerator.generate(ELEMENT.STANDALONE.DRAGON_METAL); + MaterialGenerator.generate(MaterialsElements.STANDALONE.BLACK_METAL); + MaterialGenerator.generate(MaterialsElements.STANDALONE.WHITE_METAL); + MaterialGenerator.generateOreMaterialWithAllExcessComponents(MaterialsElements.STANDALONE.GRANITE); + MaterialGenerator.generateOreMaterialWithAllExcessComponents(MaterialsElements.STANDALONE.RUNITE); + MaterialGenerator.generate(MaterialsElements.STANDALONE.DRAGON_METAL); - MISC_MATERIALS.run(); + MaterialMisc.run(); - MaterialGenerator.generate(ALLOY.SILICON_CARBIDE); - MaterialGenerator.generate(ALLOY.ZIRCONIUM_CARBIDE); - MaterialGenerator.generate(ALLOY.TANTALUM_CARBIDE); - MaterialGenerator.generate(ALLOY.NIOBIUM_CARBIDE); - MaterialGenerator.generate(ALLOY.TUNGSTEN_TITANIUM_CARBIDE); + MaterialGenerator.generate(MaterialsAlloy.SILICON_CARBIDE); + MaterialGenerator.generate(MaterialsAlloy.ZIRCONIUM_CARBIDE); + MaterialGenerator.generate(MaterialsAlloy.TANTALUM_CARBIDE); + MaterialGenerator.generate(MaterialsAlloy.NIOBIUM_CARBIDE); + MaterialGenerator.generate(MaterialsAlloy.TUNGSTEN_TITANIUM_CARBIDE); // LFTR Fuel components - MaterialGenerator.generateNuclearDusts(FLUORIDES.AMMONIUM_BIFLUORIDE); // LFTR fuel component - MaterialGenerator.generateNuclearDusts(FLUORIDES.BERYLLIUM_HYDROXIDE); // LFTR fuel component + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.AMMONIUM_BIFLUORIDE); // LFTR fuel component + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.BERYLLIUM_HYDROXIDE); // LFTR fuel component // MaterialGenerator.generateNuclearDusts(FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE); // LFTR fuel component // Generate Fluorides - MaterialGenerator.generateNuclearDusts(FLUORIDES.BERYLLIUM_FLUORIDE); - MaterialGenerator.generateNuclearDusts(FLUORIDES.LITHIUM_FLUORIDE); - MaterialGenerator.generateNuclearDusts(FLUORIDES.THORIUM_TETRAFLUORIDE); - MaterialGenerator.generateNuclearDusts(FLUORIDES.THORIUM_HEXAFLUORIDE); - MaterialGenerator.generateNuclearDusts(FLUORIDES.URANIUM_TETRAFLUORIDE, false); - MaterialGenerator.generateNuclearDusts(FLUORIDES.URANIUM_HEXAFLUORIDE, false); - MaterialGenerator.generateNuclearDusts(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.BERYLLIUM_FLUORIDE); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.LITHIUM_FLUORIDE); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.THORIUM_TETRAFLUORIDE); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.THORIUM_HEXAFLUORIDE); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.URANIUM_TETRAFLUORIDE, false); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.URANIUM_HEXAFLUORIDE, false); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE); // LFTR Fluoride outputs - MaterialGenerator.generateNuclearDusts(FLUORIDES.NEPTUNIUM_HEXAFLUORIDE); - MaterialGenerator.generateNuclearDusts(FLUORIDES.TECHNETIUM_HEXAFLUORIDE); - MaterialGenerator.generateNuclearDusts(FLUORIDES.SELENIUM_HEXAFLUORIDE); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.NEPTUNIUM_HEXAFLUORIDE); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.TECHNETIUM_HEXAFLUORIDE); + MaterialGenerator.generateNuclearDusts(MaterialsFluorides.SELENIUM_HEXAFLUORIDE); // Generate Reactor Fuel Salts - MaterialGenerator.generateNuclearDusts(NUCLIDE.LiFBeF2ZrF4U235); - MaterialGenerator.generateNuclearDusts(NUCLIDE.LiFBeF2ZrF4UF4); - MaterialGenerator.generateNuclearDusts(NUCLIDE.LiFBeF2ThF4UF4); + MaterialGenerator.generateNuclearDusts(MaterialsNuclides.LiFBeF2ZrF4U235); + MaterialGenerator.generateNuclearDusts(MaterialsNuclides.LiFBeF2ZrF4UF4); + MaterialGenerator.generateNuclearDusts(MaterialsNuclides.LiFBeF2ThF4UF4); // MaterialGenerator.generateNuclearMaterial(NUCLIDE.Li2BeF4, false); // Generate some Alloys // Misc Alloys - MaterialGenerator.generate(ALLOY.ENERGYCRYSTAL); - MaterialGenerator.generate(ALLOY.BLOODSTEEL); + MaterialGenerator.generate(MaterialsAlloy.ENERGYCRYSTAL); + MaterialGenerator.generate(MaterialsAlloy.BLOODSTEEL); - MaterialGenerator.generate(ALLOY.ZERON_100); + MaterialGenerator.generate(MaterialsAlloy.ZERON_100); // Tumbaga was the name given by Spaniards to a non-specific alloy of gold and copper - MaterialGenerator.generate(ALLOY.TUMBAGA); + MaterialGenerator.generate(MaterialsAlloy.TUMBAGA); // Potin is traditionally an alloy of bronze, tin and lead, with varying quantities of each possible - MaterialGenerator.generate(ALLOY.POTIN); + MaterialGenerator.generate(MaterialsAlloy.POTIN); // Staballoy & Tantalloy - MaterialGenerator.generate(ALLOY.STABALLOY); - MaterialGenerator.generate(ALLOY.TANTALLOY_60); - MaterialGenerator.generate(ALLOY.TANTALLOY_61); + MaterialGenerator.generate(MaterialsAlloy.STABALLOY); + MaterialGenerator.generate(MaterialsAlloy.TANTALLOY_60); + MaterialGenerator.generate(MaterialsAlloy.TANTALLOY_61); // Inconel - MaterialGenerator.generate(ALLOY.INCONEL_625); - MaterialGenerator.generate(ALLOY.INCONEL_690); - MaterialGenerator.generate(ALLOY.INCONEL_792); + MaterialGenerator.generate(MaterialsAlloy.INCONEL_625); + MaterialGenerator.generate(MaterialsAlloy.INCONEL_690); + MaterialGenerator.generate(MaterialsAlloy.INCONEL_792); // Steels - MaterialGenerator.generateDusts(ALLOY.EGLIN_STEEL_BASE); - MaterialGenerator.generate(ALLOY.EGLIN_STEEL); - MaterialGenerator.generate(ALLOY.MARAGING250); - MaterialGenerator.generate(ALLOY.MARAGING300); - MaterialGenerator.generate(ALLOY.MARAGING350); - MaterialGenerator.generate(ALLOY.AQUATIC_STEEL); + MaterialGenerator.generateDusts(MaterialsAlloy.EGLIN_STEEL_BASE); + MaterialGenerator.generate(MaterialsAlloy.EGLIN_STEEL); + MaterialGenerator.generate(MaterialsAlloy.MARAGING250); + MaterialGenerator.generate(MaterialsAlloy.MARAGING300); + MaterialGenerator.generate(MaterialsAlloy.MARAGING350); + MaterialGenerator.generate(MaterialsAlloy.AQUATIC_STEEL); - MaterialGenerator.generate(ALLOY.NITINOL_60, true); + MaterialGenerator.generate(MaterialsAlloy.NITINOL_60, true); // Composite Alloys - MaterialGenerator.generate(ALLOY.STELLITE); - MaterialGenerator.generate(ALLOY.TALONITE); + MaterialGenerator.generate(MaterialsAlloy.STELLITE); + MaterialGenerator.generate(MaterialsAlloy.TALONITE); // Hastelloy - MaterialGenerator.generate(ALLOY.HASTELLOY_W); - MaterialGenerator.generate(ALLOY.HASTELLOY_X); - MaterialGenerator.generate(ALLOY.HASTELLOY_C276); - MaterialGenerator.generate(ALLOY.HASTELLOY_N); + MaterialGenerator.generate(MaterialsAlloy.HASTELLOY_W); + MaterialGenerator.generate(MaterialsAlloy.HASTELLOY_X); + MaterialGenerator.generate(MaterialsAlloy.HASTELLOY_C276); + MaterialGenerator.generate(MaterialsAlloy.HASTELLOY_N); // Incoloy - MaterialGenerator.generate(ALLOY.INCOLOY_020); - MaterialGenerator.generate(ALLOY.INCOLOY_DS); - MaterialGenerator.generate(ALLOY.INCOLOY_MA956); + MaterialGenerator.generate(MaterialsAlloy.INCOLOY_020); + MaterialGenerator.generate(MaterialsAlloy.INCOLOY_DS); + MaterialGenerator.generate(MaterialsAlloy.INCOLOY_MA956); // Leagrisium - MaterialGenerator.generate(ALLOY.LEAGRISIUM); + MaterialGenerator.generate(MaterialsAlloy.LEAGRISIUM); // Super Conductor - MaterialGenerator.generate(ALLOY.HG1223, false, false); + MaterialGenerator.generate(MaterialsAlloy.HG1223, false, false); // Generate Fictional Materials - MaterialGenerator.generate(ALLOY.TRINIUM_TITANIUM); - MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH, false); - MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH_CARBON); - MaterialGenerator.generate(ALLOY.TRINIUM_REINFORCED_STEEL); + MaterialGenerator.generate(MaterialsAlloy.TRINIUM_TITANIUM); + MaterialGenerator.generate(MaterialsAlloy.TRINIUM_NAQUADAH, false); + MaterialGenerator.generate(MaterialsAlloy.TRINIUM_NAQUADAH_CARBON); + MaterialGenerator.generate(MaterialsAlloy.TRINIUM_REINFORCED_STEEL); // Top Tier Alloys - MaterialGenerator.generate(ALLOY.HELICOPTER); - MaterialGenerator.generate(ALLOY.LAFIUM); - MaterialGenerator.generate(ALLOY.CINOBITE); - MaterialGenerator.generate(ALLOY.PIKYONIUM); - MaterialGenerator.generate(ALLOY.ABYSSAL); - MaterialGenerator.generate(ALLOY.LAURENIUM); + MaterialGenerator.generate(MaterialsAlloy.HELICOPTER); + MaterialGenerator.generate(MaterialsAlloy.LAFIUM); + MaterialGenerator.generate(MaterialsAlloy.CINOBITE); + MaterialGenerator.generate(MaterialsAlloy.PIKYONIUM); + MaterialGenerator.generate(MaterialsAlloy.ABYSSAL); + MaterialGenerator.generate(MaterialsAlloy.LAURENIUM); // abs recipe in RECIPES_GREGTECH.java - MaterialGenerator.generate(ALLOY.BOTMIUM, true, false); + MaterialGenerator.generate(MaterialsAlloy.BOTMIUM, true, false); - MaterialGenerator.generate(ALLOY.HS188A); + MaterialGenerator.generate(MaterialsAlloy.HS188A); - MaterialGenerator.generate(ALLOY.TITANSTEEL); - MaterialGenerator.generate(ALLOY.ARCANITE); - MaterialGenerator.generate(ALLOY.OCTIRON); + MaterialGenerator.generate(MaterialsAlloy.TITANSTEEL); + MaterialGenerator.generate(MaterialsAlloy.ARCANITE); + MaterialGenerator.generate(MaterialsAlloy.OCTIRON); - MaterialGenerator.generate(ALLOY.BABBIT_ALLOY, false); - MaterialGenerator.generate(ALLOY.BLACK_TITANIUM, false); - MaterialGenerator.generate(ALLOY.INDALLOY_140, false, false); + MaterialGenerator.generate(MaterialsAlloy.BABBIT_ALLOY, false); + MaterialGenerator.generate(MaterialsAlloy.BLACK_TITANIUM, false); + MaterialGenerator.generate(MaterialsAlloy.INDALLOY_140, false, false); // High Level Bioplastic - MaterialGenerator.generate(ELEMENT.STANDALONE.RHUGNOR, false, false); + MaterialGenerator.generate(MaterialsElements.STANDALONE.RHUGNOR, false, false); // Must be the final Alloy to Generate - MaterialGenerator.generate(ALLOY.QUANTUM); + MaterialGenerator.generate(MaterialsAlloy.QUANTUM); // Ores - MaterialGenerator.generateOreMaterial(FLUORIDES.FLUORITE); - MaterialGenerator.generateOreMaterial(ALLOY.KOBOLDITE); - GTplusplus_Everglades.GenerateOreMaterials(); + MaterialGenerator.generateOreMaterial(MaterialsFluorides.FLUORITE); + MaterialGenerator.generateOreMaterial(MaterialsAlloy.KOBOLDITE); + GTPPEverglades.GenerateOreMaterials(); // formula override - ALLOY.TUNGSTEN_TITANIUM_CARBIDE.vChemicalFormula = StringUtils.subscript("(CW)7Ti3"); - ALLOY.TITANSTEEL.vChemicalFormula = StringUtils.subscript("((CW)7Ti3)3???"); + MaterialsAlloy.TUNGSTEN_TITANIUM_CARBIDE.vChemicalFormula = StringUtils.subscript("(CW)7Ti3"); + MaterialsAlloy.TITANSTEEL.vChemicalFormula = StringUtils.subscript("((CW)7Ti3)3???"); // Werkstoff bridge - ELEMENT.getInstance().ZIRCONIUM.setWerkstoffID((short) 3); - ELEMENT.getInstance().THORIUM232.setWerkstoffID((short) 30); - ELEMENT.getInstance().RUTHENIUM.setWerkstoffID((short) 64); - ELEMENT.getInstance().HAFNIUM.setWerkstoffID((short) 11000); - ELEMENT.getInstance().IODINE.setWerkstoffID((short) 11012); + MaterialsElements.getInstance().ZIRCONIUM.setWerkstoffID((short) 3); + MaterialsElements.getInstance().THORIUM232.setWerkstoffID((short) 30); + MaterialsElements.getInstance().RUTHENIUM.setWerkstoffID((short) 64); + MaterialsElements.getInstance().HAFNIUM.setWerkstoffID((short) 11000); + MaterialsElements.getInstance().IODINE.setWerkstoffID((short) 11012); } catch (final Throwable r) { Logger.INFO("Failed to Generated a Material. " + r.getMessage()); @@ -503,13 +499,13 @@ public final class ModItems { .getItem(); } // Generates a set of four special dusts to be used in my recipes. - dustAer = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().AER, true)[0]; - dustIgnis = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().IGNIS, true)[0]; - dustTerra = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().TERRA, true)[0]; - dustAqua = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().AQUA, true)[0]; + dustAer = ItemUtils.generateSpecialUseDusts(MaterialsElements.getInstance().AER, true)[0]; + dustIgnis = ItemUtils.generateSpecialUseDusts(MaterialsElements.getInstance().IGNIS, true)[0]; + dustTerra = ItemUtils.generateSpecialUseDusts(MaterialsElements.getInstance().TERRA, true)[0]; + dustAqua = ItemUtils.generateSpecialUseDusts(MaterialsElements.getInstance().AQUA, true)[0]; - ItemUtils.generateSpecialUseDusts(MISC_MATERIALS.WOODS_GLASS, false); - cellHydrogenChlorideMix = MISC_MATERIALS.HYDROGEN_CHLORIDE_MIX.getCell(1) + ItemUtils.generateSpecialUseDusts(MaterialMisc.WOODS_GLASS, false); + cellHydrogenChlorideMix = MaterialMisc.HYDROGEN_CHLORIDE_MIX.getCell(1) .getItem(); // Nuclear Fuel Dusts @@ -550,9 +546,9 @@ public final class ModItems { "Calcium Sulfate (Gypsum)", "CaSO4", Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/Calcium_sulfate - GT_OreDictUnificator.registerOre("dustCalciumSulfate", ItemUtils.getSimpleStack(dustCalciumSulfate)); + GTOreDictUnificator.registerOre("dustCalciumSulfate", ItemUtils.getSimpleStack(dustCalciumSulfate)); } else { - GT_OreDictUnificator + GTOreDictUnificator .registerOre("dustCalciumSulfate", ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGypsum", 1)); } dustLi2CO3CaOH2 = ItemUtils.generateSpecialUseDusts( @@ -560,14 +556,17 @@ public final class ModItems { "Li2CO3 + CaO2H2 Compound", "Li2CO3CaO2H2", Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/Calcium_carbonate - MaterialUtils.generateSpecialDustAndAssignToAMaterial(FLUORIDES.SODIUM_FLUORIDE, false); + MaterialUtils.generateSpecialDustAndAssignToAMaterial(MaterialsFluorides.SODIUM_FLUORIDE, false); // FLiBe Fuel Compounds dustLi2BeF4 = ItemUtils.generateSpecialUseDusts( "Li2BeF4", "Lithium Tetrafluoroberyllate Fuel Compound", "Li2BeF4", Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/FLiBe - Material.registerComponentForMaterial(NUCLIDE.Li2BeF4, OrePrefixes.dust, ItemUtils.getSimpleStack(dustLi2BeF4)); + Material.registerComponentForMaterial( + MaterialsNuclides.Li2BeF4, + OrePrefixes.dust, + ItemUtils.getSimpleStack(dustLi2BeF4)); // fluidFLiBeSalt = ("Li2BeF4", "Li2BeF4", 7430, new short[]{255, 255, 255, 100}, 0); // fluidFLiBeSalt = FluidUtils.addGTFluidNoPrefix("Li2BeF4", "Lithium Tetrafluoroberyllate", new short[]{255, // 255, 255, 100}, 0, 743, null, CI.emptyCells(1), 1000, true); @@ -608,7 +607,7 @@ public final class ModItems { false, null); - if (CORE.ConfigSwitches.enableMachine_Pollution) { + if (GTPPCore.ConfigSwitches.enableMachine_Pollution) { itemBasicTurbine = new ItemBasicScrubberTurbine(); } @@ -618,7 +617,7 @@ public final class ModItems { "itemZirconiumPellet", "Zirconium Pellet [" + StringUtils.subscript("ZrCl4") + "]", tabMisc).setTextureName(GTPlusPlus.ID + ":itemShard"); - GT_OreDictUnificator.registerOre("pelletZirconium", new ItemStack(itemZirconiumChlorideCinterPellet)); + GTOreDictUnificator.registerOre("pelletZirconium", new ItemStack(itemZirconiumChlorideCinterPellet)); // Zirconium Chloride dustZrCl4 = ItemUtils.generateSpecialUseDusts("ZrCl4", "ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; // http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf dustCookedZrCl4 = ItemUtils @@ -626,9 +625,9 @@ public final class ModItems { // Zirconium Tetrafluoride /* - * GT_OreDictUnificator.registerOre("cellZrF4", + * GTOreDictUnificator.registerOre("cellZrF4", * ItemUtils.getItemStackOfAmountFromOreDict("cellZirconiumTetrafluoride", 1)); - * GT_OreDictUnificator.registerOre("dustZrF4", + * GTOreDictUnificator.registerOre("dustZrF4", * ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1)); */ fluidZrF4 = FluidUtils.generateFluidNoPrefix( @@ -636,7 +635,7 @@ public final class ModItems { "Zirconium Tetrafluoride", 500, new short[] { 170, 170, 140, 100 }); // https://en.wikipedia.org/wiki/Zirconium_tetrafluoride - FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.setFluid(fluidZrF4); + MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE.setFluid(fluidZrF4); // Coolant Salt // NaBF4 - NaF - 621C @@ -644,7 +643,7 @@ public final class ModItems { // //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride // Load Tree Farmer - if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) { // https://en.wikipedia.org/wiki/UAN + if (GTPPCore.ConfigSwitches.enableMultiblock_TreeFarmer) { // https://en.wikipedia.org/wiki/UAN dustFertUN18 = ItemUtils .generateSpecialUseDusts("UN18Fertiliser", "UN-18 Fertiliser", Utils.rgbtoHexValue(60, 155, 60))[0]; dustFertUN32 = ItemUtils @@ -665,7 +664,7 @@ public final class ModItems { temp1, null, true); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(temp2) .fluidOutputs(new FluidStack(fluidFertBasic, 36)) .duration(5 * TICKS) @@ -708,7 +707,7 @@ public final class ModItems { true); // Test items - toolGregtechPump = new GregtechPump(); + toolGregtechPump = new ItemGregtechPump(); toolGregtechPump.registerPumpType(0, "Simple Hand Pump", 0, 0); toolGregtechPump.registerPumpType(1, "Advanced Hand Pump", 32000, 1); toolGregtechPump.registerPumpType(2, "Super Hand Pump", 128000, 2); @@ -725,17 +724,17 @@ public final class ModItems { 50640, new String[] { StringUtils.superscript("238Np"), "Result: Plutonium 238 (" + StringUtils.superscript("238Pu") + ")" }, - ELEMENT.getInstance().PLUTONIUM238.getDust(1) + MaterialsElements.getInstance().PLUTONIUM238.getDust(1) .getItem(), 5); dustDecayedRadium226 = ItemUtils.generateSpecialUseDusts( "DecayedRadium226", "Decayed Radium-226", "Contains Radon (" + StringUtils.superscript("222Rn") + ")", - ELEMENT.getInstance().RADIUM.getRgbAsHex())[0]; + MaterialsElements.getInstance().RADIUM.getRgbAsHex())[0]; dustRadium226 = new DustDecayable( "dustRadium226", - ELEMENT.getInstance().RADIUM.getRgbAsHex(), + MaterialsElements.getInstance().RADIUM.getRgbAsHex(), 90000, new String[] { StringUtils.superscript("226Ra"), "Result: Radon (" + StringUtils.superscript("222Rn") + ")" }, @@ -744,16 +743,16 @@ public final class ModItems { 5); dustProtactinium233 = new DustDecayable( "dustProtactinium233", - ELEMENT.getInstance().PROTACTINIUM.getRgbAsHex(), + MaterialsElements.getInstance().PROTACTINIUM.getRgbAsHex(), 32000, new String[] { StringUtils.superscript("233Pa"), "Result: Uranium 233(" + StringUtils.superscript("233U") + ")" }, - ELEMENT.getInstance().URANIUM233.getDust(1) + MaterialsElements.getInstance().URANIUM233.getDust(1) .getItem(), 6); dustMolybdenum99 = new DustDecayable( "dustMolybdenum99", - ELEMENT.getInstance().MOLYBDENUM.getRgbAsHex(), + MaterialsElements.getInstance().MOLYBDENUM.getRgbAsHex(), 16450, new String[] { StringUtils.superscript("99Mo"), "Result: Technicium 99ᵐ (" + StringUtils.superscript("99ᵐTc") + ")" }, @@ -799,7 +798,7 @@ public final class ModItems { try { final Class<?> baublesTest = ReflectionUtils.getClass("baubles.api.IBauble"); if (baublesTest != null) { - COMPAT_Baubles.run(); + CompatBaubles.run(); } else { Logger.INFO("Baubles Not Found - Skipping Resources."); } @@ -810,7 +809,7 @@ public final class ModItems { // Buffer Cores! Item itemBufferCore; for (int i = 1; i <= 10; i++) { - itemBufferCore = new BufferCore("itemBufferCore", i).setCreativeTab(AddToCreativeTab.tabMachines); + itemBufferCore = new ItemBufferCore("itemBufferCore", i).setCreativeTab(AddToCreativeTab.tabMachines); GameRegistry.registerItem(itemBufferCore, itemBufferCore.getUnlocalizedName()); } @@ -866,92 +865,106 @@ public final class ModItems { // Just an unusual plate needed for some black magic. if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateClay", 1) == null) { - itemPlateClay = new BaseItemPlate(NONMATERIAL.CLAY); + itemPlateClay = new BaseItemPlate(MaterialsOther.CLAY); } if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleClay", 1) == null) { - itemDoublePlateClay = new BaseItemPlateDouble(NONMATERIAL.CLAY); + itemDoublePlateClay = new BaseItemPlateDouble(MaterialsOther.CLAY); } // Need this for Mutagenic Frames if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilUranium235", 1) == null) { - itemFoilUranium235 = new BaseItemFoil(ELEMENT.getInstance().URANIUM235); + itemFoilUranium235 = new BaseItemFoil(MaterialsElements.getInstance().URANIUM235); } // A small gear needed for wizardry. if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("gearGtSmallWroughtIron", 1) == null) { - itemSmallWroughtIronGear = new BaseItemSmallGear(NONMATERIAL.WROUGHT_IRON); + itemSmallWroughtIronGear = new BaseItemSmallGear(MaterialsOther.WROUGHT_IRON); } // Krypton Processing if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotHotTitanium", 1) == null) { itemHotTitaniumIngot = ItemUtils - .getSimpleStack(new BaseItemIngot(ELEMENT.getInstance().TITANIUM, ComponentTypes.HOTINGOT)); + .getSimpleStack(new BaseItemIngot(MaterialsElements.getInstance().TITANIUM, ComponentTypes.HOTINGOT)); } else { itemHotTitaniumIngot = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotHotTitanium", 1); } // Need this for Laurenium if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIndium", 1) == null) { - itemDustIndium = new BaseItemDust(ELEMENT.getInstance().INDIUM); + itemDustIndium = new BaseItemDust(MaterialsElements.getInstance().INDIUM); } // Springs + MaterialUtils.generateComponentAndAssignToAMaterial( + ComponentTypes.SPRING, + MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN); MaterialUtils - .generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ELEMENT.STANDALONE.WHITE_METAL); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ALLOY.NITINOL_60); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ALLOY.AQUATIC_STEEL); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ALLOY.EGLIN_STEEL); + .generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, MaterialsElements.STANDALONE.WHITE_METAL); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, MaterialsAlloy.NITINOL_60); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, MaterialsAlloy.AQUATIC_STEEL); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, MaterialsAlloy.EGLIN_STEEL); // Small Springs - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, ALLOY.MARAGING250); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, ALLOY.NICHROME); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, ALLOY.STABALLOY); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, ALLOY.STEEL_BLACK); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, ALLOY.BLACK_TITANIUM); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.MARAGING250); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.NICHROME); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.STABALLOY); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.STEEL_BLACK); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.BLACK_TITANIUM); // Fine Wire - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ELEMENT.STANDALONE.WHITE_METAL); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ELEMENT.getInstance().PALLADIUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ELEMENT.getInstance().ZIRCONIUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ALLOY.LEAGRISIUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ALLOY.BABBIT_ALLOY); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ALLOY.KOBOLDITE); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ALLOY.HG1223); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ALLOY.QUANTUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ELEMENT.STANDALONE.HYPOGEN); MaterialUtils - .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, ELEMENT.STANDALONE.CHRONOMATIC_GLASS); + .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsElements.STANDALONE.WHITE_METAL); + MaterialUtils + .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsElements.getInstance().PALLADIUM); + MaterialUtils + .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsElements.getInstance().ZIRCONIUM); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.LEAGRISIUM); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.BABBIT_ALLOY); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.KOBOLDITE); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.HG1223); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.QUANTUM); + MaterialUtils + .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsElements.STANDALONE.HYPOGEN); + MaterialUtils.generateComponentAndAssignToAMaterial( + ComponentTypes.FINEWIRE, + MaterialsElements.STANDALONE.CHRONOMATIC_GLASS); // Foil - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.BLACK_TITANIUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.BOTMIUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.TITANSTEEL); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.NITINOL_60); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.QUANTUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.LAURENIUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.HYPOGEN); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.ASTRAL_TITANIUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.RHUGNOR); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.WHITE_METAL); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.ADVANCED_NITINOL); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.PIKYONIUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.CINOBITE); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.LAFIUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.TRINIUM_REINFORCED_STEEL); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.CHRONOMATIC_GLASS); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.BLACK_TITANIUM); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.BOTMIUM); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.TITANSTEEL); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.NITINOL_60); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.QUANTUM); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.LAURENIUM); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsElements.STANDALONE.HYPOGEN); + MaterialUtils.generateComponentAndAssignToAMaterial( + ComponentTypes.FOIL, + MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN); + MaterialUtils + .generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsElements.STANDALONE.ASTRAL_TITANIUM); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsElements.STANDALONE.RHUGNOR); + MaterialUtils + .generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsElements.STANDALONE.WHITE_METAL); + MaterialUtils + .generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsElements.STANDALONE.ADVANCED_NITINOL); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.PIKYONIUM); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.CINOBITE); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.LAFIUM); + MaterialUtils + .generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsAlloy.TRINIUM_REINFORCED_STEEL); + MaterialUtils + .generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, MaterialsElements.STANDALONE.CHRONOMATIC_GLASS); // Gear - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.GEAR, ELEMENT.STANDALONE.RHUGNOR); + MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.GEAR, MaterialsElements.STANDALONE.RHUGNOR); // Special Sillyness if (true) { if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateSodium", 1) == null) { - new BaseItemPlate(ELEMENT.getInstance().SODIUM); + new BaseItemPlate(MaterialsElements.getInstance().SODIUM); } - Material meatRaw = NONMATERIAL.MEAT; + Material meatRaw = MaterialsOther.MEAT; // A plate of Meat. if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateMeatRaw", 1) == null) { itemPlateRawMeat = new BaseItemPlate(meatRaw); @@ -966,22 +979,22 @@ public final class ModItems { // A plate of Vanadium. if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateVanadium", 1) == null) { - itemPlateVanadium = new BaseItemPlate(ELEMENT.getInstance().VANADIUM); + itemPlateVanadium = new BaseItemPlate(MaterialsElements.getInstance().VANADIUM); } // A plate of Lithium. if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateLithium", 1) == null) { - itemPlateLithium = new BaseItemPlate(ELEMENT.getInstance().LITHIUM); + itemPlateLithium = new BaseItemPlate(MaterialsElements.getInstance().LITHIUM); } // A plate of Europium. if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateEuropium", 1) == null) - && CORE.ConfigSwitches.enableCustom_Pipes) { - itemPlateEuropium = new BaseItemPlate(ELEMENT.getInstance().EUROPIUM); + && GTPPCore.ConfigSwitches.enableCustom_Pipes) { + itemPlateEuropium = new BaseItemPlate(MaterialsElements.getInstance().EUROPIUM); } if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleEuropium", 1) == null) - && CORE.ConfigSwitches.enableCustom_Pipes) { - itemDoublePlateEuropium = new BaseItemPlateDouble(ELEMENT.getInstance().EUROPIUM); + && GTPPCore.ConfigSwitches.enableCustom_Pipes) { + itemDoublePlateEuropium = new BaseItemPlateDouble(MaterialsElements.getInstance().EUROPIUM); } // Tumbaga Mix (For Simple Crafting) diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java index 8bbc5a3b08..3ce461ffab 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java @@ -4,7 +4,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; public class BaseItemBurnable extends CoreItem { @@ -23,7 +23,7 @@ public class BaseItemBurnable extends CoreItem { } public void registerFuel(int burn) { - CORE.burnables.add(new Pair<>(burn, ItemUtils.getSimpleStack(this, 1))); + GTPPCore.burnables.add(new Pair<>(burn, ItemUtils.getSimpleStack(this, 1))); } public final void registerOrdictionary(String name) { diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java index d391207a56..6a224ddc87 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java @@ -14,7 +14,7 @@ import net.minecraft.util.EnumChatFormatting; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; public class BaseItemColourable extends Item { @@ -42,7 +42,7 @@ public class BaseItemColourable extends Item { this.setMaxDamage(maxDmg); this.setHasSubtypes(true); this.rarity = regRarity; - GT_LanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".tooltip", description); + GTLanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".tooltip", description); this.descColour = colour; this.hasEffect = Effect; this.componentColour = rgb; @@ -57,13 +57,13 @@ public class BaseItemColourable extends Item { final int stackSize, final int maxDmg, final String description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect, int rgb) { this.setUnlocalizedName(unlocalizedName); - GT_LanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".name", displayName); + GTLanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".name", displayName); this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(creativeTab); this.setMaxStackSize(stackSize); this.setMaxDamage(maxDmg); this.rarity = regRarity; - GT_LanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".tooltip", description); + GTLanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".tooltip", description); this.descColour = colour; this.hasEffect = Effect; this.componentColour = rgb; @@ -74,8 +74,7 @@ public class BaseItemColourable extends Item { @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { list.add( - this.descColour - + GT_LanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip")); + this.descColour + GTLanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip")); // super.addInformation(stack, aPlayer, list, bool); } @@ -93,8 +92,8 @@ public class BaseItemColourable extends Item { @Override public String getItemStackDisplayName(final ItemStack tItem) { if (!("gtplusplus." + this.getUnlocalizedName() + ".name") - .equals(GT_LanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".name"))) { - return GT_LanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".name"); + .equals(GTLanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".name"))) { + return GTLanguageManager.getTranslation("gtplusplus." + this.getUnlocalizedName() + ".name"); } else return super.getItemStackDisplayName(tItem); } } diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java index 6846f8febb..5a7bc4fa45 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -20,15 +20,15 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TextureSet; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.StringUtils; @@ -71,15 +71,15 @@ public class BaseItemComponent extends Item { // if (componentType != ComponentTypes.DUST) - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( componentType.getOreDictName() + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this)); if (componentType == ComponentTypes.GEAR) { - GT_OreDictUnificator.registerOre("gear" + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this)); + GTOreDictUnificator.registerOre("gear" + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this)); } registerComponent(); - GT_LanguageManager.addStringLocalization("gtplusplus.item." + unlocalName + ".name", getFormattedLangName()); + GTLanguageManager.addStringLocalization("gtplusplus.item." + unlocalName + ".name", getFormattedLangName()); } // For Cell Generation @@ -109,12 +109,12 @@ public class BaseItemComponent extends Item { this.setTextureName(GTPlusPlus.ID + ":" + "item" + ComponentTypes.CELL.COMPONENT_NAME); GameRegistry.registerItem(this, aFormattedNameForFluids); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( ComponentTypes.CELL.getOreDictName() + Utils.sanitizeStringKeepBrackets(localName), ItemUtils.getSimpleStack(this)); registerComponent(); - GT_LanguageManager + GTLanguageManager .addStringLocalization("gtplusplus.item." + this.unlocalName + ".name", getFormattedLangName()); } @@ -144,17 +144,17 @@ public class BaseItemComponent extends Item { + "]"); Material.mComponentMap.put(componentMaterial.getUnlocalizedName(), aMap); if (componentType == ComponentTypes.PLATE) { - GregTech_API.registerCover( + GregTechAPI.registerCover( componentMaterial.getPlate(1), - new GT_RenderedTexture( + new GTRenderedTexture( componentMaterial.getTextureSet().mTextures[71], componentMaterial.getRGBA(), false), null); } else if (componentType == ComponentTypes.PLATEDOUBLE) { - GregTech_API.registerCover( + GregTechAPI.registerCover( componentMaterial.getPlateDouble(1), - new GT_RenderedTexture( + new GTRenderedTexture( componentMaterial.getTextureSet().mTextures[72], componentMaterial.getRGBA(), false), @@ -169,7 +169,7 @@ public class BaseItemComponent extends Item { } public String getCorrectTextures() { - if (!CORE.ConfigSwitches.useGregtechTextures) { + if (!GTPPCore.ConfigSwitches.useGregtechTextures) { return GTPlusPlus.ID + ":" + "item" + this.componentType.COMPONENT_NAME; } String metType = "9j4852jyo3rjmh3owlhw9oe"; @@ -198,12 +198,12 @@ public class BaseItemComponent extends Item { public String getFluidName(String aKey) { String trans; - trans = GT_LanguageManager.getTranslation(aKey); + trans = GTLanguageManager.getTranslation(aKey); if (!trans.equals(aKey)) return trans; aKey = "fluid." + aKey; - trans = GT_LanguageManager.getTranslation(aKey); + trans = GTLanguageManager.getTranslation(aKey); if (!trans.equals(aKey)) return trans; - return GT_LanguageManager.addStringLocalization( + return GTLanguageManager.addStringLocalization( "gtplusplus.fluid." + this.materialName.toLowerCase() .replace(" ", ""), this.materialName); @@ -211,7 +211,7 @@ public class BaseItemComponent extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { - return GT_LanguageManager.getTranslation("gtplusplus.item." + unlocalName + ".name") + return GTLanguageManager.getTranslation("gtplusplus.item." + unlocalName + ".name") .replace("%s", "%temp") .replace("%material", translatedMaterialName) .replace("%temp", "%s"); @@ -250,7 +250,7 @@ public class BaseItemComponent extends Item { } if (this.componentMaterial.isRadioactive) { - list.add(CORE.GT_Tooltip_Radioactive.get()); + list.add(GTPPCore.GT_Tooltip_Radioactive.get()); } if (this.componentType == ComponentTypes.INGOT || this.componentType == ComponentTypes.HOTINGOT) { @@ -324,7 +324,7 @@ public class BaseItemComponent extends Item { @Override @SideOnly(Side.CLIENT) public boolean requiresMultipleRenderPasses() { - return (CORE.ConfigSwitches.useGregtechTextures ? true : false); + return (GTPPCore.ConfigSwitches.useGregtechTextures ? true : false); } @SuppressWarnings("unchecked") @@ -332,10 +332,10 @@ public class BaseItemComponent extends Item { public int getColorFromItemStack(final ItemStack stack, final int renderPass) { if (this.componentType == ComponentTypes.CELL || this.componentType == ComponentTypes.PLASMACELL) { - if (renderPass == 0 && !CORE.ConfigSwitches.useGregtechTextures) { + if (renderPass == 0 && !GTPPCore.ConfigSwitches.useGregtechTextures) { return Utils.rgbtoHexValue(255, 255, 255); } - if (renderPass == 1 && CORE.ConfigSwitches.useGregtechTextures) { + if (renderPass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) { return Utils.rgbtoHexValue(255, 255, 255); } } @@ -380,7 +380,7 @@ public class BaseItemComponent extends Item { @Override public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) { - if (CORE.ConfigSwitches.useGregtechTextures) { + if (GTPPCore.ConfigSwitches.useGregtechTextures) { if (pass == 0) { return this.base; } @@ -392,7 +392,7 @@ public class BaseItemComponent extends Item { @Override public void registerIcons(final IIconRegister i) { - if (CORE.ConfigSwitches.useGregtechTextures) { + if (GTPPCore.ConfigSwitches.useGregtechTextures) { this.base = i.registerIcon(getCorrectTextures()); this.overlay = i.registerIcon(getCorrectTextures() + "_OVERLAY"); } else { diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java index 3ecb6960d6..a5792e236a 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java @@ -11,8 +11,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -35,22 +35,22 @@ public class BaseItemTCShard extends Item { this.setUnlocalizedName(this.unlocalName); if (Description != null) { for (int i = 0; i < Description.length; i++) { - GT_LanguageManager + GTLanguageManager .addStringLocalization("gtplusplus." + getUnlocalizedName() + ".tooltip." + i, Description[i]); } } this.setMaxStackSize(64); this.setTextureName(GTPlusPlus.ID + ":" + "itemShard"); GameRegistry.registerItem(this, this.unlocalName); - GT_OreDictUnificator.registerOre("shard" + DisplayName, ItemUtils.getSimpleStack(this)); - GT_OreDictUnificator.registerOre("gemInfused" + DisplayName, ItemUtils.getSimpleStack(this)); + GTOreDictUnificator.registerOre("shard" + DisplayName, ItemUtils.getSimpleStack(this)); + GTOreDictUnificator.registerOre("gemInfused" + DisplayName, ItemUtils.getSimpleStack(this)); } @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { for (int i = 0;; i++) { - String tooltip = GT_LanguageManager + String tooltip = GTLanguageManager .getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i); if (!("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i).equals(tooltip)) { list.add(tooltip); diff --git a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java index 4745fda281..89e9c4b038 100644 --- a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java +++ b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java @@ -16,7 +16,7 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -215,7 +215,7 @@ public class CoreItem extends Item { @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { for (int i = 0;; i++) { - String tooltip = GT_LanguageManager + String tooltip = GTLanguageManager .getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i); if (!("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i).equals(tooltip)) { list.add(tooltip); @@ -274,7 +274,7 @@ public class CoreItem extends Item { public void setItemDescription(String[] description) { for (int i = 0; i < description.length; i++) { - GT_LanguageManager.addStringLocalization( + GTLanguageManager.addStringLocalization( "gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i, description[i]); } diff --git a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java index 1140390375..228c1803eb 100644 --- a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java +++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java @@ -10,7 +10,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import gtPlusPlus.core.item.base.BaseItemComponent; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -47,7 +47,7 @@ public class BaseItemCell extends BaseItemComponent { @Override public void registerIcons(final IIconRegister i) { - if (CORE.ConfigSwitches.useGregtechTextures) { + if (GTPPCore.ConfigSwitches.useGregtechTextures) { this.base = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "cell"); this.overlay = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "cell_OVERLAY"); } else { @@ -62,10 +62,10 @@ public class BaseItemCell extends BaseItemComponent { @Override public int getColorFromItemStack(final ItemStack stack, final int renderPass) { - if (renderPass == 0 && !CORE.ConfigSwitches.useGregtechTextures) { + if (renderPass == 0 && !GTPPCore.ConfigSwitches.useGregtechTextures) { return Utils.rgbtoHexValue(230, 230, 230); } - if (renderPass == 1 && CORE.ConfigSwitches.useGregtechTextures) { + if (renderPass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) { return Utils.rgbtoHexValue(230, 230, 230); } return this.componentColour; diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java index 2592fe3cf7..a451bfc77b 100644 --- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java @@ -14,10 +14,10 @@ import net.minecraft.item.ItemStack; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.math.MathUtils; @@ -61,7 +61,7 @@ public class BaseItemDustUnique extends Item { } else { type = "%material Dust"; } - GT_LanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".name", type); + GTLanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".name", type); String temp = ""; Logger.WARNING("Unlocalized name for OreDict nameGen: " + this.getUnlocalizedName()); @@ -84,7 +84,7 @@ public class BaseItemDustUnique extends Item { Logger.WARNING("Generating OreDict Name: " + temp); } if ((temp != null) && !temp.equals("")) { - GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); + GTOreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); } registerComponent(); } @@ -115,12 +115,12 @@ public class BaseItemDustUnique extends Item { @Override public String getItemStackDisplayName(final ItemStack iStack) { - return GT_LanguageManager.getTranslation("gtplusplus." + getUnlocalizedName() + ".name") - .replace("%material", GT_LanguageManager.getTranslation("gtplusplus.material." + materialName)); + return GTLanguageManager.getTranslation("gtplusplus." + getUnlocalizedName() + ".name") + .replace("%material", GTLanguageManager.getTranslation("gtplusplus.material." + materialName)); } private String getCorrectTexture(final String pileSize) { - if (!CORE.ConfigSwitches.useGregtechTextures) { + if (!GTPPCore.ConfigSwitches.useGregtechTextures) { if ((pileSize.equals("dust")) || (pileSize.equals("Dust"))) { this.setTextureName(GTPlusPlus.ID + ":" + "dust"); } else { @@ -141,7 +141,7 @@ public class BaseItemDustUnique extends Item { @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { if (this.sRadiation > 0) { - list.add(CORE.GT_Tooltip_Radioactive.get()); + list.add(GTPPCore.GT_Tooltip_Radioactive.get()); } if (this.chemicalNotation.length() > 0 && !chemicalNotation.equals("") && !chemicalNotation.equals("NullFormula")) { diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java index 9d22c0faf8..82020229f0 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java @@ -3,7 +3,7 @@ package gtPlusPlus.core.item.base.ingots; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -14,10 +14,10 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.base.BaseItemComponent; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.EntityUtils; @@ -54,7 +54,7 @@ public class BaseItemIngotHot extends BaseItemIngot { private void generateRecipe() { Logger.WARNING("Adding Vacuum Freezer recipe for a Hot Ingot of " + this.materialName + "."); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(this)) .itemOutputs(this.outputIngot.copy()) .duration(Math.max(this.componentMaterial.getMass() * 3L, 1L) * TICKS) @@ -78,7 +78,7 @@ public class BaseItemIngotHot extends BaseItemIngot { @Override @SideOnly(Side.CLIENT) public boolean requiresMultipleRenderPasses() { - if (CORE.ConfigSwitches.useGregtechTextures) { + if (GTPPCore.ConfigSwitches.useGregtechTextures) { return true; } else { return false; @@ -88,7 +88,7 @@ public class BaseItemIngotHot extends BaseItemIngot { @Override public void registerIcons(final IIconRegister i) { - if (CORE.ConfigSwitches.useGregtechTextures) { + if (GTPPCore.ConfigSwitches.useGregtechTextures) { this.base = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "ingotHot"); this.overlay = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "ingotHot_OVERLAY"); } else { @@ -100,9 +100,9 @@ public class BaseItemIngotHot extends BaseItemIngot { @Override public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) { - if (pass == 0 && CORE.ConfigSwitches.useGregtechTextures) { + if (pass == 0 && GTPPCore.ConfigSwitches.useGregtechTextures) { return this.base; - } else if (pass == 1 && CORE.ConfigSwitches.useGregtechTextures) { + } else if (pass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) { return this.overlay; } else { return this.overlay; diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOld.java index 6335820c9a..28407a4557 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOld.java @@ -2,7 +2,7 @@ package gtPlusPlus.core.item.base.ingots; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.recipe.RecipeMaps.compressorRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import net.minecraft.entity.Entity; import net.minecraft.item.Item; @@ -10,21 +10,21 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.GT_Values; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.enums.GTValues; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class BaseItemIngot_OLD extends Item { +public class BaseItemIngotOld extends Item { protected int colour; protected String materialName; protected String unlocalName; - public BaseItemIngot_OLD(final String unlocalizedName, final String materialName, final int colour, + public BaseItemIngotOld(final String unlocalizedName, final String materialName, final int colour, final int sRadioactivity) { this.setUnlocalizedName(unlocalizedName); this.setCreativeTab(AddToCreativeTab.tabMisc); @@ -42,7 +42,7 @@ public class BaseItemIngot_OLD extends Item { temp = this.unlocalName.replace("itemHotIngot", "ingotHot"); } if ((temp != null) && !temp.equals("")) { - GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); + GTOreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); } // this.generateCompressorRecipe(); } @@ -83,7 +83,7 @@ public class BaseItemIngot_OLD extends Item { if ((temp != null) && !temp.equals("")) { tempOutput = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1); if (tempOutput != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(tempStack) .itemOutputs(tempOutput) .duration(15 * SECONDS) diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java index 98c652a1ba..92876663f0 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java @@ -14,7 +14,7 @@ import net.minecraft.world.World; import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; import gtPlusPlus.core.block.base.BlockBaseModular; import gtPlusPlus.core.block.base.BlockBaseOre; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialStack; import gtPlusPlus.core.util.minecraft.EntityUtils; @@ -149,7 +149,7 @@ public class ItemBlockGtBlock extends ItemBlock { if (this.mMaterial != null) { if (this.mMaterial.vRadiationLevel > 0) { - list.add(CORE.GT_Tooltip_Radioactive.get()); + list.add(GTPPCore.GT_Tooltip_Radioactive.get()); } } diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java index 0cee16b3f6..45d0e4f60e 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java @@ -14,7 +14,7 @@ import net.minecraft.world.World; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.block.base.BlockBaseOre; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialStack; import gtPlusPlus.core.util.minecraft.EntityUtils; @@ -76,7 +76,7 @@ public class ItemBlockOre extends ItemBlock { // Radioactive? if (this.mThisRadiation > 0) { - list.add(CORE.GT_Tooltip_Radioactive.get()); + list.add(GTPPCore.GT_Tooltip_Radioactive.get()); } if (this.mThisMaterial != null) { diff --git a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java index 020becc687..6c8e0ce81a 100644 --- a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java +++ b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java @@ -16,8 +16,8 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -48,12 +48,12 @@ public class BaseItemMisc extends Item { } if (description != null) { for (int i = 0; i < description.length; i++) { - GT_LanguageManager + GTLanguageManager .addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".tooltip." + i, description[i]); } } GameRegistry.registerItem(this, this.unlocalName); - GT_OreDictUnificator.registerOre(miscType.getOreDictPrefix() + unlocalName, ItemUtils.getSimpleStack(this)); + GTOreDictUnificator.registerOre(miscType.getOreDictPrefix() + unlocalName, ItemUtils.getSimpleStack(this)); } private String getCorrectTextures() { @@ -95,7 +95,7 @@ public class BaseItemMisc extends Item { public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { for (int i = 0;; i++) { - String tooltip = GT_LanguageManager + String tooltip = GTLanguageManager .getTranslation("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i); if (!("gtplusplus." + this.getUnlocalizedName() + ".tooltip" + "." + i).equals(tooltip)) { list.add(tooltip); diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java index b7d07e5ef0..52cada6e01 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java +++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java @@ -1,15 +1,15 @@ package gtPlusPlus.core.item.base.ore; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.millingRecipes; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -30,26 +30,26 @@ public class BaseItemMilledOre extends BaseOreComponent { ItemStack millingBall_Alumina = GregtechItemList.Milling_Ball_Alumina.get(0); ItemStack millingBall_Soapstone = GregtechItemList.Milling_Ball_Soapstone.get(0); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(10), oreStack, millingBall_Alumina) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(10), oreStack, millingBall_Alumina) .itemOutputs(milledStackOres1) .duration(2 * MINUTES) .eut(materialEU) .addTo(millingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(11), oreStack, millingBall_Soapstone) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(11), oreStack, millingBall_Soapstone) .itemOutputs(milledStackOres2) .duration(2 * MINUTES + 30 * SECONDS) .eut(materialEU) .addTo(millingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(10), crushedStack, millingBall_Alumina) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(10), crushedStack, millingBall_Alumina) .itemOutputs(milledStackCrushed1) .duration(1 * MINUTES) .eut(materialEU) .addTo(millingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(11), crushedStack, millingBall_Soapstone) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(11), crushedStack, millingBall_Soapstone) .itemOutputs(milledStackCrushed2) .duration(1 * MINUTES + 15 * SECONDS) .eut(materialEU) diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java index 2074bb2ede..dd4ad12df8 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java @@ -19,10 +19,10 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.EntityUtils; @@ -54,7 +54,7 @@ public class BaseOreComponent extends Item { this.componentColour = material.getRgbAsHex(); GameRegistry.registerItem(this, this.unlocalName); registerComponent(); - GT_OreDictUnificator + GTOreDictUnificator .registerOre(componentType.getComponent() + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this)); } @@ -127,7 +127,8 @@ public class BaseOreComponent extends Item { list.add(temp); } if (this.componentMaterial.isRadioactive) { - list.add(CORE.GT_Tooltip_Radioactive.get() + " | Level: " + this.componentMaterial.vRadiationLevel); + list.add( + GTPPCore.GT_Tooltip_Radioactive.get() + " | Level: " + this.componentMaterial.vRadiationLevel); } } else { String aChemicalFormula = Material.sChemicalFormula.get(materialName.toLowerCase()); @@ -157,7 +158,7 @@ public class BaseOreComponent extends Item { /** * Rendering Related - * + * * @author Alkalus * */ @@ -179,7 +180,7 @@ public class BaseOreComponent extends Item { this.overlay = par1IconRegister .registerIcon(GTPlusPlus.ID + ":" + "processing/MilledOre/milled_OVERLAY"); } - } else if (CORE.ConfigSwitches.useGregtechTextures) { + } else if (GTPPCore.ConfigSwitches.useGregtechTextures) { // Logger.MATERIALS(this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME+" // is using `"+GregTech.ID + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME+"' as the // layer 0 texture path."); @@ -209,10 +210,10 @@ public class BaseOreComponent extends Item { } return this.componentColour; } else { - if (renderPass == 0 && !CORE.ConfigSwitches.useGregtechTextures) { + if (renderPass == 0 && !GTPPCore.ConfigSwitches.useGregtechTextures) { return this.componentColour; } - if (renderPass == 1 && CORE.ConfigSwitches.useGregtechTextures) { + if (renderPass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) { return Utils.rgbtoHexValue(230, 230, 230); } return this.componentColour; diff --git a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java index 168d5236c6..0279a396de 100644 --- a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java +++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java @@ -11,9 +11,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.EntityUtils; @@ -54,7 +54,7 @@ public class BaseItemPlate_OLD extends Item { .contains("itemplate")) { temp = this.unlocalName.replace("itemP", "p"); if ((temp != null) && !temp.equals("")) { - GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); + GTOreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); } } } @@ -81,7 +81,7 @@ public class BaseItemPlate_OLD extends Item { @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { if (this.sRadiation > 0) { - list.add(CORE.GT_Tooltip_Radioactive.get()); + list.add(GTPPCore.GT_Tooltip_Radioactive.get()); } if (StringUtils.containsSuperOrSubScript(this.chemicalNotation)) { list.add(this.chemicalNotation); diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java index 76121ef266..f1184fb5bb 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java @@ -17,7 +17,7 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import gregtech.api.enums.Mods; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.minecraft.NBTUtils; @@ -47,10 +47,10 @@ public class BaseBauble extends Item implements IBauble { @Override public String getItemStackDisplayName(final ItemStack tItem) { String key = "gtplusplus." + getUnlocalizedName() + ".name"; - if (key.equals(GT_LanguageManager.getTranslation(key))) { + if (key.equals(GTLanguageManager.getTranslation(key))) { return super.getItemStackDisplayName(tItem).replaceAll(".name", ""); } - return GT_LanguageManager.getTranslation(key); + return GTLanguageManager.getTranslation(key); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java index 881146b15d..01cd0ec0c1 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java @@ -19,7 +19,7 @@ import baubles.api.BaubleType; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper; @@ -29,7 +29,7 @@ import ic2.api.item.IElectricItem; public class BatteryPackBaseBauble extends ElectricBaseBauble { public BatteryPackBaseBauble(int tier) { - super(BaubleType.BELT, tier, GT_Values.V[tier] * 20 * 300, "GTPP.BattPack.0" + tier + ".name"); + super(BaubleType.BELT, tier, GTValues.V[tier] * 20 * 300, "GTPP.BattPack.0" + tier + ".name"); String aUnlocalName = "GTPP.BattPack.0" + tier + ".name"; this.setCreativeTab(AddToCreativeTab.tabMachines); if (GameRegistry.findItem(GTPlusPlus.ID, aUnlocalName) == null) { diff --git a/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java index ab17e91232..5717a1e926 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java @@ -20,9 +20,9 @@ import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Mods; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.math.MathUtils; import ic2.api.item.ElectricItem; @@ -112,7 +112,7 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric @Override public final double getTransferLimit(final ItemStack itemStack) { - return GT_Values.V[mTier]; + return GTValues.V[mTier]; } @Override @@ -141,13 +141,13 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric EnumChatFormatting.GRAY + aTier + ": [" + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.getTier(stack)) + + GTUtility.formatNumbers(this.getTier(stack)) + EnumChatFormatting.GRAY + "] " + aInputLimit + ": [" + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.getTransferLimit(stack)) + + GTUtility.formatNumbers(this.getTransferLimit(stack)) + EnumChatFormatting.GRAY + aEUT + "]"); @@ -155,12 +155,12 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric EnumChatFormatting.GRAY + aCurrentPower + ": [" + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.getCharge(stack)) + + GTUtility.formatNumbers(this.getCharge(stack)) + EnumChatFormatting.GRAY + aEU + "] [" + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack))) + + GTUtility.formatNumbers(MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack))) + EnumChatFormatting.GRAY + "%]"); super.addInformation(stack, aPlayer, list, bool); diff --git a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java index c3c371ae35..35adc35e96 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java @@ -18,7 +18,7 @@ import baubles.api.BaubleType; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.CORE_Preloader; +import gtPlusPlus.preloader.PreloaderCore; public class FireProtectionBauble extends BaseBauble { @@ -26,7 +26,7 @@ public class FireProtectionBauble extends BaseBauble { static { isImmuneToFire = ReflectionUtils - .getField(Entity.class, !CORE_Preloader.DEV_ENVIRONMENT ? "func_70045_F" : "isImmuneToFire"); + .getField(Entity.class, !PreloaderCore.DEV_ENVIRONMENT ? "func_70045_F" : "isImmuneToFire"); } public static boolean fireImmune(Entity aEntity) { diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java index 2459e08bfc..4bbf29c88f 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java @@ -6,9 +6,9 @@ import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.semiFluidFuels; @@ -23,16 +23,16 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.ItemPackage; -import gtPlusPlus.core.item.circuit.GTPP_IntegratedCircuit_Item; +import gtPlusPlus.core.item.circuit.GTPPIntegratedCircuitItem; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -152,7 +152,7 @@ public class AgriculturalChem extends ItemPackage { mAlgae = new ItemAlgaeBase(); mAgrichemItem1 = new ItemAgrichemBase(); - mBioCircuit = new GTPP_IntegratedCircuit_Item("BioRecipeSelector", "bioscience/BioCircuit"); + mBioCircuit = new GTPPIntegratedCircuitItem("BioRecipeSelector", "bioscience/BioCircuit"); GregtechItemList.Circuit_BioRecipeSelector.set(mBioCircuit); mAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 0, 1); @@ -422,8 +422,8 @@ public class AgriculturalChem extends ItemPackage { ItemStack aDirtDust = ItemUtils.getSimpleStack(dustDirt, 1); // Poop Juice to Basic Slurry - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(10)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(10)) .itemOutputs(aDirtDust, aDirtDust, aManureByprod1, aManureByprod1, aManureByprod1, aManureByprod1) .outputChances(2000, 2000, 500, 500, 250, 250) .fluidInputs(FluidUtils.getFluidStack(PoopJuice, 1000)) @@ -433,8 +433,8 @@ public class AgriculturalChem extends ItemPackage { .addTo(centrifugeRecipes); // More Efficient way to get byproducts, less Slurry - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(20)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(20)) .itemOutputs(aDirtDust, aDirtDust, aManureByprod1, aManureByprod1, aManureByprod2, aManureByprod2) .outputChances(4000, 3000, 1250, 1250, 675, 675) .fluidInputs(FluidUtils.getFluidStack(PoopJuice, 1000)) @@ -446,7 +446,7 @@ public class AgriculturalChem extends ItemPackage { private static void addAdvancedSlurryRecipes() { - ItemStack aCircuit = GT_Utility.getIntegratedCircuit(10); + ItemStack aCircuit = GTUtility.getIntegratedCircuit(10); ItemStack aBone; ItemStack aMeat; ItemStack aEmptyCells = Materials.Empty.getCells(2); @@ -459,7 +459,7 @@ public class AgriculturalChem extends ItemPackage { for (ItemStack aMeatStack : mList_Master_Meats) { aMeat = ItemUtils.getSimpleStack(aMeatStack, 5); // Poop Juice to Fertile Slurry - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aCircuit, aBone, aMeat, aInputCells) .itemOutputs(aEmptyCells) .fluidInputs(aBloodStack) @@ -481,7 +481,7 @@ public class AgriculturalChem extends ItemPackage { aPeat = ItemUtils.getSimpleStack(aPeatStack, 3); for (ItemStack aMeatStack : mList_Master_Meats) { aMeat = ItemUtils.getSimpleStack(aMeatStack, 5); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aPeat, aMeat) .itemOutputs(aOutputDust) .fluidInputs(aInputFluid) @@ -492,7 +492,7 @@ public class AgriculturalChem extends ItemPackage { aPeat = ItemUtils.getSimpleStack(aPeatStack, 2); for (ItemStack aMeatStack : mList_Master_FruitVege) { aMeat = ItemUtils.getSimpleStack(aMeatStack, 9); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aPeat, aMeat) .itemOutputs(aOutputDust) .fluidInputs(aInputFluid) @@ -512,7 +512,7 @@ public class AgriculturalChem extends ItemPackage { aPeat = ItemUtils.getSimpleStack(aPeatStack, 5); for (ItemStack aMeatStack : mList_Master_Meats) { aMeat = ItemUtils.getSimpleStack(aMeatStack, 7); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aPeat, aMeat) .itemOutputs(aOutputDust) .fluidInputs(aInputFluid) @@ -523,7 +523,7 @@ public class AgriculturalChem extends ItemPackage { aPeat = ItemUtils.getSimpleStack(aPeatStack, 3); for (ItemStack aMeatStack : mList_Master_FruitVege) { aMeat = ItemUtils.getSimpleStack(aMeatStack, 12); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aPeat, aMeat) .itemOutputs(aOutputDust) .fluidInputs(aInputFluid) @@ -558,9 +558,9 @@ public class AgriculturalChem extends ItemPackage { if (aItemInstance instanceof Item aForestryFert) { aFertForestry = ItemUtils.getSimpleStack((Item) aItemInstance); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(11), + GTUtility.getIntegratedCircuit(11), ItemUtils.getSimpleStack(aDustOrganicFert, 4)) .itemOutputs(ItemUtils.getSimpleStack(aForestryFert, 3), aManureByprod, aManureByprod) .outputChances(100_00, 20_00, 20_00) @@ -578,8 +578,8 @@ public class AgriculturalChem extends ItemPackage { * IC2 Support */ aFertIC2 = ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 1); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4)) .itemOutputs(ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 3), aManureByprod, aManureByprod) .outputChances(100_00, 20_00, 20_00) .eut(240) @@ -587,7 +587,7 @@ public class AgriculturalChem extends ItemPackage { .addTo(chemicalDehydratorRecipes); // Dirt Production - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(dustDirt, 9)) .itemOutputs(ItemUtils.getSimpleStack(Blocks.dirt)) .duration(2 * SECONDS) @@ -597,13 +597,13 @@ public class AgriculturalChem extends ItemPackage { // Centrifuge Byproducts // Ammonium Nitrate, Phosphates, Calcium, Copper, Carbon - GT_Values.RA.stdBuilder() - .itemInputs(ItemUtils.getSimpleStack(aManureByprod, 4), GT_Utility.getIntegratedCircuit(20)) + GTValues.RA.stdBuilder() + .itemInputs(ItemUtils.getSimpleStack(aManureByprod, 4), GTUtility.getIntegratedCircuit(20)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphorus, 2L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Calcium, 2L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Copper, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphorus, 2L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Calcium, 2L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Copper, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L), ItemUtils.getSimpleStack(dustDirt, 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAmmoniumNitrate", 1)) .outputChances(2500, 2500, 750, 1000, 5000, 250) @@ -614,21 +614,21 @@ public class AgriculturalChem extends ItemPackage { .addTo(centrifugeRecipes); // Add Fuel Usages - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(FluidUtils.getFluidStack(PoopJuice, 1000)) .duration(0) .eut(0) .metadata(FUEL_VALUE, 12) .addTo(semiFluidFuels); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(FluidUtils.getFluidStack(ManureSlurry, 1000)) .duration(0) .eut(0) .metadata(FUEL_VALUE, 24) .addTo(semiFluidFuels); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(FluidUtils.getFluidStack(FertileManureSlurry, 1000)) .duration(0) .eut(0) @@ -636,15 +636,15 @@ public class AgriculturalChem extends ItemPackage { .addTo(semiFluidFuels); // Red Slurry / Tailings Processing - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedBioCircuit(10)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Copper, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Tin, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Sulfur, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Nickel, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lead, 1L)) + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 1L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Copper, 1L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Tin, 1L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Sulfur, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Nickel, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lead, 1L)) .outputChances(3000, 3000, 2000, 2000, 1000, 1000) .fluidInputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 1000)) .fluidOutputs(Materials.Water.getFluid(500)) diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java index b9f5e58eef..87e5a7b22f 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java @@ -3,11 +3,11 @@ package gtPlusPlus.core.item.chemistry; import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes; import static gregtech.api.recipe.RecipeMaps.distilleryRecipes; import static gregtech.api.recipe.RecipeMaps.pyrolyseRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE; -import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE; +import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.semiFluidFuels; @@ -15,13 +15,13 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeConstants; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeConstants; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; @@ -48,7 +48,7 @@ public class CoalTar extends ItemPackage { // C2H6O = C2H4 + H2O if (bioEth1 != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedBioCircuit(17), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1)) .fluidInputs(bioEth1) @@ -59,7 +59,7 @@ public class CoalTar extends ItemPackage { } if (bioEth2 != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedBioCircuit(18), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1)) .fluidInputs(bioEth2) @@ -72,7 +72,7 @@ public class CoalTar extends ItemPackage { public static void recipeCreateBenzene() { // C7H8 + 2H = CH4 + C6H6 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(Materials.Toluene.getCells(1)) .itemOutputs(Materials.Benzene.getCells(1)) .fluidInputs(Materials.Hydrogen.getGas(2000)) @@ -85,10 +85,8 @@ public class CoalTar extends ItemPackage { public static void recipeCreateEthylbenzene() { // C2H4 + C6H6 = C8H10 - GT_Values.RA.stdBuilder() - .itemInputs( - ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 2), - GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 2), GTUtility.getIntegratedCircuit(1)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2)) .fluidInputs(FluidUtils.getFluidStack("benzene", 2000)) .fluidOutputs(FluidUtils.getFluidStack("fluid.ethylbenzene", 2000)) @@ -96,8 +94,8 @@ public class CoalTar extends ItemPackage { .eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() - .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellBenzene", 2), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellBenzene", 2), GTUtility.getIntegratedCircuit(1)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2)) .fluidInputs(FluidUtils.getFluidStack("ethylene", 2000)) .fluidOutputs(FluidUtils.getFluidStack("fluid.ethylbenzene", 2000)) @@ -108,10 +106,10 @@ public class CoalTar extends ItemPackage { public static void recipeCoalToCoalTar() { // Charcoal - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(8), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 32L)) + GTUtility.getIntegratedCircuit(8), + GTOreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 32L)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDirt", 2)) .fluidOutputs(FluidUtils.getFluidStack("fluid.coaltar", 800)) .duration(18 * SECONDS) @@ -119,10 +117,10 @@ public class CoalTar extends ItemPackage { .addTo(pyrolyseRecipes); // Lignite - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(8), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 16L)) + GTUtility.getIntegratedCircuit(8), + GTOreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 16L)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2)) .fluidOutputs(FluidUtils.getFluidStack("fluid.coaltar", 800)) .duration(54 * SECONDS) @@ -130,10 +128,10 @@ public class CoalTar extends ItemPackage { .addTo(pyrolyseRecipes); // Coal - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(8), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L)) + GTUtility.getIntegratedCircuit(8), + GTOreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2)) .fluidOutputs(FluidUtils.getFluidStack("fluid.coaltar", 2200)) .duration(36 * SECONDS) @@ -141,8 +139,8 @@ public class CoalTar extends ItemPackage { .addTo(pyrolyseRecipes); // Coke - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(8), ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 8)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(8), ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 8)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 3)) .fluidOutputs(FluidUtils.getFluidStack("fluid.coaltar", 3400)) .duration(18 * SECONDS) @@ -158,15 +156,15 @@ public class CoalTar extends ItemPackage { FluidUtils.getFluidStack("liquid_naphtha", 150), FluidUtils.getFluidStack("fluid.ethylbenzene", 200), FluidUtils.getFluidStack("fluid.anthracene", 50), FluidUtils.getFluidStack("fluid.kerosene", 600) }; for (int i = 0; i < distOutputs.length; i++) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(i + 1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(i + 1)) .fluidInputs(FluidUtils.getFluidStack("fluid.coaltar", 1000)) .fluidOutputs(distOutputs[i]) .duration(30 * SECONDS) .eut(64) .addTo(distilleryRecipes); } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(FluidUtils.getFluidStack("fluid.coaltar", 1000)) .fluidOutputs(distOutputs) .duration(15 * SECONDS) @@ -176,7 +174,7 @@ public class CoalTar extends ItemPackage { private static void recipeCoalTarOilToSulfuricOilToNaphthalene() { // SulfuricCoalTarOil - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTarOil", 8), ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 8)) @@ -185,8 +183,8 @@ public class CoalTar extends ItemPackage { .eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(6)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(6)) .fluidInputs(FluidUtils.getFluidStack("fluid.sulfuriccoaltaroil", 1000)) .fluidOutputs(FluidUtils.getFluidStack("fluid.naphthalene", 1000)) .eut(TierEU.RECIPE_LV) @@ -196,7 +194,7 @@ public class CoalTar extends ItemPackage { private static void recipeNaphthaleneToPhthalicAcid() { // SulfuricCoalTarOil - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(Materials.Lithium.getDust(5)) .fluidInputs(FluidUtils.getFluidStack(Naphthalene, 2000)) .fluidOutputs(Materials.PhthalicAcid.getFluid(2500)) @@ -207,7 +205,7 @@ public class CoalTar extends ItemPackage { } private static void recipePhthalicAcidToPhthalicAnhydride() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedBioCircuit(15)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 15)) .fluidInputs(Materials.PhthalicAcid.getFluid(1000)) @@ -234,15 +232,15 @@ public class CoalTar extends ItemPackage { recipePhthalicAcidToPhthalicAnhydride(); // Burn the coal gas! - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalGas", 1)) .metadata(FUEL_VALUE, 96) - .metadata(FUEL_TYPE, GT_RecipeConstants.FuelType.GasTurbine.ordinal()) + .metadata(FUEL_TYPE, GTRecipeConstants.FuelType.GasTurbine.ordinal()) .duration(0) .eut(0) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs( FluidContainerRegistry .getFluidForFilledItem(ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricCoalTarOil", 1))) @@ -251,7 +249,7 @@ public class CoalTar extends ItemPackage { .metadata(FUEL_VALUE, 64) .addTo(semiFluidFuels); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs( FluidContainerRegistry .getFluidForFilledItem(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTarOil", 1))) @@ -260,7 +258,7 @@ public class CoalTar extends ItemPackage { .metadata(FUEL_VALUE, 32) .addTo(semiFluidFuels); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs( FluidContainerRegistry .getFluidForFilledItem(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTar", 1))) diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java index 65bc52739d..99885d77e8 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -2,12 +2,12 @@ package gtPlusPlus.core.item.chemistry; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER; -import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; -import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE; -import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; +import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE; +import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalPlantRecipes; @@ -17,25 +17,25 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TextureSet; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeConstants; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeConstants; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase; -import gtPlusPlus.core.item.circuit.GTPP_IntegratedCircuit_Item; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.item.circuit.GTPPIntegratedCircuitItem; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; +import gtPlusPlus.core.material.MaterialMisc; import gtPlusPlus.core.material.MaterialStack; -import gtPlusPlus.core.material.NONMATERIAL; +import gtPlusPlus.core.material.MaterialsElements; +import gtPlusPlus.core.material.MaterialsOther; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -63,10 +63,10 @@ public class GenericChem extends ItemPackage { false, null, 0, - new MaterialStack(NONMATERIAL.PTFE, 75), - new MaterialStack(NONMATERIAL.PLASTIC, 15), - new MaterialStack(ELEMENT.getInstance().CARBON, 5), - new MaterialStack(ELEMENT.getInstance().SODIUM, 5)); + new MaterialStack(MaterialsOther.PTFE, 75), + new MaterialStack(MaterialsOther.PLASTIC, 15), + new MaterialStack(MaterialsElements.getInstance().CARBON, 5), + new MaterialStack(MaterialsElements.getInstance().SODIUM, 5)); /** * Fluids @@ -146,7 +146,7 @@ public class GenericChem extends ItemPackage { MaterialGenerator.generate(TEFLON, false); mGenericChemItem1 = new ItemGenericChemBase(); - mAdvancedCircuit = new GTPP_IntegratedCircuit_Item("T3RecipeSelector", "science/general/AdvancedCircuit"); + mAdvancedCircuit = new GTPPIntegratedCircuitItem("T3RecipeSelector", "science/general/AdvancedCircuit"); GregtechItemList.Circuit_T3RecipeSelector.set(mAdvancedCircuit); registerItemStacks(); @@ -382,11 +382,11 @@ public class GenericChem extends ItemPackage { private void recipeSodiumEthoxide() { // C2H5OH + Na → C2H5ONa + H - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(16), ELEMENT.getInstance().SODIUM.getDust(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(16), MaterialsElements.getInstance().SODIUM.getDust(1)) .itemOutputs(ItemUtils.getSimpleStack(mSodiumEthoxide, 9)) .fluidInputs(Materials.Ethanol.getFluid(1000)) - .fluidOutputs(ELEMENT.getInstance().HYDROGEN.getFluidStack(1000)) + .fluidOutputs(MaterialsElements.getInstance().HYDROGEN.getFluidStack(1000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(CHEMPLANT_CASING_TIER, 2) @@ -395,9 +395,9 @@ public class GenericChem extends ItemPackage { private void recipePotassiumHydroxide() { // Ca(OH)2 + K2O + CO2 → CaCO3 + 2 KOH - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(18), + GTUtility.getIntegratedCircuit(18), Materials.Potash.getDust(3), ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5)) .itemOutputs( @@ -414,8 +414,8 @@ public class GenericChem extends ItemPackage { private void recipeEthylXanthates() { // Potassium ethyl xanthate - CH3CH2OH + CS2 + KOH → C3H5KOS2 + H2O - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(17), ItemUtils.getSimpleStack(mPotassiumHydroxide, 3)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(17), ItemUtils.getSimpleStack(mPotassiumHydroxide, 3)) .itemOutputs(ItemUtils.getSimpleStack(mPotassiumEthylXanthate, 12)) .fluidInputs(Materials.Ethanol.getFluid(1000), FluidUtils.getFluidStack(Carbon_Disulfide, 1000)) .fluidOutputs(FluidUtils.getWater(1000)) @@ -425,8 +425,8 @@ public class GenericChem extends ItemPackage { .addTo(chemicalPlantRecipes); // Sodium ethyl xanthate - CH3CH2ONa + CS2 → CH3CH2OCS2Na - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(17), ItemUtils.getSimpleStack(mSodiumEthoxide, 9)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(17), ItemUtils.getSimpleStack(mSodiumEthoxide, 9)) .itemOutputs(ItemUtils.getSimpleStack(mSodiumEthylXanthate, 12)) .fluidInputs(FluidUtils.getFluidStack(Carbon_Disulfide, 1000)) .duration(60 * SECONDS) @@ -437,20 +437,20 @@ public class GenericChem extends ItemPackage { private void recipeCarbonDisulfide() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 16L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 16L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1L)) .fluidOutputs(FluidUtils.getFluidStack(Carbon_Disulfide, 4000)) .duration(10 * MINUTES) .eut(TierEU.RECIPE_LV) .metadata(COIL_HEAT, 1500) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(20), + GTUtility.getIntegratedCircuit(20), ItemUtils.getSimpleStack(mBrownCatalyst, 0), ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 4)) .fluidInputs(FluidUtils.getFluidStack(CoalTar.Coal_Gas, 1000)) @@ -465,7 +465,7 @@ public class GenericChem extends ItemPackage { private void recipeMutatedLivingSolder() { // Endgame soldering alloy meant for the bioware circuit line and beyond. - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mInfiniteMutationCatalyst, 0), ItemList.Circuit_Chip_Biocell.get(64), @@ -475,7 +475,7 @@ public class GenericChem extends ItemPackage { FluidUtils.getFluidStack("plasma.tin", 18000), FluidUtils.getFluidStack("plasma.bismuth", 18000), FluidUtils.getFluidStack("cryotheum", 4000)) - .fluidOutputs(MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 280)) + .fluidOutputs(MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(144 * 280)) .duration(13 * MINUTES + 20 * SECONDS) .eut(3842160) .metadata(CHEMPLANT_CASING_TIER, 7) @@ -488,18 +488,18 @@ public class GenericChem extends ItemPackage { // Burnables // Gas Fuels - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellNitrobenzene", 1)) .metadata(FUEL_VALUE, 1600) .metadata(FUEL_TYPE, 1) .duration(0) .eut(0) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); } private void recipeGrindingBallAlumina() { - GT_Values.RA.stdBuilder() - .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 64), GT_Utility.getIntegratedCircuit(10)) + GTValues.RA.stdBuilder() + .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 64), GTUtility.getIntegratedCircuit(10)) .itemOutputs(ItemUtils.getSimpleStack(mMillingBallAlumina, 8)) .fluidInputs(FluidUtils.getFluidStack(GenericChem.Aniline, 4000)) .duration(3 * MINUTES) @@ -508,10 +508,10 @@ public class GenericChem extends ItemPackage { } private void recipeGrindingBallSoapstone() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Soapstone, 32L), - GT_Utility.getIntegratedCircuit(10)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Soapstone, 32L), + GTUtility.getIntegratedCircuit(10)) .itemOutputs(ItemUtils.getSimpleStack(mMillingBallSoapstone, 8)) .fluidInputs(FluidUtils.getFluidStack(AgrichemFluids.mLiquidResin, 2500)) .duration(2 * MINUTES) @@ -522,7 +522,7 @@ public class GenericChem extends ItemPackage { private void recipeCyclohexane() { // C6H6 + 6H = C6H12 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getTierTwoChip(), ItemUtils.getSimpleStack(mBrownCatalyst, 0)) .fluidInputs(FluidUtils.getFluidStack(Benzene, 1000), FluidUtils.getFluidStack("hydrogen", 6000)) .fluidOutputs(FluidUtils.getFluidStack(Cyclohexane, 1000)) @@ -536,7 +536,7 @@ public class GenericChem extends ItemPackage { private void recipeCyclohexanone() { // C6H12 + 2O(Air) = C6H10O + H2O - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getTierTwoChip(), ItemUtils.getSimpleStack(mBlueCatalyst, 0)) .fluidInputs(FluidUtils.getFluidStack(Cyclohexane, 1000), FluidUtils.getFluidStack("air", 4000)) .fluidOutputs(FluidUtils.getFluidStack(Cyclohexanone, 1000)) @@ -544,7 +544,7 @@ public class GenericChem extends ItemPackage { .eut(TierEU.RECIPE_MV) .metadata(CHEMPLANT_CASING_TIER, 2) .addTo(chemicalPlantRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getTierTwoChip()) .fluidInputs(FluidUtils.getFluidStack(Cyclohexane, 1000), FluidUtils.getFluidStack("oxygen", 2000)) .fluidOutputs(FluidUtils.getFluidStack(Cyclohexanone, 1000)) @@ -557,12 +557,12 @@ public class GenericChem extends ItemPackage { private void recipeCatalystRed() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierOneChip(), CI.getEmptyCatalyst(10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 2L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 2L)) .itemOutputs(ItemUtils.getSimpleStack(mRedCatalyst, 10)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) @@ -571,12 +571,12 @@ public class GenericChem extends ItemPackage { private void recipeCatalystYellow() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierThreeChip(), CI.getEmptyCatalyst(10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4L)) .itemOutputs(ItemUtils.getSimpleStack(mYellowCatalyst, 10)) .duration(1 * MINUTES) .eut(TierEU.RECIPE_EV) @@ -585,12 +585,12 @@ public class GenericChem extends ItemPackage { private void recipeCatalystBlue() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierTwoChip(), CI.getEmptyCatalyst(10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 3L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 3L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 3L)) .itemOutputs(ItemUtils.getSimpleStack(mBlueCatalyst, 10)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_HV) @@ -599,12 +599,12 @@ public class GenericChem extends ItemPackage { private void recipeCatalystOrange() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierTwoChip(), CI.getEmptyCatalyst(10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 5L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 5L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 5L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 5L)) .itemOutputs(ItemUtils.getSimpleStack(mOrangeCatalyst, 10)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_HV) @@ -613,12 +613,12 @@ public class GenericChem extends ItemPackage { private void recipeCatalystPurple() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierFourChip(), CI.getEmptyCatalyst(10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 6L), - ELEMENT.getInstance().RUTHENIUM.getDust(6)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 6L), + MaterialsElements.getInstance().RUTHENIUM.getDust(6)) .itemOutputs(ItemUtils.getSimpleStack(mPurpleCatalyst, 10)) .duration(2 * MINUTES) .eut(TierEU.RECIPE_IV) @@ -627,12 +627,12 @@ public class GenericChem extends ItemPackage { private void recipeCatalystBrown() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierOneChip(), CI.getEmptyCatalyst(10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L)) .itemOutputs(ItemUtils.getSimpleStack(mBrownCatalyst, 10)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_LV) @@ -641,12 +641,12 @@ public class GenericChem extends ItemPackage { private void recipeCatalystPink() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierThreeChip(), CI.getEmptyCatalyst(10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L), - ELEMENT.getInstance().RHODIUM.getDust(4)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L), + MaterialsElements.getInstance().RHODIUM.getDust(4)) .itemOutputs(ItemUtils.getSimpleStack(mPinkCatalyst, 10)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) @@ -655,7 +655,7 @@ public class GenericChem extends ItemPackage { private void recipeCatalystFormaldehyde() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierThreeChip(), CI.getEmptyCatalyst(4), @@ -668,13 +668,13 @@ public class GenericChem extends ItemPackage { private void recipeCatalystSolidAcid() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierThreeChip(), CI.getEmptyCatalyst(5), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 2L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 2L)) .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 5)) - .fluidInputs(MISC_MATERIALS.SOLID_ACID_MIXTURE.getFluidStack(1000)) + .fluidInputs(MaterialMisc.SOLID_ACID_MIXTURE.getFluidStack(1000)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); @@ -682,12 +682,12 @@ public class GenericChem extends ItemPackage { private void recipeCatalystInfiniteMutation() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierThreeChip(), CI.getEmptyCatalyst(5), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 10L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 10L)) .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mInfiniteMutationCatalyst, 5)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_UHV) @@ -697,7 +697,7 @@ public class GenericChem extends ItemPackage { private void recipeCadaverineAndPutrescine() { // Basic Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getTierOneChip(), ItemUtils.getSimpleStack(Items.rotten_flesh, 64)) .fluidInputs(FluidUtils.getHotWater(2000)) .fluidOutputs(FluidUtils.getFluidStack(Cadaverine, 250), FluidUtils.getFluidStack(Putrescine, 250)) @@ -706,7 +706,7 @@ public class GenericChem extends ItemPackage { .metadata(CHEMPLANT_CASING_TIER, 1) .addTo(chemicalPlantRecipes); // Advanced Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getTierTwoChip(), ItemUtils.getSimpleStack(Items.rotten_flesh, 128), @@ -723,7 +723,7 @@ public class GenericChem extends ItemPackage { private void recipeAniline() { // C6H5NO2 + 6H = C6H7N + 2H2O - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getTierThreeChip(), ItemUtils.getSimpleStack(mBlueCatalyst, 0)) .fluidInputs(FluidUtils.getFluidStack(NitroBenzene, 1000), FluidUtils.getFluidStack("hydrogen", 6000)) .fluidOutputs(FluidUtils.getFluidStack(Aniline, 1000)) @@ -737,7 +737,7 @@ public class GenericChem extends ItemPackage { private void recipeNitroBenzene() { // C6H6 + HNO3 =H2SO4= C6H5NO2 +H2O - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getTierThreeChip()) .fluidInputs( FluidUtils.getFluidStack(Benzene, 5000), @@ -755,9 +755,9 @@ public class GenericChem extends ItemPackage { private void recipe2Ethylanthraquinone() { // C6H4(CO)2O + C6H5CH2CH3 = C6H4(CO)2C6H3CH2CH3 + H2O - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(4), + GTUtility.getIntegratedCircuit(4), ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 15)) .fluidInputs(FluidUtils.getFluidStack(CoalTar.Ethylbenzene, 1000)) .fluidOutputs(FluidUtils.getFluidStack(Ethylanthraquinone2, 1000)) @@ -771,8 +771,8 @@ public class GenericChem extends ItemPackage { private void recipe2Ethylanthrahydroquinone() { // C6H4(CO)2C6H3CH2CH3 + 2H = C6H4(COH)2C6H3CH2CH3 - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(4), ItemUtils.getSimpleStack(mOrangeCatalyst, 0)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(4), ItemUtils.getSimpleStack(mOrangeCatalyst, 0)) .fluidInputs( FluidUtils.getFluidStack(Ethylanthraquinone2, 1000), FluidUtils.getFluidStack("hydrogen", 2000)) @@ -786,7 +786,7 @@ public class GenericChem extends ItemPackage { private void recipeLithiumPeroxide() { // 2HLiO2 = Li2O2 + H2O2 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 8)) .fluidOutputs(FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumPeroxide", 4)) @@ -799,9 +799,9 @@ public class GenericChem extends ItemPackage { private void recipeLithiumHydroperoxide() { // LiOH + H2O2 = HLiO2 + H2O - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(4), + GTUtility.getIntegratedCircuit(4), ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 3)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 4)) .fluidInputs(FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000)) @@ -815,8 +815,8 @@ public class GenericChem extends ItemPackage { private void recipeHydrogenPeroxide() { // C6H4(COH)2C6H3CH2CH3 + 2O =(C6H4CH)2= H2O2 + C6H4(CO)2C6H3CH2CH3 - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(4)) .fluidInputs( FluidUtils.getFluidStack("air", 20000), FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 5000), @@ -828,8 +828,8 @@ public class GenericChem extends ItemPackage { .eut(240) .metadata(CHEMPLANT_CASING_TIER, 1) .addTo(chemicalPlantRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(4)) .fluidInputs( Materials.Oxygen.getGas(10000), FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 5000), @@ -861,7 +861,7 @@ public class GenericChem extends ItemPackage { } private static void recipeAdvancedChip() { - GT_ModHandler.addShapelessCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 0L), 0, new Object[] { OrePrefixes.circuit.get(Materials.HV) }); diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java index d4f5e832f6..c7738751c2 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java @@ -15,7 +15,7 @@ import net.minecraft.util.IIcon; import gregtech.api.enums.Materials; import gtPlusPlus.core.item.base.misc.BaseItemParticle; -import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.util.Utils; public class IonParticles extends BaseItemParticle { @@ -24,16 +24,16 @@ public class IonParticles extends BaseItemParticle { public static HashMap<Integer, String> MetaToNameMap = new HashMap<>(); public IonParticles() { - super("Ion", ELEMENT.NAMES.length, EnumRarity.rare); + super("Ion", MaterialsElements.NAMES.length, EnumRarity.rare); } - public static IIcon[] overlays = new IIcon[ELEMENT.NAMES.length]; + public static IIcon[] overlays = new IIcon[MaterialsElements.NAMES.length]; public static IIcon baseTexture; static { // Generate Ions int key = 0; - for (String s : ELEMENT.NAMES) { + for (String s : MaterialsElements.NAMES) { // Map names to Meta NameToMetaMap.put(Utils.sanitizeString(s.toLowerCase()), key); MetaToNameMap.put(key, Utils.sanitizeString(s.toLowerCase())); @@ -60,7 +60,7 @@ public class IonParticles extends BaseItemParticle { @Override public String getUnlocalizedName(final ItemStack itemStack) { - return "item.particle.ion" + "." + ELEMENT.NAMES[itemStack.getItemDamage()]; + return "item.particle.ion" + "." + MaterialsElements.NAMES[itemStack.getItemDamage()]; } private static boolean createNBT(ItemStack rStack) { diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java index 5979fc76ef..078dcdee88 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java @@ -2,10 +2,10 @@ package gtPlusPlus.core.item.chemistry; import static gregtech.api.enums.Mods.BiomesOPlenty; import static gregtech.api.enums.Mods.Forestry; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER; -import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.*; import java.util.HashMap; @@ -14,27 +14,27 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.api.objects.data.Quad; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.item.base.ore.BaseItemMilledOre; -import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.material.NONMATERIAL; +import gtPlusPlus.core.material.MaterialsElements; +import gtPlusPlus.core.material.MaterialsOther; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.minecraft.NBTUtils; -import gtPlusPlus.xmod.bop.HANDLER_BiomesOPlenty; -import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; +import gtPlusPlus.xmod.bop.BiomesOPlentyHandler; +import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator; import gtPlusPlus.xmod.gregtech.common.helpers.FlotationRecipeHandler; public class MilledOreProcessing extends ItemPackage { @@ -217,57 +217,57 @@ public class MilledOreProcessing extends ItemPackage { // milledSphalerite registerOreDataForMilledType( SphaleriteFlotationFroth, - ELEMENT.getInstance().ZINC, + MaterialsElements.getInstance().ZINC, 180, - ELEMENT.getInstance().IRON, + MaterialsElements.getInstance().IRON, 120, - ELEMENT.getInstance().INDIUM, + MaterialsElements.getInstance().INDIUM, 64, - ELEMENT.getInstance().GERMANIUM, + MaterialsElements.getInstance().GERMANIUM, 15); // milledChalcopyrite registerOreDataForMilledType( ChalcopyriteFlotationFroth, - ELEMENT.getInstance().COPPER, + MaterialsElements.getInstance().COPPER, 180, - ELEMENT.getInstance().IRON, + MaterialsElements.getInstance().IRON, 120, - ELEMENT.getInstance().CADMIUM, + MaterialsElements.getInstance().CADMIUM, 50, - ELEMENT.getInstance().INDIUM, + MaterialsElements.getInstance().INDIUM, 10); // milledNickel registerOreDataForMilledType( NickelFlotationFroth, - ELEMENT.getInstance().NICKEL, + MaterialsElements.getInstance().NICKEL, 150, - ELEMENT.getInstance().COBALT, + MaterialsElements.getInstance().COBALT, 120, - ELEMENT.getInstance().RHODIUM, + MaterialsElements.getInstance().RHODIUM, 32, - ELEMENT.getInstance().RUTHENIUM, + MaterialsElements.getInstance().RUTHENIUM, 16); // milledPlatinum registerOreDataForMilledType( PlatinumFlotationFroth, - ELEMENT.getInstance().PLATINUM, + MaterialsElements.getInstance().PLATINUM, 120, - ELEMENT.getInstance().RHODIUM, + MaterialsElements.getInstance().RHODIUM, 60, - ELEMENT.getInstance().SELENIUM, + MaterialsElements.getInstance().SELENIUM, 40, - ELEMENT.getInstance().TELLURIUM, + MaterialsElements.getInstance().TELLURIUM, 10); // milledPentlandite registerOreDataForMilledType( PentlanditeFlotationFroth, - ELEMENT.getInstance().IRON, + MaterialsElements.getInstance().IRON, 150, - ELEMENT.getInstance().NICKEL, + MaterialsElements.getInstance().NICKEL, 100, - ELEMENT.getInstance().PROMETHIUM, + MaterialsElements.getInstance().PROMETHIUM, 20, - ELEMENT.getInstance().HAFNIUM, + MaterialsElements.getInstance().HAFNIUM, 10); /* @@ -276,68 +276,68 @@ public class MilledOreProcessing extends ItemPackage { // milledRedstone registerOreDataForMilledType( RedstoneFlotationFroth, - NONMATERIAL.REDSTONE, + MaterialsOther.REDSTONE, 300, - ELEMENT.getInstance().CHROMIUM, + MaterialsElements.getInstance().CHROMIUM, 60, MaterialUtils.generateMaterialFromGtENUM(Materials.Firestone), 45, - ELEMENT.getInstance().DYSPROSIUM, + MaterialsElements.getInstance().DYSPROSIUM, 16); // milledSpessartine registerOreDataForMilledType( SpessartineFlotationFroth, - ELEMENT.getInstance().MANGANESE, + MaterialsElements.getInstance().MANGANESE, 150, - ELEMENT.getInstance().ALUMINIUM, + MaterialsElements.getInstance().ALUMINIUM, 90, - ELEMENT.getInstance().OSMIUM, + MaterialsElements.getInstance().OSMIUM, 30, - ELEMENT.getInstance().STRONTIUM, + MaterialsElements.getInstance().STRONTIUM, 20); // milledGrossular registerOreDataForMilledType( GrossularFlotationFroth, - ELEMENT.getInstance().CALCIUM, + MaterialsElements.getInstance().CALCIUM, 180, - ELEMENT.getInstance().ALUMINIUM, + MaterialsElements.getInstance().ALUMINIUM, 110, - ELEMENT.getInstance().TUNGSTEN, + MaterialsElements.getInstance().TUNGSTEN, 60, - ELEMENT.getInstance().THALLIUM, + MaterialsElements.getInstance().THALLIUM, 15); // milledAlmandine registerOreDataForMilledType( AlmandineFlotationFroth, - ELEMENT.getInstance().ALUMINIUM, + MaterialsElements.getInstance().ALUMINIUM, 150, - ELEMENT.getInstance().MAGNESIUM, + MaterialsElements.getInstance().MAGNESIUM, 75, - ELEMENT.getInstance().YTTRIUM, + MaterialsElements.getInstance().YTTRIUM, 25, - ELEMENT.getInstance().YTTERBIUM, + MaterialsElements.getInstance().YTTERBIUM, 15); // milledPyrope registerOreDataForMilledType( PyropeFlotationFroth, - ELEMENT.getInstance().MAGNESIUM, + MaterialsElements.getInstance().MAGNESIUM, 110, - ELEMENT.getInstance().MANGANESE, + MaterialsElements.getInstance().MANGANESE, 70, MaterialUtils.generateMaterialFromGtENUM(Materials.Borax), 60, - ELEMENT.getInstance().RHENIUM, + MaterialsElements.getInstance().RHENIUM, 20); // milledMonazite TODO registerOreDataForMilledType( MonaziteFlotationFroth, - ELEMENT.getInstance().ERBIUM, + MaterialsElements.getInstance().ERBIUM, 64, - ELEMENT.getInstance().LANTHANUM, + MaterialsElements.getInstance().LANTHANUM, 32, - ELEMENT.getInstance().LUTETIUM, + MaterialsElements.getInstance().LUTETIUM, 16, - ELEMENT.getInstance().EUROPIUM, + MaterialsElements.getInstance().EUROPIUM, 8); } @@ -358,8 +358,8 @@ public class MilledOreProcessing extends ItemPackage { private void addVacuumFurnaceRecipes() { int aCircuitID = 1; - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(SphaleriteFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(SphaleriteFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -367,8 +367,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 5500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(ChalcopyriteFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(ChalcopyriteFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -376,8 +376,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 4500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(NickelFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(NickelFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -385,8 +385,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 4500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(PlatinumFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(PlatinumFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -394,8 +394,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 5500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(PentlanditeFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(PentlanditeFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -403,8 +403,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 5500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(RedstoneFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(RedstoneFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -412,8 +412,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 4500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(SpessartineFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(SpessartineFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -421,8 +421,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 5500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(GrossularFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(GrossularFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -430,8 +430,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 5500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(AlmandineFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(AlmandineFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -439,8 +439,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 5500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(PyropeFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(PyropeFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -448,8 +448,8 @@ public class MilledOreProcessing extends ItemPackage { .metadata(COIL_HEAT, 3500) .duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(aCircuitID++)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++)) .itemOutputs(getOutputsFromMap(MonaziteFlotationFroth)) .fluidInputs(FluidUtils.getFluidStack(MonaziteFlotationFroth, 4000)) .fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)) @@ -466,7 +466,7 @@ public class MilledOreProcessing extends ItemPackage { // Sphalerite Material aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Sphalerite); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 32), aMat.getMilled(64), @@ -482,7 +482,7 @@ public class MilledOreProcessing extends ItemPackage { // Chalcopyrite aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Chalcopyrite); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 32), aMat.getMilled(64), @@ -498,7 +498,7 @@ public class MilledOreProcessing extends ItemPackage { // Nickel aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Nickel); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 32), aMat.getMilled(64), @@ -514,7 +514,7 @@ public class MilledOreProcessing extends ItemPackage { // Platinum aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Platinum); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 32), aMat.getMilled(64), @@ -530,7 +530,7 @@ public class MilledOreProcessing extends ItemPackage { // Pentlandite aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Pentlandite); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 32), aMat.getMilled(64), @@ -546,7 +546,7 @@ public class MilledOreProcessing extends ItemPackage { // Redstone aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Redstone); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 32), aMat.getMilled(64), @@ -562,7 +562,7 @@ public class MilledOreProcessing extends ItemPackage { // Spessartine aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Spessartine); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 32), aMat.getMilled(64), @@ -578,7 +578,7 @@ public class MilledOreProcessing extends ItemPackage { // Grossular aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Grossular); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 32), aMat.getMilled(64), @@ -594,7 +594,7 @@ public class MilledOreProcessing extends ItemPackage { // Almandine aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Almandine); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 32), aMat.getMilled(64), @@ -610,7 +610,7 @@ public class MilledOreProcessing extends ItemPackage { // Pyrope aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Pyrope); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 32), aMat.getMilled(64), @@ -626,7 +626,7 @@ public class MilledOreProcessing extends ItemPackage { // Monazite aMat = MaterialUtils.generateMaterialFromGtENUM(Materials.Monazite); FlotationRecipeHandler.registerOreType(aMat); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 32), aMat.getMilled(64), @@ -648,16 +648,16 @@ public class MilledOreProcessing extends ItemPackage { ItemStack aCrushedPine = ItemUtils.getSimpleStack(AgriculturalChem.mCrushedPine, 1); - aLogs.add(ItemUtils.getSimpleStack(BOP_Block_Registrator.log_Pine)); - aLeaves.add(ItemUtils.getSimpleStack(BOP_Block_Registrator.leaves_Pine)); - aSaplings.add(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Pine)); + aLogs.add(ItemUtils.getSimpleStack(BOPBlockRegistrator.log_Pine)); + aLeaves.add(ItemUtils.getSimpleStack(BOPBlockRegistrator.leaves_Pine)); + aSaplings.add(ItemUtils.getSimpleStack(BOPBlockRegistrator.sapling_Pine)); aPinecones.add(ItemUtils.getSimpleStack(AgriculturalChem.mPinecone, 1)); if (BiomesOPlenty.isModLoaded()) { - aLogs.add(HANDLER_BiomesOPlenty.getStack(HANDLER_BiomesOPlenty.logs4, 0, 1)); - aLeaves.add(HANDLER_BiomesOPlenty.getStack(HANDLER_BiomesOPlenty.colorizedLeaves2, 1, 1)); - aSaplings.add(HANDLER_BiomesOPlenty.getStack(HANDLER_BiomesOPlenty.colorizedSaplings, 5, 1)); - aPinecones.add(ItemUtils.simpleMetaStack(HANDLER_BiomesOPlenty.mPineCone, 13, 1)); + aLogs.add(BiomesOPlentyHandler.getStack(BiomesOPlentyHandler.logs4, 0, 1)); + aLeaves.add(BiomesOPlentyHandler.getStack(BiomesOPlentyHandler.colorizedLeaves2, 1, 1)); + aSaplings.add(BiomesOPlentyHandler.getStack(BiomesOPlentyHandler.colorizedSaplings, 5, 1)); + aPinecones.add(ItemUtils.simpleMetaStack(BiomesOPlentyHandler.mPineCone, 13, 1)); } if (Forestry.isModLoaded()) { ItemStack aForestryLog = ItemUtils.getItemStackFromFQRN("Forestry:logs", 1); @@ -690,7 +690,7 @@ public class MilledOreProcessing extends ItemPackage { addRecipe(aCone, ItemUtils.getSimpleStack(aCrushedPine, 1), new int[] { 7500, 7500, 5000, 2500 }, 10, 60); } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedAdvancedCircuit(16), ItemUtils.getSimpleStack(aCrushedPine, 64)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 5), @@ -703,7 +703,7 @@ public class MilledOreProcessing extends ItemPackage { .eut(TierEU.RECIPE_MV) .metadata(CHEMPLANT_CASING_TIER, 3) .addTo(chemicalPlantRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedAdvancedCircuit(18), ItemUtils.getSimpleStack(aCrushedPine, 64)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 5), @@ -720,18 +720,18 @@ public class MilledOreProcessing extends ItemPackage { } public boolean addRecipe(ItemStack aInput, ItemStack aOutput1, int[] aChances, int aTime, int aEU) { - aOutput1 = GT_OreDictUnificator.get(true, aOutput1); + aOutput1 = GTOreDictUnificator.get(true, aOutput1); ItemStack aOutputs[] = new ItemStack[4]; for (int i = 0; i < aChances.length; i++) { aOutputs[i] = aOutput1; } aOutputs = cleanArray(aOutputs); - if ((GT_Utility.isStackInvalid(aInput)) - || (GT_Utility.isStackInvalid(aOutput1) || (GT_Utility.getContainerItem(aInput, false) != null))) { + if ((GTUtility.isStackInvalid(aInput)) + || (GTUtility.isStackInvalid(aOutput1) || (GTUtility.getContainerItem(aInput, false) != null))) { return false; } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedAdvancedCircuit(14), aInput) .itemOutputs(aOutputs) .duration(aTime * 20) diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java index d83b5a7cea..db408721fc 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java @@ -1,17 +1,17 @@ package gtPlusPlus.core.item.chemistry; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -92,10 +92,10 @@ public class NuclearChem extends ItemPackage { } private static void chemReactor_CreateMutagen() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 2), - GT_Utility.getIntegratedCircuit(20)) + GTOreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 2), + GTUtility.getIntegratedCircuit(20)) .fluidInputs(FluidRegistry.getFluidStack("mobessence", 5000)) .fluidOutputs(FluidUtils.getFluidStack(GeneticMutagen, 8000)) .duration(30 * SECONDS) diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java index 6cf0dcd09b..4a7291bb21 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -3,9 +3,9 @@ package gtPlusPlus.core.item.chemistry; import static gregtech.api.recipe.RecipeMaps.distilleryRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalPlantRecipes; @@ -19,13 +19,13 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.item.base.BaseItemComponent; @@ -74,8 +74,8 @@ public class RocketFuels extends ItemPackage { FluidStack fuelB = FluidUtils.getFluidStack("fuel", 3000); if (fuelA != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(23)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(23)) .fluidInputs(fuelA) .fluidOutputs(FluidUtils.getFluidStack(Kerosene, 1800)) .duration(10 * SECONDS) @@ -83,8 +83,8 @@ public class RocketFuels extends ItemPackage { .addTo(distilleryRecipes); } if (fuelA == null && fuelB != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(23)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(23)) .fluidInputs(fuelB) .fluidOutputs(FluidUtils.getFluidStack(Kerosene, 1800)) .duration(10 * SECONDS) @@ -96,8 +96,8 @@ public class RocketFuels extends ItemPackage { public static void createRP1() { FluidStack fuelA = FluidUtils.getFluidStack(Kerosene, 1000); if (fuelA != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(23)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(23)) .fluidInputs(fuelA) .fluidOutputs(FluidUtils.getFluidStack(RP1, 750)) .duration(40 * SECONDS) @@ -108,7 +108,7 @@ public class RocketFuels extends ItemPackage { public static void createNitrogenTetroxide() { // 2HNO3 + Cu = N2O4 + H2O + CuO - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1), ItemUtils.getSimpleStack(GenericChem.mOrangeCatalyst, 0)) @@ -125,8 +125,8 @@ public class RocketFuels extends ItemPackage { public static void createHydrazine() { // H2O2 + 2NH3 = N2H4 + 2H2O - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(21)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(21)) .fluidInputs( FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000), FluidUtils.getFluidStack("ammonia", 2000)) @@ -141,8 +141,8 @@ public class RocketFuels extends ItemPackage { public static void createMonomethylhydrazine() { // C + 2H + N2H4 = CH6N2 - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(21), ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(21), ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1)) .fluidInputs(FluidUtils.getFluidStack("hydrogen", 2000), FluidUtils.getFluidStack(Hydrazine, 1000)) .fluidOutputs(FluidUtils.getFluidStack(Monomethylhydrazine, 1000)) .duration(48 * SECONDS) @@ -153,7 +153,7 @@ public class RocketFuels extends ItemPackage { } private static void createLOH() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellLiquidHydrogen", 1)) .duration(16 * SECONDS) @@ -164,7 +164,7 @@ public class RocketFuels extends ItemPackage { private static void createHydratedAmmoniumNitrateSlurry() { // NH3 + HNO3 = NH4NO3 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedAdvancedCircuit(21)) .fluidInputs(FluidUtils.getFluidStack("ammonia", 4000), FluidUtils.getFluidStack("nitricacid", 4000)) .fluidOutputs(FluidUtils.getFluidStack(Hydrated_Ammonium_Nitrate_Slurry, 5184)) @@ -176,8 +176,8 @@ public class RocketFuels extends ItemPackage { } private static void createAmmoniumNitrateDust() { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(8)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(8)) .itemOutputs(ItemUtils.getSimpleStack(Ammonium_Nitrate_Dust, 8)) .fluidInputs(FluidUtils.getFluidStack(Hydrated_Ammonium_Nitrate_Slurry, 8 * 144)) .fluidOutputs(FluidUtils.getWater(2000)) @@ -189,7 +189,7 @@ public class RocketFuels extends ItemPackage { private static void createFormaldehyde() { // O + CH4O = CH2O + H2O - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(21), ItemUtils.getSimpleStack(GenericChem.mFormaldehydeCatalyst, 0)) @@ -203,11 +203,11 @@ public class RocketFuels extends ItemPackage { } private static void createFormaldehydeCatalyst() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 16L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 1L), - GT_Utility.getIntegratedCircuit(18)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 16L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 1L), + GTUtility.getIntegratedCircuit(18)) .itemOutputs(ItemUtils.getSimpleStack(Formaldehyde_Catalyst_Dust, 4)) .duration(8 * SECONDS) .eut(TierEU.RECIPE_LV) @@ -216,7 +216,7 @@ public class RocketFuels extends ItemPackage { private static void createUnsymmetricalDimethylhydrazine() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(21), ItemUtils.getSimpleStack(GenericChem.mFormaldehydeCatalyst, 0)) @@ -233,10 +233,10 @@ public class RocketFuels extends ItemPackage { } private static void addRocketFuelsToMap() { - HashMap<Integer, GT_Recipe> mRocketFuels = new LinkedHashMap<>(); + HashMap<Integer, GTRecipe> mRocketFuels = new LinkedHashMap<>(); mRocketFuels.put( 0, - new GT_Recipe( + new GTRecipe( true, new ItemStack[] {}, new ItemStack[] {}, @@ -250,7 +250,7 @@ public class RocketFuels extends ItemPackage { mRocketFuels.put( 1, - new GT_Recipe( + new GTRecipe( true, new ItemStack[] {}, new ItemStack[] {}, @@ -264,7 +264,7 @@ public class RocketFuels extends ItemPackage { mRocketFuels.put( 2, - new GT_Recipe( + new GTRecipe( true, new ItemStack[] {}, new ItemStack[] {}, @@ -278,7 +278,7 @@ public class RocketFuels extends ItemPackage { mRocketFuels.put( 3, - new GT_Recipe( + new GTRecipe( true, new ItemStack[] {}, new ItemStack[] {}, @@ -296,7 +296,7 @@ public class RocketFuels extends ItemPackage { mValidRocketFuelNames.add(FluidRegistry.getFluidName(Diesel)); for (int mID : mRocketFuels.keySet()) { - GT_Recipe aFuelRecipe = mRocketFuels.get(mID); + GTRecipe aFuelRecipe = mRocketFuels.get(mID); if (aFuelRecipe != null) { mValidRocketFuelNames.add(FluidRegistry.getFluidName(aFuelRecipe.mFluidInputs[0].getFluid())); mValidRocketFuels.put(mID, aFuelRecipe.mFluidInputs[0].getFluid()); @@ -308,8 +308,8 @@ public class RocketFuels extends ItemPackage { private static void createRocketFuels() { // RP1_Plus_Liquid_Oxygen - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) .fluidInputs(FluidUtils.getFluidStack(Liquid_Oxygen, 2000), FluidUtils.getFluidStack(RP1, 500)) .fluidOutputs(FluidUtils.getFluidStack(RP1_Plus_Liquid_Oxygen, 1500)) .duration(15 * SECONDS) @@ -317,8 +317,8 @@ public class RocketFuels extends ItemPackage { .metadata(CHEMPLANT_CASING_TIER, 3) .addTo(chemicalPlantRecipes); // Dense_Hydrazine_Mix - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(2)) .fluidInputs(FluidUtils.getFluidStack(Hydrazine, 4000), FluidUtils.getFluidStack("methanol", 6000)) .fluidOutputs(FluidUtils.getFluidStack(Dense_Hydrazine_Mix, 10000)) .duration(30 * SECONDS) @@ -326,8 +326,8 @@ public class RocketFuels extends ItemPackage { .metadata(CHEMPLANT_CASING_TIER, 4) .addTo(chemicalPlantRecipes); // Monomethylhydrazine_Plus_Nitric_Acid - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(3)) .fluidInputs( FluidUtils.getFluidStack(Monomethylhydrazine, 2000), FluidUtils.getFluidStack("nitricacid", 1000)) @@ -337,8 +337,8 @@ public class RocketFuels extends ItemPackage { .metadata(CHEMPLANT_CASING_TIER, 5) .addTo(chemicalPlantRecipes); // Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(4)) .fluidInputs( FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine, 2000), FluidUtils.getFluidStack(Nitrogen_Tetroxide, 2000)) diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java index 8ef674ac19..038a1ea8ce 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java @@ -17,7 +17,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.item.chemistry.GenericChem; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -270,10 +270,10 @@ public class ItemGenericChemBase extends Item { } public static int getMaxBallDurability(ItemStack aStack) { - if (GT_Utility.areStacksEqual(aStack, GenericChem.mMillingBallAlumina, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mMillingBallAlumina, true)) { return 100; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mMillingBallSoapstone, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mMillingBallSoapstone, true)) { return 50; } return 0; diff --git a/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java b/src/main/java/gtPlusPlus/core/item/circuit/GTPPIntegratedCircuitItem.java index 11bbac53a3..e616004ec1 100644 --- a/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java +++ b/src/main/java/gtPlusPlus/core/item/circuit/GTPPIntegratedCircuitItem.java @@ -29,25 +29,25 @@ import org.apache.commons.lang3.tuple.Pair; import com.gtnewhorizons.modularui.api.UIInfos; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.interfaces.INetworkUpdatableItem; -import gregtech.api.net.GT_Packet_UpdateItem; +import gregtech.api.net.GTPacketUpdateItem; import gregtech.api.objects.XSTR; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; import gregtech.common.gui.modularui.uifactory.SelectItemUIFactory; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatableItem { +public class GTPPIntegratedCircuitItem extends Item implements INetworkUpdatableItem { private final List<ItemStack> ALL_VARIANTS = new ArrayList<>(); private final String iconLocation; protected final IIcon[] iconDamage = new IIcon[25]; - public GTPP_IntegratedCircuit_Item(String unlocalizedName, String iconLocation) { + public GTPPIntegratedCircuitItem(String unlocalizedName, String iconLocation) { this.setHasSubtypes(true); this.setNoRepair(); this.setMaxStackSize(64); @@ -72,13 +72,13 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab try { aList.add("Configuration == " + aStack.getItemDamage()); aList.add( - GT_LanguageManager.addStringLocalization( + GTLanguageManager.addStringLocalization( new StringBuilder().append(getUnlocalizedName()) .append(".tooltip.0") .toString(), "Right click to reconfigure")); aList.add( - GT_LanguageManager.addStringLocalization( + GTLanguageManager.addStringLocalization( new StringBuilder().append(getUnlocalizedName()) .append(".tooltip.1") .toString(), @@ -183,7 +183,7 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab buildContext -> new SelectItemUIFactory( StatCollector.translateToLocal("GT5U.item.programmed_circuit.select.header"), configurator, - GTPP_IntegratedCircuit_Item::onConfigured, + GTPPIntegratedCircuitItem::onConfigured, ALL_VARIANTS, meta, true).createWindow(buildContext)); @@ -192,7 +192,7 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab private static void onConfigured(ItemStack stack) { NBTTagCompound tag = new NBTTagCompound(); tag.setByte("meta", (byte) stack.getItemDamage()); - GT_Values.NW.sendToServer(new GT_Packet_UpdateItem(tag)); + GTValues.NW.sendToServer(new GTPacketUpdateItem(tag)); } private static Pair<Integer, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> findConfiguratorInInv( @@ -201,9 +201,9 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab for (int j = 0, mainInventoryLength = mainInventory.length; j < mainInventoryLength; j++) { ItemStack toolStack = mainInventory[j]; - if (!GT_Utility.isStackValid(toolStack)) continue; + if (!GTUtility.isStackValid(toolStack)) continue; - for (Map.Entry<Predicate<ItemStack>, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> p : GregTech_API.sCircuitProgrammerList + for (Map.Entry<Predicate<ItemStack>, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> p : GregTechAPI.sCircuitProgrammerList .entrySet()) if (p.getKey() .test(toolStack)) return Pair.of(j, p.getValue()); diff --git a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java index 07bf082903..01f2b1b263 100644 --- a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java +++ b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java @@ -23,7 +23,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.Materials; import gregtech.api.objects.ItemData; import gregtech.api.objects.MaterialStack; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.ModItems; @@ -199,11 +199,11 @@ public class BaseItemMetaFood extends ItemFood { } mOreDictNames.put(aMetaID, aOreDictNames); if (aOreDictNames.contains("listAllmeatraw")) { - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(ModItems.itemMetaFood, 1, aMetaID), new ItemData(Materials.MeatRaw, 3628800L, new MaterialStack(Materials.Bone, 403200L))); } else if (aOreDictNames.contains("listAllmeatcooked")) { - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(ModItems.itemMetaFood, 1, aMetaID), new ItemData(Materials.MeatCooked, 3628800L, new MaterialStack(Materials.Bone, 403200L))); } diff --git a/src/main/java/gtPlusPlus/core/item/general/BufferCore.java b/src/main/java/gtPlusPlus/core/item/general/ItemBufferCore.java index 69257afb0e..e99b4ca7a0 100644 --- a/src/main/java/gtPlusPlus/core/item/general/BufferCore.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemBufferCore.java @@ -10,16 +10,16 @@ import net.minecraft.util.EnumChatFormatting; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.core.item.base.BaseItemWithDamageValue; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; -public class BufferCore extends BaseItemWithDamageValue { +public class ItemBufferCore extends BaseItemWithDamageValue { public int coreTier = 0; - public BufferCore(final String unlocalizedName, final int i) { + public ItemBufferCore(final String unlocalizedName, final int i) { super(unlocalizedName + i); this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(32); @@ -42,7 +42,7 @@ public class BufferCore extends BaseItemWithDamageValue { public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { list.add( EnumChatFormatting.GRAY + "A key crafting component for " - + GT_Values.VN[this.coreTier - 1] + + GTValues.VN[this.coreTier - 1] + " Applicances"); } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java index 9e5cf0a69d..f1f70b6cbd 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java @@ -19,7 +19,7 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -135,17 +135,17 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric list.add( StatCollector.translateToLocalFormatted( "item.personalCloakingDevice.tooltip.3", - GT_Utility.formatNumbers(this.getTier(this.thisStack)), - GT_Utility.formatNumbers(this.getTransferLimit(this.thisStack)))); + GTUtility.formatNumbers(this.getTier(this.thisStack)), + GTUtility.formatNumbers(this.getTransferLimit(this.thisStack)))); list.add( StatCollector.translateToLocalFormatted( "item.personalCloakingDevice.tooltip.4", - GT_Utility.formatNumbers(this.getCharge(stack)), + GTUtility.formatNumbers(this.getCharge(stack)), MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)))); list.add( StatCollector.translateToLocalFormatted( "item.personalCloakingDevice.tooltip.5", - GT_Utility.formatNumbers(this.secondsLeft(stack)))); + GTUtility.formatNumbers(this.secondsLeft(stack)))); super.addInformation(stack, aPlayer, list, bool); } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java index c1bea0b81d..7a0cbe3312 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java @@ -16,7 +16,7 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; @@ -74,12 +74,12 @@ public class ItemGenericToken extends CoreItem { sizes[0][4] = mCustomNameColours.size(); // sizes[0][5] = mIcons.size(); mLocalNames.put(id, aLocalName); - GT_LanguageManager + GTLanguageManager .addStringLocalization("gtplusplus." + this.getUnlocalizedName() + "." + id + ".name", aLocalName); mMaxStackSizes.put(id, aMaxStack); mDescriptionArrays.put(id, aDescript); for (int i = 0; i < aDescript.length; i++) { - GT_LanguageManager.addStringLocalization( + GTLanguageManager.addStringLocalization( "gtplusplus." + this.getUnlocalizedName() + "." + id + ".tooltip." + i, aDescript[i]); } @@ -113,7 +113,7 @@ public class ItemGenericToken extends CoreItem { public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { super.addInformation(stack, aPlayer, list, bool); for (int i = 0;; i++) { - String tooltip = GT_LanguageManager.getTranslation( + String tooltip = GTLanguageManager.getTranslation( "gtplusplus." + this .getUnlocalizedNameInefficiently(stack) + "." + stack.getItemDamage() + ".tooltip." + i); if (!("gtplusplus." + this @@ -126,7 +126,7 @@ public class ItemGenericToken extends CoreItem { @Override public String getItemStackDisplayName(final ItemStack tItem) { - String ret = GT_LanguageManager.getTranslation( + String ret = GTLanguageManager.getTranslation( "gtplusplus." + this.getUnlocalizedNameInefficiently(tItem) + "." + tItem.getItemDamage() + ".name"); EnumChatFormatting format = mCustomNameColours.get(tItem.getItemDamage()); if (format != null) { diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java index d80238b99a..ed9bddfd18 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java @@ -19,9 +19,9 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Mods; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.math.MathUtils; @@ -89,7 +89,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI @Override public double getTransferLimit(final ItemStack itemStack) { - return GT_Values.V[7]; + return GTValues.V[7]; } @Override @@ -138,7 +138,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI list.add(EnumChatFormatting.GREEN + aString1 + EnumChatFormatting.GRAY); list.add( EnumChatFormatting.GREEN + aString2 - + GT_Utility.formatNumbers(EUPerOperation) + + GTUtility.formatNumbers(EUPerOperation) + aString3 + EnumChatFormatting.GRAY); list.add(EnumChatFormatting.GREEN + aString4 + EnumChatFormatting.GRAY); @@ -151,13 +151,13 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI EnumChatFormatting.GRAY + aTier + ": [" + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.getTier(stack)) + + GTUtility.formatNumbers(this.getTier(stack)) + EnumChatFormatting.GRAY + "] " + aInputLimit + ": [" + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.getTransferLimit(stack)) + + GTUtility.formatNumbers(this.getTransferLimit(stack)) + EnumChatFormatting.GRAY + aEUT + "]"); @@ -165,12 +165,12 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI EnumChatFormatting.GRAY + aCurrentPower + ": [" + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.getCharge(stack)) + + GTUtility.formatNumbers(this.getCharge(stack)) + EnumChatFormatting.GRAY + aEU + "] [" + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack))) + + GTUtility.formatNumbers(MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack))) + EnumChatFormatting.GRAY + "%]"); list.add(EnumChatFormatting.GOLD + aString6 + EnumChatFormatting.GRAY); @@ -332,18 +332,18 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI .messagePlayer((EntityPlayer) arg1, "Your NanoBooster Whirs! Leaving you feeling stronger."); if (hp > 0) PlayerUtils - .messagePlayer((EntityPlayer) arg1, "Healed " + GT_Utility.formatNumbers(hp) + " hp."); + .messagePlayer((EntityPlayer) arg1, "Healed " + GTUtility.formatNumbers(hp) + " hp."); if (hunger > 0) PlayerUtils - .messagePlayer((EntityPlayer) arg1, "Healed " + GT_Utility.formatNumbers(hunger) + " hunger."); + .messagePlayer((EntityPlayer) arg1, "Healed " + GTUtility.formatNumbers(hunger) + " hunger."); if (saturation > 0) PlayerUtils.messagePlayer( (EntityPlayer) arg1, - "Satured Hunger by " + GT_Utility.formatNumbers(saturation) + "."); + "Satured Hunger by " + GTUtility.formatNumbers(saturation) + "."); if (hp > 0 || hunger > 0 || saturation > 0) PlayerUtils.messagePlayer( (EntityPlayer) arg1, - "You check it's remaining uses, it has " + GT_Utility.formatNumbers(secondsLeft(baubleStack)) + "You check it's remaining uses, it has " + GTUtility.formatNumbers(secondsLeft(baubleStack)) + " seconds left."); } } diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java index 24759808ab..f23f4c8dce 100644 --- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java +++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java @@ -12,7 +12,7 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.core.creative.AddToCreativeTab; public class ItemDehydratorCoil extends Item { @@ -56,7 +56,7 @@ public class ItemDehydratorCoil extends Item { @Override public String getItemStackDisplayName(final ItemStack tItem) { return StatCollector - .translateToLocalFormatted("item.itemDehydratorCoil.name", GT_Values.VN[tItem.getItemDamage() + 4]); + .translateToLocalFormatted("item.itemDehydratorCoil.name", GTValues.VN[tItem.getItemDamage() + 4]); } /* diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java index b050e4c65c..820486b742 100644 --- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java +++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java @@ -12,7 +12,7 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.core.creative.AddToCreativeTab; public class ItemDehydratorCoilWire extends Item { @@ -56,7 +56,7 @@ public class ItemDehydratorCoilWire extends Item { @Override public String getItemStackDisplayName(final ItemStack tItem) { return StatCollector - .translateToLocalFormatted("item.itemDehydratorCoilWire.name", GT_Values.VN[tItem.getItemDamage() + 4]); + .translateToLocalFormatted("item.itemDehydratorCoilWire.name", GTValues.VN[tItem.getItemDamage() + 4]); } /* diff --git a/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java b/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java index eaf8c2c9da..1524418038 100644 --- a/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java +++ b/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java @@ -12,10 +12,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.core.handler.Recipes.DecayableRecipe; import gtPlusPlus.core.item.base.BaseItemTickable; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -28,7 +28,7 @@ public class DustDecayable extends BaseItemTickable { super(true, true, unlocal, colour, (maxTicks / 1), desc1); this.turnsIntoItem = turnsInto; this.radLevel = radLevel; - GT_OreDictUnificator.registerOre(unlocal, ItemUtils.getSimpleStack(this)); + GTOreDictUnificator.registerOre(unlocal, ItemUtils.getSimpleStack(this)); new DecayableRecipe(maxTicks, getSimpleStack(this), getSimpleStack(turnsInto)); } @@ -45,7 +45,7 @@ public class DustDecayable extends BaseItemTickable { public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { super.addInformation(stack, player, list, bool); if (this.radLevel > 0) { - list.add(CORE.GT_Tooltip_Radioactive.get()); + list.add(GTPPCore.GT_Tooltip_Radioactive.get()); } } diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java b/src/main/java/gtPlusPlus/core/item/tool/misc/ItemGregtechPump.java index 5ba3aa1531..082f74ad2b 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/ItemGregtechPump.java @@ -1,8 +1,8 @@ package gtPlusPlus.core.item.tool.misc; -import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GTValues.V; import static gregtech.api.enums.Mods.GTPlusPlus; -import static gregtech.api.util.GT_Utility.formatNumbers; +import static gregtech.api.util.GTUtility.formatNumbers; import java.util.ArrayList; import java.util.BitSet; @@ -35,21 +35,21 @@ import net.minecraftforge.fluids.IFluidTank; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.SubTag; -import gregtech.api.enums.TC_Aspects.TC_AspectStack; +import gregtech.api.enums.TCAspects.TC_AspectStack; import gregtech.api.interfaces.IItemBehaviour; import gregtech.api.interfaces.IItemContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_MultiInput; +import gregtech.api.metatileentity.implementations.MTEBasicTank; +import gregtech.api.metatileentity.implementations.MTEHatchMultiInput; import gregtech.api.objects.ItemData; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.creative.AddToCreativeTab; @@ -62,7 +62,7 @@ import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; -public class GregtechPump extends Item implements ISpecialElectricItem, IElectricItemManager, IFluidContainerItem { +public class ItemGregtechPump extends Item implements ISpecialElectricItem, IElectricItemManager, IFluidContainerItem { /** * Right Click Functions @@ -91,7 +91,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri */ /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */ - private final HashMap<Short, ArrayList<IItemBehaviour<GregtechPump>>> mItemBehaviors = new HashMap<>(); + private final HashMap<Short, ArrayList<IItemBehaviour<ItemGregtechPump>>> mItemBehaviors = new HashMap<>(); public final short mOffset, mItemAmount; public final BitSet mEnabledItems; @@ -120,11 +120,11 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri ); } - public GregtechPump() { + public ItemGregtechPump() { this("MU-metatool.01", AddToCreativeTab.tabTools, (short) 1000, (short) 31766); } - public GregtechPump(final String unlocalizedName, final CreativeTabs creativeTab, final short aOffset, + public ItemGregtechPump(final String unlocalizedName, final CreativeTabs creativeTab, final short aOffset, final short aItemAmount) { this.mEnabledItems = new BitSet(aItemAmount); this.mVisibleItems = new BitSet(aItemAmount); @@ -157,7 +157,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri localizedName, EnumChatFormatting.GRAY + "Can be used to remove fluids from GT machine input & output slots"); if (euStorage > 0 && tier > 0) - this.setElectricStats(this.mOffset + id, euStorage, GT_Values.V[tier], tier, -3L, true); + this.setElectricStats(this.mOffset + id, euStorage, GTValues.V[tier], tier, -3L, true); this.rarity.put(id, regRarity); this.itemName.put(id, localizedName); this.hasEffect.put(id, Effect); @@ -188,7 +188,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri // aList.add("Meta: "+(aStack.getItemDamage()-mOffset)); int aOffsetMeta = getCorrectMetaForItemstack(aStack); aList.add( - GT_LanguageManager + GTLanguageManager .getTranslation("gtplusplus." + this.getUnlocalizedName(aStack) + "." + aOffsetMeta + ".tooltip")); if (aOffsetMeta <= 3) { @@ -234,9 +234,10 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri } } - final ArrayList<IItemBehaviour<GregtechPump>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<ItemGregtechPump>> tList = this.mItemBehaviors + .get((short) this.getDamage(aStack)); if (tList != null) { - for (final IItemBehaviour<GregtechPump> tBehavior : tList) { + for (final IItemBehaviour<ItemGregtechPump> tBehavior : tList) { aList = tBehavior.getAdditionalToolTips(this, aList, aStack); } } @@ -366,7 +367,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri } for (int i = 1; i < 5; i++) { final ItemStack tArmor = aPlayer.getEquipmentInSlot(i); - if (GT_ModHandler.isElectricItem(tArmor)) { + if (GTModHandler.isElectricItem(tArmor)) { final IElectricItem tArmorItem = (IElectricItem) tArmor.getItem(); if (tArmorItem.canProvideEnergy(tArmor) && (tArmorItem.getTier(tArmor) >= this.getTier(aStack))) { final double tCharge = ElectricItem.manager.discharge( @@ -437,9 +438,10 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri } public boolean isItemStackUsable(final ItemStack aStack) { - final ArrayList<IItemBehaviour<GregtechPump>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<ItemGregtechPump>> tList = this.mItemBehaviors + .get((short) this.getDamage(aStack)); if (tList != null) { - for (final IItemBehaviour<GregtechPump> tBehavior : tList) { + for (final IItemBehaviour<ItemGregtechPump> tBehavior : tList) { if (!tBehavior.isItemStackUsable(this, aStack)) { return false; } @@ -466,7 +468,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri * @param aValue 200 = 1 Burn Process = 500 EU, max = 32767 (that is 81917.5 EU) * @return the Item itself for convenience in constructing. */ - public final GregtechPump setBurnValue(final int aMetaValue, final int aValue) { + public final ItemGregtechPump setBurnValue(final int aMetaValue, final int aValue) { if ((aMetaValue < 0) || (aValue < 0)) { return this; } @@ -489,8 +491,8 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri * this Battery charge/discharge-able. * @return the Item itself for convenience in constructing. */ - public final GregtechPump setElectricStats(final int aMetaValue, final long aMaxCharge, final long aTransferLimit, - final long aTier, final long aSpecialData, final boolean aUseAnimations) { + public final ItemGregtechPump setElectricStats(final int aMetaValue, final long aMaxCharge, + final long aTransferLimit, final long aTier, final long aSpecialData, final boolean aUseAnimations) { if (aMetaValue < 0) { return this; } @@ -509,7 +511,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri @SideOnly(Side.CLIENT) public void getSubItems(final Item var1, final CreativeTabs aCreativeTab, final List aList) { for (int i = 0, j = this.mEnabledItems.length(); i < j; i++) { - if (this.mVisibleItems.get(i) || (GT_Values.D1 && this.mEnabledItems.get(i))) { + if (this.mVisibleItems.get(i) || (GTValues.D1 && this.mEnabledItems.get(i))) { final Long[] tStats = this.mElectricStats.get((short) (this.mOffset + i)); if ((tStats != null) && (tStats[3] < 0)) { final ItemStack tStack = new ItemStack(this, 1, this.mOffset + i); @@ -598,11 +600,12 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri * @param aBehavior the Click Behavior you want to add. * @return the Item itself for convenience in constructing. */ - public final GregtechPump addItemBehavior(final int aMetaValue, final IItemBehaviour<GregtechPump> aBehavior) { + public final ItemGregtechPump addItemBehavior(final int aMetaValue, + final IItemBehaviour<ItemGregtechPump> aBehavior) { if ((aMetaValue < 0) || (aMetaValue >= 32766) || (aBehavior == null)) { return this; } - ArrayList<IItemBehaviour<GregtechPump>> tList = this.mItemBehaviors.get((short) aMetaValue); + ArrayList<IItemBehaviour<ItemGregtechPump>> tList = this.mItemBehaviors.get((short) aMetaValue); if (tList == null) { tList = new ArrayList<>(1); this.mItemBehaviors.put((short) aMetaValue, tList); @@ -628,12 +631,12 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri } if ((aID >= 0) && (aID < this.mItemAmount)) { final ItemStack rStack = new ItemStack(this, 1, this.mOffset + aID); - GT_ModHandler.registerBoxableItemToToolBox(rStack); + GTModHandler.registerBoxableItemToToolBox(rStack); this.mEnabledItems.set(aID); this.mVisibleItems.set(aID); - GT_LanguageManager + GTLanguageManager .addStringLocalization("gtplusplus." + this.getUnlocalizedName(rStack) + "." + aID + ".name", aEnglish); - GT_LanguageManager.addStringLocalization( + GTLanguageManager.addStringLocalization( "gtplusplus." + this.getUnlocalizedName(rStack) + "." + aID + ".tooltip", aToolTip); final List<TC_AspectStack> tAspects = new ArrayList<>(); @@ -645,7 +648,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri continue; } if (tRandomData == SubTag.NO_UNIFICATION) { - GT_OreDictUnificator.addToBlacklist(rStack); + GTOreDictUnificator.addToBlacklist(rStack); continue; } } @@ -655,7 +658,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri if (tRandomData != null) { boolean tUseOreDict = true; if (tRandomData instanceof IItemBehaviour) { - this.addItemBehavior(this.mOffset + aID, (IItemBehaviour<GregtechPump>) tRandomData); + this.addItemBehavior(this.mOffset + aID, (IItemBehaviour<ItemGregtechPump>) tRandomData); tUseOreDict = false; } if (tRandomData instanceof IItemContainer) { @@ -670,21 +673,21 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri continue; } if (tRandomData instanceof ItemData) { - if (GT_Utility.isStringValid(tRandomData)) { - GT_OreDictUnificator.registerOre(tRandomData, rStack); + if (GTUtility.isStringValid(tRandomData)) { + GTOreDictUnificator.registerOre(tRandomData, rStack); } else { - GT_OreDictUnificator.addItemData(rStack, (ItemData) tRandomData); + GTOreDictUnificator.addItemData(rStack, (ItemData) tRandomData); } continue; } if (tUseOreDict) { - GT_OreDictUnificator.registerOre(tRandomData, rStack); + GTOreDictUnificator.registerOre(tRandomData, rStack); continue; } } } - if (GregTech_API.sThaumcraftCompat != null) { - GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false); + if (GregTechAPI.sThaumcraftCompat != null) { + GregTechAPI.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false); } return rStack; } @@ -697,7 +700,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri if (keyValue < 0 || keyValue > 3) { keyValue = 0; } - return GT_LanguageManager + return GTLanguageManager .getTranslation("gtplusplus." + this.getUnlocalizedName(aStack) + "." + keyValue + ".name"); } @@ -1236,19 +1239,19 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri return null; } final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();; - if (aMetaTileEntity == null || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_MultiInput) { + if (aMetaTileEntity == null || aMetaTileEntity instanceof MTEHatchMultiInput) { // blacklist multiinput hatch as it's too complex return null; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicTank) { + if (aMetaTileEntity instanceof MTEBasicTank) { Logger.INFO("Tile Was Instanceof BasicTank."); - return getStoredFluidOfGTMachine((GT_MetaTileEntity_BasicTank) aMetaTileEntity); + return getStoredFluidOfGTMachine((MTEBasicTank) aMetaTileEntity); } else { return null; } } - public FluidStack getStoredFluidOfGTMachine(GT_MetaTileEntity_BasicTank aTileEntity) { + public FluidStack getStoredFluidOfGTMachine(MTEBasicTank aTileEntity) { FluidStack f = aTileEntity.mFluid; // Let's see if this machine has output fluid too @@ -1278,15 +1281,15 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri if (aMetaTileEntity == null) { return false; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicTank) { + if (aMetaTileEntity instanceof MTEBasicTank) { Logger.INFO("Trying to clear Tile's tank. - Behaviour Class. [2]"); - return setStoredFluidOfGTMachine((GT_MetaTileEntity_BasicTank) aMetaTileEntity, aSetFluid); + return setStoredFluidOfGTMachine((MTEBasicTank) aMetaTileEntity, aSetFluid); } else { return false; } } - public boolean setStoredFluidOfGTMachine(GT_MetaTileEntity_BasicTank aTileEntity, FluidStack aSetFluid) { + public boolean setStoredFluidOfGTMachine(MTEBasicTank aTileEntity, FluidStack aSetFluid) { try { // Try Handle Outputs First diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java index e929d6cb7f..4c4330af75 100644 --- a/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraftforge.common.util.EnumHelper; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.core.item.wearable.armour.tinfoil.ArmourTinFoilHat; +import gtPlusPlus.core.item.wearable.armour.tinfoil.ItemArmourTinFoilHat; public class ArmourLoader { @@ -32,7 +32,7 @@ public class ArmourLoader { private static void glassArmour() {} private static void tinfoilArmour() { - TinFoilHat = new ArmourTinFoilHat().setUnlocalizedName("itemHatTinFoil"); + TinFoilHat = new ItemArmourTinFoilHat().setUnlocalizedName("itemHatTinFoil"); GameRegistry.registerItem(TinFoilHat, "itemHatTinFoil", GTPlusPlus.ID); } } diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ItemArmourTinFoilHat.java index 0703ac3b93..7df52a176a 100644 --- a/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ItemArmourTinFoilHat.java @@ -28,15 +28,15 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.item.wearable.armour.ArmourLoader; import gtPlusPlus.core.item.wearable.armour.base.BaseArmourHelm; -public class ArmourTinFoilHat extends BaseArmourHelm { +public class ItemArmourTinFoilHat extends BaseArmourHelm { public IIcon iconHelm; - public ArmourTinFoilHat() { + public ItemArmourTinFoilHat() { super(ArmourLoader.TinFoilArmour, 0); } @@ -122,7 +122,7 @@ public class ArmourTinFoilHat extends BaseArmourHelm { if (player instanceof EntityPlayer) { // Apply Slow - if (!GT_Utility.getPotion(player, Potion.moveSlowdown.id)) { + if (!GTUtility.getPotion(player, Potion.moveSlowdown.id)) { player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 2, 1, true)); } diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/GTPPCore.java index 535a3f0821..985e942f52 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/GTPPCore.java @@ -23,12 +23,12 @@ import gregtech.api.objects.XSTR; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.CORE_Preloader; +import gtPlusPlus.preloader.PreloaderCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; -import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator; -import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal; +import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractGenerator; +import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractTerminal; -public class CORE { +public class GTPPCore { public static Map PlayerCache; @@ -70,8 +70,8 @@ public class CORE { public static List<Pair<Integer, ItemStack>> burnables = new ArrayList<>(); // TesseractMaps - public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> sTesseractGeneratorOwnershipMap = new HashMap<>(); - public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> sTesseractTerminalOwnershipMap = new HashMap<>(); + public static final Map<UUID, Map<Integer, MTETesseractGenerator>> sTesseractGeneratorOwnershipMap = new HashMap<>(); + public static final Map<UUID, Map<Integer, MTETesseractTerminal>> sTesseractTerminalOwnershipMap = new HashMap<>(); // BookMap public static final Map<String, ItemStack> sBookList = new ConcurrentHashMap<>(); @@ -92,7 +92,7 @@ public class CORE { // Feature Related public static boolean enableCustomCapes = false; - public static int enableWatchdogBGM = CORE_Preloader.enableWatchdogBGM; + public static int enableWatchdogBGM = PreloaderCore.enableWatchdogBGM; public static boolean hideUniversalCells = true; // Single Block Machines diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java index 95088535ce..836ccfa504 100644 --- a/src/main/java/gtPlusPlus/core/material/Material.java +++ b/src/main/java/gtPlusPlus/core/material/Material.java @@ -1,6 +1,6 @@ package gtPlusPlus.core.material; -import static gregtech.api.enums.GT_Values.M; +import static gregtech.api.enums.GTValues.M; import static gregtech.api.enums.Mods.TinkerConstruct; import static gtPlusPlus.core.util.math.MathUtils.safeCast_LongToInt; @@ -20,7 +20,7 @@ import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TextureSet; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes; @@ -381,7 +381,7 @@ public class Material { try { this.unlocalizedName = Utils.sanitizeString(materialName); this.localizedName = materialName; - this.translatedName = GT_LanguageManager + this.translatedName = GTLanguageManager .addStringLocalization("gtplusplus.material." + unlocalizedName, localizedName); mMaterialCache.put(getLocalizedName().toLowerCase(), this); Logger.INFO("Stored " + getLocalizedName() + " to cache with key: " + getLocalizedName().toLowerCase()); @@ -759,37 +759,37 @@ public class Material { for (MaterialStack m : this.getComposites()) { // Gems - if (m.getStackMaterial() == ELEMENT.getInstance().AER) { + if (m.getStackMaterial() == MaterialsElements.getInstance().AER) { aGem++; - } else if (m.getStackMaterial() == ELEMENT.getInstance().AQUA) { + } else if (m.getStackMaterial() == MaterialsElements.getInstance().AQUA) { aGem++; - } else if (m.getStackMaterial() == ELEMENT.getInstance().IGNIS) { + } else if (m.getStackMaterial() == MaterialsElements.getInstance().IGNIS) { aGem++; - } else if (m.getStackMaterial() == ELEMENT.getInstance().TERRA) { + } else if (m.getStackMaterial() == MaterialsElements.getInstance().TERRA) { aGem++; - } else if (m.getStackMaterial() == ELEMENT.getInstance().MAGIC) { + } else if (m.getStackMaterial() == MaterialsElements.getInstance().MAGIC) { aGem++; } // Shiny Materials - if (m.getStackMaterial() == ELEMENT.getInstance().GOLD) { + if (m.getStackMaterial() == MaterialsElements.getInstance().GOLD) { aShiny++; - } else if (m.getStackMaterial() == ELEMENT.getInstance().SILVER) { + } else if (m.getStackMaterial() == MaterialsElements.getInstance().SILVER) { aShiny++; - } else if (m.getStackMaterial() == ELEMENT.getInstance().PLATINUM) { + } else if (m.getStackMaterial() == MaterialsElements.getInstance().PLATINUM) { aShiny++; - } else if (m.getStackMaterial() == ELEMENT.getInstance().TITANIUM) { + } else if (m.getStackMaterial() == MaterialsElements.getInstance().TITANIUM) { aShiny++; - } else if (m.getStackMaterial() == ELEMENT.getInstance().GERMANIUM) { + } else if (m.getStackMaterial() == MaterialsElements.getInstance().GERMANIUM) { aShiny++; - } else if (m.getStackMaterial() == ELEMENT.getInstance().GALLIUM) { + } else if (m.getStackMaterial() == MaterialsElements.getInstance().GALLIUM) { aShiny++; - } else if (m.getStackMaterial() == ELEMENT.getInstance().MERCURY) { + } else if (m.getStackMaterial() == MaterialsElements.getInstance().MERCURY) { aShiny++; - } else if (m.getStackMaterial() == ELEMENT.getInstance().MAGIC) { + } else if (m.getStackMaterial() == MaterialsElements.getInstance().MAGIC) { aShiny++; - } else if (m.getStackMaterial() == ELEMENT.getInstance().SAMARIUM) { + } else if (m.getStackMaterial() == MaterialsElements.getInstance().SAMARIUM) { aShiny++; - } else if (m.getStackMaterial() == ELEMENT.getInstance().TANTALUM) { + } else if (m.getStackMaterial() == MaterialsElements.getInstance().TANTALUM) { aShiny++; } } @@ -831,7 +831,7 @@ public class Material { if (r.getStackMaterial() .getTextureSet().mSetName.toLowerCase() .contains("fluid")) { - sets.put(ELEMENT.getInstance().GOLD); + sets.put(MaterialsElements.getInstance().GOLD); } else { sets.put(r.getStackMaterial()); } diff --git a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java index 8b07e29a52..1dce894309 100644 --- a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java @@ -9,8 +9,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.GT_Values; -import gregtech.api.util.GT_Utility; +import gregtech.api.enums.GTValues; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; @@ -40,26 +40,26 @@ import gtPlusPlus.core.item.base.rods.BaseItemRod; import gtPlusPlus.core.item.base.rods.BaseItemRodLong; import gtPlusPlus.core.item.base.rotors.BaseItemRotor; import gtPlusPlus.core.item.base.screws.BaseItemScrew; -import gtPlusPlus.core.material.nuclear.FLUORIDES; +import gtPlusPlus.core.material.nuclear.MaterialsFluorides; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_AlloySmelter; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Assembler; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_BlastSmelter; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_DustGeneration; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Extruder; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_FluidCanning; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Fluids; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Fluorite; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MaterialProcessing; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MetalRecipe; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Ore; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Plasma; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Plates; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_ShapedCrafting; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenAlloySmelter; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenAssembler; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenBlastSmelter; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenDustGeneration; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenExtruder; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenFluidCanning; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenFluids; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenFluorite; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenMaterialProcessing; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenMetalRecipe; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenOre; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenPlasma; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenPlates; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenRecycling; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenShapedCrafting; public class MaterialGenerator { @@ -81,7 +81,7 @@ public class MaterialGenerator { public static boolean addFluidCannerRecipe(ItemStack aEmpty, ItemStack aFullContainer, FluidStack aFluidIn, FluidStack rFluidOut, Integer aTime, Integer aEu) { - RecipeGen_FluidCanning g = new RecipeGen_FluidCanning(false, aEmpty, aFullContainer, aFluidIn, null, null, 0); + RecipeGenFluidCanning g = new RecipeGenFluidCanning(false, aEmpty, aFullContainer, aFluidIn, null, null, 0); if (g != null && g.valid()) { return true; } @@ -178,21 +178,21 @@ public class MaterialGenerator { } // Add A jillion Recipes - old code - new RecipeGen_AlloySmelter(matInfo); - new RecipeGen_Assembler(matInfo); + new RecipeGenAlloySmelter(matInfo); + new RecipeGenAssembler(matInfo); if (generateBlastSmelterRecipes) { - new RecipeGen_BlastSmelter(matInfo); + new RecipeGenBlastSmelter(matInfo); } - new RecipeGen_MetalRecipe(matInfo); - new RecipeGen_Extruder(matInfo); - new RecipeGen_Fluids(matInfo); - new RecipeGen_Plates(matInfo); - new RecipeGen_ShapedCrafting(matInfo); - new RecipeGen_MaterialProcessing(matInfo); + new RecipeGenMetalRecipe(matInfo); + new RecipeGenExtruder(matInfo); + new RecipeGenFluids(matInfo); + new RecipeGenPlates(matInfo); + new RecipeGenShapedCrafting(matInfo); + new RecipeGenMaterialProcessing(matInfo); - new RecipeGen_DustGeneration(matInfo); - new RecipeGen_Recycling(matInfo); - new RecipeGen_Plasma(matInfo); + new RecipeGenDustGeneration(matInfo); + new RecipeGenRecycling(matInfo); + new RecipeGenPlasma(matInfo); return true; @@ -225,9 +225,9 @@ public class MaterialGenerator { // Add A jillion Recipes - old code try { - RecipeGen_DustGeneration.addMixerRecipe_Standalone(matInfo); - new RecipeGen_Fluids(matInfo); - new RecipeGen_MaterialProcessing(matInfo); + RecipeGenDustGeneration.addMixerRecipe_Standalone(matInfo); + new RecipeGenFluids(matInfo); + new RecipeGenMaterialProcessing(matInfo); } catch (Throwable t) { Logger.MATERIALS("Failed to generate some recipes for " + materialName); Logger.ERROR("Failed to generate some recipes for " + materialName); @@ -247,8 +247,8 @@ public class MaterialGenerator { public static void generateNuclearDusts(final Material matInfo, boolean generateDehydratorRecipe) { generateNuclearMaterial(matInfo, false, true, false, false, true); if (generateDehydratorRecipe && matInfo.getFluid() != null && matInfo.getDust(0) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(20)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(20)) .itemOutputs(matInfo.getDust(1)) .fluidInputs(matInfo.getFluidStack(144)) .eut(matInfo.vVoltageMultiplier) @@ -287,21 +287,21 @@ public class MaterialGenerator { if (generatePlates) { temp = new BaseItemPlate(matInfo); temp = new BaseItemPlateDouble(matInfo); - new RecipeGen_Plates(matInfo); - new RecipeGen_Extruder(matInfo); - new RecipeGen_Assembler(matInfo); + new RecipeGenPlates(matInfo); + new RecipeGenExtruder(matInfo); + new RecipeGenAssembler(matInfo); } if (!disableOptionalRecipes) { - new RecipeGen_ShapedCrafting(matInfo); - new RecipeGen_Fluids(matInfo); - new RecipeGen_MaterialProcessing(matInfo); - new RecipeGen_Recycling(matInfo); + new RecipeGenShapedCrafting(matInfo); + new RecipeGenFluids(matInfo); + new RecipeGenMaterialProcessing(matInfo); + new RecipeGenRecycling(matInfo); } - new RecipeGen_MetalRecipe(matInfo); - new RecipeGen_DustGeneration(matInfo, disableOptionalRecipes); - new RecipeGen_Plasma(matInfo); + new RecipeGenMetalRecipe(matInfo); + new RecipeGenDustGeneration(matInfo, disableOptionalRecipes); + new RecipeGenPlasma(matInfo); } catch (final Throwable t) { Logger.MATERIALS("" + matInfo.getLocalizedName() + " failed to generate."); @@ -365,10 +365,10 @@ public class MaterialGenerator { "Generated all ore components for " + matInfo.getLocalizedName() + ", now generating processing recipes."); - if (matInfo == FLUORIDES.FLUORITE) { - new RecipeGen_Fluorite(matInfo); + if (matInfo == MaterialsFluorides.FLUORITE) { + new RecipeGenFluorite(matInfo); } else { - new RecipeGen_Ore(matInfo); + new RecipeGenOre(matInfo); } } catch (final Throwable t) { @@ -406,19 +406,19 @@ public class MaterialGenerator { "Generated all ore & base components for " + matInfo.getLocalizedName() + ", now generating processing recipes."); - new RecipeGen_Ore(matInfo, true); - new RecipeGen_AlloySmelter(matInfo); - new RecipeGen_Assembler(matInfo); - new RecipeGen_BlastSmelter(matInfo); - new RecipeGen_MetalRecipe(matInfo); - new RecipeGen_Extruder(matInfo); - new RecipeGen_Fluids(matInfo); - new RecipeGen_Plates(matInfo); - new RecipeGen_ShapedCrafting(matInfo); - new RecipeGen_MaterialProcessing(matInfo); - new RecipeGen_DustGeneration(matInfo); - new RecipeGen_Recycling(matInfo); - new RecipeGen_Plasma(matInfo); + new RecipeGenOre(matInfo, true); + new RecipeGenAlloySmelter(matInfo); + new RecipeGenAssembler(matInfo); + new RecipeGenBlastSmelter(matInfo); + new RecipeGenMetalRecipe(matInfo); + new RecipeGenExtruder(matInfo); + new RecipeGenFluids(matInfo); + new RecipeGenPlates(matInfo); + new RecipeGenShapedCrafting(matInfo); + new RecipeGenMaterialProcessing(matInfo); + new RecipeGenDustGeneration(matInfo); + new RecipeGenRecycling(matInfo); + new RecipeGenPlasma(matInfo); return true; } catch (final Throwable t) { Logger.MATERIALS("" + matInfo.getLocalizedName() + " failed to generate."); diff --git a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/main/java/gtPlusPlus/core/material/MaterialMisc.java index c46b05fbb8..d00529d044 100644 --- a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialMisc.java @@ -7,7 +7,7 @@ import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; -public final class MISC_MATERIALS { +public final class MaterialMisc { /* * Some of these materials purely exist as data objects, items will most likely be assigned separately. Most are @@ -40,9 +40,9 @@ public final class MISC_MATERIALS { "KNO3", 0, false, - new MaterialStack(ELEMENT.getInstance().POTASSIUM, 1), - new MaterialStack(ELEMENT.getInstance().NITROGEN, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 3)); + new MaterialStack(MaterialsElements.getInstance().POTASSIUM, 1), + new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3)); public static final Material SODIUM_NITRATE = new Material( "Sodium Nitrate", MaterialState.SOLID, // State @@ -56,9 +56,9 @@ public final class MISC_MATERIALS { "NaNO3", 0, false, - new MaterialStack(ELEMENT.getInstance().SODIUM, 1), - new MaterialStack(ELEMENT.getInstance().NITROGEN, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 3)); + new MaterialStack(MaterialsElements.getInstance().SODIUM, 1), + new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3)); public static final Material SOLAR_SALT_COLD = new Material( "Solar Salt (Cold)", @@ -99,8 +99,8 @@ public final class MISC_MATERIALS { "SrO", 0, false, - new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 1)); + new MaterialStack(MaterialsElements.getInstance().STRONTIUM, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1)); public static final Material SELENIUM_DIOXIDE = new Material( "Selenium Dioxide", @@ -112,8 +112,8 @@ public final class MISC_MATERIALS { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().SELENIUM, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 2)); + new MaterialStack(MaterialsElements.getInstance().SELENIUM, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2)); public static final Material SELENIOUS_ACID = new Material( "Selenious Acid", @@ -126,8 +126,8 @@ public final class MISC_MATERIALS { false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. new MaterialStack(SELENIUM_DIOXIDE, 1), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 8), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)); + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 8), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 4)); public static final Material HYDROGEN_CYANIDE = new Material( "Hydrogen Cyanide", @@ -139,9 +139,9 @@ public final class MISC_MATERIALS { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), - new MaterialStack(ELEMENT.getInstance().CARBON, 1), - new MaterialStack(ELEMENT.getInstance().NITROGEN, 1)); + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1), + new MaterialStack(MaterialsElements.getInstance().CARBON, 1), + new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1)); public static final Material CARBON_MONOXIDE = new Material( "Carbon Monoxide", @@ -153,8 +153,8 @@ public final class MISC_MATERIALS { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().CARBON, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 1)); + new MaterialStack(MaterialsElements.getInstance().CARBON, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1)); public static final Material CARBON_DIOXIDE = new Material( "Carbon Dioxide", @@ -166,8 +166,8 @@ public final class MISC_MATERIALS { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().CARBON, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 2)); + new MaterialStack(MaterialsElements.getInstance().CARBON, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2)); public static final Material WOODS_GLASS = new Material( "Wood's Glass", // Material Name @@ -182,10 +182,10 @@ public final class MISC_MATERIALS { "Si4Ba3Na2Ni", 0, false, - new MaterialStack(ELEMENT.getInstance().SILICON, 40), - new MaterialStack(ELEMENT.getInstance().BARIUM, 30), - new MaterialStack(ELEMENT.getInstance().SODIUM, 20), - new MaterialStack(ELEMENT.getInstance().NICKEL, 10)); + new MaterialStack(MaterialsElements.getInstance().SILICON, 40), + new MaterialStack(MaterialsElements.getInstance().BARIUM, 30), + new MaterialStack(MaterialsElements.getInstance().SODIUM, 20), + new MaterialStack(MaterialsElements.getInstance().NICKEL, 10)); /* * Rare Earth Materials @@ -201,12 +201,14 @@ public final class MISC_MATERIALS { -1, -1, -1, // Radiation - new MaterialStack[] { new MaterialStack(ORES.GREENOCKITE, 1), new MaterialStack(ORES.LANTHANITE_CE, 1), - new MaterialStack(ORES.AGARDITE_CD, 1), new MaterialStack(ORES.YTTRIALITE, 1), + new MaterialStack[] { new MaterialStack(MaterialsOres.GREENOCKITE, 1), + new MaterialStack(MaterialsOres.LANTHANITE_CE, 1), new MaterialStack(MaterialsOres.AGARDITE_CD, 1), + new MaterialStack(MaterialsOres.YTTRIALITE, 1), new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.NetherQuartz), 1), new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Galena), 1), new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Chalcopyrite), 1), - new MaterialStack(ORES.CRYOLITE, 1), new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1) }); + new MaterialStack(MaterialsOres.CRYOLITE, 1), + new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 1) }); public static final Material RARE_EARTH_MID = new Material( "Rare Earth (II)", // Material Name @@ -218,11 +220,12 @@ public final class MISC_MATERIALS { -1, -1, -1, // Radiation - new MaterialStack[] { new MaterialStack(ORES.LANTHANITE_ND, 1), new MaterialStack(ORES.AGARDITE_ND, 1), - new MaterialStack(ORES.YTTRIAITE, 1), new MaterialStack(ORES.CROCROITE, 1), - new MaterialStack(ORES.NICHROMITE, 1), new MaterialStack(ORES.ZIRCON, 1), - new MaterialStack(ELEMENT.STANDALONE.GRANITE, 1), new MaterialStack(ELEMENT.STANDALONE.BLACK_METAL, 1), - new MaterialStack(ELEMENT.STANDALONE.RUNITE, 1) }); + new MaterialStack[] { new MaterialStack(MaterialsOres.LANTHANITE_ND, 1), + new MaterialStack(MaterialsOres.AGARDITE_ND, 1), new MaterialStack(MaterialsOres.YTTRIAITE, 1), + new MaterialStack(MaterialsOres.CROCROITE, 1), new MaterialStack(MaterialsOres.NICHROMITE, 1), + new MaterialStack(MaterialsOres.ZIRCON, 1), new MaterialStack(MaterialsElements.STANDALONE.GRANITE, 1), + new MaterialStack(MaterialsElements.STANDALONE.BLACK_METAL, 1), + new MaterialStack(MaterialsElements.STANDALONE.RUNITE, 1) }); public static final Material RARE_EARTH_HIGH = new Material( "Rare Earth (III)", // Material Name @@ -234,17 +237,17 @@ public final class MISC_MATERIALS { -1, -1, -1, // Radiation - new MaterialStack[] { new MaterialStack(ORES.GADOLINITE_Y, 1), new MaterialStack(ORES.LEPERSONNITE, 1), - new MaterialStack(ORES.FLORENCITE, 1), new MaterialStack(ORES.FLUORCAPHITE, 1), - new MaterialStack(ORES.LAUTARITE, 1), new MaterialStack(ORES.DEMICHELEITE_BR, 1), - new MaterialStack(ORES.ALBURNITE, 1), new MaterialStack(ORES.SAMARSKITE_Y, 1), - new MaterialStack(ORES.AGARDITE_LA, 1), }); + new MaterialStack[] { new MaterialStack(MaterialsOres.GADOLINITE_Y, 1), + new MaterialStack(MaterialsOres.LEPERSONNITE, 1), new MaterialStack(MaterialsOres.FLORENCITE, 1), + new MaterialStack(MaterialsOres.FLUORCAPHITE, 1), new MaterialStack(MaterialsOres.LAUTARITE, 1), + new MaterialStack(MaterialsOres.DEMICHELEITE_BR, 1), new MaterialStack(MaterialsOres.ALBURNITE, 1), + new MaterialStack(MaterialsOres.SAMARSKITE_Y, 1), new MaterialStack(MaterialsOres.AGARDITE_LA, 1), }); public static final Material WATER = new Material( "Water", MaterialState.PURE_LIQUID, - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 1)); + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 2), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1)); // OH public static final Material HYDROXIDE = new Material( @@ -257,8 +260,8 @@ public final class MISC_MATERIALS { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().OXYGEN, 1), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1)); + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1)); // NH3 public static final Material AMMONIA = new Material( @@ -271,8 +274,8 @@ public final class MISC_MATERIALS { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().NITROGEN, 1), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3)); + new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 3)); // NH4 public static final Material AMMONIUM = new Material( @@ -285,14 +288,14 @@ public final class MISC_MATERIALS { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().NITROGEN, 1), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4)); + new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 4)); public static final Material HYDROGEN_CHLORIDE = new Material( "Hydrogen Chloride", MaterialState.PURE_GAS, - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 1)); + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1), + new MaterialStack(MaterialsElements.getInstance().CHLORINE, 1)); public static final Material HYDROGEN_CHLORIDE_MIX = new Material( "Hydrogen Chloride Mix", @@ -304,14 +307,14 @@ public final class MISC_MATERIALS { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 1)); + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1), + new MaterialStack(MaterialsElements.getInstance().CHLORINE, 1)); public static final Material SODIUM_CHLORIDE = new Material( "Sodium Chloride", MaterialState.PURE_GAS, - new MaterialStack(ELEMENT.getInstance().SODIUM, 1), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 1)); + new MaterialStack(MaterialsElements.getInstance().SODIUM, 1), + new MaterialStack(MaterialsElements.getInstance().CHLORINE, 1)); public static final Material SALT_WATER = new Material( "Salt Water", @@ -338,8 +341,8 @@ public final class MISC_MATERIALS { "Sr(OH)2", 0, false, - new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1), - new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2)); + new MaterialStack(MaterialsElements.getInstance().STRONTIUM, 1), + new MaterialStack(MaterialMisc.HYDROXIDE, 2)); // Glue Chemicals @@ -355,9 +358,9 @@ public final class MISC_MATERIALS { "(CH3CO)2O", 0, true, - new MaterialStack(ELEMENT.getInstance().CARBON, 4), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 3)); + new MaterialStack(MaterialsElements.getInstance().CARBON, 4), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 6), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3)); public static final Material CHLOROACETIC_ACID = new Material( "Chloroacetic Acid", @@ -371,10 +374,10 @@ public final class MISC_MATERIALS { "ClCH2-COOH", 0, true, - new MaterialStack(ELEMENT.getInstance().CARBON, 2), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 1)); + new MaterialStack(MaterialsElements.getInstance().CARBON, 2), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 3), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2), + new MaterialStack(MaterialsElements.getInstance().CHLORINE, 1)); public static final Material DICHLOROACETIC_ACID = new Material( "Dichloroacetic Acid", @@ -388,10 +391,10 @@ public final class MISC_MATERIALS { "Cl2CH-COOH", 0, true, - new MaterialStack(ELEMENT.getInstance().CARBON, 2), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 2)); + new MaterialStack(MaterialsElements.getInstance().CARBON, 2), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 2), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2), + new MaterialStack(MaterialsElements.getInstance().CHLORINE, 2)); public static final Material TRICHLOROACETIC_ACID = new Material( "Trichloroacetic Acid", @@ -405,10 +408,10 @@ public final class MISC_MATERIALS { "Cl3C-COOH", 0, true, - new MaterialStack(ELEMENT.getInstance().CARBON, 2), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 3)); + new MaterialStack(MaterialsElements.getInstance().CARBON, 2), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2), + new MaterialStack(MaterialsElements.getInstance().CHLORINE, 3)); public static final Material CHLOROACETIC_MIXTURE = new Material( "Chloroacetic Mixture", @@ -423,10 +426,10 @@ public final class MISC_MATERIALS { "Cl?H?C-COOH", 0, true, - new MaterialStack(ELEMENT.getInstance().CARBON, 6), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 6), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 6)); + new MaterialStack(MaterialsElements.getInstance().CARBON, 6), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 6), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 6), + new MaterialStack(MaterialsElements.getInstance().CHLORINE, 6)); public static final Material SODIUM_CYANIDE = new Material( "Sodium Cyanide", @@ -440,9 +443,9 @@ public final class MISC_MATERIALS { "NaCN", 0, false, - new MaterialStack(ELEMENT.getInstance().SODIUM, 1), - new MaterialStack(ELEMENT.getInstance().CARBON, 1), - new MaterialStack(ELEMENT.getInstance().NITROGEN, 1)); + new MaterialStack(MaterialsElements.getInstance().SODIUM, 1), + new MaterialStack(MaterialsElements.getInstance().CARBON, 1), + new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1)); public static final Material CALCIUM_CHLORIDE = new Material( "Calcium Chloride", @@ -456,8 +459,8 @@ public final class MISC_MATERIALS { "CaCl2", 0, false, - new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 2)); + new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1), + new MaterialStack(MaterialsElements.getInstance().CHLORINE, 2)); public static final Material CYANOACETIC_ACID = new Material( "Cyanoacetic Acid", @@ -471,10 +474,10 @@ public final class MISC_MATERIALS { "C3H3NO2", 0, false, - new MaterialStack(ELEMENT.getInstance().CARBON, 3), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3), - new MaterialStack(ELEMENT.getInstance().NITROGEN, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 2)); + new MaterialStack(MaterialsElements.getInstance().CARBON, 3), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 3), + new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2)); public static final Material SOLID_ACID_MIXTURE = new Material( "Solid Acid Catalyst Mixture", @@ -488,9 +491,9 @@ public final class MISC_MATERIALS { "?H2SO4?", 0, true, - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2), - new MaterialStack(ELEMENT.getInstance().SULFUR, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)); + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 2), + new MaterialStack(MaterialsElements.getInstance().SULFUR, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 4)); public static final Material COPPER_SULFATE = new Material( "Copper(II) Sulfate", @@ -504,9 +507,9 @@ public final class MISC_MATERIALS { "CuSO4", 0, false, - new MaterialStack(ELEMENT.getInstance().COPPER, 1), - new MaterialStack(ELEMENT.getInstance().SULFUR, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)); + new MaterialStack(MaterialsElements.getInstance().COPPER, 1), + new MaterialStack(MaterialsElements.getInstance().SULFUR, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 4)); public static final Material COPPER_SULFATE_HYDRATED = new Material( "Copper(II) Sulfate Pentahydrate", @@ -520,9 +523,9 @@ public final class MISC_MATERIALS { "CuSO4∙(H2O)5", 0, false, - new MaterialStack(ELEMENT.getInstance().COPPER, 1), - new MaterialStack(ELEMENT.getInstance().SULFUR, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)); + new MaterialStack(MaterialsElements.getInstance().COPPER, 1), + new MaterialStack(MaterialsElements.getInstance().SULFUR, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 4)); public static final Material ETHYL_CYANOACETATE = new Material( "Ethyl Cyanoacetate", @@ -536,10 +539,10 @@ public final class MISC_MATERIALS { "C5H7NO2", 0, true, - new MaterialStack(ELEMENT.getInstance().CARBON, 2), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 3)); + new MaterialStack(MaterialsElements.getInstance().CARBON, 2), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2), + new MaterialStack(MaterialsElements.getInstance().CHLORINE, 3)); public static final Material CYANOACRYLATE_POLYMER = new Material( "Cyanoacrylate Polymer", @@ -553,10 +556,10 @@ public final class MISC_MATERIALS { "(-C6H7NO2-)n", 0, true, - new MaterialStack(ELEMENT.getInstance().CARBON, 2), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 3)); + new MaterialStack(MaterialsElements.getInstance().CARBON, 2), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2), + new MaterialStack(MaterialsElements.getInstance().CHLORINE, 3)); public static final Material ETHYL_CYANOACRYLATE = new Material( "Ethyl Cyanoacrylate (Super Glue)", @@ -570,10 +573,10 @@ public final class MISC_MATERIALS { "C6H7NO2", 0, true, - new MaterialStack(ELEMENT.getInstance().CARBON, 2), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 3)); + new MaterialStack(MaterialsElements.getInstance().CARBON, 2), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 2), + new MaterialStack(MaterialsElements.getInstance().CHLORINE, 3)); public static final Material MUTATED_LIVING_SOLDER = new Material( "Mutated Living Solder", @@ -587,6 +590,6 @@ public final class MISC_MATERIALS { "?Sn?Bi?", 0, true, - new MaterialStack(ELEMENT.getInstance().TIN, 1), - new MaterialStack(ELEMENT.getInstance().BISMUTH, 1)); + new MaterialStack(MaterialsElements.getInstance().TIN, 1), + new MaterialStack(MaterialsElements.getInstance().BISMUTH, 1)); } diff --git a/src/main/java/gtPlusPlus/core/material/MaterialStack.java b/src/main/java/gtPlusPlus/core/material/MaterialStack.java index 37070a35ec..d4d11781c5 100644 --- a/src/main/java/gtPlusPlus/core/material/MaterialStack.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialStack.java @@ -9,7 +9,7 @@ import gregtech.api.enums.OrePrefixes; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.bartworks.BW_Utils; +import gtPlusPlus.xmod.bartworks.BWUtils; public class MaterialStack { @@ -58,7 +58,7 @@ public class MaterialStack { public ItemStack getUnificatedDustStack(final int amount) { if (this.stackMaterial.werkstoffID != 0) { - ItemStack stack = BW_Utils + ItemStack stack = BWUtils .getCorrespondingItemStack(OrePrefixes.dust, this.stackMaterial.werkstoffID, amount); if (stack != null) { return stack; diff --git a/src/main/java/gtPlusPlus/core/material/ALLOY.java b/src/main/java/gtPlusPlus/core/material/MaterialsAlloy.java index 8df8d54f12..53017a4d29 100644 --- a/src/main/java/gtPlusPlus/core/material/ALLOY.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialsAlloy.java @@ -4,7 +4,7 @@ import gregtech.api.enums.Materials; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.minecraft.MaterialUtils; -public final class ALLOY { +public final class MaterialsAlloy { // Just some GT Alloys that I need within mine. public static final Material BRONZE = MaterialUtils.generateMaterialFromGtENUM(Materials.Bronze); @@ -30,10 +30,10 @@ public final class ALLOY { true, // Uses Blast furnace? "⬟ ⯂ ⬢ ⬣ ⯃ ⯄", // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().AER, 5), - new MaterialStack(ELEMENT.getInstance().IGNIS, 5), - new MaterialStack(ELEMENT.getInstance().TERRA, 5), - new MaterialStack(ELEMENT.getInstance().AQUA, 5)); + new MaterialStack(MaterialsElements.getInstance().AER, 5), + new MaterialStack(MaterialsElements.getInstance().IGNIS, 5), + new MaterialStack(MaterialsElements.getInstance().TERRA, 5), + new MaterialStack(MaterialsElements.getInstance().AQUA, 5)); public static final Material BLOODSTEEL = new Material( "Blood Steel", // Material Name @@ -45,8 +45,8 @@ public final class ALLOY { 100, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ALLOY.STEEL, 5), - new MaterialStack(ELEMENT.getInstance().IGNIS, 5)); + new MaterialStack(MaterialsAlloy.STEEL, 5), + new MaterialStack(MaterialsElements.getInstance().IGNIS, 5)); public static final Material STABALLOY = new Material( "Staballoy", // Material Name @@ -58,8 +58,8 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().URANIUM238, 9), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 1)); + new MaterialStack(MaterialsElements.getInstance().URANIUM238, 9), + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 1)); public static final Material TANTALLOY_60 = new Material( "Tantalloy-60", // Material Name @@ -71,8 +71,8 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4), - new MaterialStack(ELEMENT.getInstance().TANTALUM, 46)); + new MaterialStack(MaterialsElements.getInstance().TUNGSTEN, 4), + new MaterialStack(MaterialsElements.getInstance().TANTALUM, 46)); public static final Material TANTALLOY_61 = new Material( "Tantalloy-61", // Material Name @@ -84,9 +84,9 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ALLOY.TANTALLOY_60, 2), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 12), - new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8)); + new MaterialStack(MaterialsAlloy.TANTALLOY_60, 2), + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 12), + new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 8)); public static final Material TUMBAGA = new Material( "Tumbaga", // Material Name @@ -98,8 +98,8 @@ public final class ALLOY { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().GOLD, 70), - new MaterialStack(ELEMENT.getInstance().COPPER, 30)); + new MaterialStack(MaterialsElements.getInstance().GOLD, 70), + new MaterialStack(MaterialsElements.getInstance().COPPER, 30)); public static final Material POTIN = new Material( "Potin", // Material Name @@ -111,9 +111,9 @@ public final class ALLOY { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().LEAD, 40), - new MaterialStack(ALLOY.BRONZE, 40), - new MaterialStack(ELEMENT.getInstance().TIN, 20)); + new MaterialStack(MaterialsElements.getInstance().LEAD, 40), + new MaterialStack(MaterialsAlloy.BRONZE, 40), + new MaterialStack(MaterialsElements.getInstance().TIN, 20)); /* * public static final Material BEDROCKIUM = new Material( "Bedrockium", //Material Name new short[]{32, 32, 32, 0}, @@ -131,9 +131,9 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().NICKEL, 3), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 7), - new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10), + new MaterialStack(MaterialsElements.getInstance().NICKEL, 3), + new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 7), + new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 10), new MaterialStack(INVAR, 10), new MaterialStack(NICHROME, 13)); @@ -147,9 +147,9 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 5), - new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10), - new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10), + new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 5), + new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 10), + new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 10), new MaterialStack(NICHROME, 15)); public static final Material INCONEL_792 = new Material( @@ -162,9 +162,9 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().NICKEL, 20), - new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10), - new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 20), + new MaterialStack(MaterialsElements.getInstance().NICKEL, 20), + new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 10), + new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 20), new MaterialStack(NICHROME, 10)); public static final Material NITINOL_60 = new Material( @@ -177,8 +177,8 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().NICKEL, 40), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 60)); + new MaterialStack(MaterialsElements.getInstance().NICKEL, 40), + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 60)); public static final Material ZERON_100 = new Material( "Zeron-100", // Material Name @@ -190,12 +190,12 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 26), - new MaterialStack(ELEMENT.getInstance().NICKEL, 6), - new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4), - new MaterialStack(ELEMENT.getInstance().COPPER, 20), - new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4), - new MaterialStack(ALLOY.STEEL, 40)); + new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 26), + new MaterialStack(MaterialsElements.getInstance().NICKEL, 6), + new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 4), + new MaterialStack(MaterialsElements.getInstance().COPPER, 20), + new MaterialStack(MaterialsElements.getInstance().TUNGSTEN, 4), + new MaterialStack(MaterialsAlloy.STEEL, 40)); public static final Material MARAGING250 = new Material( "Maraging Steel 250", // Material Name @@ -207,11 +207,11 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ALLOY.STEEL, 64), - new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 4), - new MaterialStack(ELEMENT.getInstance().NICKEL, 16), - new MaterialStack(ELEMENT.getInstance().COBALT, 8)); + new MaterialStack(MaterialsAlloy.STEEL, 64), + new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 4), + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 4), + new MaterialStack(MaterialsElements.getInstance().NICKEL, 16), + new MaterialStack(MaterialsElements.getInstance().COBALT, 8)); public static final Material MARAGING300 = new Material( "Maraging Steel 300", // Material Name @@ -223,11 +223,11 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ALLOY.STEEL, 64), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 4), - new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4), - new MaterialStack(ELEMENT.getInstance().NICKEL, 16), - new MaterialStack(ELEMENT.getInstance().COBALT, 8)); + new MaterialStack(MaterialsAlloy.STEEL, 64), + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 4), + new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 4), + new MaterialStack(MaterialsElements.getInstance().NICKEL, 16), + new MaterialStack(MaterialsElements.getInstance().COBALT, 8)); public static final Material MARAGING350 = new Material( "Maraging Steel 350", // Material Name @@ -239,11 +239,11 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ALLOY.STEEL, 64), - new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4), - new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4), - new MaterialStack(ELEMENT.getInstance().NICKEL, 16), - new MaterialStack(ELEMENT.getInstance().COBALT, 8)); + new MaterialStack(MaterialsAlloy.STEEL, 64), + new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 4), + new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 4), + new MaterialStack(MaterialsElements.getInstance().NICKEL, 16), + new MaterialStack(MaterialsElements.getInstance().COBALT, 8)); public static final Material AQUATIC_STEEL = new Material( "Watertight Steel", // Material Name @@ -255,13 +255,13 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ALLOY.STEEL, 60), - new MaterialStack(ELEMENT.getInstance().CARBON, 10), - new MaterialStack(ELEMENT.getInstance().MANGANESE, 5), - new MaterialStack(ELEMENT.getInstance().SILICON, 10), - new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 5), - new MaterialStack(ELEMENT.getInstance().SULFUR, 5), - new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 5)); + new MaterialStack(MaterialsAlloy.STEEL, 60), + new MaterialStack(MaterialsElements.getInstance().CARBON, 10), + new MaterialStack(MaterialsElements.getInstance().MANGANESE, 5), + new MaterialStack(MaterialsElements.getInstance().SILICON, 10), + new MaterialStack(MaterialsElements.getInstance().PHOSPHORUS, 5), + new MaterialStack(MaterialsElements.getInstance().SULFUR, 5), + new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 5)); public static final Material STELLITE = new Material( "Stellite", // Material Name @@ -273,10 +273,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().COBALT, 35), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 35), - new MaterialStack(ELEMENT.getInstance().MANGANESE, 20), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 10)); + new MaterialStack(MaterialsElements.getInstance().COBALT, 35), + new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 35), + new MaterialStack(MaterialsElements.getInstance().MANGANESE, 20), + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 10)); public static final Material TALONITE = new Material( "Talonite", // Material Name @@ -288,10 +288,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().COBALT, 40), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 30), - new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 20), - new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10)); + new MaterialStack(MaterialsElements.getInstance().COBALT, 40), + new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 30), + new MaterialStack(MaterialsElements.getInstance().PHOSPHORUS, 20), + new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 10)); public static final Material HASTELLOY_W = new Material( "Hastelloy-W", // Material Name @@ -303,11 +303,11 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().IRON, 06), - new MaterialStack(ELEMENT.getInstance().COBALT, 2), - new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 24), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 6), - new MaterialStack(ELEMENT.getInstance().NICKEL, 62)); + new MaterialStack(MaterialsElements.getInstance().IRON, 06), + new MaterialStack(MaterialsElements.getInstance().COBALT, 2), + new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 24), + new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 6), + new MaterialStack(MaterialsElements.getInstance().NICKEL, 62)); public static final Material HASTELLOY_X = new Material( "Hastelloy-X", // Material Name @@ -319,12 +319,12 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().IRON, 18), - new MaterialStack(ELEMENT.getInstance().MANGANESE, 2), - new MaterialStack(ELEMENT.getInstance().SILICON, 2), - new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 8), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 22), - new MaterialStack(ELEMENT.getInstance().NICKEL, 48)); + new MaterialStack(MaterialsElements.getInstance().IRON, 18), + new MaterialStack(MaterialsElements.getInstance().MANGANESE, 2), + new MaterialStack(MaterialsElements.getInstance().SILICON, 2), + new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 8), + new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 22), + new MaterialStack(MaterialsElements.getInstance().NICKEL, 48)); public static final Material HASTELLOY_N = new Material( "Hastelloy-N", // Material Name @@ -336,11 +336,11 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8), - new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 8), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 8), - new MaterialStack(ELEMENT.getInstance().NICKEL, 60)); + new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 8), + new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 16), + new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 8), + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 8), + new MaterialStack(MaterialsElements.getInstance().NICKEL, 60)); public static final Material HASTELLOY_C276 = new Material( "Hastelloy-C276", // Material Name @@ -352,12 +352,12 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().COBALT, 2), - new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16), - new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 2), - new MaterialStack(ELEMENT.getInstance().COPPER, 2), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 14), - new MaterialStack(ELEMENT.getInstance().NICKEL, 64)); + new MaterialStack(MaterialsElements.getInstance().COBALT, 2), + new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 16), + new MaterialStack(MaterialsElements.getInstance().TUNGSTEN, 2), + new MaterialStack(MaterialsElements.getInstance().COPPER, 2), + new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 14), + new MaterialStack(MaterialsElements.getInstance().NICKEL, 64)); public static final Material INCOLOY_020 = new Material( "Incoloy-020", // Material Name @@ -369,10 +369,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().IRON, 40), - new MaterialStack(ELEMENT.getInstance().COPPER, 4), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20), - new MaterialStack(ELEMENT.getInstance().NICKEL, 36)); + new MaterialStack(MaterialsElements.getInstance().IRON, 40), + new MaterialStack(MaterialsElements.getInstance().COPPER, 4), + new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 20), + new MaterialStack(MaterialsElements.getInstance().NICKEL, 36)); public static final Material INCOLOY_DS = new Material( "Incoloy-DS", // Material Name @@ -384,10 +384,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().IRON, 46), - new MaterialStack(ELEMENT.getInstance().COBALT, 18), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 18), - new MaterialStack(ELEMENT.getInstance().NICKEL, 18)); + new MaterialStack(MaterialsElements.getInstance().IRON, 46), + new MaterialStack(MaterialsElements.getInstance().COBALT, 18), + new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 18), + new MaterialStack(MaterialsElements.getInstance().NICKEL, 18)); public static final Material INCOLOY_MA956 = new Material( "Incoloy-MA956", // Material Name @@ -399,10 +399,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().IRON, 64), - new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 12), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20), - new MaterialStack(ELEMENT.getInstance().YTTRIUM, 4)); + new MaterialStack(MaterialsElements.getInstance().IRON, 64), + new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 12), + new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 20), + new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 4)); public static final Material TUNGSTEN_CARBIDE = new Material( "Tungsten Carbide", // Material Name @@ -415,8 +415,8 @@ public final class ALLOY { true, // Uses Blast furnace? false, // Generate cells // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().CARBON, 50), - new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 50)); + new MaterialStack(MaterialsElements.getInstance().CARBON, 50), + new MaterialStack(MaterialsElements.getInstance().TUNGSTEN, 50)); public static final Material TUNGSTEN_TITANIUM_CARBIDE = new Material( "Tungsten Titanium Carbide", // Material Name @@ -429,7 +429,7 @@ public final class ALLOY { true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. new MaterialStack(TUNGSTEN_CARBIDE, 70), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 30)); + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 30)); public static final Material SILICON_CARBIDE = new Material( "Silicon Carbide", // Material Name @@ -441,8 +441,8 @@ public final class ALLOY { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().SILICON, 50), - new MaterialStack(ELEMENT.getInstance().CARBON, 50)); + new MaterialStack(MaterialsElements.getInstance().SILICON, 50), + new MaterialStack(MaterialsElements.getInstance().CARBON, 50)); public static final Material TANTALUM_CARBIDE = new Material( "Tantalum Carbide", // Material Name @@ -454,8 +454,8 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().TANTALUM, 50), - new MaterialStack(ELEMENT.getInstance().CARBON, 50)); + new MaterialStack(MaterialsElements.getInstance().TANTALUM, 50), + new MaterialStack(MaterialsElements.getInstance().CARBON, 50)); public static final Material ZIRCONIUM_CARBIDE = new Material( "Zirconium Carbide", // Material Name @@ -467,8 +467,8 @@ public final class ALLOY { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 50), - new MaterialStack(ELEMENT.getInstance().CARBON, 50)); + new MaterialStack(MaterialsElements.getInstance().ZIRCONIUM, 50), + new MaterialStack(MaterialsElements.getInstance().CARBON, 50)); public static final Material NIOBIUM_CARBIDE = new Material( "Niobium Carbide", // Material Name @@ -480,8 +480,8 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().NIOBIUM, 50), - new MaterialStack(ELEMENT.getInstance().CARBON, 50)); + new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 50), + new MaterialStack(MaterialsElements.getInstance().CARBON, 50)); public static final Material ARCANITE = new Material( "Arcanite", // Material Name @@ -493,10 +493,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().THORIUM232, 40), + new MaterialStack(MaterialsElements.getInstance().THORIUM232, 40), new MaterialStack(ENERGYCRYSTAL, 40), - new MaterialStack(ELEMENT.getInstance().ORDO, 10), - new MaterialStack(ELEMENT.getInstance().PERDITIO, 10)); + new MaterialStack(MaterialsElements.getInstance().ORDO, 10), + new MaterialStack(MaterialsElements.getInstance().PERDITIO, 10)); public static final Material LEAGRISIUM = new Material( "Grisium", // Material Name @@ -507,13 +507,13 @@ public final class ALLOY { 96, // Protons 128, // Neutrons true, // Uses Blast furnace? - new MaterialStack(ELEMENT.getInstance().TITANIUM, 18), - new MaterialStack(ELEMENT.getInstance().CARBON, 18), - new MaterialStack(ELEMENT.getInstance().POTASSIUM, 18), - new MaterialStack(ELEMENT.getInstance().LITHIUM, 18), - new MaterialStack(ELEMENT.getInstance().SULFUR, 18), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10)); // Material Stacks with Percentage of - // required elements. + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 18), + new MaterialStack(MaterialsElements.getInstance().CARBON, 18), + new MaterialStack(MaterialsElements.getInstance().POTASSIUM, 18), + new MaterialStack(MaterialsElements.getInstance().LITHIUM, 18), + new MaterialStack(MaterialsElements.getInstance().SULFUR, 18), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 10)); // Material Stacks with Percentage of + // required elements. public static final Material EGLIN_STEEL_BASE = new Material( "Eglin Steel Base Compound", // Material Name @@ -525,7 +525,7 @@ public final class ALLOY { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().IRON, 12), + new MaterialStack(MaterialsElements.getInstance().IRON, 12), new MaterialStack(KANTHAL, 3), new MaterialStack(INVAR, 15)); @@ -539,10 +539,10 @@ public final class ALLOY { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ALLOY.EGLIN_STEEL_BASE, 10), - new MaterialStack(ELEMENT.getInstance().SULFUR, 1), - new MaterialStack(ELEMENT.getInstance().SILICON, 4), - new MaterialStack(ELEMENT.getInstance().CARBON, 1)); + new MaterialStack(MaterialsAlloy.EGLIN_STEEL_BASE, 10), + new MaterialStack(MaterialsElements.getInstance().SULFUR, 1), + new MaterialStack(MaterialsElements.getInstance().SILICON, 4), + new MaterialStack(MaterialsElements.getInstance().CARBON, 1)); public static final Material HG1223 = new Material( "HG-1223", // Material Name @@ -553,11 +553,11 @@ public final class ALLOY { -1, -1, false, // Uses Blast furnace? - new MaterialStack(ELEMENT.getInstance().MERCURY, 1), - new MaterialStack(ELEMENT.getInstance().BARIUM, 2), - new MaterialStack(ELEMENT.getInstance().CALCIUM, 2), - new MaterialStack(ELEMENT.getInstance().COPPER, 3), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 8)); + new MaterialStack(MaterialsElements.getInstance().MERCURY, 1), + new MaterialStack(MaterialsElements.getInstance().BARIUM, 2), + new MaterialStack(MaterialsElements.getInstance().CALCIUM, 2), + new MaterialStack(MaterialsElements.getInstance().COPPER, 3), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 8)); public static final Material HS188A = new Material( "HS188-A", // Material Name @@ -568,10 +568,10 @@ public final class ALLOY { -1, // Protons -1, // Neutrons true, // Uses Blast furnace? - new MaterialStack(ELEMENT.getInstance().COBALT, 20), - new MaterialStack(ELEMENT.getInstance().HAFNIUM, 20), + new MaterialStack(MaterialsElements.getInstance().COBALT, 20), + new MaterialStack(MaterialsElements.getInstance().HAFNIUM, 20), new MaterialStack(TALONITE, 16), - new MaterialStack(ELEMENT.getInstance().RHENIUM, 10), + new MaterialStack(MaterialsElements.getInstance().RHENIUM, 10), new MaterialStack(NIOBIUM_CARBIDE, 10), new MaterialStack(HASTELLOY_X, 8), new MaterialStack(TUNGSTENSTEEL, 8), @@ -590,8 +590,8 @@ public final class ALLOY { -1, -1, true, // Uses Blast furnace? - new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 3), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 7)); + new MaterialStack(MaterialsElements.getInstance().TRINIUM_REFINED, 3), + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 7)); public static final Material TRINIUM_NAQUADAH = new Material( "Trinium Naquadah Alloy", // Material Name @@ -602,8 +602,8 @@ public final class ALLOY { -1, -1, false, // Uses Blast furnace? - new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 5), - new MaterialStack(ELEMENT.getInstance().NAQUADAH, 9)); + new MaterialStack(MaterialsElements.getInstance().TRINIUM_REFINED, 5), + new MaterialStack(MaterialsElements.getInstance().NAQUADAH, 9)); public static final Material TRINIUM_NAQUADAH_CARBON = new Material( "Trinium Naquadah Carbonite", // Material Name MaterialState.SOLID, // State @@ -614,7 +614,7 @@ public final class ALLOY { -1, true, // Uses Blast furnace? new MaterialStack(TRINIUM_NAQUADAH, 9), - new MaterialStack(ELEMENT.getInstance().CARBON, 1)); + new MaterialStack(MaterialsElements.getInstance().CARBON, 1)); public static final Material TRINIUM_REINFORCED_STEEL = new Material( "Arceus Alloy 2B", // Material Name @@ -626,11 +626,11 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 30), - new MaterialStack(ALLOY.MARAGING350, 40), - new MaterialStack(ALLOY.TUNGSTENSTEEL, 20), - new MaterialStack(ALLOY.OSMIRIDIUM, 10), - new MaterialStack(ELEMENT.getInstance().STRONTIUM, 10)); + new MaterialStack(MaterialsElements.getInstance().TRINIUM_REFINED, 30), + new MaterialStack(MaterialsAlloy.MARAGING350, 40), + new MaterialStack(MaterialsAlloy.TUNGSTENSTEEL, 20), + new MaterialStack(MaterialsAlloy.OSMIRIDIUM, 10), + new MaterialStack(MaterialsElements.getInstance().STRONTIUM, 10)); /* * Witchery Material @@ -646,9 +646,9 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().NICKEL, 35), - new MaterialStack(ELEMENT.getInstance().THAUMIUM, 30), - new MaterialStack(ELEMENT.getInstance().IRON, 35)); + new MaterialStack(MaterialsElements.getInstance().NICKEL, 35), + new MaterialStack(MaterialsElements.getInstance().THAUMIUM, 30), + new MaterialStack(MaterialsElements.getInstance().IRON, 35)); /* * Top Tier Alloys @@ -664,11 +664,11 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().HELIUM, 20), - new MaterialStack(ELEMENT.getInstance().LITHIUM, 20), - new MaterialStack(ELEMENT.getInstance().COBALT, 20), - new MaterialStack(ELEMENT.getInstance().PLATINUM, 20), - new MaterialStack(ELEMENT.getInstance().ERBIUM, 20)); + new MaterialStack(MaterialsElements.getInstance().HELIUM, 20), + new MaterialStack(MaterialsElements.getInstance().LITHIUM, 20), + new MaterialStack(MaterialsElements.getInstance().COBALT, 20), + new MaterialStack(MaterialsElements.getInstance().PLATINUM, 20), + new MaterialStack(MaterialsElements.getInstance().ERBIUM, 20)); // 0lafe Compound public static final Material LAFIUM = new Material( @@ -681,14 +681,14 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ALLOY.HASTELLOY_N, 8), - new MaterialStack(ELEMENT.getInstance().NAQUADAH, 4), - new MaterialStack(ELEMENT.getInstance().SAMARIUM, 2), - new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4), - new MaterialStack(ELEMENT.getInstance().ARGON, 2), - new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 6), - new MaterialStack(ELEMENT.getInstance().NICKEL, 8), - new MaterialStack(ELEMENT.getInstance().CARBON, 2)); + new MaterialStack(MaterialsAlloy.HASTELLOY_N, 8), + new MaterialStack(MaterialsElements.getInstance().NAQUADAH, 4), + new MaterialStack(MaterialsElements.getInstance().SAMARIUM, 2), + new MaterialStack(MaterialsElements.getInstance().TUNGSTEN, 4), + new MaterialStack(MaterialsElements.getInstance().ARGON, 2), + new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 6), + new MaterialStack(MaterialsElements.getInstance().NICKEL, 8), + new MaterialStack(MaterialsElements.getInstance().CARBON, 2)); // Cinobi Alloy public static final Material CINOBITE = new Material( @@ -701,14 +701,14 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ALLOY.ZERON_100, 16), - new MaterialStack(ELEMENT.getInstance().NAQUADRIA, 7), - new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 5), - new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 3), - new MaterialStack(ELEMENT.getInstance().MERCURY, 2), - new MaterialStack(ELEMENT.getInstance().TIN, 2), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 12), - new MaterialStack(ALLOY.OSMIRIDIUM, 6)); + new MaterialStack(MaterialsAlloy.ZERON_100, 16), + new MaterialStack(MaterialsElements.getInstance().NAQUADRIA, 7), + new MaterialStack(MaterialsElements.getInstance().GADOLINIUM, 5), + new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 3), + new MaterialStack(MaterialsElements.getInstance().MERCURY, 2), + new MaterialStack(MaterialsElements.getInstance().TIN, 2), + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 12), + new MaterialStack(MaterialsAlloy.OSMIRIDIUM, 6)); // Piky Alloy public static final Material PIKYONIUM = new Material( @@ -721,14 +721,14 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ALLOY.INCONEL_792, 16), - new MaterialStack(ALLOY.EGLIN_STEEL, 10), - new MaterialStack(ELEMENT.getInstance().NAQUADAH_ENRICHED, 8), - new MaterialStack(ELEMENT.getInstance().CERIUM, 6), - new MaterialStack(ELEMENT.getInstance().ANTIMONY, 4), - new MaterialStack(ELEMENT.getInstance().PLATINUM, 4), - new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), - new MaterialStack(ALLOY.TUNGSTENSTEEL, 8)); + new MaterialStack(MaterialsAlloy.INCONEL_792, 16), + new MaterialStack(MaterialsAlloy.EGLIN_STEEL, 10), + new MaterialStack(MaterialsElements.getInstance().NAQUADAH_ENRICHED, 8), + new MaterialStack(MaterialsElements.getInstance().CERIUM, 6), + new MaterialStack(MaterialsElements.getInstance().ANTIMONY, 4), + new MaterialStack(MaterialsElements.getInstance().PLATINUM, 4), + new MaterialStack(MaterialsElements.getInstance().YTTERBIUM, 2), + new MaterialStack(MaterialsAlloy.TUNGSTENSTEEL, 8)); // Piky Alloy public static final Material ABYSSAL = new Material( @@ -741,14 +741,14 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ALLOY.STAINLESS_STEEL, 10), - new MaterialStack(ALLOY.TUNGSTEN_CARBIDE, 10), - new MaterialStack(ALLOY.NICHROME, 10), - new MaterialStack(ALLOY.BRONZE, 10), - new MaterialStack(ALLOY.INCOLOY_MA956, 10), - new MaterialStack(ELEMENT.getInstance().IODINE, 2), - new MaterialStack(ELEMENT.getInstance().RADON, 2), - new MaterialStack(ELEMENT.getInstance().GERMANIUM, 2)); + new MaterialStack(MaterialsAlloy.STAINLESS_STEEL, 10), + new MaterialStack(MaterialsAlloy.TUNGSTEN_CARBIDE, 10), + new MaterialStack(MaterialsAlloy.NICHROME, 10), + new MaterialStack(MaterialsAlloy.BRONZE, 10), + new MaterialStack(MaterialsAlloy.INCOLOY_MA956, 10), + new MaterialStack(MaterialsElements.getInstance().IODINE, 2), + new MaterialStack(MaterialsElements.getInstance().RADON, 2), + new MaterialStack(MaterialsElements.getInstance().GERMANIUM, 2)); // Alkalus Alloy public static final Material LAURENIUM = new Material( @@ -761,11 +761,11 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ALLOY.EGLIN_STEEL, 40), - new MaterialStack(ELEMENT.getInstance().INDIUM, 10), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20), - new MaterialStack(ELEMENT.getInstance().DYSPROSIUM, 5), - new MaterialStack(ELEMENT.getInstance().RHENIUM, 5)); + new MaterialStack(MaterialsAlloy.EGLIN_STEEL, 40), + new MaterialStack(MaterialsElements.getInstance().INDIUM, 10), + new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 20), + new MaterialStack(MaterialsElements.getInstance().DYSPROSIUM, 5), + new MaterialStack(MaterialsElements.getInstance().RHENIUM, 5)); // Bot Alloy public static final Material BOTMIUM = new Material( @@ -778,10 +778,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ALLOY.NITINOL_60, 2), - new MaterialStack(ELEMENT.getInstance().OSMIUM, 12), - new MaterialStack(ELEMENT.getInstance().RUTHENIUM, 12), - new MaterialStack(ELEMENT.getInstance().THALLIUM, 6)); + new MaterialStack(MaterialsAlloy.NITINOL_60, 2), + new MaterialStack(MaterialsElements.getInstance().OSMIUM, 12), + new MaterialStack(MaterialsElements.getInstance().RUTHENIUM, 12), + new MaterialStack(MaterialsElements.getInstance().THALLIUM, 6)); // Titansteel public static final Material TITANSTEEL = new Material( @@ -794,10 +794,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ALLOY.TUNGSTEN_TITANIUM_CARBIDE, 3), - new MaterialStack(ELEMENT.getInstance().IGNIS, 1), - new MaterialStack(ELEMENT.getInstance().TERRA, 1), - new MaterialStack(ELEMENT.getInstance().PERDITIO, 1)); + new MaterialStack(MaterialsAlloy.TUNGSTEN_TITANIUM_CARBIDE, 3), + new MaterialStack(MaterialsElements.getInstance().IGNIS, 1), + new MaterialStack(MaterialsElements.getInstance().TERRA, 1), + new MaterialStack(MaterialsElements.getInstance().PERDITIO, 1)); public static final Material OCTIRON = new Material( "Octiron", // Material Name @@ -813,7 +813,7 @@ public final class ALLOY { new MaterialStack(TITANSTEEL, 30), new MaterialStack(ENERGYCRYSTAL, 5), new MaterialStack(STEEL_BLACK, 10), - new MaterialStack(ELEMENT.getInstance().THAUMIUM, 25)); + new MaterialStack(MaterialsElements.getInstance().THAUMIUM, 25)); public static final Material BLACK_TITANIUM = new Material( "Black Titanium", // Material Name @@ -825,15 +825,15 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().TITANIUM, 55), - new MaterialStack(ELEMENT.getInstance().LANTHANUM, 12), - new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 8), - new MaterialStack(ELEMENT.getInstance().COBALT, 6), - new MaterialStack(ELEMENT.getInstance().MANGANESE, 4), - new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 4), - new MaterialStack(ELEMENT.getInstance().PALLADIUM, 4), - new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2), - new MaterialStack(ELEMENT.getInstance().ARGON, 5)); + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 55), + new MaterialStack(MaterialsElements.getInstance().LANTHANUM, 12), + new MaterialStack(MaterialsElements.getInstance().TUNGSTEN, 8), + new MaterialStack(MaterialsElements.getInstance().COBALT, 6), + new MaterialStack(MaterialsElements.getInstance().MANGANESE, 4), + new MaterialStack(MaterialsElements.getInstance().PHOSPHORUS, 4), + new MaterialStack(MaterialsElements.getInstance().PALLADIUM, 4), + new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 2), + new MaterialStack(MaterialsElements.getInstance().ARGON, 5)); public static final Material BABBIT_ALLOY = new Material( "Babbit Alloy", // Material Name @@ -845,10 +845,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().TIN, 10), - new MaterialStack(ELEMENT.getInstance().LEAD, 72), - new MaterialStack(ELEMENT.getInstance().ANTIMONY, 16), - new MaterialStack(ELEMENT.getInstance().ARSENIC, 2)); + new MaterialStack(MaterialsElements.getInstance().TIN, 10), + new MaterialStack(MaterialsElements.getInstance().LEAD, 72), + new MaterialStack(MaterialsElements.getInstance().ANTIMONY, 16), + new MaterialStack(MaterialsElements.getInstance().ARSENIC, 2)); public static final Material INDALLOY_140 = new Material( "Indalloy 140", // Material Name @@ -860,11 +860,11 @@ public final class ALLOY { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ELEMENT.getInstance().BISMUTH, 47), - new MaterialStack(ELEMENT.getInstance().LEAD, 25), - new MaterialStack(ELEMENT.getInstance().TIN, 13), - new MaterialStack(ELEMENT.getInstance().CADMIUM, 10), - new MaterialStack(ELEMENT.getInstance().INDIUM, 5)); + new MaterialStack(MaterialsElements.getInstance().BISMUTH, 47), + new MaterialStack(MaterialsElements.getInstance().LEAD, 25), + new MaterialStack(MaterialsElements.getInstance().TIN, 13), + new MaterialStack(MaterialsElements.getInstance().CADMIUM, 10), + new MaterialStack(MaterialsElements.getInstance().INDIUM, 5)); // Quantum public static final Material QUANTUM = new Material( @@ -877,12 +877,12 @@ public final class ALLOY { 200, // Neutrons true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(ALLOY.STELLITE, 15), - new MaterialStack(ALLOY.ENERGYCRYSTAL, 5), - new MaterialStack(ALLOY.SILICON_CARBIDE, 5), - new MaterialStack(ELEMENT.getInstance().GALLIUM, 5), - new MaterialStack(ELEMENT.getInstance().AMERICIUM, 5), - new MaterialStack(ELEMENT.getInstance().PALLADIUM, 5), - new MaterialStack(ELEMENT.getInstance().BISMUTH, 5), - new MaterialStack(ELEMENT.getInstance().GERMANIUM, 5)); + new MaterialStack(MaterialsAlloy.STELLITE, 15), + new MaterialStack(MaterialsAlloy.ENERGYCRYSTAL, 5), + new MaterialStack(MaterialsAlloy.SILICON_CARBIDE, 5), + new MaterialStack(MaterialsElements.getInstance().GALLIUM, 5), + new MaterialStack(MaterialsElements.getInstance().AMERICIUM, 5), + new MaterialStack(MaterialsElements.getInstance().PALLADIUM, 5), + new MaterialStack(MaterialsElements.getInstance().BISMUTH, 5), + new MaterialStack(MaterialsElements.getInstance().GERMANIUM, 5)); } diff --git a/src/main/java/gtPlusPlus/core/material/ELEMENT.java b/src/main/java/gtPlusPlus/core/material/MaterialsElements.java index 9bcea2a47b..d1fcf3f5c5 100644 --- a/src/main/java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialsElements.java @@ -8,7 +8,7 @@ import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; -public final class ELEMENT { +public final class MaterialsElements { public static final String[] NAMES = new String[] { "Hydrogen", "Helium" }; @@ -467,15 +467,15 @@ public final class ELEMENT { Logger.MATERIALS("Initialising Base Elements."); } - private static final ELEMENT INSTANCE = new ELEMENT(); + private static final MaterialsElements INSTANCE = new MaterialsElements(); - public ELEMENT() { + public MaterialsElements() { // GTNH Trinium Handling TRINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Trinium); TRINIUM_REFINED = TRINIUM; } - public static ELEMENT getInstance() { + public static MaterialsElements getInstance() { return INSTANCE; } @@ -520,7 +520,7 @@ public final class ELEMENT { "Advanced Nitinol", MaterialState.SOLID, TextureSets.ENRICHED.get(), - ALLOY.NITINOL_60.getRGB(), + MaterialsAlloy.NITINOL_60.getRGB(), 8400, 14377, 40, diff --git a/src/main/java/gtPlusPlus/core/material/MaterialsOres.java b/src/main/java/gtPlusPlus/core/material/MaterialsOres.java new file mode 100644 index 0000000000..d78b88d1c7 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/material/MaterialsOres.java @@ -0,0 +1,778 @@ +package gtPlusPlus.core.material; + +import gregtech.api.enums.TextureSet; +import gtPlusPlus.core.client.CustomTextureSet.TextureSets; +import gtPlusPlus.core.material.state.MaterialState; + +public final class MaterialsOres { + + public static final Material AGARDITE_CD = new Material( + "Agardite (Cd)", // Material Name + MaterialState.ORE, // State + TextureSet.SET_METALLIC, // Texture Set + new short[] { 170, 188, 33, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { // (CdCa)Cu7(AsO2)4(O2H)5·3H2O + new MaterialStack(MaterialsElements.getInstance().CADMIUM, 1), + new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1), + new MaterialStack(MaterialsElements.getInstance().COPPER, 7), + new MaterialStack(MaterialsElements.getInstance().ARSENIC, 4), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 21), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 11) }); + + public static final Material AGARDITE_LA = new Material( + "Agardite (La)", // Material Name + MaterialState.ORE, // State + TextureSet.SET_FINE, // Texture Set + new short[] { 206, 232, 9, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { // (LaCa)Cu5(AsO6)2(OH)4·3H2O + new MaterialStack(MaterialsElements.getInstance().LANTHANUM, 1), + new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1), + new MaterialStack(MaterialsElements.getInstance().COPPER, 5), + new MaterialStack(MaterialsElements.getInstance().ARSENIC, 2), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 19), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 10) }); + + public static final Material AGARDITE_ND = new Material( + "Agardite (Nd)", // Material Name + MaterialState.ORE, // State + TextureSet.SET_METALLIC, // Texture Set + new short[] { 225, 244, 78, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { // (NdCa)Cu6(As3O3)2(O2H)6·3H2O + new MaterialStack(MaterialsElements.getInstance().NEODYMIUM, 1), + new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1), + new MaterialStack(MaterialsElements.getInstance().COPPER, 6), + new MaterialStack(MaterialsElements.getInstance().ARSENIC, 6), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 21), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 12) }); + + public static final Material AGARDITE_Y = new Material( + "Agardite (Y)", // Material Name + MaterialState.ORE, // State + TextureSet.SET_METALLIC, // Texture Set + new short[] { 210, 232, 44, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { // (YCa)Cu5(As2O4)3(OH)6·3H2O + new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 1), + new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1), + new MaterialStack(MaterialsElements.getInstance().COPPER, 5), + new MaterialStack(MaterialsElements.getInstance().ARSENIC, 6), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 21), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 12) }); + + // Alburnite + // Ag8GeTe2S4 + public static final Material ALBURNITE = new Material( + "Alburnite", // Material Name + MaterialState.ORE, // State + TextureSet.SET_METALLIC, // Texture Set + new short[] { 16, 5, 105, 0 }, // Material Colour + -1, + -1, + -1, + -1, + 0, // Radiation + new MaterialStack[] { // Na3AlF6 + new MaterialStack(MaterialsElements.getInstance().GOLD, 8), + new MaterialStack(MaterialsElements.getInstance().GERMANIUM, 1), + new MaterialStack(MaterialsElements.getInstance().TELLURIUM, 2), + new MaterialStack(MaterialsElements.getInstance().SULFUR, 4) }); + + public static final Material CERITE = new Material( + "Cerite", // Material Name + MaterialState.ORE, // State + TextureSets.REFINED.get(), // Texture Set + new short[] { 68, 13, 0, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { // (Ce,La,Ca)9(Mg,Fe+3)(SiO4)6(SiO3OH)(OH)3 + new MaterialStack(MaterialsElements.getInstance().CERIUM, 9), + new MaterialStack(MaterialsElements.getInstance().LANTHANUM, 9), + new MaterialStack(MaterialsElements.getInstance().CALCIUM, 9), + new MaterialStack(MaterialsElements.getInstance().MAGNESIUM, 3), + new MaterialStack(MaterialsElements.getInstance().IRON, 3), + new MaterialStack(MaterialsElements.getInstance().SILICON, 7), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 20), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 4) }); + + // Comancheite + // Hg55N24(NH2,OH)4(Cl,Br)34 + public static final Material COMANCHEITE = new Material( + "Comancheite", // Material Name + MaterialState.ORE, // State + TextureSets.REFINED.get(), // Texture Set + new short[] { 65, 205, 105, 0 }, // Material Colour + -1, + -1, + -1, + -1, + 0, // Radiation + new MaterialStack[] { // Na3AlF6 + new MaterialStack(MaterialsElements.getInstance().MERCURY, 54 / 4), + new MaterialStack(MaterialsElements.getInstance().NITROGEN, 28 / 4), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 12 / 4), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 8 / 4), + new MaterialStack(MaterialsElements.getInstance().CHLORINE, 34 / 4), + new MaterialStack(MaterialsElements.getInstance().BROMINE, 34 / 4) }); + + public static final Material CROCROITE = new Material( + "Crocoite", // Material Name + MaterialState.ORE, // State + TextureSet.SET_GEM_VERTICAL, // Texture Set + new short[] { 255, 143, 84, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().LEAD, 2), + new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 2), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3), + new MaterialStack(MaterialsElements.getInstance().CAESIUM, 1), }); + + public static final Material CRYOLITE = new Material( + "Cryolite (F)", // Material Name + MaterialState.ORE, // State + TextureSet.SET_SHINY, // Texture Set + new short[] { 205, 205, 255, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { // Na3AlF6 + new MaterialStack(MaterialsElements.getInstance().SODIUM, 3), + new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6) }); + + // Demicheleite-(Br) + // BiSBr + public static final Material DEMICHELEITE_BR = new Material( + "Demicheleite (Br)", // Material Name + MaterialState.ORE, // State + TextureSet.SET_SHINY, // Texture Set + new short[] { 165, 75, 75, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { // Na3AlF6 + new MaterialStack(MaterialsElements.getInstance().BISMUTH, 13), + new MaterialStack(MaterialsElements.getInstance().SULFUR, 11), + new MaterialStack(MaterialsElements.getInstance().BROMINE, 1) }); + + public static final Material FLORENCITE = new Material( + "Florencite", // Material Name + MaterialState.ORE, // State + TextureSet.SET_METALLIC, // Texture Set + new short[] { 249, 249, 124, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { // SmAl3(PO4)2(OH)6 + new MaterialStack(MaterialsElements.getInstance().SAMARIUM, 1), + new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 3), + new MaterialStack(MaterialsElements.getInstance().PHOSPHORUS, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 10), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 6) }); + + public static final Material FLUORCAPHITE = new Material( + "Fluorcaphite", // Material Name + MaterialState.ORE, // State + TextureSet.SET_FINE, // Texture Set + new short[] { 255, 255, 30, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { // (Ca,Sr,Ce,Na)5(PO4)3F + new MaterialStack(MaterialsElements.getInstance().CALCIUM, 5), + new MaterialStack(MaterialMisc.STRONTIUM_OXIDE, 5), + new MaterialStack(MaterialsElements.getInstance().CERIUM, 5), + new MaterialStack(MaterialsElements.getInstance().SODIUM, 5), + new MaterialStack(MaterialsElements.getInstance().PHOSPHORUS, 3), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 12), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6), }); + + // Gadolinite_Ce + public static final Material GADOLINITE_CE = new Material( + "Gadolinite (Ce)", // Material Name + MaterialState.ORE, // State + TextureSets.REFINED.get(), // Texture Set + new short[] { 15, 159, 59, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CERIUM, 4), + new MaterialStack(MaterialsElements.getInstance().ERBIUM, 2), + new MaterialStack(MaterialsElements.getInstance().LANTHANUM, 2), + new MaterialStack(MaterialsElements.getInstance().NEODYMIUM, 2), + new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 2), + new MaterialStack(MaterialsElements.getInstance().GADOLINIUM, 1), + new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 2), + new MaterialStack(MaterialsElements.getInstance().SILICON, 7), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 14), }); + + // Gadolinite_Y + public static final Material GADOLINITE_Y = new Material( + "Gadolinite (Y)", // Material Name + MaterialState.ORE, // State + TextureSets.REFINED.get(), // Texture Set + new short[] { 35, 189, 99, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CERIUM, 2), + new MaterialStack(MaterialsElements.getInstance().ERBIUM, 2), + new MaterialStack(MaterialsElements.getInstance().LANTHANUM, 2), + new MaterialStack(MaterialsElements.getInstance().NEODYMIUM, 2), + new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 4), + new MaterialStack(MaterialsElements.getInstance().GADOLINIUM, 2), + new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 3), + new MaterialStack(MaterialsElements.getInstance().SILICON, 4), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 9), }); + + public static final Material GEIKIELITE = new Material( + "Geikielite", // Material Name + MaterialState.ORE, // State + TextureSets.GEM_A.get(), // Texture Set + new short[] { 187, 193, 204, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().MAGNESIUM, 1), + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3) }); + + public static final Material GREENOCKITE = new Material( + "Greenockite", // Material Name + MaterialState.ORE, // State + TextureSets.GEM_A.get(), // Texture Set + new short[] { 110, 193, 25, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CADMIUM, 1), + new MaterialStack(MaterialsElements.getInstance().SULFUR, 1), }); + + public static final Material HIBONITE = new Material( + "Hibonite", // Material Name + MaterialState.ORE, // State + TextureSet.SET_METALLIC, // Texture Set + new short[] { 58, 31, 0, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { // ((Ca,Ce)(Al,Ti,Mg)12O19) + new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1), + new MaterialStack(MaterialsElements.getInstance().CERIUM, 1), + new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 12), + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 12), + new MaterialStack(MaterialsElements.getInstance().MAGNESIUM, 12), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 19), }); + + // Honeaite + // Au3TlTe2 + public static final Material HONEAITE = new Material( + "Honeaite", // Material Name + MaterialState.ORE, // State + TextureSet.SET_FINE, // Texture Set + new short[] { 165, 165, 5, 0 }, // Material Colour + -1, + -1, + -1, + -1, + 0, // Radiation + new MaterialStack[] { // Na3AlF6 + new MaterialStack(MaterialsElements.getInstance().GOLD, 3), + new MaterialStack(MaterialsElements.getInstance().THALLIUM, 1), + new MaterialStack(MaterialsElements.getInstance().TELLURIUM, 2) }); + + // Irarsite + // (Ir,Ru,Rh,Pt)AsS + public static final Material IRARSITE = new Material( + "Irarsite", // Material Name + MaterialState.ORE, // State + TextureSets.ENRICHED.get(), // Texture Set + new short[] { 125, 105, 105, 0 }, // Material Colour + -1, + -1, + -1, + -1, + 0, // Radiation + new MaterialStack[] { // Na3AlF6 + new MaterialStack(MaterialsElements.getInstance().IRIDIUM, 1), + new MaterialStack(MaterialsElements.getInstance().RUTHENIUM, 1), + new MaterialStack(MaterialsElements.getInstance().RHODIUM, 1), + new MaterialStack(MaterialsElements.getInstance().PLATINUM, 1), + new MaterialStack(MaterialsElements.getInstance().ARSENIC, 1), + new MaterialStack(MaterialsElements.getInstance().SULFUR, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1) }); + + // Kashinite + // (Ir,Rh)2S3 + public static final Material KASHINITE = new Material( + "Kashinite", // Material Name + MaterialState.ORE, // State + TextureSet.SET_SHINY, // Texture Set + new short[] { 75, 105, 75, 0 }, // Material Colour + -1, + -1, + -1, + -1, + 0, // Radiation + new MaterialStack[] { // Na3AlF6 + new MaterialStack(MaterialsElements.getInstance().IRIDIUM, 2), + new MaterialStack(MaterialsElements.getInstance().RHODIUM, 2), + new MaterialStack(MaterialsElements.getInstance().SULFUR, 3) }); + + // Tl(Cl,Br) + public static final Material LAFOSSAITE = new Material( + "Lafossaite", // Material Name + MaterialState.ORE, // State + TextureSets.REFINED.get(), // Texture Set + new short[] { 165, 105, 205, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { // Na3AlF6 + new MaterialStack(MaterialsElements.getInstance().CHLORINE, 1), + new MaterialStack(MaterialsElements.getInstance().BROMINE, 1), + new MaterialStack(MaterialsElements.getInstance().THALLIUM, 1) }); + + public static final Material LANTHANITE_CE = new Material( + "Lanthanite (Ce)", // Material Name + MaterialState.ORE, // State + TextureSet.SET_METALLIC, // Texture Set + new short[] { 186, 113, 179, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { // (Ce)2(CO3)3·8(H2O) + new MaterialStack(MaterialsElements.getInstance().CERIUM, 2), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3), + new MaterialStack(MaterialsElements.getInstance().CALCIUM, 3), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 2), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1), }); + + public static final Material LANTHANITE_LA = new Material( + "Lanthanite (La)", // Material Name + MaterialState.ORE, // State + TextureSets.REFINED.get(), // Texture Set + new short[] { 219, 160, 214, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { // (La)2(CO3)3·8(H2O) + new MaterialStack(MaterialsElements.getInstance().LANTHANUM, 2), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3), + new MaterialStack(MaterialsElements.getInstance().CALCIUM, 3), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 2), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1), }); + + public static final Material LANTHANITE_ND = new Material( + "Lanthanite (Nd)", // Material Name + MaterialState.ORE, // State + TextureSet.SET_METALLIC, // Texture Set + new short[] { 153, 76, 145, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { // (Nd)2(CO3)3·8(H2O) + new MaterialStack(MaterialsElements.getInstance().NEODYMIUM, 2), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3), + new MaterialStack(MaterialsElements.getInstance().CALCIUM, 3), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 2), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 1), }); + + // Iodine Source + public static final Material LAUTARITE = new Material( + "Lautarite", // Material Name + MaterialState.ORE, // State + TextureSet.SET_FINE, // Texture Set + new short[] { 165, 105, 205, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { // Na3AlF6 + new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1), + new MaterialStack(MaterialsElements.getInstance().IODINE, 2), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 6) }); + + public static final Material LEPERSONNITE = new Material( + "Lepersonnite", // Material Name + MaterialState.ORE, // State + TextureSet.SET_EMERALD, // Texture Set + new short[] { 175, 175, 20, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1), + new MaterialStack(MaterialsElements.getInstance().YTTERBIUM, 3), + new MaterialStack(MaterialsElements.getInstance().GADOLINIUM, 2), + new MaterialStack(MaterialsElements.getInstance().DYSPROSIUM, 2), + new MaterialStack(MaterialsElements.getInstance().URANIUM235, 2), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 29), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 24) }); + + // Miessiite + // Pd11Te2Se2 + public static final Material MIESSIITE = new Material( + "Miessiite", // Material Name + MaterialState.ORE, // State + TextureSet.SET_FINE, // Texture Set + new short[] { 75, 75, 75, 0 }, // Material Colour + -1, + -1, + -1, + -1, + 0, // Radiation + new MaterialStack[] { // Na3AlF6 + new MaterialStack(MaterialsElements.getInstance().PALLADIUM, 11), + new MaterialStack(MaterialsElements.getInstance().TELLURIUM, 2), + new MaterialStack(MaterialsElements.getInstance().SELENIUM, 2) }); + + public static final Material NICHROMITE = new Material( + "Nichromite", // Material Name + MaterialState.ORE, // State + TextureSet.SET_METALLIC, // Texture Set + new short[] { 22, 19, 19, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().NICKEL, 1), + new MaterialStack(MaterialsElements.getInstance().COBALT, 1), + new MaterialStack(MaterialsElements.getInstance().IRON, 3), + new MaterialStack(MaterialsElements.getInstance().ALUMINIUM, 2), + new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 2), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 8) }); + + // Perroudite + // Hg5Ag4S5(I,Br)2Cl2 + public static final Material PERROUDITE = new Material( + "Perroudite", // Material Name + MaterialState.ORE, // State + TextureSet.SET_METALLIC, // Texture Set + new short[] { 77, 165, 174, 0 }, // Material Colour + -1, + -1, + -1, + -1, + 0, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().SULFUR, 5), + new MaterialStack(MaterialsElements.getInstance().SILVER, 4), + new MaterialStack(MaterialsElements.getInstance().IODINE, 2), + new MaterialStack(MaterialsElements.getInstance().MERCURY, 5), + new MaterialStack(MaterialsElements.getInstance().BROMINE, 2), + new MaterialStack(MaterialsElements.getInstance().CHLORINE, 2) }); + + public static final Material POLYCRASE = new Material( + "Polycrase", // Material Name + MaterialState.ORE, // State + TextureSet.SET_ROUGH, // Texture Set + new short[] { 51, 0, 11, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 1), + new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1), + new MaterialStack(MaterialsElements.getInstance().CERIUM, 1), + new MaterialStack(MaterialsElements.getInstance().URANIUM235, 1), + new MaterialStack(MaterialsElements.getInstance().THORIUM, 1), + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 2), + new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 2), + new MaterialStack(MaterialsElements.getInstance().TANTALUM, 2), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 6) }); + + // Radiobarite + // Radium, Barium, Barite? + public static final Material RADIOBARITE = new Material( + "Barite (Ra)", // Material Name + MaterialState.ORE, // State + TextureSet.SET_FLINT, // Texture Set + new short[] { 205, 205, 205, 0 }, // Material Colour + -1, + -1, + -1, + -1, + 0, // Radiation + new MaterialStack[] { // Na3AlF6 + new MaterialStack(MaterialsElements.getInstance().BARIUM, 32), + new MaterialStack(MaterialsElements.getInstance().RADIUM, 1), + new MaterialStack(MaterialsElements.getInstance().SULFUR, 16), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 15) }); + + // Samarskite_Y + public static final Material SAMARSKITE_Y = new Material( + "Samarskite (Y)", // Material Name + MaterialState.ORE, // State + TextureSets.ENRICHED.get(), // Texture Set + new short[] { 65, 163, 164, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 2), // Y not YT/YB + new MaterialStack(MaterialsElements.getInstance().IRON, 10), + new MaterialStack(MaterialsElements.getInstance().URANIUM235, 2), + new MaterialStack(MaterialsElements.getInstance().THORIUM, 3), + new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 2), + new MaterialStack(MaterialsElements.getInstance().TANTALUM, 3) }); + + // Samarskite_YB + public static final Material SAMARSKITE_YB = new Material( + "Samarskite (Yb)", // Material Name + MaterialState.ORE, // State + TextureSets.ENRICHED.get(), // Texture Set + new short[] { 95, 193, 194, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().YTTERBIUM, 2), // Y not YT/YB + new MaterialStack(MaterialsElements.getInstance().IRON, 9), + new MaterialStack(MaterialsElements.getInstance().URANIUM235, 3), + new MaterialStack(MaterialsElements.getInstance().THORIUM, 2), + new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 3), + new MaterialStack(MaterialsElements.getInstance().TANTALUM, 2) }); + + public static final Material TITANITE = new Material( + "Titanite", // Material Name + MaterialState.ORE, // State + TextureSet.SET_METALLIC, // Texture Set + new short[] { 184, 198, 105, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CALCIUM, 2), + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 2), + new MaterialStack(MaterialsElements.getInstance().SILICON, 2), + new MaterialStack(MaterialsElements.getInstance().THORIUM, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 10) }); + + public static final Material XENOTIME = new Material( + "Xenotime", // Material Name + MaterialState.ORE, // State + TextureSet.SET_OPAL, // Texture Set + new short[] { 235, 89, 199, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 2), + new MaterialStack(MaterialsElements.getInstance().YTTERBIUM, 2), + new MaterialStack(MaterialsElements.getInstance().ERBIUM, 2), + new MaterialStack(MaterialsElements.getInstance().EUROPIUM, 1), + new MaterialStack(MaterialsElements.getInstance().PHOSPHORUS, 2), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 8) }); + + public static final Material YTTRIAITE = new Material( // TODO + "Yttriaite", // Material Name + MaterialState.ORE, // State + TextureSet.SET_METALLIC, // Texture Set + new short[] { 255, 143, 84, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 1), // Y not YT/YB + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 3), + new MaterialStack(MaterialsElements.getInstance().IRON, 4), + new MaterialStack(MaterialsElements.getInstance().TIN, 1), + new MaterialStack(MaterialsElements.getInstance().NITROGEN, 2) }); + + public static final Material YTTRIALITE = new Material( + "Yttrialite", // Material Name + MaterialState.ORE, // State + TextureSet.SET_RUBY, // Texture Set + new short[] { 35, 189, 99, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 2), + new MaterialStack(MaterialsElements.getInstance().THORIUM, 2), + new MaterialStack(MaterialsElements.getInstance().SILICON, 2), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 7), }); + + public static final Material YTTROCERITE = new Material( + "Yttrocerite", // Material Name + MaterialState.ORE, // State + TextureSet.SET_DIAMOND, // Texture Set + new short[] { 35, 19, 199, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CERIUM, 1), + new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 5), + new MaterialStack(MaterialsElements.getInstance().YTTRIUM, 1), }); + + public static final Material ZIMBABWEITE = new Material( + "Zimbabweite", // Material Name + MaterialState.ORE, // State + TextureSet.SET_FINE, // Texture Set + new short[] { 193, 187, 131, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CALCIUM, 2), + new MaterialStack(MaterialsElements.getInstance().POTASSIUM, 2), + new MaterialStack(MaterialsElements.getInstance().LEAD, 1), + new MaterialStack(MaterialsElements.getInstance().ARSENIC, 4), + new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 4), + new MaterialStack(MaterialsElements.getInstance().TANTALUM, 4), + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 4), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 18) }); + + public static final Material ZIRCON = new Material( + "Zircon", // Material Name + MaterialState.ORE, // State + TextureSets.GEM_A.get(), // Texture Set + new short[] { 195, 19, 19, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().ZIRCONIUM, 1), + new MaterialStack(MaterialsElements.getInstance().SILICON, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 4), }); + + public static final Material ZIRCONILITE = new Material( + "Zirconolite", // Material Name + MaterialState.ORE, // State + TextureSet.SET_FINE, // Texture Set + new short[] { 45, 26, 0, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CALCIUM, 2), + new MaterialStack(MaterialsElements.getInstance().ZIRCONIUM, 2), + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 4), + new MaterialStack(MaterialsElements.getInstance().CERIUM, 1), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 14) }); + + public static final Material ZIRCOPHYLLITE = new Material( + "Zircophyllite", // Material Name + MaterialState.ORE, // State + TextureSets.REFINED.get(), // Texture Set + new short[] { 30, 0, 6, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().POTASSIUM, 3), + new MaterialStack(MaterialsElements.getInstance().SODIUM, 3), + new MaterialStack(MaterialsElements.getInstance().MANGANESE, 7), + new MaterialStack(MaterialsElements.getInstance().IRON, 7), + new MaterialStack(MaterialsElements.getInstance().ZIRCONIUM, 2), + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 2), + new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 2), + new MaterialStack(MaterialsElements.getInstance().SILICON, 8), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 13), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 7), }); + + public static final Material ZIRKELITE = new Material( + "Zirkelite", // Material Name + MaterialState.ORE, // State + TextureSets.GEM_A.get(), // Texture Set + new short[] { 229, 208, 48, 0 }, // Material Colour + -1, + -1, + -1, + -1, + -1, // Radiation + new MaterialStack[] { // (Ca,Th,Ce)Zr(Ti,Nb)2O7 + new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1), + new MaterialStack(MaterialsElements.getInstance().THORIUM, 1), + new MaterialStack(MaterialsElements.getInstance().CERIUM, 1), + new MaterialStack(MaterialsElements.getInstance().ZIRCONIUM, 1), + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 2), + new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 2), + new MaterialStack(MaterialsElements.getInstance().OXYGEN, 7) }); + + public static final Material DEEP_EARTH_REACTOR_FUEL_DEPOSIT = new Material( + "Radioactive Mineral Mix", // Material Name + MaterialState.ORE, // State + TextureSets.NUCLEAR.get(), // Texture Set + null, // Material Colour + -1, + -1, + -1, + -1, + 4, // Radiation + new MaterialStack[] { // Na3AlF6 + new MaterialStack(MaterialsElements.getInstance().RADON, 2), + new MaterialStack(MaterialsElements.getInstance().RADIUM, 1), + new MaterialStack(MaterialsElements.getInstance().URANIUM235, 1), + new MaterialStack(MaterialsElements.getInstance().URANIUM238, 10), + new MaterialStack(MaterialsElements.getInstance().THORIUM, 25), + new MaterialStack(MaterialsElements.getInstance().THORIUM232, 4), new MaterialStack(FLUORCAPHITE, 6), + new MaterialStack(SAMARSKITE_Y, 8), new MaterialStack(TITANITE, 4) }); +} diff --git a/src/main/java/gtPlusPlus/core/material/NONMATERIAL.java b/src/main/java/gtPlusPlus/core/material/MaterialsOther.java index 5e084b84bf..38a2ce73c1 100644 --- a/src/main/java/gtPlusPlus/core/material/NONMATERIAL.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialsOther.java @@ -4,7 +4,7 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.TextureSet; import gtPlusPlus.core.util.minecraft.MaterialUtils; -public class NONMATERIAL { +public class MaterialsOther { // Soul Sand public static final Material SOULSAND = MaterialUtils.generateMaterialFromGtENUM(Materials.SoulSand); diff --git a/src/main/java/gtPlusPlus/core/material/ORES.java b/src/main/java/gtPlusPlus/core/material/ORES.java deleted file mode 100644 index 420c553d49..0000000000 --- a/src/main/java/gtPlusPlus/core/material/ORES.java +++ /dev/null @@ -1,701 +0,0 @@ -package gtPlusPlus.core.material; - -import gregtech.api.enums.TextureSet; -import gtPlusPlus.core.client.CustomTextureSet.TextureSets; -import gtPlusPlus.core.material.state.MaterialState; - -public final class ORES { - - public static final Material AGARDITE_CD = new Material( - "Agardite (Cd)", // Material Name - MaterialState.ORE, // State - TextureSet.SET_METALLIC, // Texture Set - new short[] { 170, 188, 33, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { // (CdCa)Cu7(AsO2)4(O2H)5·3H2O - new MaterialStack(ELEMENT.getInstance().CADMIUM, 1), new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), - new MaterialStack(ELEMENT.getInstance().COPPER, 7), new MaterialStack(ELEMENT.getInstance().ARSENIC, 4), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 21), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 11) }); - - public static final Material AGARDITE_LA = new Material( - "Agardite (La)", // Material Name - MaterialState.ORE, // State - TextureSet.SET_FINE, // Texture Set - new short[] { 206, 232, 9, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { // (LaCa)Cu5(AsO6)2(OH)4·3H2O - new MaterialStack(ELEMENT.getInstance().LANTHANUM, 1), new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), - new MaterialStack(ELEMENT.getInstance().COPPER, 5), new MaterialStack(ELEMENT.getInstance().ARSENIC, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 19), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10) }); - - public static final Material AGARDITE_ND = new Material( - "Agardite (Nd)", // Material Name - MaterialState.ORE, // State - TextureSet.SET_METALLIC, // Texture Set - new short[] { 225, 244, 78, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { // (NdCa)Cu6(As3O3)2(O2H)6·3H2O - new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 1), new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), - new MaterialStack(ELEMENT.getInstance().COPPER, 6), new MaterialStack(ELEMENT.getInstance().ARSENIC, 6), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 21), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12) }); - - public static final Material AGARDITE_Y = new Material( - "Agardite (Y)", // Material Name - MaterialState.ORE, // State - TextureSet.SET_METALLIC, // Texture Set - new short[] { 210, 232, 44, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { // (YCa)Cu5(As2O4)3(OH)6·3H2O - new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), - new MaterialStack(ELEMENT.getInstance().COPPER, 5), new MaterialStack(ELEMENT.getInstance().ARSENIC, 6), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 21), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12) }); - - // Alburnite - // Ag8GeTe2S4 - public static final Material ALBURNITE = new Material( - "Alburnite", // Material Name - MaterialState.ORE, // State - TextureSet.SET_METALLIC, // Texture Set - new short[] { 16, 5, 105, 0 }, // Material Colour - -1, - -1, - -1, - -1, - 0, // Radiation - new MaterialStack[] { // Na3AlF6 - new MaterialStack(ELEMENT.getInstance().GOLD, 8), new MaterialStack(ELEMENT.getInstance().GERMANIUM, 1), - new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2), - new MaterialStack(ELEMENT.getInstance().SULFUR, 4) }); - - public static final Material CERITE = new Material( - "Cerite", // Material Name - MaterialState.ORE, // State - TextureSets.REFINED.get(), // Texture Set - new short[] { 68, 13, 0, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { // (Ce,La,Ca)9(Mg,Fe+3)(SiO4)6(SiO3OH)(OH)3 - new MaterialStack(ELEMENT.getInstance().CERIUM, 9), new MaterialStack(ELEMENT.getInstance().LANTHANUM, 9), - new MaterialStack(ELEMENT.getInstance().CALCIUM, 9), new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 3), - new MaterialStack(ELEMENT.getInstance().IRON, 3), new MaterialStack(ELEMENT.getInstance().SILICON, 7), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 20), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4) }); - - // Comancheite - // Hg55N24(NH2,OH)4(Cl,Br)34 - public static final Material COMANCHEITE = new Material( - "Comancheite", // Material Name - MaterialState.ORE, // State - TextureSets.REFINED.get(), // Texture Set - new short[] { 65, 205, 105, 0 }, // Material Colour - -1, - -1, - -1, - -1, - 0, // Radiation - new MaterialStack[] { // Na3AlF6 - new MaterialStack(ELEMENT.getInstance().MERCURY, 54 / 4), - new MaterialStack(ELEMENT.getInstance().NITROGEN, 28 / 4), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12 / 4), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 8 / 4), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 34 / 4), - new MaterialStack(ELEMENT.getInstance().BROMINE, 34 / 4) }); - - public static final Material CROCROITE = new Material( - "Crocoite", // Material Name - MaterialState.ORE, // State - TextureSet.SET_GEM_VERTICAL, // Texture Set - new short[] { 255, 143, 84, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().LEAD, 2), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2), new MaterialStack(ELEMENT.getInstance().OXYGEN, 3), - new MaterialStack(ELEMENT.getInstance().CAESIUM, 1), }); - - public static final Material CRYOLITE = new Material( - "Cryolite (F)", // Material Name - MaterialState.ORE, // State - TextureSet.SET_SHINY, // Texture Set - new short[] { 205, 205, 255, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { // Na3AlF6 - new MaterialStack(ELEMENT.getInstance().SODIUM, 3), new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) }); - - // Demicheleite-(Br) - // BiSBr - public static final Material DEMICHELEITE_BR = new Material( - "Demicheleite (Br)", // Material Name - MaterialState.ORE, // State - TextureSet.SET_SHINY, // Texture Set - new short[] { 165, 75, 75, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { // Na3AlF6 - new MaterialStack(ELEMENT.getInstance().BISMUTH, 13), new MaterialStack(ELEMENT.getInstance().SULFUR, 11), - new MaterialStack(ELEMENT.getInstance().BROMINE, 1) }); - - public static final Material FLORENCITE = new Material( - "Florencite", // Material Name - MaterialState.ORE, // State - TextureSet.SET_METALLIC, // Texture Set - new short[] { 249, 249, 124, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { // SmAl3(PO4)2(OH)6 - new MaterialStack(ELEMENT.getInstance().SAMARIUM, 1), new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 3), - new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1), new MaterialStack(ELEMENT.getInstance().OXYGEN, 10), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6) }); - - public static final Material FLUORCAPHITE = new Material( - "Fluorcaphite", // Material Name - MaterialState.ORE, // State - TextureSet.SET_FINE, // Texture Set - new short[] { 255, 255, 30, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { // (Ca,Sr,Ce,Na)5(PO4)3F - new MaterialStack(ELEMENT.getInstance().CALCIUM, 5), new MaterialStack(MISC_MATERIALS.STRONTIUM_OXIDE, 5), - new MaterialStack(ELEMENT.getInstance().CERIUM, 5), new MaterialStack(ELEMENT.getInstance().SODIUM, 5), - new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 3), new MaterialStack(ELEMENT.getInstance().OXYGEN, 12), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 6), }); - - // Gadolinite_Ce - public static final Material GADOLINITE_CE = new Material( - "Gadolinite (Ce)", // Material Name - MaterialState.ORE, // State - TextureSets.REFINED.get(), // Texture Set - new short[] { 15, 159, 59, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CERIUM, 4), - new MaterialStack(ELEMENT.getInstance().ERBIUM, 2), new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2), - new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2), new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), - new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 1), - new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 2), new MaterialStack(ELEMENT.getInstance().SILICON, 7), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 14), }); - - // Gadolinite_Y - public static final Material GADOLINITE_Y = new Material( - "Gadolinite (Y)", // Material Name - MaterialState.ORE, // State - TextureSets.REFINED.get(), // Texture Set - new short[] { 35, 189, 99, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CERIUM, 2), - new MaterialStack(ELEMENT.getInstance().ERBIUM, 2), new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2), - new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2), new MaterialStack(ELEMENT.getInstance().YTTRIUM, 4), - new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2), - new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 3), new MaterialStack(ELEMENT.getInstance().SILICON, 4), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 9), }); - - public static final Material GEIKIELITE = new Material( - "Geikielite", // Material Name - MaterialState.ORE, // State - TextureSets.GEM_A.get(), // Texture Set - new short[] { 187, 193, 204, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 1), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 1), new MaterialStack(ELEMENT.getInstance().OXYGEN, 3) }); - - public static final Material GREENOCKITE = new Material( - "Greenockite", // Material Name - MaterialState.ORE, // State - TextureSets.GEM_A.get(), // Texture Set - new short[] { 110, 193, 25, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CADMIUM, 1), - new MaterialStack(ELEMENT.getInstance().SULFUR, 1), }); - - public static final Material HIBONITE = new Material( - "Hibonite", // Material Name - MaterialState.ORE, // State - TextureSet.SET_METALLIC, // Texture Set - new short[] { 58, 31, 0, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { // ((Ca,Ce)(Al,Ti,Mg)12O19) - new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), new MaterialStack(ELEMENT.getInstance().CERIUM, 1), - new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 12), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 12), - new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 12), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 19), }); - - // Honeaite - // Au3TlTe2 - public static final Material HONEAITE = new Material( - "Honeaite", // Material Name - MaterialState.ORE, // State - TextureSet.SET_FINE, // Texture Set - new short[] { 165, 165, 5, 0 }, // Material Colour - -1, - -1, - -1, - -1, - 0, // Radiation - new MaterialStack[] { // Na3AlF6 - new MaterialStack(ELEMENT.getInstance().GOLD, 3), new MaterialStack(ELEMENT.getInstance().THALLIUM, 1), - new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2) }); - - // Irarsite - // (Ir,Ru,Rh,Pt)AsS - public static final Material IRARSITE = new Material( - "Irarsite", // Material Name - MaterialState.ORE, // State - TextureSets.ENRICHED.get(), // Texture Set - new short[] { 125, 105, 105, 0 }, // Material Colour - -1, - -1, - -1, - -1, - 0, // Radiation - new MaterialStack[] { // Na3AlF6 - new MaterialStack(ELEMENT.getInstance().IRIDIUM, 1), new MaterialStack(ELEMENT.getInstance().RUTHENIUM, 1), - new MaterialStack(ELEMENT.getInstance().RHODIUM, 1), new MaterialStack(ELEMENT.getInstance().PLATINUM, 1), - new MaterialStack(ELEMENT.getInstance().ARSENIC, 1), new MaterialStack(ELEMENT.getInstance().SULFUR, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 1) }); - - // Kashinite - // (Ir,Rh)2S3 - public static final Material KASHINITE = new Material( - "Kashinite", // Material Name - MaterialState.ORE, // State - TextureSet.SET_SHINY, // Texture Set - new short[] { 75, 105, 75, 0 }, // Material Colour - -1, - -1, - -1, - -1, - 0, // Radiation - new MaterialStack[] { // Na3AlF6 - new MaterialStack(ELEMENT.getInstance().IRIDIUM, 2), new MaterialStack(ELEMENT.getInstance().RHODIUM, 2), - new MaterialStack(ELEMENT.getInstance().SULFUR, 3) }); - - // Tl(Cl,Br) - public static final Material LAFOSSAITE = new Material( - "Lafossaite", // Material Name - MaterialState.ORE, // State - TextureSets.REFINED.get(), // Texture Set - new short[] { 165, 105, 205, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { // Na3AlF6 - new MaterialStack(ELEMENT.getInstance().CHLORINE, 1), new MaterialStack(ELEMENT.getInstance().BROMINE, 1), - new MaterialStack(ELEMENT.getInstance().THALLIUM, 1) }); - - public static final Material LANTHANITE_CE = new Material( - "Lanthanite (Ce)", // Material Name - MaterialState.ORE, // State - TextureSet.SET_METALLIC, // Texture Set - new short[] { 186, 113, 179, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { // (Ce)2(CO3)3·8(H2O) - new MaterialStack(ELEMENT.getInstance().CERIUM, 2), new MaterialStack(ELEMENT.getInstance().OXYGEN, 3), - new MaterialStack(ELEMENT.getInstance().CALCIUM, 3), new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 1), }); - - public static final Material LANTHANITE_LA = new Material( - "Lanthanite (La)", // Material Name - MaterialState.ORE, // State - TextureSets.REFINED.get(), // Texture Set - new short[] { 219, 160, 214, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { // (La)2(CO3)3·8(H2O) - new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2), new MaterialStack(ELEMENT.getInstance().OXYGEN, 3), - new MaterialStack(ELEMENT.getInstance().CALCIUM, 3), new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 1), }); - - public static final Material LANTHANITE_ND = new Material( - "Lanthanite (Nd)", // Material Name - MaterialState.ORE, // State - TextureSet.SET_METALLIC, // Texture Set - new short[] { 153, 76, 145, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { // (Nd)2(CO3)3·8(H2O) - new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2), new MaterialStack(ELEMENT.getInstance().OXYGEN, 3), - new MaterialStack(ELEMENT.getInstance().CALCIUM, 3), new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 1), }); - - // Iodine Source - public static final Material LAUTARITE = new Material( - "Lautarite", // Material Name - MaterialState.ORE, // State - TextureSet.SET_FINE, // Texture Set - new short[] { 165, 105, 205, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { // Na3AlF6 - new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), new MaterialStack(ELEMENT.getInstance().IODINE, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 6) }); - - public static final Material LEPERSONNITE = new Material( - "Lepersonnite", // Material Name - MaterialState.ORE, // State - TextureSet.SET_EMERALD, // Texture Set - new short[] { 175, 175, 20, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), - new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 3), - new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2), - new MaterialStack(ELEMENT.getInstance().DYSPROSIUM, 2), - new MaterialStack(ELEMENT.getInstance().URANIUM235, 2), new MaterialStack(ELEMENT.getInstance().OXYGEN, 29), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 24) }); - - // Miessiite - // Pd11Te2Se2 - public static final Material MIESSIITE = new Material( - "Miessiite", // Material Name - MaterialState.ORE, // State - TextureSet.SET_FINE, // Texture Set - new short[] { 75, 75, 75, 0 }, // Material Colour - -1, - -1, - -1, - -1, - 0, // Radiation - new MaterialStack[] { // Na3AlF6 - new MaterialStack(ELEMENT.getInstance().PALLADIUM, 11), - new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2), - new MaterialStack(ELEMENT.getInstance().SELENIUM, 2) }); - - public static final Material NICHROMITE = new Material( - "Nichromite", // Material Name - MaterialState.ORE, // State - TextureSet.SET_METALLIC, // Texture Set - new short[] { 22, 19, 19, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NICKEL, 1), - new MaterialStack(ELEMENT.getInstance().COBALT, 1), new MaterialStack(ELEMENT.getInstance().IRON, 3), - new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 2), new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 8) }); - - // Perroudite - // Hg5Ag4S5(I,Br)2Cl2 - public static final Material PERROUDITE = new Material( - "Perroudite", // Material Name - MaterialState.ORE, // State - TextureSet.SET_METALLIC, // Texture Set - new short[] { 77, 165, 174, 0 }, // Material Colour - -1, - -1, - -1, - -1, - 0, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().SULFUR, 5), - new MaterialStack(ELEMENT.getInstance().SILVER, 4), new MaterialStack(ELEMENT.getInstance().IODINE, 2), - new MaterialStack(ELEMENT.getInstance().MERCURY, 5), new MaterialStack(ELEMENT.getInstance().BROMINE, 2), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 2) }); - - public static final Material POLYCRASE = new Material( - "Polycrase", // Material Name - MaterialState.ORE, // State - TextureSet.SET_ROUGH, // Texture Set - new short[] { 51, 0, 11, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), - new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), new MaterialStack(ELEMENT.getInstance().CERIUM, 1), - new MaterialStack(ELEMENT.getInstance().URANIUM235, 1), new MaterialStack(ELEMENT.getInstance().THORIUM, 1), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 2), new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2), - new MaterialStack(ELEMENT.getInstance().TANTALUM, 2), new MaterialStack(ELEMENT.getInstance().OXYGEN, 6) }); - - // Radiobarite - // Radium, Barium, Barite? - public static final Material RADIOBARITE = new Material( - "Barite (Ra)", // Material Name - MaterialState.ORE, // State - TextureSet.SET_FLINT, // Texture Set - new short[] { 205, 205, 205, 0 }, // Material Colour - -1, - -1, - -1, - -1, - 0, // Radiation - new MaterialStack[] { // Na3AlF6 - new MaterialStack(ELEMENT.getInstance().BARIUM, 32), new MaterialStack(ELEMENT.getInstance().RADIUM, 1), - new MaterialStack(ELEMENT.getInstance().SULFUR, 16), new MaterialStack(ELEMENT.getInstance().OXYGEN, 15) }); - - // Samarskite_Y - public static final Material SAMARSKITE_Y = new Material( - "Samarskite (Y)", // Material Name - MaterialState.ORE, // State - TextureSets.ENRICHED.get(), // Texture Set - new short[] { 65, 163, 164, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), // Y not YT/YB - new MaterialStack(ELEMENT.getInstance().IRON, 10), new MaterialStack(ELEMENT.getInstance().URANIUM235, 2), - new MaterialStack(ELEMENT.getInstance().THORIUM, 3), new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2), - new MaterialStack(ELEMENT.getInstance().TANTALUM, 3) }); - - // Samarskite_YB - public static final Material SAMARSKITE_YB = new Material( - "Samarskite (Yb)", // Material Name - MaterialState.ORE, // State - TextureSets.ENRICHED.get(), // Texture Set - new short[] { 95, 193, 194, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), // Y not YT/YB - new MaterialStack(ELEMENT.getInstance().IRON, 9), new MaterialStack(ELEMENT.getInstance().URANIUM235, 3), - new MaterialStack(ELEMENT.getInstance().THORIUM, 2), new MaterialStack(ELEMENT.getInstance().NIOBIUM, 3), - new MaterialStack(ELEMENT.getInstance().TANTALUM, 2) }); - - public static final Material TITANITE = new Material( - "Titanite", // Material Name - MaterialState.ORE, // State - TextureSet.SET_METALLIC, // Texture Set - new short[] { 184, 198, 105, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 2), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 2), new MaterialStack(ELEMENT.getInstance().SILICON, 2), - new MaterialStack(ELEMENT.getInstance().THORIUM, 1), new MaterialStack(ELEMENT.getInstance().OXYGEN, 10) }); - - public static final Material XENOTIME = new Material( - "Xenotime", // Material Name - MaterialState.ORE, // State - TextureSet.SET_OPAL, // Texture Set - new short[] { 235, 89, 199, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), - new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), new MaterialStack(ELEMENT.getInstance().ERBIUM, 2), - new MaterialStack(ELEMENT.getInstance().EUROPIUM, 1), - new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 8) }); - - public static final Material YTTRIAITE = new Material( // TODO - "Yttriaite", // Material Name - MaterialState.ORE, // State - TextureSet.SET_METALLIC, // Texture Set - new short[] { 255, 143, 84, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), // Y not YT/YB - new MaterialStack(ELEMENT.getInstance().OXYGEN, 3), new MaterialStack(ELEMENT.getInstance().IRON, 4), - new MaterialStack(ELEMENT.getInstance().TIN, 1), new MaterialStack(ELEMENT.getInstance().NITROGEN, 2) }); - - public static final Material YTTRIALITE = new Material( - "Yttrialite", // Material Name - MaterialState.ORE, // State - TextureSet.SET_RUBY, // Texture Set - new short[] { 35, 189, 99, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), - new MaterialStack(ELEMENT.getInstance().THORIUM, 2), new MaterialStack(ELEMENT.getInstance().SILICON, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 7), }); - - public static final Material YTTROCERITE = new Material( - "Yttrocerite", // Material Name - MaterialState.ORE, // State - TextureSet.SET_DIAMOND, // Texture Set - new short[] { 35, 19, 199, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CERIUM, 1), - new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), new MaterialStack(ELEMENT.getInstance().FLUORINE, 5), - new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), }); - - public static final Material ZIMBABWEITE = new Material( - "Zimbabweite", // Material Name - MaterialState.ORE, // State - TextureSet.SET_FINE, // Texture Set - new short[] { 193, 187, 131, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 2), - new MaterialStack(ELEMENT.getInstance().POTASSIUM, 2), new MaterialStack(ELEMENT.getInstance().LEAD, 1), - new MaterialStack(ELEMENT.getInstance().ARSENIC, 4), new MaterialStack(ELEMENT.getInstance().NIOBIUM, 4), - new MaterialStack(ELEMENT.getInstance().TANTALUM, 4), new MaterialStack(ELEMENT.getInstance().TITANIUM, 4), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 18) }); - - public static final Material ZIRCON = new Material( - "Zircon", // Material Name - MaterialState.ORE, // State - TextureSets.GEM_A.get(), // Texture Set - new short[] { 195, 19, 19, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1), - new MaterialStack(ELEMENT.getInstance().SILICON, 1), new MaterialStack(ELEMENT.getInstance().OXYGEN, 4), }); - - public static final Material ZIRCONILITE = new Material( - "Zirconolite", // Material Name - MaterialState.ORE, // State - TextureSet.SET_FINE, // Texture Set - new short[] { 45, 26, 0, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 2), - new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2), new MaterialStack(ELEMENT.getInstance().TITANIUM, 4), - new MaterialStack(ELEMENT.getInstance().CERIUM, 1), new MaterialStack(ELEMENT.getInstance().OXYGEN, 14) }); - - public static final Material ZIRCOPHYLLITE = new Material( - "Zircophyllite", // Material Name - MaterialState.ORE, // State - TextureSets.REFINED.get(), // Texture Set - new short[] { 30, 0, 6, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().POTASSIUM, 3), - new MaterialStack(ELEMENT.getInstance().SODIUM, 3), new MaterialStack(ELEMENT.getInstance().MANGANESE, 7), - new MaterialStack(ELEMENT.getInstance().IRON, 7), new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 2), new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2), - new MaterialStack(ELEMENT.getInstance().SILICON, 8), new MaterialStack(ELEMENT.getInstance().OXYGEN, 13), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 7), }); - - public static final Material ZIRKELITE = new Material( - "Zirkelite", // Material Name - MaterialState.ORE, // State - TextureSets.GEM_A.get(), // Texture Set - new short[] { 229, 208, 48, 0 }, // Material Colour - -1, - -1, - -1, - -1, - -1, // Radiation - new MaterialStack[] { // (Ca,Th,Ce)Zr(Ti,Nb)2O7 - new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), new MaterialStack(ELEMENT.getInstance().THORIUM, 1), - new MaterialStack(ELEMENT.getInstance().CERIUM, 1), new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 2), new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 7) }); - - public static final Material DEEP_EARTH_REACTOR_FUEL_DEPOSIT = new Material( - "Radioactive Mineral Mix", // Material Name - MaterialState.ORE, // State - TextureSets.NUCLEAR.get(), // Texture Set - null, // Material Colour - -1, - -1, - -1, - -1, - 4, // Radiation - new MaterialStack[] { // Na3AlF6 - new MaterialStack(ELEMENT.getInstance().RADON, 2), new MaterialStack(ELEMENT.getInstance().RADIUM, 1), - new MaterialStack(ELEMENT.getInstance().URANIUM235, 1), - new MaterialStack(ELEMENT.getInstance().URANIUM238, 10), - new MaterialStack(ELEMENT.getInstance().THORIUM, 25), - new MaterialStack(ELEMENT.getInstance().THORIUM232, 4), new MaterialStack(FLUORCAPHITE, 6), - new MaterialStack(SAMARSKITE_Y, 8), new MaterialStack(TITANITE, 4) }); -} diff --git a/src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsFluorides.java index 5a50a604da..f3ae16c644 100644 --- a/src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java +++ b/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsFluorides.java @@ -1,13 +1,13 @@ package gtPlusPlus.core.material.nuclear; import gregtech.api.enums.Materials; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialMisc; import gtPlusPlus.core.material.MaterialStack; +import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.material.state.MaterialState; -public class FLUORIDES { +public class MaterialsFluorides { public static final Material FLUORITE = new Material( "Fluorite (F)", // Material Name @@ -20,9 +20,10 @@ public class FLUORIDES { false, // Uses Blast furnace? false, // Generate cells // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 16), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 32), new MaterialStack(ELEMENT.getInstance().IRON, 4), - new MaterialStack(ELEMENT.getInstance().CARBON, 2) }); + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CALCIUM, 16), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 32), + new MaterialStack(MaterialsElements.getInstance().IRON, 4), + new MaterialStack(MaterialsElements.getInstance().CARBON, 2) }); // ThF4 public static final Material THORIUM_TETRAFLUORIDE = new Material( @@ -35,8 +36,8 @@ public class FLUORIDES { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().THORIUM232, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 4) }); + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().THORIUM232, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4) }); // ThF6 public static final Material THORIUM_HEXAFLUORIDE = new Material( @@ -49,9 +50,9 @@ public class FLUORIDES { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().THORIUM232, 1), - new MaterialStack(ELEMENT.getInstance().THORIUM, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 12) }); + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().THORIUM232, 1), + new MaterialStack(MaterialsElements.getInstance().THORIUM, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 12) }); // UF4 public static final Material URANIUM_TETRAFLUORIDE = new Material( @@ -64,8 +65,8 @@ public class FLUORIDES { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().URANIUM233, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 4) }); + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().URANIUM233, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4) }); // UF6 public static final Material URANIUM_HEXAFLUORIDE = new Material( @@ -78,8 +79,8 @@ public class FLUORIDES { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) }); + new MaterialStack[] { new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2) }); // ZrF4 @@ -98,15 +99,15 @@ public class FLUORIDES { -1, true, false, - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 4) }); + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().ZIRCONIUM, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4) }); /* * public static final Material ZIRCONIUM_TETRAFLUORIDE = new Material( "Zirconium Tetrafluoride", //Material Name * MaterialState.LIQUID, //State null, //Material Colour -1, //Melting Point in C -1, //Boiling Point in C -1, * //Protons -1, //Neutrons false, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new * MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1), new - * MaterialStack(ELEMENT.getInstance().FLUORINE, 4) }); + * MaterialStack(MaterialsElements.getInstance().FLUORINE, 4) }); */ // BeF2 @@ -120,8 +121,8 @@ public class FLUORIDES { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) }); + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2) }); // LiF public static final Material LITHIUM_FLUORIDE = new Material( @@ -134,8 +135,8 @@ public class FLUORIDES { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().LITHIUM7, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 1) }); + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().LITHIUM7, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 1) }); // LFTR sub components @@ -150,9 +151,9 @@ public class FLUORIDES { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MISC_MATERIALS.AMMONIUM, 1), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) }); + new MaterialStack[] { new MaterialStack(MaterialMisc.AMMONIUM, 1), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2) }); // Be(OH)2 public static final Material BERYLLIUM_HYDROXIDE = new Material( @@ -165,8 +166,8 @@ public class FLUORIDES { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1), - new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2) }); + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 1), + new MaterialStack(MaterialMisc.HYDROXIDE, 2) }); // (NH4)2BeF4 public static final Material AMMONIUM_TETRAFLUOROBERYLLATE = new Material( @@ -179,9 +180,9 @@ public class FLUORIDES { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MISC_MATERIALS.AMMONIUM, 2), - new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 4) }); + new MaterialStack[] { new MaterialStack(MaterialMisc.AMMONIUM, 2), + new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4) }); // LFTR Output public static final Material NEPTUNIUM_HEXAFLUORIDE = new Material( @@ -194,8 +195,8 @@ public class FLUORIDES { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NEPTUNIUM, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) }); + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().NEPTUNIUM, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6) }); public static final Material TECHNETIUM_HEXAFLUORIDE = new Material( "Technetium Hexafluoride", // Material Name @@ -207,8 +208,8 @@ public class FLUORIDES { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TECHNETIUM, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) }); + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().TECHNETIUM, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6) }); public static final Material SELENIUM_HEXAFLUORIDE = new Material( "Selenium Hexafluoride", // Material Name @@ -220,8 +221,8 @@ public class FLUORIDES { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().SELENIUM, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) }); + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().SELENIUM, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6) }); public static final Material SODIUM_FLUORIDE = new Material( "Sodium Fluoride", // Material Name @@ -233,12 +234,12 @@ public class FLUORIDES { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().SODIUM, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 1) }); + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().SODIUM, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 1) }); - private static final FLUORIDES INSTANCE = new FLUORIDES(); + private static final MaterialsFluorides INSTANCE = new MaterialsFluorides(); - public static FLUORIDES getInstance() { + public static MaterialsFluorides getInstance() { return INSTANCE; } } diff --git a/src/main/java/gtPlusPlus/core/material/nuclear/NUCLIDE.java b/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsNuclides.java index ebd24bad07..8d74ef9ab8 100644 --- a/src/main/java/gtPlusPlus/core/material/nuclear/NUCLIDE.java +++ b/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsNuclides.java @@ -1,13 +1,13 @@ package gtPlusPlus.core.material.nuclear; import gtPlusPlus.core.client.CustomTextureSet.TextureSets; -import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialStack; +import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.data.StringUtils; -public final class NUCLIDE { +public final class MaterialsNuclides { public static final Material Li2BeF4 = new Material( "Lithium Tetrafluoroberyllate (LFTB)", // Material Name @@ -22,8 +22,8 @@ public final class NUCLIDE { StringUtils.subscript(StringUtils.superscript("7") + "Li2BeF4"), // Chemical Formula 4, // Radioactivity Level // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 2), - new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1) }); + new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 2), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1) }); public static final Material LiFBeF2ThF4UF4 = new Material( "LFTR Fuel 3", // Material Name @@ -38,9 +38,10 @@ public final class NUCLIDE { StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ThF4UF4"), // Chemical Formula 5, // Radioactivity Level // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 65), - new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 28), new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1), - new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1) }); + new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 65), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 28), + new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1), + new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1) }); public static final Material LiFBeF2ZrF4UF4 = new Material( "LFTR Fuel 2", // Material Name @@ -55,10 +56,10 @@ public final class NUCLIDE { StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ZrF4UF4"), // Chemical Formula 5, // Radioactivity Level // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 65), - new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 28), - new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 5), - new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 2) }); + new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 65), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 28), + new MaterialStack(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE, 5), + new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 2) }); public static final Material LiFBeF2ZrF4U235 = new Material( "LFTR Fuel 1", // Material Name @@ -74,10 +75,10 @@ public final class NUCLIDE { // Formula 5, // Radioactivity Level // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 55), - new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 25), - new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 6), - new MaterialStack(ELEMENT.getInstance().URANIUM235, 14) }); + new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 55), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 25), + new MaterialStack(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE, 6), + new MaterialStack(MaterialsElements.getInstance().URANIUM235, 14) }); // Misc public static final Material BurntLftrFuel_MK1 = new Material( @@ -91,9 +92,10 @@ public final class NUCLIDE { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiBeF2UF4FP"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().LITHIUM, 1), - new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1), new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1), - new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) }); + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().LITHIUM, 1), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1), + new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1) }); public static final Material BurntLftrFuel_MK2 = new Material( "Burnt Reactor Fuel II", // Material Name @@ -106,9 +108,10 @@ public final class NUCLIDE { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiBeF2UF4FP"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().LITHIUM, 1), - new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1), new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1), - new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) }); + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().LITHIUM, 1), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1), + new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1) }); // LFTR Core Fluids public static final Material LiFBeF2UF4FP = new Material( @@ -122,9 +125,10 @@ public final class NUCLIDE { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2UF4FP"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), - new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1), new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1), - new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) }); + new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1), + new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1) }); public static final Material Sparged_LiFBeF2UF4FP = new Material( "Helium Sparged U Salt", // Material Name @@ -137,9 +141,10 @@ public final class NUCLIDE { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2UF4FP"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), - new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1), new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1), - new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) }); + new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1), + new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1) }); public static final Material UF6F2FP = new Material( "Phosphorous Uranium Hexafluoride (P-UF6)", // Material Name @@ -152,9 +157,9 @@ public final class NUCLIDE { false, // Uses Blast furnace? StringUtils.subscript("UF6F2FP"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 3), - new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1) }); + new MaterialStack[] { new MaterialStack(MaterialsFluorides.URANIUM_HEXAFLUORIDE, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 3), + new MaterialStack(MaterialsElements.getInstance().PHOSPHORUS, 1) }); public static final Material LiFBeF2 = new Material( "Stable Molten Salt Base", // Material Name @@ -167,8 +172,8 @@ public final class NUCLIDE { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), - new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1) }); + new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1) }); public static final Material LiFBeF2UF4 = new Material( "LFTR Fuel Base", // Material Name @@ -181,7 +186,8 @@ public final class NUCLIDE { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2UF4"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(LiFBeF2, 1), new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1) }); + new MaterialStack[] { new MaterialStack(LiFBeF2, 1), + new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1) }); // LFTR Blanket Fluids @@ -197,8 +203,8 @@ public final class NUCLIDE { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiFThF4"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), - new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) }); + new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1) }); // Tier 2 Fuel blanket output public static final Material LiFBeF2ThF4 = new Material( @@ -212,9 +218,9 @@ public final class NUCLIDE { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ThF4"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), - new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1), - new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) }); + new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1) }); // Tier 1 Fuel blanket output public static final Material Sparged_LiFThF4 = new Material( @@ -228,8 +234,8 @@ public final class NUCLIDE { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiFThF4"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), - new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) }); + new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1) }); // Tier 2 Fuel blanket output public static final Material Sparged_LiFBeF2ThF4 = new Material( @@ -243,9 +249,9 @@ public final class NUCLIDE { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ThF4"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), - new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1), - new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) }); + new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1) }); public static final Material UF6F2 = new Material( "Fluorinated Uranium Hexafluoride (F-UF6)", // Material Name @@ -258,8 +264,8 @@ public final class NUCLIDE { false, // Uses Blast furnace? StringUtils.subscript("UF6F2"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) }); + new MaterialStack[] { new MaterialStack(MaterialsFluorides.URANIUM_HEXAFLUORIDE, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2) }); // Secondary material is molten metal public static final Material NAQ_FUEL_T1 = new Material( @@ -272,8 +278,8 @@ public final class NUCLIDE { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NAQUADAH, 2), - new MaterialStack(ELEMENT.getInstance().TANTALUM, 3) }); + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().NAQUADAH, 2), + new MaterialStack(MaterialsElements.getInstance().TANTALUM, 3) }); // Secondary material is a plasma public static final Material NAQ_FUEL_T2 = new Material( @@ -286,8 +292,8 @@ public final class NUCLIDE { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NAQUADAH_ENRICHED, 2), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 3) }); + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().NAQUADAH_ENRICHED, 2), + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 3) }); // Secondary material is a plasma public static final Material NAQ_FUEL_T3 = new Material( @@ -300,12 +306,12 @@ public final class NUCLIDE { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NAQUADRIA, 2), - new MaterialStack(ELEMENT.getInstance().AMERICIUM, 3) }); + new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().NAQUADRIA, 2), + new MaterialStack(MaterialsElements.getInstance().AMERICIUM, 3) }); - private static final NUCLIDE INSTANCE = new NUCLIDE(); + private static final MaterialsNuclides INSTANCE = new MaterialsNuclides(); - public static NUCLIDE getInstance() { + public static MaterialsNuclides getInstance() { return INSTANCE; } } diff --git a/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui.java b/src/main/java/gtPlusPlus/core/network/packet/PacketVolumetricFlaskGui.java index 9dfa1dbad5..449819335f 100644 --- a/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui.java +++ b/src/main/java/gtPlusPlus/core/network/packet/PacketVolumetricFlaskGui.java @@ -13,7 +13,7 @@ import gtPlusPlus.core.network.handler.AbstractServerMessageHandler; import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter; import io.netty.buffer.ByteBuf; -public class Packet_VolumetricFlaskGui extends AbstractServerMessageHandler<Packet_VolumetricFlaskGui> +public class PacketVolumetricFlaskGui extends AbstractServerMessageHandler<PacketVolumetricFlaskGui> implements AbstractPacket { private int x; @@ -21,9 +21,9 @@ public class Packet_VolumetricFlaskGui extends AbstractServerMessageHandler<Pack private int z; private int flaskValue; - public Packet_VolumetricFlaskGui() {} + public PacketVolumetricFlaskGui() {} - public Packet_VolumetricFlaskGui(TileEntityVolumetricFlaskSetter tile, int aCustomValue) { + public PacketVolumetricFlaskGui(TileEntityVolumetricFlaskSetter tile, int aCustomValue) { x = tile.xCoord; y = tile.yCoord; z = tile.zCoord; @@ -81,7 +81,7 @@ public class Packet_VolumetricFlaskGui extends AbstractServerMessageHandler<Pack this.flaskValue = aVal; } - protected TileEntityVolumetricFlaskSetter getTileEntity(Packet_VolumetricFlaskGui message, MessageContext ctx) { + protected TileEntityVolumetricFlaskSetter getTileEntity(PacketVolumetricFlaskGui message, MessageContext ctx) { Logger.INFO("Trying to get tile."); World worldObj = getWorld(ctx); if (worldObj == null) { @@ -110,7 +110,7 @@ public class Packet_VolumetricFlaskGui extends AbstractServerMessageHandler<Pack } @Override - public IMessage handleServerMessage(EntityPlayer player, Packet_VolumetricFlaskGui message, MessageContext ctx) { + public IMessage handleServerMessage(EntityPlayer player, PacketVolumetricFlaskGui message, MessageContext ctx) { TileEntityVolumetricFlaskSetter te = getTileEntity(message, ctx); if (te != null) { Logger.INFO("Setting value on tile. " + message.getCustomValue()); diff --git a/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui2.java b/src/main/java/gtPlusPlus/core/network/packet/PacketVolumetricFlaskGui2.java index 599469191b..35ed2c17dc 100644 --- a/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui2.java +++ b/src/main/java/gtPlusPlus/core/network/packet/PacketVolumetricFlaskGui2.java @@ -13,7 +13,7 @@ import gtPlusPlus.core.network.handler.AbstractClientMessageHandler; import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter; import io.netty.buffer.ByteBuf; -public class Packet_VolumetricFlaskGui2 extends AbstractClientMessageHandler<Packet_VolumetricFlaskGui2> +public class PacketVolumetricFlaskGui2 extends AbstractClientMessageHandler<PacketVolumetricFlaskGui2> implements AbstractPacket { private int x; @@ -21,9 +21,9 @@ public class Packet_VolumetricFlaskGui2 extends AbstractClientMessageHandler<Pac private int z; private int flaskValue; - public Packet_VolumetricFlaskGui2() {} + public PacketVolumetricFlaskGui2() {} - public Packet_VolumetricFlaskGui2(TileEntityVolumetricFlaskSetter tile, int aCustomValue) { + public PacketVolumetricFlaskGui2(TileEntityVolumetricFlaskSetter tile, int aCustomValue) { x = tile.xCoord; y = tile.yCoord; z = tile.zCoord; @@ -81,7 +81,7 @@ public class Packet_VolumetricFlaskGui2 extends AbstractClientMessageHandler<Pac this.flaskValue = aVal; } - protected TileEntityVolumetricFlaskSetter getTileEntity(Packet_VolumetricFlaskGui2 message, MessageContext ctx) { + protected TileEntityVolumetricFlaskSetter getTileEntity(PacketVolumetricFlaskGui2 message, MessageContext ctx) { Logger.INFO("Trying to get tile."); World worldObj = getWorld(ctx); if (worldObj == null) { @@ -115,7 +115,7 @@ public class Packet_VolumetricFlaskGui2 extends AbstractClientMessageHandler<Pac } @Override - public IMessage handleClientMessage(EntityPlayer player, Packet_VolumetricFlaskGui2 message, MessageContext ctx) { + public IMessage handleClientMessage(EntityPlayer player, PacketVolumetricFlaskGui2 message, MessageContext ctx) { TileEntityVolumetricFlaskSetter te = getTileEntity(message, ctx); if (te != null) { Logger.INFO("Setting value on tile. " + message.getCustomValue()); diff --git a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java index 5f6f93542e..43b1d90648 100644 --- a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java +++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java @@ -43,24 +43,24 @@ import gtPlusPlus.core.entity.monster.EntitySickBlaze; import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; import gtPlusPlus.core.entity.projectile.EntityLightningAttack; import gtPlusPlus.core.entity.projectile.EntityToxinballSmall; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.CORE.ConfigSwitches; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.lib.GTPPCore.ConfigSwitches; import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest; -import gtPlusPlus.nei.NEI_GTPP_Config; -import gtPlusPlus.xmod.gregtech.common.render.GTPP_CapeRenderer; -import gtPlusPlus.xmod.gregtech.common.render.GTPP_FlaskRenderer; -import gtPlusPlus.xmod.gregtech.common.render.GTPP_Render_MachineBlock; +import gtPlusPlus.nei.GTPPNEIConfig; +import gtPlusPlus.xmod.gregtech.common.render.CapeRenderer; +import gtPlusPlus.xmod.gregtech.common.render.FlaskRenderer; +import gtPlusPlus.xmod.gregtech.common.render.MachineBlockRenderer; import ic2.core.item.ItemFluidCell; public class ClientProxy extends CommonProxy implements Runnable { - private final GTPP_CapeRenderer mCapeRenderer; + private final CapeRenderer mCapeRenderer; @SideOnly(Side.CLIENT) public static boolean mFancyGraphics = false; public ClientProxy() { - mCapeRenderer = new GTPP_CapeRenderer(); + mCapeRenderer = new CapeRenderer(); // Get Graphics Mode. mFancyGraphics = Minecraft.isFancyGraphicsEnabled(); } @@ -93,11 +93,11 @@ public class ClientProxy extends CommonProxy implements Runnable { */ new CustomOreBlockRenderer(); new CustomItemBlockRenderer(); - new GTPP_Render_MachineBlock(); + new MachineBlockRenderer(); - new GTPP_FlaskRenderer(); + new FlaskRenderer(); - MinecraftForge.EVENT_BUS.register(new NEI_GTPP_Config()); + MinecraftForge.EVENT_BUS.register(new GTPPNEIConfig()); super.init(e); } @@ -157,7 +157,7 @@ public class ClientProxy extends CommonProxy implements Runnable { @Override public void onLoadComplete(FMLLoadCompleteEvent event) { - if (CORE.ConfigSwitches.hideUniversalCells) { + if (GTPPCore.ConfigSwitches.hideUniversalCells) { hideUniversalCells(); } super.onLoadComplete(event); diff --git a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java b/src/main/java/gtPlusPlus/core/recipe/LoaderMachineComponents.java index a10d2cd05b..b66c508359 100644 --- a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java +++ b/src/main/java/gtPlusPlus/core/recipe/LoaderMachineComponents.java @@ -4,7 +4,7 @@ import gregtech.api.enums.ItemList; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class LOADER_Machine_Components { +public class LoaderMachineComponents { public static void initialise() { registerDefaultComponents(); diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java deleted file mode 100644 index 454e24f0d1..0000000000 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java +++ /dev/null @@ -1,152 +0,0 @@ -package gtPlusPlus.core.recipe; - -import static gregtech.api.recipe.RecipeMaps.pyrolyseRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gtPlusPlus.api.recipe.GTPPRecipeMaps.alloyBlastSmelterRecipes; -import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.MISC_MATERIALS; -import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.MaterialUtils; - -public class RECIPES_SeleniumProcessing { - - public static void init() { - - // We need this - MaterialUtils.generateSpecialDustAndAssignToAMaterial(MISC_MATERIALS.SELENIUM_DIOXIDE, false); - - // Makes Selenium Dioxide - processCopperRecipes(); - - // Liquify the Dried Dioxide - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(13), MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1)) - .fluidInputs(FluidUtils.getSteam(500)) - .fluidOutputs(MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(1000)) - .duration(24 * SECONDS) - .eut(1024) - .addTo(pyrolyseRecipes); - - // Produce Selenious Acid - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(14), MISC_MATERIALS.SELENIUM_DIOXIDE.getCell(1)) - .itemOutputs(CI.emptyCells(1)) - .fluidInputs(FluidUtils.getHotWater(4000)) - .fluidOutputs(MISC_MATERIALS.SELENIOUS_ACID.getFluidStack(1000)) - .duration(24 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(pyrolyseRecipes); - - // Make Selenium - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(14), ELEMENT.getInstance().CARBON.getDust(16)) - .itemOutputs(ELEMENT.getInstance().SELENIUM.getIngot(1), ELEMENT.getInstance().SELENIUM.getIngot(1)) - .outputChances(100_00, 20_00) - .fluidInputs(MISC_MATERIALS.SELENIOUS_ACID.getFluidStack(750), Materials.SulfuricAcid.getFluid(8000)) - .fluidOutputs(ELEMENT.getInstance().SELENIUM.getFluidStack(144 * 1)) - .eut(TierEU.RECIPE_IV) - .duration(5 * MINUTES) - .addTo(alloyBlastSmelterRecipes); - } - - public static void processCopperRecipes() { - - // Copper - GT_Values.RA.stdBuilder() - .itemInputs( - CI.getNumberedAdvancedCircuit(23), - ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Copper, 1)) - .itemOutputs( - ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Copper, 1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1)) - .outputChances(100_00, 1_00, 1_00, 5_00, 5_00, 5_00, 10_00, 10_00, 10_00) - .fluidInputs(FluidUtils.getHotWater(1000)) - .fluidOutputs(MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(20)) - .eut(1024) - .duration(40 * SECONDS) - .addTo(chemicalDehydratorRecipes); - - // Tetra - GT_Values.RA.stdBuilder() - .itemInputs( - CI.getNumberedAdvancedCircuit(23), - ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Tetrahedrite, 1)) - .itemOutputs( - ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Tetrahedrite, 1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1)) - .outputChances(100_00, 1_00, 1_00, 3_00, 3_00, 3_00, 8_00, 8_00, 8_00) - .fluidInputs(FluidUtils.getHotWater(1000)) - .fluidOutputs(MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10)) - .eut(1024) - .duration(40 * SECONDS) - .addTo(chemicalDehydratorRecipes); - - // Chalco - GT_Values.RA.stdBuilder() - .itemInputs( - CI.getNumberedAdvancedCircuit(23), - ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1)) - .itemOutputs( - ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Chalcopyrite, 1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1)) - .outputChances(100_00, 1_00, 1_00, 3_00, 3_00, 3_00, 8_00, 8_00, 8_00) - .fluidInputs(FluidUtils.getHotWater(1000)) - .fluidOutputs(MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10)) - .eut(1024) - .duration(40 * SECONDS) - .addTo(chemicalDehydratorRecipes); - - // Malachite - GT_Values.RA.stdBuilder() - .itemInputs( - CI.getNumberedAdvancedCircuit(23), - ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Malachite, 1)) - .itemOutputs( - ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Malachite, 1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1)) - .outputChances(100_00, 1_00, 1_00, 3_00, 3_00, 3_00, 8_00, 8_00, 8_00) - .fluidInputs(FluidUtils.getHotWater(1000)) - .fluidOutputs(MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10)) - .eut(1024) - .duration(40 * SECONDS) - .addTo(chemicalDehydratorRecipes); - } -} diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java b/src/main/java/gtPlusPlus/core/recipe/RecipesBatteries.java index 4369fdbfa3..2d8e417f1b 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesBatteries.java @@ -8,7 +8,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -public class RECIPE_Batteries { +public class RecipesBatteries { static ItemStack RECIPE_Battery_Sodium = GregtechItemList.Battery_RE_EV_Sodium.get(1); static ItemStack RECIPE_Battery_Cadmium = GregtechItemList.Battery_RE_EV_Cadmium.get(1); @@ -27,35 +27,35 @@ public class RECIPE_Batteries { RecipeUtils.addShapedGregtechRecipe( GT_Battery_Sodium, - RECIPES_Machines.cableTier4, + RecipesMachines.cableTier4, GT_Battery_Sodium, CI.circuitTier3, machineTransformer_EV, CI.circuitTier3, GT_Battery_Sodium, - RECIPES_Machines.cableTier4, + RecipesMachines.cableTier4, GT_Battery_Sodium, RECIPE_Battery_Sodium); RecipeUtils.addShapedGregtechRecipe( GT_Battery_Cadmium, - RECIPES_Machines.cableTier4, + RecipesMachines.cableTier4, GT_Battery_Cadmium, CI.circuitTier3, machineTransformer_EV, CI.circuitTier3, GT_Battery_Cadmium, - RECIPES_Machines.cableTier4, + RecipesMachines.cableTier4, GT_Battery_Cadmium, RECIPE_Battery_Cadmium); RecipeUtils.addShapedGregtechRecipe( GT_Battery_Lithium, - RECIPES_Machines.cableTier4, + RecipesMachines.cableTier4, GT_Battery_Lithium, CI.circuitTier3, machineTransformer_EV, CI.circuitTier3, GT_Battery_Lithium, - RECIPES_Machines.cableTier4, + RecipesMachines.cableTier4, GT_Battery_Lithium, RECIPE_Battery_Lithium); } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java index 454810ae47..5ada7c5a03 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java @@ -3,8 +3,8 @@ package gtPlusPlus.core.recipe; import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gtPlusPlus.core.recipe.common.CI.bitsd; import static gtPlusPlus.core.util.minecraft.ItemUtils.getSimpleStack; import static gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits.generatePipeRecipes; @@ -14,30 +14,30 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialsAlloy; +import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; -import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; +import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper; -public class RECIPES_General { +public class RecipesGeneral { static final ItemStack NULL = null; static ItemStack RECIPE_Paper; @@ -87,7 +87,7 @@ public class RECIPES_General { "stickWood", "dustBone", "stickWood", - ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest))) { + ItemUtils.getSimpleStack(BOPBlockRegistrator.sapling_Rainforest))) { Logger.INFO("Added a recipe for Rainforest oak Saplings."); } @@ -112,7 +112,7 @@ public class RECIPES_General { // Potin if (RecipeUtils.addShapelessGregtechRecipe( new Object[] { "dustLead", "dustBronze", "dustTin", "dustLead", "dustBronze" }, - ALLOY.POTIN.getDust(5))) { + MaterialsAlloy.POTIN.getDust(5))) { Logger.INFO("Added shapeless recipe for Potin Dust."); } @@ -126,11 +126,11 @@ public class RECIPES_General { new Object[] { ItemUtils.getSimpleStack(ModItems.dustTumbagaMix), ItemUtils.getSimpleStack(ModItems.dustTumbagaMix), ItemUtils.getSimpleStack(ModItems.dustTumbagaMix), "dustGold" }, - ALLOY.TUMBAGA.getDust(10))) { + MaterialsAlloy.TUMBAGA.getDust(10))) { Logger.INFO("Added shapeless recipe for Tumbaga Dust."); } - if (CORE.ConfigSwitches.enableMachine_Pollution) { + if (GTPPCore.ConfigSwitches.enableMachine_Pollution) { RecipeUtils.addShapedRecipe( CI.craftingToolFile, "plateIron", @@ -166,7 +166,7 @@ public class RECIPES_General { ItemUtils.simpleMetaStack(ModItems.itemBasicTurbine, 2, 1)); } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(Blocks.glass, 16), ItemUtils.getSimpleStack(Blocks.glowstone, 16), @@ -178,7 +178,7 @@ public class RECIPES_General { .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(Blocks.glass, 64), ItemUtils.getSimpleStack(Blocks.glowstone, 64), @@ -247,7 +247,7 @@ public class RECIPES_General { } // Magic Feather - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(Items.feather, 64), ItemUtils.getSimpleStack(Blocks.emerald_block, 32), @@ -262,13 +262,13 @@ public class RECIPES_General { .addTo(assemblerRecipes); // Pest Killer - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getTieredMachineCasing(1), CI.getElectricPump(2, 1), CI.getPlate(2, 4), ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(0), 2), - GT_Utility.getIntegratedCircuit(16)) + GTUtility.getIntegratedCircuit(16)) .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockPestKiller)) .fluidInputs(FluidUtils.getHotWater(500)) .duration(1 * MINUTES) @@ -355,21 +355,22 @@ public class RECIPES_General { ItemUtils.getSimpleStack(ModItems.itemPlateRawMeat), ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 1)); - generateWireRecipes(ELEMENT.getInstance().ZIRCONIUM); - generateWireRecipes(ALLOY.HG1223); - generateWireRecipes(ALLOY.LEAGRISIUM); - generateWireRecipes(ALLOY.TRINIUM_TITANIUM); - generateWireRecipes(ELEMENT.STANDALONE.HYPOGEN); - generateWireRecipes(ELEMENT.STANDALONE.CHRONOMATIC_GLASS); + generateWireRecipes(MaterialsElements.getInstance().ZIRCONIUM); + generateWireRecipes(MaterialsAlloy.HG1223); + generateWireRecipes(MaterialsAlloy.LEAGRISIUM); + generateWireRecipes(MaterialsAlloy.TRINIUM_TITANIUM); + generateWireRecipes(MaterialsElements.STANDALONE.HYPOGEN); + generateWireRecipes(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS); // No Material for void, natch. if (Thaumcraft.isModLoaded()) { generatePipeRecipes(GT_Materials.Void.mDefaultLocalName, GT_Materials.Void.getMass(), 15); } - Material[] gtpp = new Material[] { ALLOY.STABALLOY, ALLOY.TANTALLOY_60, ALLOY.TANTALLOY_61, ALLOY.POTIN, - ALLOY.MARAGING300, ALLOY.MARAGING350, ALLOY.INCONEL_690, ALLOY.INCONEL_792, ALLOY.HASTELLOY_X, - ALLOY.TRINIUM_NAQUADAH_CARBON }; + Material[] gtpp = new Material[] { MaterialsAlloy.STABALLOY, MaterialsAlloy.TANTALLOY_60, + MaterialsAlloy.TANTALLOY_61, MaterialsAlloy.POTIN, MaterialsAlloy.MARAGING300, MaterialsAlloy.MARAGING350, + MaterialsAlloy.INCONEL_690, MaterialsAlloy.INCONEL_792, MaterialsAlloy.HASTELLOY_X, + MaterialsAlloy.TRINIUM_NAQUADAH_CARBON }; for (Material mat : gtpp) { // generatePipeRecipes multiplies the voltage multiplier by 8 because ??! reasons. @@ -391,7 +392,7 @@ public class RECIPES_General { RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[6], - ALLOY.MARAGING250.getGear(1), + MaterialsAlloy.MARAGING250.getGear(1), CI.component_Plate[6], CI.getTieredCircuitOreDictName(4), GregtechItemList.Casing_AdvancedVacuum.get(1), @@ -403,7 +404,7 @@ public class RECIPES_General { RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[6], - ALLOY.MARAGING300.getGear(1), + MaterialsAlloy.MARAGING300.getGear(1), CI.component_Plate[6], CI.getTieredCircuitOreDictName(5), GregtechItemList.Casing_Adv_BlastFurnace.get(1), @@ -415,7 +416,7 @@ public class RECIPES_General { RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[8], - ALLOY.PIKYONIUM.getGear(1), + MaterialsAlloy.PIKYONIUM.getGear(1), CI.component_Plate[9], CI.getTieredCircuitOreDictName(7), GregtechItemList.Casing_Naq_Reactor_A.get(1), @@ -426,47 +427,47 @@ public class RECIPES_General { GregtechItemList.Hatch_Input_Naquadah.get(1L, new Object[0])); if (PollutionUtils.isPollutionEnabled()) { - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Muffler_Adv_LV.get(1L, new Object[0]), bitsd, new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LV.get(1), Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_LV.get(1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Muffler_Adv_MV.get(1L, new Object[0]), bitsd, new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MV.get(1), Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_MV.get(1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Muffler_Adv_HV.get(1L, new Object[0]), bitsd, new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_HV.get(1), Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_HV.get(1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Muffler_Adv_EV.get(1L, new Object[0]), bitsd, new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_EV.get(1), Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_EV.get(1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Muffler_Adv_IV.get(1L, new Object[0]), bitsd, new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_IV.get(1), Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_IV.get(1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Muffler_Adv_LuV.get(1L, new Object[0]), bitsd, new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LuV.get(1), Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_LuV.get(1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Muffler_Adv_ZPM.get(1L, new Object[0]), bitsd, new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_ZPM.get(1), Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_ZPM.get(1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Muffler_Adv_UV.get(1L, new Object[0]), bitsd, new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_UV.get(1), Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_UV.get(1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Muffler_Adv_MAX.get(1L, new Object[0]), bitsd, new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MAX.get(1), diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java index 5da803b392..22008ac647 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java @@ -1,6 +1,6 @@ package gtPlusPlus.core.recipe; -import static gregtech.api.enums.GT_Values.RA; +import static gregtech.api.enums.GTValues.RA; import static gregtech.api.enums.Mods.Backpack; import static gregtech.api.enums.Mods.Baubles; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; @@ -23,21 +23,21 @@ import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes; -import static gregtech.api.util.GT_RecipeBuilder.BUCKETS; -import static gregtech.api.util.GT_RecipeBuilder.HOURS; -import static gregtech.api.util.GT_RecipeBuilder.INGOTS; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.AssemblyLine; -import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER; -import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; -import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE; -import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; -import static gregtech.api.util.GT_RecipeConstants.FUSION_THRESHOLD; -import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM; -import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gregtech.api.util.GTRecipeBuilder.BUCKETS; +import static gregtech.api.util.GTRecipeBuilder.HOURS; +import static gregtech.api.util.GTRecipeBuilder.INGOTS; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.AssemblyLine; +import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; +import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE; +import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE; +import static gregtech.api.util.GTRecipeConstants.FUSION_THRESHOLD; +import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM; +import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.alloyBlastSmelterRecipes; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalPlantRecipes; @@ -50,20 +50,19 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; - +import bartworks.system.material.WerkstoffLoader; import cpw.mods.fml.common.Loader; -import goodgenerator.items.MyMaterial; -import gregtech.api.enums.GT_Values; +import goodgenerator.items.GGMaterial; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeConstants; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeConstants; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.ModItems; @@ -72,20 +71,20 @@ import gtPlusPlus.core.item.chemistry.GenericChem; import gtPlusPlus.core.item.chemistry.IonParticles; import gtPlusPlus.core.item.crafting.ItemDummyResearch; import gtPlusPlus.core.item.crafting.ItemDummyResearch.ASSEMBLY_LINE_RESEARCH; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.MISC_MATERIALS; -import gtPlusPlus.core.material.ORES; +import gtPlusPlus.core.material.MaterialMisc; +import gtPlusPlus.core.material.MaterialsAlloy; +import gtPlusPlus.core.material.MaterialsElements; +import gtPlusPlus.core.material.MaterialsOres; import gtPlusPlus.core.material.Particle; -import gtPlusPlus.core.material.nuclear.FLUORIDES; +import gtPlusPlus.core.material.nuclear.MaterialsFluorides; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; -import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; +import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -public class RECIPES_GREGTECH { +public class RecipesGregTech { public static void run() { Logger.INFO("Loading Recipes through GregAPI for Industrial Multiblocks."); @@ -122,8 +121,8 @@ public class RECIPES_GREGTECH { /* * Special Recipe handlers */ - RECIPES_SeleniumProcessing.init(); - RECIPES_RareEarthProcessing.init(); + RecipesSeleniumProcessing.init(); + RecipesRareEarthProcessing.init(); addFuels(); } @@ -132,7 +131,7 @@ public class RECIPES_GREGTECH { // Wood's Glass Laser Lens RA.stdBuilder() - .itemInputs(MISC_MATERIALS.WOODS_GLASS.getDust(5), ItemList.Shape_Mold_Ball.get(0)) + .itemInputs(MaterialMisc.WOODS_GLASS.getDust(5), ItemList.Shape_Mold_Ball.get(0)) .itemOutputs(GregtechItemList.Laser_Lens_WoodsGlass.get(1)) .duration(5 * MINUTES) .eut(TierEU.RECIPE_HV) @@ -147,7 +146,7 @@ public class RECIPES_GREGTECH { // 4 NO2 (g) + O2 (g) + 2 H2O (l) → 4 HNO3 (aq) // Advanced method for Nitric Acid Production - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedAdvancedCircuit(17), CI.getPinkCatalyst(0)) .fluidInputs(Materials.NitrogenDioxide.getGas(4000L), FluidUtils.getAir(4000), FluidUtils.getWater(2000)) .fluidOutputs(FluidUtils.getFluidStack("nitricacid", 4000)) @@ -157,34 +156,34 @@ public class RECIPES_GREGTECH { .addTo(chemicalPlantRecipes); // Advanced recipe for Fluorine Production - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(17), CI.getPurpleCatalyst(0), ItemUtils.getSimpleStack(Blocks.sandstone, 64), ItemUtils.getSimpleStack(Blocks.sandstone, 64)) .itemOutputs( - FLUORIDES.FLUORITE.getOre(8), - FLUORIDES.FLUORITE.getOre(4), - FLUORIDES.FLUORITE.getOre(4), - FLUORIDES.FLUORITE.getOre(4)) + MaterialsFluorides.FLUORITE.getOre(8), + MaterialsFluorides.FLUORITE.getOre(4), + MaterialsFluorides.FLUORITE.getOre(4), + MaterialsFluorides.FLUORITE.getOre(4)) .fluidInputs(FluidUtils.getFluidStack("nitricacid", 4000), FluidUtils.getAir(8000)) .duration(10 * SECONDS) .eut(1024) .metadata(CHEMPLANT_CASING_TIER, 5) .addTo(chemicalPlantRecipes); // Advanced recipe for Fluorine Production - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(17), CI.getPurpleCatalyst(0), ItemUtils.getSimpleStack(Blocks.sand, 64), ItemUtils.getSimpleStack(Blocks.sand, 64)) .itemOutputs( - FLUORIDES.FLUORITE.getOre(4), - FLUORIDES.FLUORITE.getOre(2), - FLUORIDES.FLUORITE.getOre(2), - FLUORIDES.FLUORITE.getOre(2)) + MaterialsFluorides.FLUORITE.getOre(4), + MaterialsFluorides.FLUORITE.getOre(2), + MaterialsFluorides.FLUORITE.getOre(2), + MaterialsFluorides.FLUORITE.getOre(2)) .fluidInputs(FluidUtils.getFluidStack("nitricacid", 5000), FluidUtils.getAir(12000)) .duration(10 * SECONDS) .eut(1024) @@ -192,7 +191,7 @@ public class RECIPES_GREGTECH { .addTo(chemicalPlantRecipes); // 3NO2 + H2O = 2HNO3 + NO - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedAdvancedCircuit(16), CI.getPinkCatalyst(0)) .fluidInputs(Materials.NitrogenDioxide.getGas(3000L), FluidUtils.getDistilledWater(1000)) .fluidOutputs(FluidUtils.getFluidStack("nitricacid", 2000), Materials.NitricOxide.getGas(1000L)) @@ -202,7 +201,7 @@ public class RECIPES_GREGTECH { .addTo(chemicalPlantRecipes); // Produce Boric Acid // Na2B4O7·10H2O + 2HCl = 4B(OH)3 + 2NaCl + 5H2O - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedAdvancedCircuit(21), ItemUtils.getItemStackOfAmountFromOreDict("dustBorax", 23)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustSalt", 4)) .fluidInputs(FluidUtils.getFluidStack(GenericChem.HydrochloricAcid, 2000)) @@ -213,13 +212,13 @@ public class RECIPES_GREGTECH { .addTo(chemicalPlantRecipes); // Produce Th232 - GT_Values.RA.stdBuilder() - .itemInputs(CI.getNumberedAdvancedCircuit(22), ELEMENT.getInstance().THORIUM.getDust(16)) + GTValues.RA.stdBuilder() + .itemInputs(CI.getNumberedAdvancedCircuit(22), MaterialsElements.getInstance().THORIUM.getDust(16)) .itemOutputs( - ELEMENT.getInstance().THORIUM.getSmallDust(32), - ELEMENT.getInstance().THORIUM232.getDust(2), - ELEMENT.getInstance().THORIUM232.getSmallDust(2), - ELEMENT.getInstance().URANIUM232.getDust(1)) + MaterialsElements.getInstance().THORIUM.getSmallDust(32), + MaterialsElements.getInstance().THORIUM232.getDust(2), + MaterialsElements.getInstance().THORIUM232.getSmallDust(2), + MaterialsElements.getInstance().URANIUM232.getDust(1)) .fluidInputs(FluidUtils.getDistilledWater(2000), FluidUtils.getFluidStack("boricacid", 1500)) .duration(5 * MINUTES) .eut(TierEU.RECIPE_EV) @@ -227,22 +226,22 @@ public class RECIPES_GREGTECH { .addTo(chemicalPlantRecipes); // Modify Sapling into Pine Sapling - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedBioCircuit(6), ItemUtils.getSimpleStack(Blocks.sapling, 32)) - .itemOutputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Pine, 16)) + .itemOutputs(ItemUtils.getSimpleStack(BOPBlockRegistrator.sapling_Pine, 16)) .fluidInputs(FluidUtils.getFluidStack("fluid.geneticmutagen", 2000), FluidUtils.getDistilledWater(8000)) .duration(120 * SECONDS) .eut(64) .metadata(CHEMPLANT_CASING_TIER, 2) .addTo(chemicalPlantRecipes); - int aLaureniumTier = ALLOY.LAURENIUM.vTier; + int aLaureniumTier = MaterialsAlloy.LAURENIUM.vTier; // Adding Recipes for Casings - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(12), CI.getTieredMachineCasing(aLaureniumTier - 1), - ALLOY.LAURENIUM.getPlate(8), + MaterialsAlloy.LAURENIUM.getPlate(8), CI.getGear(aLaureniumTier, 2)) .itemOutputs(GregtechItemList.Casing_Machine_Custom_3.get(1)) .fluidInputs( @@ -254,13 +253,13 @@ public class RECIPES_GREGTECH { .metadata(CHEMPLANT_CASING_TIER, 5) .addTo(chemicalPlantRecipes); - int aBotmiumTier = ALLOY.BOTMIUM.vTier; + int aBotmiumTier = MaterialsAlloy.BOTMIUM.vTier; // Adding Recipes for Casings - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(12), CI.getTieredMachineCasing(aBotmiumTier - 1), - ALLOY.BOTMIUM.getPlate(8), + MaterialsAlloy.BOTMIUM.getPlate(8), CI.getGear(aBotmiumTier, 2)) .itemOutputs(GregtechItemList.Casing_Machine_Custom_4.get(1)) .fluidInputs( @@ -274,7 +273,7 @@ public class RECIPES_GREGTECH { // Refine GT HF into GT++ HF if (FluidUtils.doesHydrofluoricAcidGtExist()) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedAdvancedCircuit(22)) .fluidInputs(FluidUtils.getHydrofluoricAcid(2000), FluidUtils.getHydrofluoricAcidGT(5000)) .fluidOutputs(FluidUtils.getHydrofluoricAcid(4500)) @@ -288,7 +287,7 @@ public class RECIPES_GREGTECH { private static void fluidHeaterRecipes() { RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(20)) + .itemInputs(GTUtility.getIntegratedCircuit(20)) .fluidInputs(Materials.Water.getFluid(1000)) .fluidOutputs(FluidUtils.getHotWater(1000)) .duration(1 * SECONDS + 10 * TICKS) @@ -300,9 +299,9 @@ public class RECIPES_GREGTECH { // Hypogen RA.stdBuilder() .fluidInputs( - ELEMENT.STANDALONE.DRAGON_METAL.getFluidStack(144), - ELEMENT.STANDALONE.RHUGNOR.getFluidStack(288)) - .fluidOutputs(ELEMENT.STANDALONE.HYPOGEN.getFluidStack(36)) + MaterialsElements.STANDALONE.DRAGON_METAL.getFluidStack(144), + MaterialsElements.STANDALONE.RHUGNOR.getFluidStack(288)) + .fluidOutputs(MaterialsElements.STANDALONE.HYPOGEN.getFluidStack(36)) .duration(6 * MINUTES + 49 * SECONDS + 12 * TICKS) .eut(TierEU.RECIPE_UHV) .metadata(FUSION_THRESHOLD, 1_200_000_000) @@ -313,8 +312,8 @@ public class RECIPES_GREGTECH { .fluidInputs( MaterialUtils.getMaterial("Infinity", "Neutronium") .getMolten(144), - ALLOY.QUANTUM.getFluidStack(288)) - .fluidOutputs(ELEMENT.STANDALONE.RHUGNOR.getFluidStack(144)) + MaterialsAlloy.QUANTUM.getFluidStack(288)) + .fluidOutputs(MaterialsElements.STANDALONE.RHUGNOR.getFluidStack(144)) .duration(25 * SECONDS + 12 * TICKS) .eut(TierEU.RECIPE_UV) .metadata(FUSION_THRESHOLD, 2_000_000_000) @@ -335,19 +334,19 @@ public class RECIPES_GREGTECH { ItemList.Energy_LapotronicOrb.get(32), CI.getTieredComponent(OrePrefixes.cableGt12, 7, 32), CI.getTieredComponent(OrePrefixes.wireGt16, 6, 64), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadria, 64L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gadolinium, 32L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Samarium, 16L), - ALLOY.ARCANITE.getGear(8), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Naquadria, 64L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gadolinium, 32L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Samarium, 16L), + MaterialsAlloy.ARCANITE.getGear(8), new Object[] { CI.getTieredCircuitOreDictName(5), 64 }, new Object[] { CI.getTieredCircuitOreDictName(6), 32 }, new Object[] { CI.getTieredCircuitOreDictName(7), 16 }, GregtechItemList.Laser_Lens_Special.get(1), ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 3, 64)) .fluidInputs( - ALLOY.NITINOL_60.getFluidStack(144 * 9 * 4), - ALLOY.ENERGYCRYSTAL.getFluidStack(144 * 9 * 8), - ALLOY.TUMBAGA.getFluidStack(144 * 9 * 32), + MaterialsAlloy.NITINOL_60.getFluidStack(144 * 9 * 4), + MaterialsAlloy.ENERGYCRYSTAL.getFluidStack(144 * 9 * 8), + MaterialsAlloy.TUMBAGA.getFluidStack(144 * 9 * 32), Materials.Nichrome.getMolten(16 * INGOTS)) .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockCasings3Misc, 15, 32)) .eut(TierEU.RECIPE_LuV) @@ -376,7 +375,7 @@ public class RECIPES_GREGTECH { CI.getTieredFluid(8, 144 * 32), CI.getAlternativeTieredFluid(7, 144 * 16), CI.getTertiaryTieredFluid(7, 144 * 16), - ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144)) + MaterialsAlloy.BABBIT_ALLOY.getFluidStack(128 * 144)) .itemOutputs(GregtechItemList.Hatch_Input_TurbineHousing.get(4)) .eut(TierEU.RECIPE_UV) .duration(2 * HOURS) @@ -411,7 +410,7 @@ public class RECIPES_GREGTECH { CI.getTertiaryTieredFluid(j - 2, 144 * 16), CI.getAlternativeTieredFluid(j, 144 * 16)) .itemOutputs(aGemCasings[aCasingSlot++]) - .eut(GT_Values.VP[j]) + .eut(GTValues.VP[j]) .duration(2 * MINUTES) .addTo(AssemblyLine); } @@ -446,7 +445,7 @@ public class RECIPES_GREGTECH { CI.getAlternativeTieredFluid(j, 144 * 16), CI.getTertiaryTieredFluid(j - 1, 144 * 16)) .itemOutputs(aGemBatteries[aCasingSlot++]) - .eut(GT_Values.VP[j]) + .eut(GTValues.VP[j]) .duration(2 * MINUTES) .addTo(AssemblyLine); } @@ -510,7 +509,7 @@ public class RECIPES_GREGTECH { CI.getAlternativeTieredFluid(h - 1, 144 * 4 * 8), CI.getAlternativeTieredFluid(h - 2, 144 * 4 * 8)) .itemOutputs(aChargeOutputs[aCurrSlot]) - .eut(GT_Values.VP[h]) + .eut(GTValues.VP[h]) .duration((aCurrSlot + 1) * HOURS) .addTo(AssemblyLine); aCurrSlot++; @@ -556,11 +555,11 @@ public class RECIPES_GREGTECH { new Object[] { OrePrefixes.circuit.get(Materials.UV), 8 }, new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 16 }, ItemList.Circuit_Chip_PPIC.get(16, new Object() {}), - ALLOY.PIKYONIUM.getPlate(16), - ALLOY.CINOBITE.getScrew(32)) + MaterialsAlloy.PIKYONIUM.getPlate(16), + MaterialsAlloy.CINOBITE.getScrew(32)) .fluidInputs( - ALLOY.PIKYONIUM.getFluidStack(144 * 8), - ALLOY.INDALLOY_140.getFluidStack(144 * 9), + MaterialsAlloy.PIKYONIUM.getFluidStack(144 * 8), + MaterialsAlloy.INDALLOY_140.getFluidStack(144 * 9), Materials.SolderingAlloy.getMolten(144 * 10)) .itemOutputs(GregtechItemList.Mega_AlloyBlastSmelter.get(1L)) .eut(TierEU.RECIPE_UHV / 2) @@ -581,40 +580,40 @@ public class RECIPES_GREGTECH { .itemInputs(CI.getEmitter(i, 2), CI.getSensor(i, 2)) .itemOutputs(aTransParts[i - 1].get(1)) .duration(5 * SECONDS) - .eut(GT_Values.VP[i]) + .eut(GTValues.VP[i]) .addTo(laserEngraverRecipes); } RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 6L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 6L), GregtechItemList.Laser_Lens_Special.get(0)) - .itemOutputs(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getDust(1)) + .itemOutputs(MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getDust(1)) .duration(3 * MINUTES) .eut(TierEU.RECIPE_UEV) .addTo(laserEngraverRecipes); RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 8L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 8L), GregtechItemList.Laser_Lens_Special.get(0)) - .itemOutputs(ELEMENT.STANDALONE.ASTRAL_TITANIUM.getDust(1)) + .itemOutputs(MaterialsElements.STANDALONE.ASTRAL_TITANIUM.getDust(1)) .duration(2 * MINUTES) .eut(TierEU.RECIPE_UHV) .addTo(laserEngraverRecipes); RA.stdBuilder() - .itemInputs(ALLOY.NITINOL_60.getBlock(2), GregtechItemList.Laser_Lens_Special.get(0)) - .itemOutputs(ELEMENT.STANDALONE.ADVANCED_NITINOL.getBlock(1)) + .itemInputs(MaterialsAlloy.NITINOL_60.getBlock(2), GregtechItemList.Laser_Lens_Special.get(0)) + .itemOutputs(MaterialsElements.STANDALONE.ADVANCED_NITINOL.getBlock(1)) .duration(1 * MINUTES) .eut(TierEU.RECIPE_UV) .addTo(laserEngraverRecipes); RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 64L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 64L), GregtechItemList.Laser_Lens_Special.get(0)) - .itemOutputs(ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getDust(1)) + .itemOutputs(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS.getDust(1)) .duration(5 * MINUTES) .eut(TierEU.RECIPE_UHV) .addTo(laserEngraverRecipes); @@ -641,14 +640,14 @@ public class RECIPES_GREGTECH { if (Loader.isModLoaded("OpenBlocks")) { RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(14)) + .itemInputs(GTUtility.getIntegratedCircuit(14)) .fluidInputs(FluidRegistry.getFluidStack("mobessence", 100)) .fluidOutputs(FluidRegistry.getFluidStack("xpjuice", 1332)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(brewingRecipes); RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(14)) + .itemInputs(GTUtility.getIntegratedCircuit(14)) .fluidInputs(FluidRegistry.getFluidStack("xpjuice", 1332)) .fluidOutputs(FluidRegistry.getFluidStack("mobessence", 100)) .duration(5 * SECONDS) @@ -657,21 +656,21 @@ public class RECIPES_GREGTECH { } RA.stdBuilder() - .itemInputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest)) + .itemInputs(ItemUtils.getSimpleStack(BOPBlockRegistrator.sapling_Rainforest)) .fluidInputs(Materials.Water.getFluid(100L)) .fluidOutputs(Materials.Biomass.getFluid(100L)) .duration(1 * MINUTES) .eut(3) .addTo(brewingRecipes); RA.stdBuilder() - .itemInputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest)) + .itemInputs(ItemUtils.getSimpleStack(BOPBlockRegistrator.sapling_Rainforest)) .fluidInputs(Materials.Honey.getFluid(100L)) .fluidOutputs(Materials.Biomass.getFluid(100L)) .duration(1 * MINUTES) .eut(3) .addTo(brewingRecipes); RA.stdBuilder() - .itemInputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest)) + .itemInputs(ItemUtils.getSimpleStack(BOPBlockRegistrator.sapling_Rainforest)) .fluidInputs(FluidUtils.getFluidStack("juice", 100)) .fluidOutputs(Materials.Biomass.getFluid(100L)) .duration(1 * MINUTES) @@ -710,146 +709,148 @@ public class RECIPES_GREGTECH { private static void blastSmelterRecipes() { // Eglin Steel - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(6), - ELEMENT.getInstance().IRON.getDust(4), - ALLOY.KANTHAL.getDust(1), - ALLOY.INVAR.getDust(5), - ELEMENT.getInstance().SULFUR.getDust(1), - ELEMENT.getInstance().CARBON.getDust(1), - ELEMENT.getInstance().SILICON.getDust(4)) - .fluidOutputs(ALLOY.EGLIN_STEEL.getFluidStack(16 * 144)) + GTUtility.getIntegratedCircuit(6), + MaterialsElements.getInstance().IRON.getDust(4), + MaterialsAlloy.KANTHAL.getDust(1), + MaterialsAlloy.INVAR.getDust(5), + MaterialsElements.getInstance().SULFUR.getDust(1), + MaterialsElements.getInstance().CARBON.getDust(1), + MaterialsElements.getInstance().SILICON.getDust(4)) + .fluidOutputs(MaterialsAlloy.EGLIN_STEEL.getFluidStack(16 * 144)) .eut(TierEU.RECIPE_MV) .duration(45 * SECONDS) .addTo(alloyBlastSmelterRecipes); // HG1223 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(5), - ELEMENT.getInstance().BARIUM.getDust(2), - ELEMENT.getInstance().CALCIUM.getDust(2), - ELEMENT.getInstance().COPPER.getDust(3)) - .fluidOutputs(ALLOY.HG1223.getFluidStack(16 * 144)) + GTUtility.getIntegratedCircuit(5), + MaterialsElements.getInstance().BARIUM.getDust(2), + MaterialsElements.getInstance().CALCIUM.getDust(2), + MaterialsElements.getInstance().COPPER.getDust(3)) + .fluidOutputs(MaterialsAlloy.HG1223.getFluidStack(16 * 144)) .eut(TierEU.RECIPE_LuV) .duration(2 * MINUTES) .addTo(alloyBlastSmelterRecipes); // NITINOL_60 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(2), - ELEMENT.getInstance().TITANIUM.getDust(3), - ELEMENT.getInstance().NICKEL.getDust(2)) - .fluidOutputs(ALLOY.NITINOL_60.getFluidStack(5 * 144)) + GTUtility.getIntegratedCircuit(2), + MaterialsElements.getInstance().TITANIUM.getDust(3), + MaterialsElements.getInstance().NICKEL.getDust(2)) + .fluidOutputs(MaterialsAlloy.NITINOL_60.getFluidStack(5 * 144)) .eut(TierEU.RECIPE_IV) .duration(1 * MINUTES + 15 * SECONDS) .addTo(alloyBlastSmelterRecipes); // INDALLOY_140 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(5), - ELEMENT.getInstance().BISMUTH.getDust(47), - ELEMENT.getInstance().LEAD.getDust(25), - ELEMENT.getInstance().TIN.getDust(13), - ELEMENT.getInstance().CADMIUM.getDust(10), - ELEMENT.getInstance().INDIUM.getDust(5)) - .fluidOutputs(ALLOY.INDALLOY_140.getFluidStack(100 * 144)) + GTUtility.getIntegratedCircuit(5), + MaterialsElements.getInstance().BISMUTH.getDust(47), + MaterialsElements.getInstance().LEAD.getDust(25), + MaterialsElements.getInstance().TIN.getDust(13), + MaterialsElements.getInstance().CADMIUM.getDust(10), + MaterialsElements.getInstance().INDIUM.getDust(5)) + .fluidOutputs(MaterialsAlloy.INDALLOY_140.getFluidStack(100 * 144)) .eut(TierEU.RECIPE_IV) .duration(40 * SECONDS) .addTo(alloyBlastSmelterRecipes); // Germanium Roasting - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(15), + GTUtility.getIntegratedCircuit(15), ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedSphalerite", 8), - ELEMENT.getInstance().CARBON.getDust(32)) + MaterialsElements.getInstance().CARBON.getDust(32)) .fluidInputs(Materials.SulfuricAcid.getFluid(2000)) - .fluidOutputs(ELEMENT.getInstance().GERMANIUM.getFluidStack(288)) + .fluidOutputs(MaterialsElements.getInstance().GERMANIUM.getFluidStack(288)) .eut(4_000) .duration(5 * MINUTES) .addTo(alloyBlastSmelterRecipes); // Rhenium Roasting - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(20), + GTUtility.getIntegratedCircuit(20), ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedScheelite", 8), - ELEMENT.getInstance().CARBON.getDust(32)) + MaterialsElements.getInstance().CARBON.getDust(32)) .fluidInputs(Materials.SulfuricAcid.getFluid(10000)) - .fluidOutputs(ELEMENT.getInstance().RHENIUM.getFluidStack(144)) + .fluidOutputs(MaterialsElements.getInstance().RHENIUM.getFluidStack(144)) .eut(4_000) .duration(5 * MINUTES) .addTo(alloyBlastSmelterRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(20), + GTUtility.getIntegratedCircuit(20), ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedMolybdenite", 8), - ELEMENT.getInstance().CARBON.getDust(32)) + MaterialsElements.getInstance().CARBON.getDust(32)) .fluidInputs(Materials.SulfuricAcid.getFluid(7500)) - .fluidOutputs(ELEMENT.getInstance().RHENIUM.getFluidStack(144)) + .fluidOutputs(MaterialsElements.getInstance().RHENIUM.getFluidStack(144)) .eut(4_000) .duration(5 * MINUTES) .addTo(alloyBlastSmelterRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(20), + GTUtility.getIntegratedCircuit(20), ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedMolybdenum", 8), - ELEMENT.getInstance().CARBON.getDust(32)) + MaterialsElements.getInstance().CARBON.getDust(32)) .fluidInputs(Materials.SulfuricAcid.getFluid(5000)) - .fluidOutputs(ELEMENT.getInstance().RHENIUM.getFluidStack(288)) + .fluidOutputs(MaterialsElements.getInstance().RHENIUM.getFluidStack(288)) .eut(4_000) .duration(5 * MINUTES) .addTo(alloyBlastSmelterRecipes); // Thallium Roasting - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(21), + GTUtility.getIntegratedCircuit(21), ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedZinc", 3), ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPyrite", 4), - ELEMENT.getInstance().CARBON.getDust(16)) + MaterialsElements.getInstance().CARBON.getDust(16)) .fluidInputs(Materials.SulfuricAcid.getFluid(1250)) - .fluidOutputs(ELEMENT.getInstance().THALLIUM.getFluidStack(288)) + .fluidOutputs(MaterialsElements.getInstance().THALLIUM.getFluidStack(288)) .eut(TierEU.RECIPE_IV) .duration(1 * MINUTES + 15 * SECONDS) .noOptimize() .addTo(alloyBlastSmelterRecipes); // Strontium processing - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(21), - MISC_MATERIALS.STRONTIUM_OXIDE.getDust(8), - ELEMENT.getInstance().ALUMINIUM.getDust(8)) - .itemOutputs(ELEMENT.getInstance().ALUMINIUM.getIngot(8), ELEMENT.getInstance().STRONTIUM.getIngot(8)) - .fluidOutputs(ELEMENT.getInstance().OXYGEN.getFluidStack(8000)) + GTUtility.getIntegratedCircuit(21), + MaterialMisc.STRONTIUM_OXIDE.getDust(8), + MaterialsElements.getInstance().ALUMINIUM.getDust(8)) + .itemOutputs( + MaterialsElements.getInstance().ALUMINIUM.getIngot(8), + MaterialsElements.getInstance().STRONTIUM.getIngot(8)) + .fluidOutputs(MaterialsElements.getInstance().OXYGEN.getFluidStack(8000)) .eut(TierEU.RECIPE_EV) .duration(2 * MINUTES) .addTo(alloyBlastSmelterRecipes); // molten botmium - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(4), + GTUtility.getIntegratedCircuit(4), ItemUtils.getItemStackOfAmountFromOreDict("dustNitinol60", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustOsmium", 6), ItemUtils.getItemStackOfAmountFromOreDict("dustRuthenium", 6), ItemUtils.getItemStackOfAmountFromOreDict("dustThallium", 3)) - .fluidOutputs(ALLOY.BOTMIUM.getFluidStack(2304)) + .fluidOutputs(MaterialsAlloy.BOTMIUM.getFluidStack(2304)) .eut(TierEU.RECIPE_UV) .duration(2 * MINUTES) .addTo(alloyBlastSmelterRecipes); // molten precious metals alloy - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(6), + GTUtility.getIntegratedCircuit(6), ItemUtils.getItemStackOfAmountFromOreDict("dustRuthenium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustRhodium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustPalladium", 1), @@ -862,11 +863,11 @@ public class RECIPES_GREGTECH { .addTo(alloyBlastSmelterRecipes); // lossless phonon transfer medium - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(5), + GTUtility.getIntegratedCircuit(5), WerkstoffLoader.MagnetoResonaticDust.get(OrePrefixes.dust, 5), - MyMaterial.metastableOganesson.get(OrePrefixes.dust, 1), + GGMaterial.metastableOganesson.get(OrePrefixes.dust, 1), Materials.Praseodymium.getDust(15), Materials.SuperconductorUIVBase.getDust(6)) .fluidInputs(MaterialsUEVplus.PhononCrystalSolution.getFluid(4000L)) @@ -883,7 +884,7 @@ public class RECIPES_GREGTECH { ItemStack foodRaisins = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foodRaisins", 1); if (cropGrape != null && foodRaisins != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedBioCircuit(20), cropGrape) .itemOutputs(foodRaisins) .eut(2) @@ -892,18 +893,18 @@ public class RECIPES_GREGTECH { } // Process Waste Water - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedBioCircuit(21)) .itemOutputs( ItemUtils.getSimpleStack(Blocks.dirt), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L)) .outputChances(20_00, 5_00, 10, 7, 6, 5, 4, 3, 2) .fluidInputs(FluidUtils.getFluidStack("sludge", 1000)) .fluidOutputs(Materials.Methane.getGas(100)) @@ -912,7 +913,7 @@ public class RECIPES_GREGTECH { .addTo(chemicalDehydratorRecipes); // C8H10 = C8H8 + 2H - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedAdvancedCircuit(18), CI.emptyCells(3)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("cellStyrene", 1), @@ -926,7 +927,7 @@ public class RECIPES_GREGTECH { * Add custom recipes for drying leather */ if (Backpack.isModLoaded()) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedAdvancedCircuit(18), new ItemStack(Items.leather, 2)) .itemOutputs(ItemUtils.getCorrectStacktype("Backpack:tannedLeather", 1)) .fluidInputs(FluidUtils.getFluidStack("fluid.ethylbenzene", 1000)) @@ -935,10 +936,10 @@ public class RECIPES_GREGTECH { .addTo(chemicalDehydratorRecipes); if (NewHorizonsCoreMod.isModLoaded()) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(18), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ArtificialLeather", 2L, 0)) + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ArtificialLeather", 2L, 0)) .itemOutputs(ItemUtils.getCorrectStacktype("Backpack:tannedLeather", 1)) .fluidInputs(FluidUtils.getFluidStack("fluid.ethylbenzene", 1000)) .eut(180) @@ -948,11 +949,11 @@ public class RECIPES_GREGTECH { } // Alternative ACETIC ANHYDRIDE recipe for Kevlar Line // 2C2H4O2 = C4H6O3 + H2O - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedAdvancedCircuit(18), CI.emptyCells(1)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1)) .fluidInputs(FluidUtils.getFluidStack("aceticacid", 2000)) - .fluidOutputs(MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000)) + .fluidOutputs(MaterialMisc.ACETIC_ANHYDRIDE.getFluidStack(1000)) .eut(TierEU.RECIPE_HV) .duration(30 * SECONDS) .addTo(chemicalDehydratorRecipes); @@ -962,7 +963,7 @@ public class RECIPES_GREGTECH { // Styrene // C8H10 = C8H8 + 2H RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .itemInputs(GTUtility.getIntegratedCircuit(24)) .itemOutputs() .fluidInputs(FluidUtils.getFluidStack("fluid.ethylbenzene", 1000)) .fluidOutputs(Materials.Styrene.getFluid(1000L), Materials.Hydrogen.getGas(2000)) @@ -973,7 +974,7 @@ public class RECIPES_GREGTECH { // Short-cut Styrene // C6H6 + C2H4 = C8H8 + 2H RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .itemInputs(GTUtility.getIntegratedCircuit(24)) .itemOutputs() .fluidInputs(Materials.Ethylene.getGas(500L), Materials.Benzene.getFluid(500L)) .fluidOutputs(Materials.Styrene.getFluid(500L), Materials.Hydrogen.getGas(1000)) @@ -986,8 +987,8 @@ public class RECIPES_GREGTECH { RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Vanadium, 32L), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.VanadiumSteel, 8L)) + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Vanadium, 32L), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.VanadiumSteel, 8L)) .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 0, 4)) .fluidInputs(Materials.Oxygen.getGas(8000L)) .duration(16 * SECONDS) @@ -997,7 +998,7 @@ public class RECIPES_GREGTECH { RA.stdBuilder() .itemInputs( ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 0, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VanadiumGallium, 8L)) + GTOreDictUnificator.get(OrePrefixes.plate, Materials.VanadiumGallium, 8L)) .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 8)) .fluidInputs(Materials.Tantalum.getMolten(4 * INGOTS)) .duration(32 * SECONDS) @@ -1007,9 +1008,9 @@ public class RECIPES_GREGTECH { RA.stdBuilder() .itemInputs( ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 4L), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 4L), ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(3), 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 2L)) + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 2L)) .itemOutputs(ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1)) .fluidInputs(Materials.Oxygen.getGas(16 * BUCKETS)) .duration(3 * SECONDS + 4 * TICKS) @@ -1019,9 +1020,9 @@ public class RECIPES_GREGTECH { RA.stdBuilder() .itemInputs( GregtechItemList.Casing_Vanadium_Redox.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 4L), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 4L), ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(4), 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 2L)) + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 2L)) .itemOutputs(GregtechItemList.Casing_Vanadium_Redox_IV.get(1)) .fluidInputs(Materials.Nitrogen.getGas(16 * BUCKETS)) .duration(6 * SECONDS) @@ -1031,9 +1032,9 @@ public class RECIPES_GREGTECH { RA.stdBuilder() .itemInputs( GregtechItemList.Casing_Vanadium_Redox_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TungstenSteel, 4L), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.TungstenSteel, 4L), ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(5), 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 2L)) + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 2L)) .itemOutputs(GregtechItemList.Casing_Vanadium_Redox_LuV.get(1)) .fluidInputs(Materials.Helium.getGas(8 * BUCKETS)) .duration(12 * SECONDS + 10 * TICKS) @@ -1045,7 +1046,7 @@ public class RECIPES_GREGTECH { GregtechItemList.Casing_Vanadium_Redox_LuV.get(1), ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 16), ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 2L)) + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 2L)) .itemOutputs(GregtechItemList.Casing_Vanadium_Redox_ZPM.get(1)) .fluidInputs(Materials.Argon.getGas(4 * BUCKETS)) .duration(25 * SECONDS) @@ -1055,9 +1056,9 @@ public class RECIPES_GREGTECH { RA.stdBuilder() .itemInputs( GregtechItemList.Casing_Vanadium_Redox_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Naquadah, 4L), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Naquadah, 4L), ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 2L)) + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 2L)) .itemOutputs(GregtechItemList.Casing_Vanadium_Redox_UV.get(1)) .fluidInputs(Materials.Radon.getGas(4 * BUCKETS)) .duration(50 * SECONDS) @@ -1067,9 +1068,9 @@ public class RECIPES_GREGTECH { RA.stdBuilder() .itemInputs( GregtechItemList.Casing_Vanadium_Redox_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Americium, 4L), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Americium, 4L), ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(8), 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 2L)) + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 2L)) .itemOutputs(GregtechItemList.Casing_Vanadium_Redox_MAX.get(1)) .fluidInputs(FluidUtils.getFluidStack("krypton", 500)) .duration(1 * MINUTES + 40 * SECONDS) @@ -1080,8 +1081,8 @@ public class RECIPES_GREGTECH { .itemInputs( ItemUtils.getSimpleStack(CI.explosiveITNT, 2), ItemUtils.getSimpleStack(CI.explosiveTNT, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 2L), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iron, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 2L), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Iron, 1L)) .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockMiningExplosive, 3)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV / 2) @@ -1089,9 +1090,9 @@ public class RECIPES_GREGTECH { RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 8L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.BlackSteel, 8L)) + GTOreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1L), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 8L), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.BlackSteel, 8L)) .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard, 64)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) @@ -1102,9 +1103,9 @@ public class RECIPES_GREGTECH { CI.fluidRegulator_LV, CI.electricMotor_LV, CI.getTieredComponent(OrePrefixes.bolt, 1, 8), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Brass, 1L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Brass, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2L)) + GTOreDictUnificator.get(OrePrefixes.ring, Materials.Brass, 1L), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Brass, 1L), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2L)) .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) @@ -1115,9 +1116,9 @@ public class RECIPES_GREGTECH { CI.fluidRegulator_MV, CI.electricMotor_MV, CI.getTieredComponent(OrePrefixes.bolt, 2, 8), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Invar, 1L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Invar, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2L)) + GTOreDictUnificator.get(OrePrefixes.ring, Materials.Invar, 1L), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Invar, 1L), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2L)) .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) @@ -1128,9 +1129,9 @@ public class RECIPES_GREGTECH { CI.fluidRegulator_HV, CI.electricMotor_HV, CI.getTieredComponent(OrePrefixes.bolt, 3, 8), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Chrome, 1L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Chrome, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L)) + GTOreDictUnificator.get(OrePrefixes.ring, Materials.Chrome, 1L), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Chrome, 1L), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L)) .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) @@ -1141,37 +1142,37 @@ public class RECIPES_GREGTECH { CI.fluidRegulator_EV, CI.electricMotor_EV, CI.getTieredComponent(OrePrefixes.bolt, 4, 8), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Titanium, 1L), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2L)) + GTOreDictUnificator.get(OrePrefixes.ring, Materials.Titanium, 1L), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 1L), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2L)) .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); RA.stdBuilder() - .itemInputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1), GT_Utility.getIntegratedCircuit(20)) + .itemInputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1), GTUtility.getIntegratedCircuit(20)) .itemOutputs(ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1000, 1)) .duration(1 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_LV) .addTo(assemblerRecipes); RA.stdBuilder() - .itemInputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1), GT_Utility.getIntegratedCircuit(20)) + .itemInputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1), GTUtility.getIntegratedCircuit(20)) .itemOutputs(ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1001, 1)) .duration(6 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); RA.stdBuilder() - .itemInputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1), GT_Utility.getIntegratedCircuit(20)) + .itemInputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1), GTUtility.getIntegratedCircuit(20)) .itemOutputs(ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1002, 1)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); RA.stdBuilder() - .itemInputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1), GT_Utility.getIntegratedCircuit(20)) + .itemInputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1), GTUtility.getIntegratedCircuit(20)) .itemOutputs(ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1003, 1)) .duration(1 * MINUTES + 36 * SECONDS) .eut(TierEU.RECIPE_EV) @@ -1214,7 +1215,7 @@ public class RECIPES_GREGTECH { .itemOutputs(aPackOutput[aAS]) .fluidInputs(CI.getTieredFluid(i, (144 * 4))) .duration(30 * i * SECONDS) - .eut(GT_Values.VP[i]) + .eut(GTValues.VP[i]) .addTo(assemblerRecipes); } @@ -1223,11 +1224,11 @@ public class RECIPES_GREGTECH { // Turbine Housing Research Page RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(17), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Trinium, 64L), + GTUtility.getIntegratedCircuit(17), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Trinium, 64L), CI.getSensor(6, 6), CI.getBolt(7, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 64L), + GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 64L), ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 12)) .itemOutputs( ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_8_TURBINE_AUTOMATION, 1)) @@ -1239,10 +1240,10 @@ public class RECIPES_GREGTECH { // Cloaking Device Research Page RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(17), + GTUtility.getIntegratedCircuit(17), ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 4), CI.getFieldGenerator(6, 16), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Palladium, 32L), + GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Palladium, 32L), ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 12)) .itemOutputs(ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_9_CLOAKING, 1)) .fluidInputs(CI.getAlternativeTieredFluid(7, 144 * 32)) @@ -1255,7 +1256,7 @@ public class RECIPES_GREGTECH { private static void distilleryRecipes() { Logger.INFO("Registering Distillery/Distillation Tower Recipes."); RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(4)) + .itemInputs(GTUtility.getIntegratedCircuit(4)) .fluidInputs(Materials.Air.getGas(1000L)) .fluidOutputs(Materials.Helium.getGas(1L)) .duration(20 * SECONDS) @@ -1300,15 +1301,15 @@ public class RECIPES_GREGTECH { // Lava RA.stdBuilder() - .fluidInputs(FluidUtils.getLava(1000), FluidUtils.getWater(16_000 / GT_Values.STEAM_PER_WATER)) + .fluidInputs(FluidUtils.getLava(1000), FluidUtils.getWater(16_000 / GTValues.STEAM_PER_WATER)) .fluidOutputs(FluidUtils.getPahoehoeLava(1000), FluidUtils.getSteam(16_000)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tantalum, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungstate, 1), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tantalum, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tungstate, 1), new ItemStack(Blocks.obsidian, 1, 0)) .outputChances(444, 222, 56, 56, 56, 125, 1000) .duration(1 * SECONDS) @@ -1318,13 +1319,13 @@ public class RECIPES_GREGTECH { // Pahoehoe Lava RA.stdBuilder() - .fluidInputs(FluidUtils.getPahoehoeLava(1000), FluidUtils.getWater(16_000 / GT_Values.STEAM_PER_WATER)) + .fluidInputs(FluidUtils.getPahoehoeLava(1000), FluidUtils.getWater(16_000 / GTValues.STEAM_PER_WATER)) .fluidOutputs(FluidUtils.getSteam(16_000)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Electrum, 1), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tantalum, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungstate, 1), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Electrum, 1), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tantalum, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tungstate, 1), new ItemStack(Blocks.obsidian, 1, 0)) .outputChances(167, 56, 56, 125, 3700) .duration(1 * SECONDS) @@ -1336,7 +1337,7 @@ public class RECIPES_GREGTECH { RA.stdBuilder() .fluidInputs( FluidUtils.getFluidStack("ic2hotcoolant", 500), - FluidUtils.getWater(100_000 / GT_Values.STEAM_PER_WATER)) + FluidUtils.getWater(100_000 / GTValues.STEAM_PER_WATER)) .fluidOutputs(FluidUtils.getFluidStack("ic2coolant", 500), FluidUtils.getSuperHeatedSteam(100_000)) .duration(1 * SECONDS) .eut(0) @@ -1346,9 +1347,9 @@ public class RECIPES_GREGTECH { RA.stdBuilder() .fluidInputs( - MISC_MATERIALS.SOLAR_SALT_HOT.getFluidStack(100), - FluidUtils.getWater(100_000 / GT_Values.STEAM_PER_WATER)) - .fluidOutputs(MISC_MATERIALS.SOLAR_SALT_COLD.getFluidStack(100), FluidUtils.getSuperHeatedSteam(100_000)) + MaterialMisc.SOLAR_SALT_HOT.getFluidStack(100), + FluidUtils.getWater(100_000 / GTValues.STEAM_PER_WATER)) + .fluidOutputs(MaterialMisc.SOLAR_SALT_COLD.getFluidStack(100), FluidUtils.getSuperHeatedSteam(100_000)) .duration(1 * SECONDS) .eut(0) .addTo(thermalBoilerRecipes); @@ -1363,21 +1364,21 @@ public class RECIPES_GREGTECH { .metadata(FUEL_TYPE, 2) .duration(0) .eut(0) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); RA.stdBuilder() .itemInputs(ItemUtils.getIC2Cell(2)) .metadata(FUEL_VALUE, 32) .metadata(FUEL_TYPE, 2) .duration(0) .eut(0) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); RA.stdBuilder() .itemInputs(ItemUtils.getIC2Cell(11)) .metadata(FUEL_VALUE, 24) .metadata(FUEL_TYPE, 2) .duration(0) .eut(0) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); } private static void extractorRecipes() { @@ -1405,7 +1406,7 @@ public class RECIPES_GREGTECH { private static void fluidExtractorRecipes() { // Gelid Cryotheum RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cryotheum, 1L)) + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cryotheum, 1L)) .fluidOutputs(FluidUtils.getFluidStack("cryotheum", 250)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV / 2) @@ -1421,7 +1422,7 @@ public class RECIPES_GREGTECH { // Blazing Pyrotheum RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Pyrotheum, 1L)) + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Pyrotheum, 1L)) .fluidOutputs(FluidUtils.getFluidStack("pyrotheum", 250)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV / 2) @@ -1431,10 +1432,10 @@ public class RECIPES_GREGTECH { private static void centrifugeRecipes() { RA.stdBuilder() - .itemInputs(CI.getNumberedAdvancedCircuit(2), MISC_MATERIALS.SOLAR_SALT_COLD.getCell(1)) + .itemInputs(CI.getNumberedAdvancedCircuit(2), MaterialMisc.SOLAR_SALT_COLD.getCell(1)) .itemOutputs( - MISC_MATERIALS.SODIUM_NITRATE.getDust(3), - MISC_MATERIALS.POTASSIUM_NITRATE.getDust(2), + MaterialMisc.SODIUM_NITRATE.getDust(3), + MaterialMisc.POTASSIUM_NITRATE.getDust(2), CI.emptyCells(1)) .duration(6 * SECONDS) .eut(TierEU.RECIPE_MV) @@ -1447,9 +1448,9 @@ public class RECIPES_GREGTECH { .itemInputs( CI.getNumberedAdvancedCircuit(2), CI.emptyCells(1), - MISC_MATERIALS.SODIUM_NITRATE.getDust(3), - MISC_MATERIALS.POTASSIUM_NITRATE.getDust(2)) - .itemOutputs(MISC_MATERIALS.SOLAR_SALT_COLD.getCell(1)) + MaterialMisc.SODIUM_NITRATE.getDust(3), + MaterialMisc.POTASSIUM_NITRATE.getDust(2)) + .itemOutputs(MaterialMisc.SOLAR_SALT_COLD.getCell(1)) .duration(2 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(mixerRecipes); @@ -1462,7 +1463,7 @@ public class RECIPES_GREGTECH { Materials.Potassium.getDust(9), Materials.Lithium.getDust(9), Materials.Sulfur.getDust(9)) - .itemOutputs(ALLOY.LEAGRISIUM.getDust(50)) + .itemOutputs(MaterialsAlloy.LEAGRISIUM.getDust(50)) .fluidInputs(Materials.Hydrogen.getGas(5000)) .duration(1 * MINUTES) .eut(TierEU.RECIPE_EV) @@ -1476,7 +1477,7 @@ public class RECIPES_GREGTECH { Materials.Titanium.getDust(1), Materials.Nickel.getDust(4), Materials.Cobalt.getDust(2)) - .itemOutputs(ALLOY.MARAGING250.getDust(24)) + .itemOutputs(MaterialsAlloy.MARAGING250.getDust(24)) .duration(1 * MINUTES) .eut(TierEU.RECIPE_EV) .addTo(mixerRecipes); @@ -1487,8 +1488,8 @@ public class RECIPES_GREGTECH { RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(21), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 32L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Sulfur, 8L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 32L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Sulfur, 8L)) .fluidInputs(FluidUtils.getFluidStack("sulfuricacid", 4000)) .fluidOutputs(FluidUtils.getFluidStack("sulfuricapatite", 8000)) .duration(20 * SECONDS) @@ -1498,7 +1499,7 @@ public class RECIPES_GREGTECH { // KOH + HNO3 = KNO3 + H2O RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(GenericChem.mPotassiumHydroxide, 3), CI.getNumberedAdvancedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumNitrade, 5L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumNitrade, 5L)) .fluidInputs(Materials.NitricAcid.getFluid(1000)) .fluidOutputs(Materials.Water.getFluid(1000)) .duration(5 * SECONDS) @@ -1510,7 +1511,7 @@ public class RECIPES_GREGTECH { .itemInputs( ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6), CI.getNumberedAdvancedCircuit(1)) - .itemOutputs(MISC_MATERIALS.SODIUM_NITRATE.getDust(10)) + .itemOutputs(MaterialMisc.SODIUM_NITRATE.getDust(10)) .fluidInputs(Materials.NitricAcid.getFluid(2000)) .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) .duration(5 * SECONDS) @@ -1522,10 +1523,10 @@ public class RECIPES_GREGTECH { // Synthetic Graphite RA.stdBuilder() - .itemInputs(ALLOY.SILICON_CARBIDE.getDust(16), GT_Utility.getIntegratedCircuit(22)) + .itemInputs(MaterialsAlloy.SILICON_CARBIDE.getDust(16), GTUtility.getIntegratedCircuit(22)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 8L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Silicon, 8L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 8L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Silicon, 8L)) .fluidInputs(Materials.Nitrogen.getGas(4000)) .fluidOutputs() .duration(1 * MINUTES) @@ -1537,14 +1538,14 @@ public class RECIPES_GREGTECH { private static void compressorRecipes() { RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Clay, 1L)) + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Clay, 1L)) .duration(15 * SECONDS) .eut(2) .addTo(compressorRecipes); RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 9L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, Materials.MeatRaw, 1L)) + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 9L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, Materials.MeatRaw, 1L)) .duration(15 * SECONDS) .eut(2) .addTo(compressorRecipes); @@ -1560,8 +1561,8 @@ public class RECIPES_GREGTECH { private static void macerationRecipes() { RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.block, Materials.MeatRaw, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 9L)) + .itemInputs(GTOreDictUnificator.get(OrePrefixes.block, Materials.MeatRaw, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 9L)) .duration(44 * SECONDS) .eut(4) .addTo(maceratorRecipes); @@ -1569,7 +1570,7 @@ public class RECIPES_GREGTECH { if (ItemUtils.simpleMetaStack("chisel:limestone", 0, 1) != null) { RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("limestone", 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 4L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 4L)) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); @@ -1579,8 +1580,8 @@ public class RECIPES_GREGTECH { private static void cyclotronRecipes() { // Polonium - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) .itemOutputs(GregtechItemList.Pellet_RTG_PO210.get(1)) .outputChances(100) .fluidInputs(FluidUtils.getFluidStack("molten.bismuth", 1)) @@ -1589,8 +1590,8 @@ public class RECIPES_GREGTECH { .addTo(cyclotronRecipes); // Americium - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) .itemOutputs(GregtechItemList.Pellet_RTG_AM241.get(4)) .outputChances(2500) .fluidInputs(FluidUtils.getFluidStack("molten.americium", 1)) @@ -1599,8 +1600,8 @@ public class RECIPES_GREGTECH { .addTo(cyclotronRecipes); // Strontium u235 - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) .itemOutputs(GregtechItemList.Pellet_RTG_SR90.get(1)) .outputChances(570) .fluidInputs(FluidUtils.getFluidStack("molten.uranium235", 10)) @@ -1609,8 +1610,8 @@ public class RECIPES_GREGTECH { .addTo(cyclotronRecipes); // Strontium u233 - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) .itemOutputs(GregtechItemList.Pellet_RTG_SR90.get(1)) .outputChances(660) .fluidInputs(FluidUtils.getFluidStack("molten.uranium233", 10)) @@ -1619,8 +1620,8 @@ public class RECIPES_GREGTECH { .addTo(cyclotronRecipes); // Strontium pu239 - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) .itemOutputs(GregtechItemList.Pellet_RTG_SR90.get(1)) .outputChances(220) .fluidInputs(FluidUtils.getFluidStack("molten.plutonium", 10)) @@ -1629,8 +1630,8 @@ public class RECIPES_GREGTECH { .addTo(cyclotronRecipes); // Plutonium - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) .itemOutputs(GregtechItemList.Pellet_RTG_PU238.get(2)) .outputChances(780) .fluidInputs(FluidUtils.getFluidStack("molten.plutonium238", 1)) @@ -1639,8 +1640,8 @@ public class RECIPES_GREGTECH { .addTo(cyclotronRecipes); // Neptunium - GT_Values.RA.stdBuilder() - .itemInputs(ELEMENT.getInstance().URANIUM238.getDust(1)) + GTValues.RA.stdBuilder() + .itemInputs(MaterialsElements.getInstance().URANIUM238.getDust(1)) .itemOutputs(ItemUtils.getSimpleStack(ModItems.dustNeptunium238)) .outputChances(500) .fluidInputs(FluidUtils.getFluidStack("deuterium", 400)) @@ -1653,8 +1654,8 @@ public class RECIPES_GREGTECH { */ // Quark Smash - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(3)) .itemOutputs( Particle.getBaseParticle(Particle.UP), Particle.getBaseParticle(Particle.DOWN), @@ -1668,8 +1669,8 @@ public class RECIPES_GREGTECH { .eut(TierEU.RECIPE_ZPM) .addTo(cyclotronRecipes); // Lepton Smash - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(6)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(6)) .itemOutputs( Particle.getBaseParticle(Particle.ELECTRON), Particle.getBaseParticle(Particle.MUON), @@ -1683,8 +1684,8 @@ public class RECIPES_GREGTECH { .eut(TierEU.RECIPE_ZPM) .addTo(cyclotronRecipes); // Boson Smash - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(9)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(9)) .itemOutputs( Particle.getBaseParticle(Particle.GLUON), Particle.getBaseParticle(Particle.PHOTON), @@ -1697,8 +1698,8 @@ public class RECIPES_GREGTECH { .eut(TierEU.RECIPE_ZPM) .addTo(cyclotronRecipes); // Mixed Smash 1 - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(12)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(12)) .itemOutputs( Particle.getBaseParticle(Particle.GRAVITON), Particle.getBaseParticle(Particle.ETA_MESON), @@ -1714,8 +1715,8 @@ public class RECIPES_GREGTECH { .eut(TierEU.RECIPE_UV) .addTo(cyclotronRecipes); // Mixed Smash 1 - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(12)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(12)) .itemOutputs( Particle.getBaseParticle(Particle.GRAVITON), Particle.getBaseParticle(Particle.ETA_MESON), @@ -1726,13 +1727,13 @@ public class RECIPES_GREGTECH { Particle.getBaseParticle(Particle.OMEGA), Particle.getBaseParticle(Particle.HIGGS_BOSON)) .outputChances(5000, 200, 200, 100, 80, 60, 40, 30) - .fluidInputs(new FluidStack(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getPlasma(), 2500)) + .fluidInputs(new FluidStack(MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getPlasma(), 2500)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_UV) .addTo(cyclotronRecipes); // Graviton Smash - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(15)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(15)) .itemOutputs(Particle.getBaseParticle(Particle.GRAVITON), Particle.getBaseParticle(Particle.UNKNOWN)) .outputChances(1000, 100) .fluidInputs(FluidUtils.getFluidStack("plasma.hydrogen", 100)) @@ -1748,8 +1749,8 @@ public class RECIPES_GREGTECH { } // Quantum Anomaly - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(24), Particle.getBaseParticle(Particle.UNKNOWN)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(24), Particle.getBaseParticle(Particle.UNKNOWN)) .itemOutputs(GregtechItemList.Laser_Lens_Special.get(1)) .outputChances(100) .fluidInputs(aPlasma) @@ -1776,8 +1777,8 @@ public class RECIPES_GREGTECH { // Ionize Plasma if ((aPlasma2 != null && !aPlasma2.isFluidEqual(aPlasma_NULL)) || (aPlasma3 != null && !aPlasma3.isFluidEqual(aPlasma_NULL))) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1 + (tenCountA - 1))) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1 + (tenCountA - 1))) .itemOutputs( Particle.getIon(y, 1), Particle.getIon(y, 2), @@ -1806,8 +1807,8 @@ public class RECIPES_GREGTECH { } // Generate Hydrogen Ion Recipe - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(24)) .itemOutputs( Particle.getIon("Hydrogen", 1), Particle.getIon("Hydrogen", 2), @@ -1824,8 +1825,8 @@ public class RECIPES_GREGTECH { .eut(TierEU.RECIPE_LuV) .addTo(cyclotronRecipes); // Generate Hydrogen Plasma Recipe - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(21), Particle.getIon("Hydrogen", 0)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(21), Particle.getIon("Hydrogen", 0)) .itemOutputs( Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.NEUTRON), @@ -1840,8 +1841,8 @@ public class RECIPES_GREGTECH { .eut(TierEU.RECIPE_LuV) .addTo(cyclotronRecipes); // Generate Protons Easily - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(20), Particle.getIon("Hydrogen", 0)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(20), Particle.getIon("Hydrogen", 0)) .itemOutputs( Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.PROTON), @@ -1857,8 +1858,8 @@ public class RECIPES_GREGTECH { .duration(20 * SECONDS) .eut(TierEU.RECIPE_LuV) .addTo(cyclotronRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(22), Particle.getBaseParticle(Particle.UNKNOWN)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(22), Particle.getBaseParticle(Particle.UNKNOWN)) .itemOutputs( Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.PROTON), @@ -1875,9 +1876,9 @@ public class RECIPES_GREGTECH { .eut(TierEU.RECIPE_LuV) .addTo(cyclotronRecipes); // Create Strange Dust - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - ELEMENT.getInstance().PLUTONIUM238.getDust(1), + MaterialsElements.getInstance().PLUTONIUM238.getDust(1), Particle.getBaseParticle(Particle.UNKNOWN), Particle.getBaseParticle(Particle.UNKNOWN), Particle.getBaseParticle(Particle.UNKNOWN), @@ -1886,7 +1887,7 @@ public class RECIPES_GREGTECH { Particle.getBaseParticle(Particle.UNKNOWN), Particle.getBaseParticle(Particle.UNKNOWN), Particle.getBaseParticle(Particle.UNKNOWN)) - .itemOutputs(ORES.DEEP_EARTH_REACTOR_FUEL_DEPOSIT.getDust(1)) + .itemOutputs(MaterialsOres.DEEP_EARTH_REACTOR_FUEL_DEPOSIT.getDust(1)) .outputChances(2500) .fluidInputs(FluidUtils.getFluidStack(FluidUtils.getWildcardFluidStack("ender", 1000), 1000)) .duration(15 * MINUTES) diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/main/java/gtPlusPlus/core/recipe/RecipesLaserEngraver.java index 1f8d5d9a8e..63c136c8f9 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesLaserEngraver.java @@ -1,27 +1,27 @@ package gtPlusPlus.core.recipe; import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes; -import static gregtech.api.util.GT_RecipeBuilder.HOURS; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.HOURS; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OreDictNames; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; import gregtech.api.interfaces.IOreRecipeRegistrator; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; +import gtPlusPlus.everglades.dimension.DimensionEverglades; -public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { +public class RecipesLaserEngraver implements IOreRecipeRegistrator { - public RECIPES_LaserEngraver() { + public RecipesLaserEngraver() { OrePrefixes.crafting.add(this); } @@ -29,18 +29,18 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, final String aModName, final ItemStack aStack) { if (aOreDictName.equals(OreDictNames.craftingLensWhite.toString())) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lithium, 2L), - GT_Utility.copyAmount(0L, aStack)) + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Lithium, 2L), + GTUtility.copyAmount(0L, aStack)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleLithium7", 1)) .duration(4 * MINUTES) .eut(TierEU.RECIPE_EV) .addTo(laserEngraverRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 3L), - GT_Utility.copyAmount(0L, aStack)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 3L), + GTUtility.copyAmount(0L, aStack)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 1)) .duration(2 * MINUTES) .eut(TierEU.RECIPE_EV) @@ -71,62 +71,62 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { ItemStack wireT4a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Naquadah", 1); // T1 - GT_Values.RA.stdBuilder() - .itemInputs(wireT1a, GT_Utility.copyAmount(0L, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(wireT1a, GTUtility.copyAmount(0L, aStack)) .itemOutputs(coilWire1) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(laserEngraverRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(wireT1b, GT_Utility.copyAmount(0L, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(wireT1b, GTUtility.copyAmount(0L, aStack)) .itemOutputs(coilWire1) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(laserEngraverRecipes); // T2 - GT_Values.RA.stdBuilder() - .itemInputs(wireT2a, GT_Utility.copyAmount(0L, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(wireT2a, GTUtility.copyAmount(0L, aStack)) .itemOutputs(coilWire2) .duration(20 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(laserEngraverRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(wireT2b, GT_Utility.copyAmount(0L, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(wireT2b, GTUtility.copyAmount(0L, aStack)) .itemOutputs(coilWire2) .duration(20 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(laserEngraverRecipes); // T3 - GT_Values.RA.stdBuilder() - .itemInputs(wireT3a, GT_Utility.copyAmount(0L, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(wireT3a, GTUtility.copyAmount(0L, aStack)) .itemOutputs(coilWire3) .duration(30 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(laserEngraverRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(wireT3b, GT_Utility.copyAmount(0L, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(wireT3b, GTUtility.copyAmount(0L, aStack)) .itemOutputs(coilWire3) .duration(30 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(laserEngraverRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(wireT3c, GT_Utility.copyAmount(0L, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(wireT3c, GTUtility.copyAmount(0L, aStack)) .itemOutputs(coilWire3) .duration(30 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(laserEngraverRecipes); // T4 - GT_Values.RA.stdBuilder() - .itemInputs(wireT4a, GT_Utility.copyAmount(0L, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(wireT4a, GTUtility.copyAmount(0L, aStack)) .itemOutputs(coilWire4) .duration(40 * SECONDS) .eut(TierEU.RECIPE_LuV) .addTo(laserEngraverRecipes); } else if (aOreDictName.equals(OreDictNames.craftingLensOrange.toString())) { - GT_Values.RA.stdBuilder() - .itemInputs(ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk), GT_Utility.copyAmount(0L, aStack)) - .itemOutputs(ItemUtils.getSimpleStack(Dimension_Everglades.portalItem)) + GTValues.RA.stdBuilder() + .itemInputs(ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk), GTUtility.copyAmount(0L, aStack)) + .itemOutputs(ItemUtils.getSimpleStack(DimensionEverglades.portalItem)) .duration(3 * HOURS) .eut(TierEU.RECIPE_IV) .addTo(laserEngraverRecipes); diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/main/java/gtPlusPlus/core/recipe/RecipesMachineComponents.java index 4929872caa..516aecf93a 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesMachineComponents.java @@ -1,6 +1,6 @@ package gtPlusPlus.core.recipe; -public class RECIPES_MachineComponents { +public class RecipesMachineComponents { // Fluid Pipe public static String pipeTier7 = "pipeHugeSteel"; diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java index 0c89e94b7e..2287d6cf4f 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java @@ -7,14 +7,14 @@ import static gregtech.api.enums.Mods.RemoteIO; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.distilleryRecipes; -import static gregtech.api.util.GT_RecipeBuilder.HOURS; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.AssemblyLine; -import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER; -import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM; -import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME; +import static gregtech.api.util.GTRecipeBuilder.HOURS; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.AssemblyLine; +import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER; +import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM; +import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalPlantRecipes; import java.util.List; @@ -26,41 +26,41 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.technus.tectech.recipe.TT_recipeAdder; -import com.github.technus.tectech.thing.CustomItemList; import com.google.common.collect.ImmutableList; +import bartworks.system.material.WerkstoffLoader; import goodgenerator.loader.Loaders; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.item.crafting.ItemDummyResearch; import gtPlusPlus.core.item.crafting.ItemDummyResearch.ASSEMBLY_LINE_RESEARCH; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.material.MaterialMisc; +import gtPlusPlus.core.material.MaterialsAlloy; +import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; +import gtPlusPlus.everglades.dimension.DimensionEverglades; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.covers.CoverManager; import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper; +import tectech.recipe.TTRecipeAdder; +import tectech.thing.CustomItemList; -public class RECIPES_Machines { +public class RecipesMachines { // Outputs public static ItemStack RECIPE_Buffer_ULV = GregtechItemList.Energy_Buffer_1by1_ULV.get(1); @@ -230,7 +230,7 @@ public class RECIPES_Machines { } private static void advHeatExchanger() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(18), ItemList.Machine_Multi_HeatExchanger.get(1), @@ -242,7 +242,7 @@ public class RECIPES_Machines { .duration(60 * SECONDS) .eut(TierEU.RECIPE_LuV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(18), ItemList.Casing_StableTitanium.get(1), @@ -311,34 +311,34 @@ public class RECIPES_Machines { private static void multiForgeHammer() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(CI.machineHull_IV, 2), ItemList.Machine_IV_Hammer.get(1), CI.getPlate(4, 8), CI.getBolt(5, 32), - ELEMENT.getInstance().ZIRCONIUM.getFineWire(32), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 4L)) + MaterialsElements.getInstance().ZIRCONIUM.getFineWire(32), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 4L)) .itemOutputs(GregtechItemList.Controller_IndustrialForgeHammer.get(1)) .fluidInputs(CI.getTieredFluid(4, 144 * 12)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Casing_IndustrialForgeHammer.get(1), CI.bitsd, - new Object[] { "IBI", "HCH", "IHI", 'I', CI.getPlate(4, 1), 'B', ALLOY.BABBIT_ALLOY.getPlate(1), 'C', - ItemList.Casing_HeatProof.get(1), 'H', ALLOY.HASTELLOY_X.getRod(1) }); + new Object[] { "IBI", "HCH", "IHI", 'I', CI.getPlate(4, 1), 'B', MaterialsAlloy.BABBIT_ALLOY.getPlate(1), + 'C', ItemList.Casing_HeatProof.get(1), 'H', MaterialsAlloy.HASTELLOY_X.getRod(1) }); } private static void multiMolecularTransformer() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getTieredGTPPMachineCasing(6, 1), CI.getPlate(5, 16), CI.getBolt(5, 32), - ALLOY.HG1223.getFineWire(64), + MaterialsAlloy.HG1223.getFineWire(64), CI.getEmitter(4, 8), ItemUtils.getItemStackOfAmountFromOreDict("circuitMaster", 10)) .itemOutputs( @@ -348,41 +348,41 @@ public class RECIPES_Machines { .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata( RESEARCH_ITEM, ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_11_MOLECULAR_TRANSFORMER, 1)) .metadata(RESEARCH_TIME, 30 * MINUTES) .itemInputs( - ALLOY.HG1223.getFineWire(64), - ALLOY.HG1223.getFineWire(64), + MaterialsAlloy.HG1223.getFineWire(64), + MaterialsAlloy.HG1223.getFineWire(64), ItemList.Electric_Motor_IV.get(16), ItemList.Energy_LapotronicOrb.get(16), CI.getTieredComponent(OrePrefixes.cableGt12, 6, 16), CI.getTieredComponent(OrePrefixes.wireGt16, 5, 32), - ALLOY.ZERON_100.getFrameBox(4), - ALLOY.ZIRCONIUM_CARBIDE.getPlateDouble(32), - ALLOY.BABBIT_ALLOY.getPlate(64), - ALLOY.LEAGRISIUM.getGear(8), + MaterialsAlloy.ZERON_100.getFrameBox(4), + MaterialsAlloy.ZIRCONIUM_CARBIDE.getPlateDouble(32), + MaterialsAlloy.BABBIT_ALLOY.getPlate(64), + MaterialsAlloy.LEAGRISIUM.getGear(8), new Object[] { CI.getTieredCircuitOreDictName(4), 64 }, new Object[] { CI.getTieredCircuitOreDictName(5), 32 }, new Object[] { CI.getTieredCircuitOreDictName(6), 16 }, GregtechItemList.Laser_Lens_WoodsGlass.get(1)) .fluidInputs( - ALLOY.NITINOL_60.getFluidStack(144 * 9 * (2)), - ALLOY.INCOLOY_MA956.getFluidStack(144 * 9 * (8)), - ALLOY.KANTHAL.getFluidStack(144 * 1 * (4))) + MaterialsAlloy.NITINOL_60.getFluidStack(144 * 9 * (2)), + MaterialsAlloy.INCOLOY_MA956.getFluidStack(144 * 9 * (8)), + MaterialsAlloy.KANTHAL.getFluidStack(144 * 1 * (4))) .itemOutputs(GregtechItemList.Controller_MolecularTransformer.get(1)) .eut(TierEU.RECIPE_LuV) .duration(10 * MINUTES) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(16), CI.getPlate(6, 4), CI.getScrew(6, 8), - ELEMENT.getInstance().PALLADIUM.getFineWire(16), + MaterialsElements.getInstance().PALLADIUM.getFineWire(16), CI.getSensor(5, 2), ItemUtils.getItemStackOfAmountFromOreDict("circuitElite", 4)) .itemOutputs(GregtechItemList.Casing_Molecular_Transformer_1.get(1)) @@ -390,7 +390,7 @@ public class RECIPES_Machines { .duration(20 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(16), CI.getPlate(5, 4), @@ -403,12 +403,12 @@ public class RECIPES_Machines { .duration(20 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(16), ItemUtils.getSimpleStack(Blocks.glowstone, 16), CI.getGear(5, 8), - ELEMENT.getInstance().TITANIUM.getWire04(4), + MaterialsElements.getInstance().TITANIUM.getWire04(4), CI.getFieldGenerator(4, 2), ItemUtils.getItemStackOfAmountFromOreDict("circuitData", 8)) .itemOutputs(GregtechItemList.Casing_Molecular_Transformer_3.get(1)) @@ -433,7 +433,7 @@ public class RECIPES_Machines { CI.getDoublePlate(4, 1), GregtechItemList.Casing_Turbine_Shaft.get(1)); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(18), ItemList.Casing_Turbine.get(1), @@ -447,7 +447,7 @@ public class RECIPES_Machines { .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); // Steam - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(18), ItemList.Casing_Turbine.get(1), @@ -458,7 +458,7 @@ public class RECIPES_Machines { .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(18), ItemList.LargeSteamTurbine.get(1), @@ -472,7 +472,7 @@ public class RECIPES_Machines { .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); // Gas - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(18), ItemList.Casing_Turbine1.get(1), @@ -483,7 +483,7 @@ public class RECIPES_Machines { .duration(5 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(18), ItemList.LargeGasTurbine.get(1), @@ -497,7 +497,7 @@ public class RECIPES_Machines { .eut(TierEU.RECIPE_LuV) .addTo(assemblerRecipes); // HP Steam - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(18), ItemList.Casing_Turbine2.get(1), @@ -508,7 +508,7 @@ public class RECIPES_Machines { .duration(5 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(18), ItemList.LargeHPSteamTurbine.get(1), @@ -522,7 +522,7 @@ public class RECIPES_Machines { .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); // Plasma - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(18), ItemList.Casing_Turbine3.get(1), @@ -533,7 +533,7 @@ public class RECIPES_Machines { .duration(5 * SECONDS) .eut(TierEU.RECIPE_LuV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(18), ItemList.LargePlasmaTurbine.get(1), @@ -546,7 +546,7 @@ public class RECIPES_Machines { .duration(60 * SECONDS) .eut(TierEU.RECIPE_ZPM) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(18), new ItemStack(supercriticalFluidTurbineCasing, 1), @@ -557,10 +557,10 @@ public class RECIPES_Machines { .duration(5 * SECONDS) .eut(TierEU.RECIPE_LuV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(18), - GT_Utility.copyAmount(1, Loaders.SCTurbine), + GTUtility.copyAmount(1, Loaders.SCTurbine), new ItemStack(WerkstoffLoader.items.get(OrePrefixes.plate), 8, 10104), new ItemStack(WerkstoffLoader.items.get(OrePrefixes.screw), 16, 10104), new ItemStack(WerkstoffLoader.items.get(OrePrefixes.gearGt), 4, 10104), @@ -575,54 +575,54 @@ public class RECIPES_Machines { private static void multiSolarTower() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(17), CI.getTieredGTPPMachineCasing(3, 4), - ALLOY.MARAGING250.getPlate(8), - ALLOY.MARAGING250.getBolt(8), - ALLOY.MARAGING250.getScrew(8), + MaterialsAlloy.MARAGING250.getPlate(8), + MaterialsAlloy.MARAGING250.getBolt(8), + MaterialsAlloy.MARAGING250.getScrew(8), CI.getCircuit(5, 8)) .itemOutputs(GregtechItemList.Industrial_Solar_Tower.get(1)) .fluidInputs(CI.getTieredFluid(3, 144 * 16)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(17), - ALLOY.MARAGING350.getFrameBox(1), - ALLOY.STAINLESS_STEEL.getPlate(4), - ALLOY.MARAGING350.getScrew(8)) + MaterialsAlloy.MARAGING350.getFrameBox(1), + MaterialsAlloy.STAINLESS_STEEL.getPlate(4), + MaterialsAlloy.MARAGING350.getScrew(8)) .itemOutputs(GregtechItemList.Casing_SolarTower_Structural.get(1)) .fluidInputs(CI.getTieredFluid(3, 144 * 4)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(17), - ALLOY.MARAGING250.getFrameBox(1), - ALLOY.STAINLESS_STEEL.getPlate(4), - ALLOY.MARAGING250.getBolt(16), - ELEMENT.getInstance().ALUMINIUM.getScrew(8)) + MaterialsAlloy.MARAGING250.getFrameBox(1), + MaterialsAlloy.STAINLESS_STEEL.getPlate(4), + MaterialsAlloy.MARAGING250.getBolt(16), + MaterialsElements.getInstance().ALUMINIUM.getScrew(8)) .itemOutputs(GregtechItemList.Casing_SolarTower_SaltContainment.get(1)) .fluidInputs(CI.getTieredFluid(3, 144 * 4)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(17), - ALLOY.MARAGING250.getFrameBox(1), - ALLOY.STEEL_BLACK.getPlate(4), - ALLOY.MARAGING250.getScrew(8)) + MaterialsAlloy.MARAGING250.getFrameBox(1), + MaterialsAlloy.STEEL_BLACK.getPlate(4), + MaterialsAlloy.MARAGING250.getScrew(8)) .itemOutputs(GregtechItemList.Casing_SolarTower_HeatContainment.get(1)) .fluidInputs(CI.getAlternativeTieredFluid(3, 144 * 4)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(17), CI.getTieredGTPPMachineCasing(2, 1), @@ -640,7 +640,7 @@ public class RECIPES_Machines { private static void multiElementalDuplicator() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemList.Machine_IV_Replicator.get(1)) .metadata(RESEARCH_TIME, 12 * HOURS) .itemInputs( @@ -660,13 +660,13 @@ public class RECIPES_Machines { CI.getTieredFluid(7, 144 * 32), CI.getAlternativeTieredFluid(6, 144 * 16), CI.getTertiaryTieredFluid(6, 144 * 16), - ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144)) + MaterialsAlloy.BABBIT_ALLOY.getFluidStack(128 * 144)) .itemOutputs(GregtechItemList.Controller_ElementalDuplicator.get(1)) .eut(TierEU.RECIPE_ZPM) .duration(10 * MINUTES) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, GregtechItemList.Modulator_III.get(1)) .metadata(RESEARCH_TIME, 4 * HOURS) .itemInputs( @@ -683,13 +683,13 @@ public class RECIPES_Machines { CI.getTieredFluid(6, 144 * 16), CI.getAlternativeTieredFluid(5, 144 * 8), CI.getTertiaryTieredFluid(5, 144 * 8), - ALLOY.BABBIT_ALLOY.getFluidStack(64 * 144)) + MaterialsAlloy.BABBIT_ALLOY.getFluidStack(64 * 144)) .itemOutputs(GregtechItemList.Hatch_Input_Elemental_Duplicator.get(1)) .eut(TierEU.RECIPE_LuV) .duration(2 * HOURS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, GregtechItemList.ResonanceChamber_III.get(1)) .metadata(RESEARCH_TIME, 2 * HOURS) .itemInputs( @@ -706,7 +706,7 @@ public class RECIPES_Machines { CI.getTieredFluid(5, 144 * 16), CI.getAlternativeTieredFluid(4, 144 * 8), CI.getTertiaryTieredFluid(4, 144 * 8), - ALLOY.BABBIT_ALLOY.getFluidStack(16 * 144)) + MaterialsAlloy.BABBIT_ALLOY.getFluidStack(16 * 144)) .itemOutputs(GregtechItemList.Casing_ElementalDuplicator.get(1)) .eut(TierEU.RECIPE_LuV) .duration(10 * MINUTES) @@ -752,7 +752,7 @@ public class RECIPES_Machines { } private static void zyngen() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(6), CI.getTieredMachineHull(4), @@ -770,19 +770,19 @@ public class RECIPES_Machines { private static void chemPlant() { - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Casing_Machine_Custom_1.get(2L), CI.bits, new Object[] { "PhP", "PFP", "PwP", 'P', OrePrefixes.plate.get(Materials.Bronze), 'F', OrePrefixes.frameGt.get(Materials.Bronze) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Casing_Machine_Custom_2.get(2L), CI.bits, new Object[] { "PPP", "hFw", "PPP", 'P', OrePrefixes.plate.get(Materials.Aluminium), 'F', OrePrefixes.frameGt.get(Materials.Aluminium) }); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedBioCircuit(19), CI.getTieredGTPPMachineCasing(2, 4), @@ -791,11 +791,11 @@ public class RECIPES_Machines { CI.getTieredComponentOfMaterial(Materials.Plastic, OrePrefixes.pipeLarge, 4), CI.getTieredComponent(OrePrefixes.frameGt, 2, 4)) .itemOutputs(GregtechItemList.ChemicalPlant_Controller.get(1)) - .fluidInputs(ALLOY.STEEL_BLACK.getFluidStack(2 * (144 * 4))) + .fluidInputs(MaterialsAlloy.STEEL_BLACK.getFluidStack(2 * (144 * 4))) .duration(2 * MINUTES) .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedBioCircuit(15), CI.getTieredGTPPMachineCasing(1, 2), @@ -804,7 +804,7 @@ public class RECIPES_Machines { CI.getTieredComponentOfMaterial(Materials.Lead, OrePrefixes.plate, 48), CI.getTieredComponentOfMaterial(Materials.SolderingAlloy, OrePrefixes.wireFine, 16)) .itemOutputs(GregtechItemList.Bus_Catalysts.get(1)) - .fluidInputs(ALLOY.BRONZE.getFluidStack(2 * (144 * 4))) + .fluidInputs(MaterialsAlloy.BRONZE.getFluidStack(2 * (144 * 4))) .duration(60 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); @@ -814,14 +814,14 @@ public class RECIPES_Machines { private static void algaeFarm() { // Give the bad algae a use. - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 32)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 4)) .duration(15 * SECONDS) .eut(16) .addTo(distilleryRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedBioCircuit(21), CI.getTieredGTPPMachineCasing(0, 4), @@ -830,7 +830,7 @@ public class RECIPES_Machines { CI.getTieredComponentOfMaterial(Materials.Steel, OrePrefixes.bolt, 16), CI.getTieredComponentOfMaterial(Materials.Redstone, OrePrefixes.dust, 32)) .itemOutputs(GregtechItemList.AlgaeFarm_Controller.get(1)) - .fluidInputs(ALLOY.POTIN.getFluidStack(2 * (144 * 4))) + .fluidInputs(MaterialsAlloy.POTIN.getFluidStack(2 * (144 * 4))) .duration(60 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); @@ -838,7 +838,7 @@ public class RECIPES_Machines { } private static void distillus() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(19), ItemList.Distillation_Tower.get(2), @@ -846,10 +846,10 @@ public class RECIPES_Machines { CI.getTieredComponent(OrePrefixes.circuit, 6, 8)) .itemOutputs(GregtechItemList.Machine_Adv_DistillationTower.get(1)) .fluidInputs( - ALLOY.AQUATIC_STEEL.getFluidStack(144 * 32), - ALLOY.BABBIT_ALLOY.getFluidStack(144 * 16), - ALLOY.BRONZE.getFluidStack(144 * 64), - ALLOY.KANTHAL.getFluidStack(144 * 16)) + MaterialsAlloy.AQUATIC_STEEL.getFluidStack(144 * 32), + MaterialsAlloy.BABBIT_ALLOY.getFluidStack(144 * 16), + MaterialsAlloy.BRONZE.getFluidStack(144 * 64), + MaterialsAlloy.KANTHAL.getFluidStack(144 * 16)) .duration(10 * MINUTES) .eut(TierEU.RECIPE_LuV) .metadata(CHEMPLANT_CASING_TIER, 5) @@ -864,7 +864,7 @@ public class RECIPES_Machines { TierEU.RECIPE_IV }; for (int tier = 1; tier < aOutputs.length + 1; tier++) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedBioCircuit(19), CI.getElectricPump(tier, 2), @@ -889,7 +889,7 @@ public class RECIPES_Machines { long[] voltageTiers = new long[] { 16, TierEU.RECIPE_LV, TierEU.RECIPE_MV, TierEU.RECIPE_HV, TierEU.RECIPE_EV, TierEU.RECIPE_IV, TierEU.RECIPE_LuV, TierEU.RECIPE_ZPM, TierEU.RECIPE_UV, TierEU.RECIPE_UHV }; for (int i = 0; i < 10; i++) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedBioCircuit(20), CI.getTieredMachineCasing(i), @@ -928,7 +928,7 @@ public class RECIPES_Machines { IV_MACHINE_AlloySmelter = ItemList.Machine_IV_AlloySmelter.get(1); IV_MACHINE_Mixer = ItemList.Machine_IV_Mixer.get(1); EV_MACHINE_ChemicalBath = ItemList.Machine_EV_ChemicalBath.get(1); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { if (Railcraft.isModLoaded()) { // Misc INPUT_RCCokeOvenBlock = ItemUtils @@ -940,41 +940,41 @@ public class RECIPES_Machines { private static void runModRecipes() { // Computer Cube - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(CI.getDataOrb(), 4 * (1)), ItemList.Cover_Screen.get(4), CI.machineHull_IV, ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 2)) .itemOutputs(GregtechItemList.Gregtech_Computer_Cube.get(1)) - .fluidInputs(ELEMENT.getInstance().TANTALUM.getFluidStack(144 * 16)) + .fluidInputs(MaterialsElements.getInstance().TANTALUM.getFluidStack(144 * 16)) .duration(3 * MINUTES) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); // Circuit programmer - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(CI.robotArm_LV, 4 * (1)), ItemList.Cover_Controller.get(1, CI.electricMotor_MV), CI.machineHull_MV, - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2)) + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2)) .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer)) - .fluidInputs(ELEMENT.getInstance().IRON.getFluidStack(144 * 4)) + .fluidInputs(MaterialsElements.getInstance().IRON.getFluidStack(144 * 4)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(assemblerRecipes); // Lead Lined Chest for (ItemStack plateRubber : OreDictionary.getOres("plateAnyRubber")) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.machineHull_LV, - GT_Utility.copyAmount(32, plateRubber), + GTUtility.copyAmount(32, plateRubber), ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 9), ItemUtils.getSimpleStack(Blocks.chest)) .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockDecayablesChest)) - .fluidInputs(ELEMENT.getInstance().LEAD.getFluidStack(144 * 16)) + .fluidInputs(MaterialsElements.getInstance().LEAD.getFluidStack(144 * 16)) .duration(1 * MINUTES + 30 * SECONDS) .eut(60) .addTo(assemblerRecipes); @@ -982,39 +982,39 @@ public class RECIPES_Machines { } // RTG - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemOutputs(GregtechItemList.RTG.get(1)) - .fluidInputs(ALLOY.NIOBIUM_CARBIDE.getFluidStack(144 * 16)) + .fluidInputs(MaterialsAlloy.NIOBIUM_CARBIDE.getFluidStack(144 * 16)) .duration(10 * MINUTES) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); // Super Jukebox - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.machineHull_LV, - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 4), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 4), ItemUtils.getItemStackOfAmountFromOreDict("plateTumbaga", 8), ItemUtils.getSimpleStack(Blocks.jukebox)) .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockCustomJukebox)) - .fluidInputs(ELEMENT.getInstance().COPPER.getFluidStack(144 * 2)) + .fluidInputs(MaterialsElements.getInstance().COPPER.getFluidStack(144 * 2)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(assemblerRecipes); // Poo Collector - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.machineHull_MV, ItemList.FluidRegulator_MV.get(2), CI.getTieredComponent(OrePrefixes.pipeMedium, 2, 2), - ALLOY.EGLIN_STEEL.getPlate(4), - ALLOY.POTIN.getScrew(6)) + MaterialsAlloy.EGLIN_STEEL.getPlate(4), + MaterialsAlloy.POTIN.getScrew(6)) .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockPooCollector)) - .fluidInputs(ALLOY.TUMBAGA.getFluidStack(144 * 4)) + .fluidInputs(MaterialsAlloy.TUMBAGA.getFluidStack(144 * 4)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(assemblerRecipes); // Adv. Poo Collector - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getTieredMachineHull(-1), ItemUtils.getSimpleStack(ModBlocks.blockPooCollector), @@ -1027,14 +1027,14 @@ public class RECIPES_Machines { .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - ItemStack aBronzeBricks = ItemUtils.simpleMetaStack(GregTech_API.sBlockCasings1, 10, 1); + ItemStack aBronzeBricks = ItemUtils.simpleMetaStack(GregTechAPI.sBlockCasings1, 10, 1); // Steam Macerator Multi RecipeUtils.addShapedGregtechRecipe( aBronzeBricks, "gemDiamond", aBronzeBricks, "craftingPiston", - ALLOY.TUMBAGA.getFrameBox(1), + MaterialsAlloy.TUMBAGA.getFrameBox(1), "craftingPiston", aBronzeBricks, "gemDiamond", @@ -1047,7 +1047,7 @@ public class RECIPES_Machines { "plateWroughtIron", aBronzeBricks, "rotorTin", - ALLOY.TUMBAGA.getFrameBox(1), + MaterialsAlloy.TUMBAGA.getFrameBox(1), "rotorTin", aBronzeBricks, "plateWroughtIron", @@ -1057,17 +1057,17 @@ public class RECIPES_Machines { // Steam Mixer Multi RecipeUtils.addShapedGregtechRecipe( aBronzeBricks, - ALLOY.TUMBAGA.getRing(1), + MaterialsAlloy.TUMBAGA.getRing(1), aBronzeBricks, - ALLOY.TUMBAGA.getRotor(1), - ALLOY.TUMBAGA.getFrameBox(1), - ALLOY.TUMBAGA.getRotor(1), + MaterialsAlloy.TUMBAGA.getRotor(1), + MaterialsAlloy.TUMBAGA.getFrameBox(1), + MaterialsAlloy.TUMBAGA.getRotor(1), aBronzeBricks, - ALLOY.TUMBAGA.getRing(1), + MaterialsAlloy.TUMBAGA.getRing(1), aBronzeBricks, GregtechItemList.Controller_SteamMixerMulti.get(1)); - ItemStack aWoodenCasing = ItemUtils.simpleMetaStack(GregTech_API.sBlockCasings9, 2, 1); + ItemStack aWoodenCasing = ItemUtils.simpleMetaStack(GregTechAPI.sBlockCasings9, 2, 1); // WaterPump RecipeUtils.addShapedGregtechRecipe( "frameGtBronze", @@ -1087,7 +1087,7 @@ public class RECIPES_Machines { "plateWroughtIron", aBronzeBricks, "gearBronze", - ALLOY.TUMBAGA.getFrameBox(1), + MaterialsAlloy.TUMBAGA.getFrameBox(1), "gearBronze", aBronzeBricks, "plateWroughtIron", @@ -1103,7 +1103,7 @@ public class RECIPES_Machines { Blocks.anvil, "plateWroughtIron", aBronzeBricks, - ALLOY.TUMBAGA.getFrameBox(1), + MaterialsAlloy.TUMBAGA.getFrameBox(1), aBronzeBricks, GregtechItemList.Controller_SteamForgeHammerMulti.get(1)); @@ -1112,9 +1112,9 @@ public class RECIPES_Machines { aBronzeBricks, "craftingPiston", aBronzeBricks, - ALLOY.TUMBAGA.getGear(1), - ALLOY.TUMBAGA.getFrameBox(1), - ALLOY.TUMBAGA.getGear(1), + MaterialsAlloy.TUMBAGA.getGear(1), + MaterialsAlloy.TUMBAGA.getFrameBox(1), + MaterialsAlloy.TUMBAGA.getGear(1), aBronzeBricks, "craftingPiston", aBronzeBricks, @@ -1126,7 +1126,7 @@ public class RECIPES_Machines { "pipeMediumBronze", "plateBronze", "plateBronze", - GregtechItemList.GT_FluidTank_ULV.get(1), + GregtechItemList.GTFluidTank_ULV.get(1), "plateBronze", "plateBronze", "pipeMediumBronze", @@ -1136,13 +1136,13 @@ public class RECIPES_Machines { // Steam Input Bus RecipeUtils.addShapedGregtechRecipe( "plateBronze", - ALLOY.TUMBAGA.getPlate(1), + MaterialsAlloy.TUMBAGA.getPlate(1), "plateBronze", "plateTin", ItemUtils.getSimpleStack(Blocks.hopper), "plateTin", "plateBronze", - ALLOY.TUMBAGA.getPlate(1), + MaterialsAlloy.TUMBAGA.getPlate(1), "plateBronze", GregtechItemList.Hatch_Input_Bus_Steam.get(1)); @@ -1151,16 +1151,16 @@ public class RECIPES_Machines { "plateBronze", "plateTin", "plateBronze", - ALLOY.TUMBAGA.getPlate(1), + MaterialsAlloy.TUMBAGA.getPlate(1), ItemUtils.getSimpleStack(Blocks.hopper), - ALLOY.TUMBAGA.getPlate(1), + MaterialsAlloy.TUMBAGA.getPlate(1), "plateBronze", "plateTin", "plateBronze", GregtechItemList.Hatch_Output_Bus_Steam.get(1)); // Flask Configurator - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(8), CI.getTieredMachineHull(2), @@ -1174,7 +1174,7 @@ public class RECIPES_Machines { .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) { // Industrial Centrifuge RECIPE_IndustrialCentrifugeController = GregtechItemList.Industrial_Centrifuge.get(1); RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(1); @@ -1204,12 +1204,12 @@ public class RECIPES_Machines { CI.component_Plate[6], RECIPE_IndustrialCentrifugeCasing); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - ALLOY.MARAGING250.getPlate(4), - ALLOY.INCONEL_792.getPlate(2), - ALLOY.TUMBAGA.getRod(3), - GT_Utility.getIntegratedCircuit(1)) + MaterialsAlloy.MARAGING250.getPlate(4), + MaterialsAlloy.INCONEL_792.getPlate(2), + MaterialsAlloy.TUMBAGA.getRod(3), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(RECIPE_IndustrialCentrifugeCasing) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -1217,7 +1217,7 @@ public class RECIPES_Machines { } - if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { // Industrial Coke Oven RECIPE_IndustrialCokeOvenController = GregtechItemList.Industrial_CokeOven.get(1); RECIPE_IndustrialCokeOvenFrame = GregtechItemList.Casing_CokeOven.get(1); @@ -1250,12 +1250,12 @@ public class RECIPES_Machines { CI.component_Rod[7], CI.component_Plate[7], RECIPE_IndustrialCokeOvenFrame); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - ALLOY.TANTALLOY_61.getPlate(4), - ALLOY.TANTALLOY_61.getRod(4), - ALLOY.TANTALLOY_61.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1)) + MaterialsAlloy.TANTALLOY_61.getPlate(4), + MaterialsAlloy.TANTALLOY_61.getRod(4), + MaterialsAlloy.TANTALLOY_61.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(RECIPE_IndustrialCokeOvenFrame) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -1287,7 +1287,7 @@ public class RECIPES_Machines { RECIPE_IndustrialCokeOvenCasingB); } - if (CORE.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) { // Industrial Electrolyzer RECIPE_IndustrialElectrolyzerController = GregtechItemList.Industrial_Electrolyzer.get(1); RECIPE_IndustrialElectrolyzerFrame = GregtechItemList.Casing_Electrolyzer.get(1); @@ -1304,13 +1304,13 @@ public class RECIPES_Machines { "stickLongPotin", "platePotin", RECIPE_IndustrialElectrolyzerFrame); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - ALLOY.POTIN.getPlate(4), - ALLOY.POTIN.getLongRod(3), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Chrome, 1), - ALLOY.POTIN.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1)) + MaterialsAlloy.POTIN.getPlate(4), + MaterialsAlloy.POTIN.getLongRod(3), + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Chrome, 1), + MaterialsAlloy.POTIN.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(RECIPE_IndustrialElectrolyzerFrame) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -1330,7 +1330,7 @@ public class RECIPES_Machines { RECIPE_IndustrialElectrolyzerController); } - if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { // Industrial Material Press RECIPE_IndustrialMaterialPressController = GregtechItemList.Industrial_PlatePress.get(1); RECIPE_IndustrialMaterialPressFrame = GregtechItemList.Casing_MaterialPress.get(1); @@ -1347,13 +1347,13 @@ public class RECIPES_Machines { "stickLongTumbaga", "plateTitanium", RECIPE_IndustrialMaterialPressFrame); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4), - ALLOY.TANTALLOY_60.getRod(2), - ALLOY.TUMBAGA.getLongRod(2), - ALLOY.TUMBAGA.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4), + MaterialsAlloy.TANTALLOY_60.getRod(2), + MaterialsAlloy.TUMBAGA.getLongRod(2), + MaterialsAlloy.TUMBAGA.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(RECIPE_IndustrialMaterialPressFrame) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -1373,7 +1373,7 @@ public class RECIPES_Machines { RECIPE_IndustrialMaterialPressController); } - if (CORE.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) { // Industrial Maceration Stack RECIPE_IndustrialMacerationStackController = GregtechItemList.Industrial_MacerationStack.get(1); RECIPE_IndustrialMacerationStackFrame = GregtechItemList.Casing_MacerationStack.get(1); @@ -1390,13 +1390,13 @@ public class RECIPES_Machines { "stickLongPalladium", "platePalladium", RECIPE_IndustrialMacerationStackFrame); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 5), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Platinum, 2), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Palladium, 1), - ALLOY.INCONEL_625.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 5), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Platinum, 2), + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Palladium, 1), + MaterialsAlloy.INCONEL_625.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(RECIPE_IndustrialMacerationStackFrame) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -1428,7 +1428,7 @@ public class RECIPES_Machines { GregtechItemList.Maceration_Upgrade_Chip.get(1)); } - if (CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialWireMill) { // Industrial Wire Factory RECIPE_IndustrialWireFactoryController = GregtechItemList.Industrial_WireFactory.get(1); RECIPE_IndustrialWireFactoryFrame = GregtechItemList.Casing_WireFactory.get(1); @@ -1445,12 +1445,12 @@ public class RECIPES_Machines { "stickBlueSteel", "plateBlueSteel", RECIPE_IndustrialWireFactoryFrame); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.BlueSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueSteel, 1), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.BlueSteel, 4), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueSteel, 1), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(RECIPE_IndustrialWireFactoryFrame) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -1471,7 +1471,7 @@ public class RECIPES_Machines { } // Tiered Tanks - if (CORE.ConfigSwitches.enableMachine_FluidTanks) { + if (GTPPCore.ConfigSwitches.enableMachine_FluidTanks) { CI.component_Plate[1] = "plateTin"; pipeTier1 = "pipeLargeClay"; CI.circuitTier1 = ItemList.Circuit_Primitive.get(1); @@ -1488,8 +1488,8 @@ public class RECIPES_Machines { ItemStack waterBucket = ItemUtils.getSimpleStack(Items.water_bucket); // Allows clearing stored fluids. - GregtechItemList[] aTanks = new GregtechItemList[] { GregtechItemList.GT_FluidTank_ULV, - GregtechItemList.GT_FluidTank_LV, GregtechItemList.GT_FluidTank_MV, GregtechItemList.GT_FluidTank_HV }; + GregtechItemList[] aTanks = new GregtechItemList[] { GregtechItemList.GTFluidTank_ULV, + GregtechItemList.GTFluidTank_LV, GregtechItemList.GTFluidTank_MV, GregtechItemList.GTFluidTank_HV }; for (GregtechItemList aTank : aTanks) { RecipeUtils.addShapelessGregtechRecipe(new Object[] { aTank.get(1) }, aTank.get(1)); } @@ -1504,7 +1504,7 @@ public class RECIPES_Machines { CI.component_Plate[4], waterBucket, CI.component_Plate[4], - GregtechItemList.GT_FluidTank_ULV.get(1)); + GregtechItemList.GTFluidTank_ULV.get(1)); RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[5], CI.component_Plate[4], @@ -1515,7 +1515,7 @@ public class RECIPES_Machines { CI.component_Plate[3], CI.electricPump_LV, CI.component_Plate[3], - GregtechItemList.GT_FluidTank_LV.get(1)); + GregtechItemList.GTFluidTank_LV.get(1)); RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[8], CI.component_Plate[3], @@ -1526,7 +1526,7 @@ public class RECIPES_Machines { CI.component_Plate[5], CI.electricPump_LV, CI.component_Plate[5], - GregtechItemList.GT_FluidTank_MV.get(1)); + GregtechItemList.GTFluidTank_MV.get(1)); RecipeUtils.addShapedGregtechRecipe( CI.circuitTier1, CI.component_Plate[7], @@ -1537,10 +1537,10 @@ public class RECIPES_Machines { CI.circuitTier1, CI.electricPump_MV, CI.circuitTier1, - GregtechItemList.GT_FluidTank_HV.get(1)); + GregtechItemList.GTFluidTank_HV.get(1)); } - if (CORE.ConfigSwitches.enableMultiblock_MultiTank) { + if (GTPPCore.ConfigSwitches.enableMultiblock_MultiTank) { // Industrial Multi Tank // RECIPE_IndustrialMultiTankController = GregtechItemList.Industrial_MultiTank.get(1); RECIPE_IndustrialMultiTankFrame = GregtechItemList.Casing_MultitankExterior.get(1); @@ -1574,14 +1574,14 @@ public class RECIPES_Machines { // Semi-Fluid Generators - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(1, 1), CI.getElectricMotor(1, 2), CI.getElectricPiston(1, 2), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Cobalt, 1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1L), + GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Cobalt, 1L), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1L), CI.getGear(1, 2)) .itemOutputs(GregtechItemList.Generator_SemiFluid_LV.get(1)) .fluidInputs(Materials.Plastic.getMolten(144)) @@ -1589,14 +1589,14 @@ public class RECIPES_Machines { .eut(TierEU.RECIPE_LV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(2, 1), CI.getElectricMotor(2, 2), CI.getElectricPiston(2, 2), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnnealedCopper, 1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1L), + GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnnealedCopper, 1L), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1L), CI.getGear(2, 2)) .itemOutputs(GregtechItemList.Generator_SemiFluid_MV.get(1)) .fluidInputs(Materials.Plastic.getMolten(144)) @@ -1604,29 +1604,29 @@ public class RECIPES_Machines { .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(3, 1), CI.getElectricMotor(3, 2), CI.getElectricPiston(3, 2), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Chrome, 2)) + GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 1L), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Chrome, 2)) .itemOutputs(GregtechItemList.Generator_SemiFluid_HV.get(1)) .fluidInputs(Materials.Plastic.getMolten(144)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(4, 1), CI.getElectricMotor(4, 2), CI.getElectricPiston(4, 2), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Titanium, 1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L), + GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Titanium, 1L), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L), CI.getGear(4, 2)) .itemOutputs(GregtechItemList.Generator_SemiFluid_EV.get(1)) .fluidInputs(Materials.Plastic.getMolten(144)) @@ -1634,14 +1634,14 @@ public class RECIPES_Machines { .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(5, 1), CI.getElectricMotor(5, 2), CI.getElectricPiston(5, 2), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L), + GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 1L), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L), CI.getGear(5, 2)) .itemOutputs(GregtechItemList.Generator_SemiFluid_IV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(144)) @@ -1649,39 +1649,39 @@ public class RECIPES_Machines { .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Generator_SemiFluid_LV.get(1L), CI.bits, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_LV, 'P', ItemList.Electric_Piston_LV, 'E', ItemList.Electric_Motor_LV, 'C', OrePrefixes.circuit.get(Materials.LV), 'W', - OrePrefixes.cableGt01.get(Materials.Cobalt), 'G', ALLOY.TUMBAGA.getGear(2) }); - GT_ModHandler.addCraftingRecipe( + OrePrefixes.cableGt01.get(Materials.Cobalt), 'G', MaterialsAlloy.TUMBAGA.getGear(2) }); + GTModHandler.addCraftingRecipe( GregtechItemList.Generator_SemiFluid_MV.get(1L), CI.bits, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_MV, 'P', ItemList.Electric_Piston_MV, 'E', ItemList.Electric_Motor_MV, 'C', OrePrefixes.circuit.get(Materials.MV), 'W', - OrePrefixes.cableGt01.get(Materials.AnnealedCopper), 'G', ALLOY.EGLIN_STEEL.getGear(2) }); - GT_ModHandler.addCraftingRecipe( + OrePrefixes.cableGt01.get(Materials.AnnealedCopper), 'G', MaterialsAlloy.EGLIN_STEEL.getGear(2) }); + GTModHandler.addCraftingRecipe( GregtechItemList.Generator_SemiFluid_HV.get(1L), CI.bits, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_HV, 'P', ItemList.Electric_Piston_HV, 'E', ItemList.Electric_Motor_HV, 'C', OrePrefixes.circuit.get(Materials.HV), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'G', - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Chrome, 1) }); - GT_ModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Chrome, 1) }); + GTModHandler.addCraftingRecipe( GregtechItemList.Generator_SemiFluid_EV.get(1L), CI.bits, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E', ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.EV), 'W', - OrePrefixes.cableGt01.get(Materials.Titanium), 'G', ALLOY.INCOLOY_DS.getGear(1) }); - GT_ModHandler.addCraftingRecipe( + OrePrefixes.cableGt01.get(Materials.Titanium), 'G', MaterialsAlloy.INCOLOY_DS.getGear(1) }); + GTModHandler.addCraftingRecipe( GregtechItemList.Generator_SemiFluid_IV.get(1L), CI.bits, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Piston_IV, 'E', ItemList.Electric_Motor_IV, 'C', OrePrefixes.circuit.get(Materials.IV), 'W', - OrePrefixes.cableGt01.get(Materials.Tungsten), 'G', ALLOY.NITINOL_60.getGear(1) }); + OrePrefixes.cableGt01.get(Materials.Tungsten), 'G', MaterialsAlloy.NITINOL_60.getGear(1) }); - if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) { + if (GTPPCore.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) { // Industrial Blast Smelter RECIPE_IndustrialBlastSmelterController = GregtechItemList.Industrial_AlloyBlastSmelter.get(1); RECIPE_IndustrialBlastSmelterFrame = GregtechItemList.Casing_BlastSmelter.get(1); @@ -1711,11 +1711,11 @@ public class RECIPES_Machines { CI.craftingToolWrench, "plateZirconiumCarbide", RECIPE_IndustrialBlastSmelterFrame); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - ALLOY.ZIRCONIUM_CARBIDE.getPlate(6), - ALLOY.ZIRCONIUM_CARBIDE.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1)) + MaterialsAlloy.ZIRCONIUM_CARBIDE.getPlate(6), + MaterialsAlloy.ZIRCONIUM_CARBIDE.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(RECIPE_IndustrialBlastSmelterFrame) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -1733,12 +1733,12 @@ public class RECIPES_Machines { "plateStaballoy", "plateStaballoy", RECIPE_IndustrialBlastSmelterCoil); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - ALLOY.STABALLOY.getPlate(6), - ALLOY.STABALLOY.getFrameBox(2), + MaterialsAlloy.STABALLOY.getPlate(6), + MaterialsAlloy.STABALLOY.getFrameBox(2), CI.gearboxCasing_Tier_3, - GT_Utility.getIntegratedCircuit(1)) + GTUtility.getIntegratedCircuit(1)) .itemOutputs(RECIPE_IndustrialBlastSmelterCoil) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -1746,35 +1746,35 @@ public class RECIPES_Machines { } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Casing_Coil_Infinity.get(1), ItemList.Reactor_Coolant_Sp_6.get(4), - ALLOY.LAURENIUM.getPlateDouble(2), + MaterialsAlloy.LAURENIUM.getPlateDouble(2), CustomItemList.eM_Coil.get(1)) .itemOutputs(GregtechItemList.Casing_Coil_QuantumForceTransformer.get(1)) - .fluidInputs(ALLOY.QUANTUM.getFluidStack(144 * 4)) + .fluidInputs(MaterialsAlloy.QUANTUM.getFluidStack(144 * 4)) .duration(1 * MINUTES + 30 * SECONDS) .eut(TierEU.RECIPE_LuV) .addTo(assemblerRecipes); - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( GregtechItemList.Casing_Coil_QuantumForceTransformer.get(1), 2048 * 120 * 20, 2048, - (int) GT_Values.VP[11], + (int) GTValues.VP[11], 16, new Object[] { GregtechItemList.Controller_MolecularTransformer.get(1), - GT_ModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1), + GTModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1), new Object[] { OrePrefixes.circuit.get(Materials.UEV), 8 }, ItemList.Electric_Pump_UEV.get(4), ItemList.Field_Generator_UEV.get(4), GregtechItemList.Laser_Lens_Special.get(1) }, - new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10), - ALLOY.PIKYONIUM.getFluidStack(144 * 32) }, + new FluidStack[] { MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10), + MaterialsAlloy.PIKYONIUM.getFluidStack(144 * 32) }, GregtechItemList.QuantumForceTransformer.get(1), 1200 * 20, - (int) GT_Values.VP[11]); + (int) GTValues.VP[11]); - if (CORE.ConfigSwitches.enableMultiblock_MatterFabricator) { + if (GTPPCore.ConfigSwitches.enableMultiblock_MatterFabricator) { // Industrial Matter Fabricator RECIPE_IndustrialMatterFabController = GregtechItemList.Industrial_MassFab.get(1); RECIPE_IndustrialMatterFabFrame = GregtechItemList.Casing_MatterFab.get(1); @@ -1785,9 +1785,9 @@ public class RECIPES_Machines { CI.getPlate(8, 1), CI.circuitTier8, CI.getPlate(8, 1), - GT_OreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L), + GTOreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L), CI.machineCasing_UV, - GT_OreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L), + GTOreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L), CI.getPlate(8, 1), CI.circuitTier8, CI.getPlate(8, 1), @@ -1804,7 +1804,7 @@ public class RECIPES_Machines { CI.component_Rod[8], "plateNiobiumCarbide", RECIPE_IndustrialMatterFabFrame); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemOutputs(RECIPE_IndustrialMatterFabFrame) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -1822,13 +1822,13 @@ public class RECIPES_Machines { CI.getPlate(7, 1), CI.getPlate(6, 1), RECIPE_IndustrialMatterFabCoil); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.machineCasing_UV, - ALLOY.ZERON_100.getPlate(4), - ALLOY.PIKYONIUM.getPlate(2), - ALLOY.STELLITE.getFrameBox(2), - GT_Utility.getIntegratedCircuit(1)) + MaterialsAlloy.ZERON_100.getPlate(4), + MaterialsAlloy.PIKYONIUM.getPlate(2), + MaterialsAlloy.STELLITE.getFrameBox(2), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(RECIPE_IndustrialMatterFabCoil) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -1836,7 +1836,7 @@ public class RECIPES_Machines { } - if (CORE.ConfigSwitches.enableMultiblock_IndustrialSifter) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialSifter) { // Industrial Sieve RECIPE_IndustrialSieveController = GregtechItemList.Industrial_Sifter.get(1); RECIPE_IndustrialSieveFrame = GregtechItemList.Casing_Sifter.get(1); @@ -1866,11 +1866,11 @@ public class RECIPES_Machines { "plateEglinSteel", "plateEglinSteel", RECIPE_IndustrialSieveFrame); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - ALLOY.EGLIN_STEEL.getPlate(8), - ALLOY.TUMBAGA.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1)) + MaterialsAlloy.EGLIN_STEEL.getPlate(8), + MaterialsAlloy.TUMBAGA.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(RECIPE_IndustrialSieveFrame) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -1888,11 +1888,11 @@ public class RECIPES_Machines { "wireFineSteel", "frameGtEglinSteel", RECIPE_IndustrialSieveGrate); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 5), - ALLOY.EGLIN_STEEL.getFrameBox(4), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 5), + MaterialsAlloy.EGLIN_STEEL.getFrameBox(4), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(RECIPE_IndustrialSieveGrate) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -1900,40 +1900,40 @@ public class RECIPES_Machines { } - if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) { + if (GTPPCore.ConfigSwitches.enableMultiblock_TreeFarmer) { // Industrial Tree Farmer RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1); RECIPE_TreeFarmFrame = GregtechItemList.Casing_PLACEHOLDER_TreeFarmer.get(1); // Industrial Tree Farm Controller RecipeUtils.addShapedGregtechRecipe( ItemList.Field_Generator_IV.get(1), - ALLOY.INCOLOY_MA956.getRotor(1), + MaterialsAlloy.INCOLOY_MA956.getRotor(1), ItemList.Field_Generator_IV.get(1), - ALLOY.NITINOL_60.getPlate(1), + MaterialsAlloy.NITINOL_60.getPlate(1), GregtechItemList.GTPP_Casing_IV.get(1), - ALLOY.NITINOL_60.getPlate(1), + MaterialsAlloy.NITINOL_60.getPlate(1), ItemList.Field_Generator_IV.get(1), - ALLOY.INCONEL_792.getComponentByPrefix(OrePrefixes.pipeMedium, 1), + MaterialsAlloy.INCONEL_792.getComponentByPrefix(OrePrefixes.pipeMedium, 1), ItemList.Field_Generator_IV.get(1), RECIPE_TreeFarmController); // Industrial Tree Farm Frame - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(2), - ALLOY.TUMBAGA.getFrameBox(1), + GTUtility.getIntegratedCircuit(2), + MaterialsAlloy.TUMBAGA.getFrameBox(1), ItemUtils.getItemStackOfAmountFromOreDict("pipeTinySteel", 1), ItemList.MV_Coil.get(1), ItemList.IC2_Plantball.get(4), - GT_OreDictUnificator.get(OrePrefixes.plank, Materials.Wood, 8)) + GTOreDictUnificator.get(OrePrefixes.plank, Materials.Wood, 8)) .itemOutputs(RECIPE_TreeFarmFrame) - .fluidInputs(GT_ModHandler.getDistilledWater(2000)) + .fluidInputs(GTModHandler.getDistilledWater(2000)) .duration(10 * SECONDS) .eut(64) .addTo(assemblerRecipes); } - if (CORE.ConfigSwitches.enableMachine_Tesseracts) { + if (GTPPCore.ConfigSwitches.enableMachine_Tesseracts) { // Tesseracts RECIPE_TesseractGenerator = GregtechItemList.GT4_Tesseract_Generator.get(1); RECIPE_TesseractTerminal = GregtechItemList.GT4_Tesseract_Terminal.get(1); @@ -1963,7 +1963,7 @@ public class RECIPES_Machines { RECIPE_TesseractTerminal); } - if (CORE.ConfigSwitches.enableMachine_SimpleWasher) { + if (GTPPCore.ConfigSwitches.enableMachine_SimpleWasher) { final List<ItemStack> washers = ImmutableList.of( GregtechItemList.SimpleDustWasher_LV.get(1), GregtechItemList.SimpleDustWasher_MV.get(1), @@ -1976,7 +1976,7 @@ public class RECIPES_Machines { for (int i = 0; i < washers.size(); i++) { final int tier = i + 1; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getTieredMachineHull(tier), CI.getTieredComponent(OrePrefixes.screw, tier, tier * 4), @@ -1986,13 +1986,13 @@ public class RECIPES_Machines { .itemOutputs(washers.get(i)) .fluidInputs(CI.getTieredFluid(tier, 144 * tier)) .duration(20 * 5 * tier) - .eut(GT_Values.VP[tier]) + .eut(GTValues.VP[tier]) .addTo(assemblerRecipes); } } - if (CORE.ConfigSwitches.enableMachine_Pollution && PollutionUtils.isPollutionEnabled()) { + if (GTPPCore.ConfigSwitches.enableMachine_Pollution && PollutionUtils.isPollutionEnabled()) { RecipeUtils.addShapedGregtechRecipe( "plateCarbon", @@ -2141,7 +2141,7 @@ public class RECIPES_Machines { GregtechItemList.Pollution_Cleaner_MAX.get(1)); } - if (CORE.ConfigSwitches.enableMultiblock_ThermalBoiler) { + if (GTPPCore.ConfigSwitches.enableMultiblock_ThermalBoiler) { RECIPE_ThermalBoilerController = GregtechItemList.GT4_Thermal_Boiler.get(1); RECIPE_ThermalBoilerCasing = GregtechItemList.Casing_ThermalContainment.get(2); ItemStack centrifugeEV = ItemList.Machine_EV_Centrifuge.get(1); @@ -2171,21 +2171,21 @@ public class RECIPES_Machines { RECIPE_ThermalBoilerController); RecipeUtils.addShapedGregtechRecipe( - ALLOY.MARAGING350.getPlate(1), + MaterialsAlloy.MARAGING350.getPlate(1), "plateStainlessSteel", - ALLOY.MARAGING350.getPlate(1), + MaterialsAlloy.MARAGING350.getPlate(1), "circuitAdvanced", CI.machineCasing_HV, "circuitAdvanced", - ALLOY.MARAGING350.getPlate(1), - ALLOY.MARAGING350.getPlate(1), - ALLOY.MARAGING350.getPlate(1), + MaterialsAlloy.MARAGING350.getPlate(1), + MaterialsAlloy.MARAGING350.getPlate(1), + MaterialsAlloy.MARAGING350.getPlate(1), RECIPE_ThermalBoilerCasing); // Lava Filter Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(18), + GTUtility.getIntegratedCircuit(18), ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 32), ItemUtils.getItemStackOfAmountFromOreDict("wireFineSteel", 32), ItemUtils.getItemStackOfAmountFromOreDict("ringTumbaga", 16), @@ -2224,7 +2224,7 @@ public class RECIPES_Machines { CI.getTieredCircuit(7), GregtechItemList.Hatch_Air_Intake_Extreme.get(1)); - if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) { + if (GTPPCore.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) { // Thorium Reactor RECIPE_LFTRController = GregtechItemList.ThoriumReactor.get(1); @@ -2269,7 +2269,7 @@ public class RECIPES_Machines { RECIPE_LFTROuterCasing); // LFTR Control Circuit - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 1), CI.fieldGenerator_HV) @@ -2334,7 +2334,7 @@ public class RECIPES_Machines { RecipeUtils.addShapedGregtechRecipe( CI.getPlate(5, 1), - ALLOY.HASTELLOY_X.getPlateDouble(1), + MaterialsAlloy.HASTELLOY_X.getPlateDouble(1), CI.getPlate(5, 1), CI.getPlate(5, 1), CI.getTieredMachineCasing(5), @@ -2345,7 +2345,7 @@ public class RECIPES_Machines { GregtechItemList.ColdTrap_IV.get(1)); RecipeUtils.addShapedGregtechRecipe( CI.getPlate(7, 1), - ALLOY.HS188A.getPlateDouble(1), + MaterialsAlloy.HS188A.getPlateDouble(1), CI.getPlate(7, 1), CI.getPlate(7, 1), GregtechItemList.ColdTrap_IV.get(1), @@ -2359,22 +2359,22 @@ public class RECIPES_Machines { CI.getFieldGenerator(3, 1), CI.getRobotArm(5, 1), CI.getPlate(5, 1), - ALLOY.HASTELLOY_N.getPlateDouble(1), + MaterialsAlloy.HASTELLOY_N.getPlateDouble(1), ItemList.Machine_IV_ChemicalReactor.get(1), - ALLOY.HASTELLOY_N.getPlateDouble(1), + MaterialsAlloy.HASTELLOY_N.getPlateDouble(1), CI.getPlate(5, 1), - ALLOY.HASTELLOY_N.getPlateDouble(1), + MaterialsAlloy.HASTELLOY_N.getPlateDouble(1), CI.getFieldGenerator(3, 1), GregtechItemList.ReactorProcessingUnit_IV.get(1)); RecipeUtils.addShapedGregtechRecipe( CI.getFieldGenerator(5, 1), CI.getRobotArm(7, 1), CI.getPlate(7, 1), - ALLOY.HS188A.getPlateDouble(1), + MaterialsAlloy.HS188A.getPlateDouble(1), GregtechItemList.ReactorProcessingUnit_IV.get(1), - ALLOY.HS188A.getPlateDouble(1), + MaterialsAlloy.HS188A.getPlateDouble(1), CI.getPlate(7, 1), - ALLOY.HS188A.getPlateDouble(1), + MaterialsAlloy.HS188A.getPlateDouble(1), CI.getFieldGenerator(5, 1), GregtechItemList.ReactorProcessingUnit_ZPM.get(1)); @@ -2395,52 +2395,52 @@ public class RECIPES_Machines { } // Cyclotron - if (CORE.ConfigSwitches.enableMultiblock_Cyclotron) { + if (GTPPCore.ConfigSwitches.enableMultiblock_Cyclotron) { RECIPE_CyclotronController = GregtechItemList.COMET_Cyclotron.get(1); RECIPE_CyclotronOuterCasing = GregtechItemList.Casing_Cyclotron_External.get(1); RECIPE_CyclotronInnerCoil = GregtechItemList.Casing_Cyclotron_Coil.get(1); // Outer Casing - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Casing_FrostProof.get(1), ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, 4), - ALLOY.INCOLOY_DS.getPlate(8), - ALLOY.INCONEL_690.getScrew(16), - ALLOY.EGLIN_STEEL.getLongRod(4), + MaterialsAlloy.INCOLOY_DS.getPlate(8), + MaterialsAlloy.INCONEL_690.getScrew(16), + MaterialsAlloy.EGLIN_STEEL.getLongRod(4), CI.getElectricPiston(3, 2)) .itemOutputs(RECIPE_CyclotronOuterCasing) - .fluidInputs(ALLOY.ZIRCONIUM_CARBIDE.getFluidStack(144 * 8) // Input Flui + .fluidInputs(MaterialsAlloy.ZIRCONIUM_CARBIDE.getFluidStack(144 * 8) // Input Flui ) .duration(60 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); // Inner Coil - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Casing_Coil_Nichrome.get(1), ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, 8), - ALLOY.INCOLOY_MA956.getPlate(8), - ALLOY.TANTALLOY_61.getBolt(16), - ALLOY.INCOLOY_020.getScrew(32), + MaterialsAlloy.INCOLOY_MA956.getPlate(8), + MaterialsAlloy.TANTALLOY_61.getBolt(16), + MaterialsAlloy.INCOLOY_020.getScrew(32), CI.getFieldGenerator(4, 1)) .itemOutputs(RECIPE_CyclotronInnerCoil) - .fluidInputs(ALLOY.HG1223.getFluidStack(144 * 5) // Input Flui + .fluidInputs(MaterialsAlloy.HG1223.getFluidStack(144 * 5) // Input Flui ) .duration(2 * MINUTES) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); // Controller - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.machineHull_IV, ItemUtils.getSimpleStack(RECIPE_CyclotronInnerCoil, 2), - ALLOY.INCOLOY_020.getPlate(8), - ALLOY.TANTALLOY_61.getGear(2), - ALLOY.INCOLOY_MA956.getScrew(16), + MaterialsAlloy.INCOLOY_020.getPlate(8), + MaterialsAlloy.TANTALLOY_61.getGear(2), + MaterialsAlloy.INCOLOY_MA956.getScrew(16), ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(5), 16)) .itemOutputs(RECIPE_CyclotronController) - .fluidInputs(ALLOY.INCOLOY_020.getFluidStack(144 * 9) // Input Flui + .fluidInputs(MaterialsAlloy.INCOLOY_020.getFluidStack(144 * 9) // Input Flui ) .duration(5 * MINUTES) .eut(TierEU.RECIPE_IV) @@ -2449,14 +2449,14 @@ public class RECIPES_Machines { } // Mazut - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Controller_LargeSemifluidGenerator.get(1L), CI.bitsd, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E', ItemList.Electric_Pump_EV, 'C', OrePrefixes.circuit.get(Materials.EV), 'W', - OrePrefixes.cableGt08.get(Materials.Electrum), 'G', ALLOY.INCONEL_792.getGear(1) }); + OrePrefixes.cableGt08.get(Materials.Electrum), 'G', MaterialsAlloy.INCONEL_792.getGear(1) }); - if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation) { + if (GTPPCore.ConfigSwitches.enableMultiblock_PowerSubstation) { RecipeUtils.addShapedRecipe( "screwTitanium", "plateIncoloy020", @@ -2484,7 +2484,7 @@ public class RECIPES_Machines { GregtechItemList.PowerSubStation.get(1)); } - if (CORE.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge) { RecipeUtils.addShapedRecipe( "plateRedSteel", CI.craftingToolHammer_Hard, @@ -2496,11 +2496,11 @@ public class RECIPES_Machines { CI.craftingToolWrench, "plateRedSteel", GregtechItemList.Casing_ThermalCentrifuge.get(1)); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 6), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(GregtechItemList.Casing_ThermalCentrifuge.get(1L)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -2519,7 +2519,7 @@ public class RECIPES_Machines { GregtechItemList.Industrial_ThermalCentrifuge.get(1)); } - if (CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialWashPlant) { RecipeUtils.addShapedRecipe( "plateGrisium", CI.craftingToolHammer_Hard, @@ -2531,12 +2531,12 @@ public class RECIPES_Machines { CI.craftingToolWrench, "plateGrisium", GregtechItemList.Casing_WashPlant.get(1)); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - ALLOY.LEAGRISIUM.getPlate(4), - ALLOY.TALONITE.getPlate(2), - ALLOY.LEAGRISIUM.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1)) + MaterialsAlloy.LEAGRISIUM.getPlate(4), + MaterialsAlloy.TALONITE.getPlate(2), + MaterialsAlloy.LEAGRISIUM.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(GregtechItemList.Casing_WashPlant.get(1L)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -2555,8 +2555,8 @@ public class RECIPES_Machines { GregtechItemList.Industrial_WashPlant.get(1)); } - if (CORE.ConfigSwitches.enableMultiblock_LargeAutoCrafter) { - GT_Values.RA.stdBuilder() + if (GTPPCore.ConfigSwitches.enableMultiblock_LargeAutoCrafter) { + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1), ItemList.Block_IridiumTungstensteel.get(1), @@ -2569,7 +2569,7 @@ public class RECIPES_Machines { .duration(2 * MINUTES) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( GregtechItemList.Casing_Refinery_Structural.get(4), ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 1), @@ -2581,7 +2581,7 @@ public class RECIPES_Machines { .duration(5 * MINUTES) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1), CI.getEmitter(4, 2), @@ -2597,8 +2597,8 @@ public class RECIPES_Machines { } - if (CORE.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine) { - ItemStack plate = ALLOY.MARAGING300.getPlate(1); + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine) { + ItemStack plate = MaterialsAlloy.MARAGING300.getPlate(1); RecipeUtils.addShapedRecipe( plate, CI.craftingToolHammer_Hard, @@ -2610,12 +2610,12 @@ public class RECIPES_Machines { CI.craftingToolWrench, plate, GregtechItemList.Casing_CuttingFactoryFrame.get(1)); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - ALLOY.MARAGING300.getPlate(4), - ALLOY.STELLITE.getPlate(2), - ALLOY.TALONITE.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1)) + MaterialsAlloy.MARAGING300.getPlate(4), + MaterialsAlloy.STELLITE.getPlate(2), + MaterialsAlloy.TALONITE.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(GregtechItemList.Casing_CuttingFactoryFrame.get(1L)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -2635,8 +2635,8 @@ public class RECIPES_Machines { } // IV_MACHINE_Extruder - if (CORE.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine) { - ItemStack plate = ALLOY.INCONEL_690.getPlate(1); + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine) { + ItemStack plate = MaterialsAlloy.INCONEL_690.getPlate(1); RecipeUtils.addShapedRecipe( plate, CI.craftingToolHammer_Hard, @@ -2648,12 +2648,12 @@ public class RECIPES_Machines { CI.craftingToolWrench, plate, GregtechItemList.Casing_Extruder.get(1)); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - ALLOY.INCONEL_690.getPlate(4), - ALLOY.TALONITE.getPlate(2), - ALLOY.STABALLOY.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1)) + MaterialsAlloy.INCONEL_690.getPlate(4), + MaterialsAlloy.TALONITE.getPlate(2), + MaterialsAlloy.STABALLOY.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(GregtechItemList.Casing_Extruder.get(1L)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -2672,8 +2672,8 @@ public class RECIPES_Machines { GregtechItemList.Industrial_Extruder.get(1)); } - if (CORE.ConfigSwitches.enableMultiblock_IndustrialFishingPort) { - ItemStack plate = ALLOY.AQUATIC_STEEL.getPlate(1); + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialFishingPort) { + ItemStack plate = MaterialsAlloy.AQUATIC_STEEL.getPlate(1); RecipeUtils.addShapedRecipe( plate, CI.craftingToolHammer_Hard, @@ -2685,12 +2685,12 @@ public class RECIPES_Machines { CI.craftingToolWrench, plate, GregtechItemList.Casing_FishPond.get(1)); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - ALLOY.AQUATIC_STEEL.getPlate(4), - ALLOY.EGLIN_STEEL.getPlate(2), - ALLOY.EGLIN_STEEL.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1)) + MaterialsAlloy.AQUATIC_STEEL.getPlate(4), + MaterialsAlloy.EGLIN_STEEL.getPlate(2), + MaterialsAlloy.EGLIN_STEEL.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(GregtechItemList.Casing_FishPond.get(1L)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -2711,9 +2711,9 @@ public class RECIPES_Machines { if (true) { // Advanced Vacuum Freezer - ItemStack plate = ALLOY.LEAGRISIUM.getPlateDouble(1); - ItemStack gear = ALLOY.INCOLOY_MA956.getGear(1); - ItemStack frame = ALLOY.NITINOL_60.getFrameBox(1); + ItemStack plate = MaterialsAlloy.LEAGRISIUM.getPlateDouble(1); + ItemStack gear = MaterialsAlloy.INCOLOY_MA956.getGear(1); + ItemStack frame = MaterialsAlloy.NITINOL_60.getFrameBox(1); ItemStack cell1 = ItemList.Reactor_Coolant_He_6.get(1); ItemStack cell2 = ItemList.Reactor_Coolant_NaK_6.get(1); @@ -2741,9 +2741,9 @@ public class RECIPES_Machines { GregtechItemList.Industrial_Cryogenic_Freezer.get(1)); // Advanced Blast Furnace - plate = ALLOY.HASTELLOY_N.getPlateDouble(1); - gear = ALLOY.HASTELLOY_W.getGear(1); - frame = ALLOY.HASTELLOY_X.getFrameBox(1); + plate = MaterialsAlloy.HASTELLOY_N.getPlateDouble(1); + gear = MaterialsAlloy.HASTELLOY_W.getGear(1); + frame = MaterialsAlloy.HASTELLOY_X.getFrameBox(1); cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1); cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1); ItemStack cell3 = ItemUtils.simpleMetaStack("IC2:reactorVentDiamond:1:1", 1, 1); @@ -2771,28 +2771,28 @@ public class RECIPES_Machines { plate, GregtechItemList.Machine_Adv_BlastFurnace.get(1)); // Hatch_Input_Pyrotheum - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Hatch_Input_IV.get(1), GregtechItemList.Casing_Adv_BlastFurnace.get(1), - ALLOY.MARAGING250.getPlate(4), - ALLOY.MARAGING300.getGear(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 2), - GT_Utility.getIntegratedCircuit(1)) + MaterialsAlloy.MARAGING250.getPlate(4), + MaterialsAlloy.MARAGING300.getGear(1), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 2), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(GregtechItemList.Hatch_Input_Pyrotheum.get(1L)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) .addTo(assemblerRecipes); // Casing_Adv_BlastFurnace - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - ALLOY.HASTELLOY_X.getFrameBox(1), - ALLOY.HASTELLOY_N.getPlateDouble(4), - ALLOY.HASTELLOY_W.getGear(1), + MaterialsAlloy.HASTELLOY_X.getFrameBox(1), + MaterialsAlloy.HASTELLOY_N.getPlateDouble(4), + MaterialsAlloy.HASTELLOY_W.getGear(1), ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1), ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1), ItemUtils.simpleMetaStack("IC2:reactorVentDiamond:1:1", 1, 1), - GT_Utility.getIntegratedCircuit(1)) + GTUtility.getIntegratedCircuit(1)) .itemOutputs(GregtechItemList.Casing_Adv_BlastFurnace.get(1L)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -2800,8 +2800,8 @@ public class RECIPES_Machines { // Advanced Implosion Compressor plate = ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 1); - gear = ALLOY.LEAGRISIUM.getGear(1); - frame = ALLOY.CINOBITE.getFrameBox(1); + gear = MaterialsAlloy.LEAGRISIUM.getGear(1); + frame = MaterialsAlloy.CINOBITE.getFrameBox(1); cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1); cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1); @@ -2818,9 +2818,9 @@ public class RECIPES_Machines { GregtechItemList.Machine_Adv_ImplosionCompressor.get(1)); // Supply Depot - plate = ALLOY.TUNGSTEN_CARBIDE.getPlateDouble(1); - gear = ALLOY.TRINIUM_TITANIUM.getRing(1); - frame = ALLOY.TUNGSTEN_CARBIDE.getFrameBox(1); + plate = MaterialsAlloy.TUNGSTEN_CARBIDE.getPlateDouble(1); + gear = MaterialsAlloy.TRINIUM_TITANIUM.getRing(1); + frame = MaterialsAlloy.TUNGSTEN_CARBIDE.getFrameBox(1); cell1 = CI.conveyorModule_LuV; cell2 = CI.electricMotor_LuV; ItemStack casingAmazon = GregtechItemList.Casing_AmazonWarehouse.get(1); @@ -2836,15 +2836,15 @@ public class RECIPES_Machines { gear, plate, GregtechItemList.Casing_AmazonWarehouse.get(1)); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - ALLOY.TUNGSTEN_CARBIDE.getFrameBox(1), - ALLOY.TUNGSTEN_CARBIDE.getPlateDouble(4), - ALLOY.TRINIUM_TITANIUM.getRing(1), + MaterialsAlloy.TUNGSTEN_CARBIDE.getFrameBox(1), + MaterialsAlloy.TUNGSTEN_CARBIDE.getPlateDouble(4), + MaterialsAlloy.TRINIUM_TITANIUM.getRing(1), ItemList.Electric_Motor_LuV.get(1), ItemList.Conveyor_Module_LuV.get(1), ItemUtils.getItemStackOfAmountFromOreDict("cableGt12VanadiumGallium", 1), - GT_Utility.getIntegratedCircuit(1)) + GTUtility.getIntegratedCircuit(1)) .itemOutputs(GregtechItemList.Casing_AmazonWarehouse.get(1L)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -2876,8 +2876,8 @@ public class RECIPES_Machines { GregtechItemList.Industrial_Mixer.get(1)); } - if (CORE.ConfigSwitches.enableMultiblock_IndustrialMultiMachine) { - ItemStack plate = ALLOY.STABALLOY.getPlate(1); + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialMultiMachine) { + ItemStack plate = MaterialsAlloy.STABALLOY.getPlate(1); ItemStack o_Compressor = ItemList.Machine_IV_Compressor.get(1); ItemStack o_Lathe = ItemList.Machine_IV_Lathe.get(1); @@ -2897,12 +2897,12 @@ public class RECIPES_Machines { CI.craftingToolWrench, plate, GregtechItemList.Casing_Multi_Use.get(1)); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - ALLOY.STABALLOY.getPlate(4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2), - ALLOY.ZIRCONIUM_CARBIDE.getFrameBox(1), - GT_Utility.getIntegratedCircuit(1)) + MaterialsAlloy.STABALLOY.getPlate(4), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2), + MaterialsAlloy.ZIRCONIUM_CARBIDE.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(GregtechItemList.Casing_Multi_Use.get(1L)) .duration(2 * SECONDS + 10 * TICKS) .eut(16) @@ -2922,33 +2922,33 @@ public class RECIPES_Machines { } // Drilling Platform Casings - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getItemStackOfAmountFromOreDict("frameGtTriniumNaquadahCarbonite", 4), ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleTriniumTitaniumAlloy", 1 * (1)), ItemUtils.getItemStackOfAmountFromOreDict("gearGtPikyonium64B", 2 * (1)), - ALLOY.TRINIUM_REINFORCED_STEEL.getPlateDouble(4 * 1), + MaterialsAlloy.TRINIUM_REINFORCED_STEEL.getPlateDouble(4 * 1), ItemUtils.getSimpleStack((CI.machineHull_LuV), 1 * 1)) .itemOutputs(GregtechItemList.Casing_BedrockMiner.get(1)) - .fluidInputs(ALLOY.MARAGING350.getFluidStack(144 * 16 * 1)) - .duration((int) GT_Values.V[4]) + .fluidInputs(MaterialsAlloy.MARAGING350.getFluidStack(144 * 16 * 1)) + .duration((int) GTValues.V[4]) .eut(TierEU.RECIPE_LuV) .addTo(assemblerRecipes); int aCostMultiplier = 1; // Reservoir Hatch - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Hatch_Input_EV.get(1), - GT_ModHandler.getModItem(RemoteIO.ID, "tile.machine", 1), + GTModHandler.getModItem(RemoteIO.ID, "tile.machine", 1), ItemList.Electric_Pump_EV.get(1)) .itemOutputs(GregtechItemList.Hatch_Reservoir.get(1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); // Mystic Frame - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( GregtechItemList.Casing_Multi_Use.get(1), ItemList.Field_Generator_MV.get(1, CI.circuitTier7), @@ -2957,7 +2957,7 @@ public class RECIPES_Machines { ItemList.Sensor_HV.get(1, CI.circuitTier7), CI.getTieredComponent(OrePrefixes.plate, 7, 8 * aCostMultiplier), CI.getTieredComponent(OrePrefixes.wireGt08, 8, 4 * aCostMultiplier)) - .itemOutputs(ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame, 2)) + .itemOutputs(ItemUtils.getSimpleStack(DimensionEverglades.blockPortalFrame, 2)) .fluidInputs(CI.getTieredFluid(6, (144 * 8))) .duration(4 * MINUTES + 30 * SECONDS) .eut(TierEU.RECIPE_LuV) @@ -2992,7 +2992,7 @@ public class RECIPES_Machines { ItemStack aPrevTier = (i == 0 ? CI.getTieredMachineHull(1) : aOutput[i - 1]); aPrevTier.stackSize = 1; int aTier = (i + 1); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( aPrevTier, CI.getTieredComponent(OrePrefixes.plate, aTier, 4), @@ -3006,7 +3006,7 @@ public class RECIPES_Machines { .eut(voltageTiers[i]) .addTo(assemblerRecipes); // Energy Buffer - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(aOutput[i], 4), CI.getTieredComponent(OrePrefixes.plate, aTier, 8), @@ -3040,7 +3040,7 @@ public class RECIPES_Machines { CI.getTransmissionComponent(tier, 2), CI.getFieldGenerator(tier, 1), CI.getTieredComponent(OrePrefixes.plate, tier + 1, 4), CI.getTieredComponent(OrePrefixes.circuit, tier + 1, 2), }; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aInputs) .itemOutputs(aChargers[tier - 1]) .fluidInputs(CI.getAlternativeTieredFluid(tier, (144 * 2 * (tier + 1)))) @@ -3053,7 +3053,7 @@ public class RECIPES_Machines { private static void largeArcFurnace() { int aCostMultiplier = 1; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( GregtechItemList.Casing_Multi_Use.get(aCostMultiplier), CI.getTransmissionComponent(2, 2 * aCostMultiplier), @@ -3065,7 +3065,7 @@ public class RECIPES_Machines { .duration(60 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( GregtechItemList.Casing_Industrial_Arc_Furnace.get(1), CI.getFieldGenerator(4, 2 * aCostMultiplier), @@ -3083,7 +3083,7 @@ public class RECIPES_Machines { private static void industrialVacuumFurnace() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( GregtechItemList.Casing_Multi_Use.get(1), CI.getHeatCoil(2), @@ -3095,7 +3095,7 @@ public class RECIPES_Machines { .duration(60 * SECONDS) .eut(TierEU.RECIPE_LuV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( GregtechItemList.Casing_Vacuum_Furnace.get(1), CI.getTieredComponent(OrePrefixes.wireGt16, 7, 4), @@ -3114,7 +3114,7 @@ public class RECIPES_Machines { private static void milling() { // Isa Mill Controller - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemList.Machine_IV_Macerator.get(1)) .metadata(RESEARCH_TIME, 20 * MINUTES) .itemInputs( @@ -3122,11 +3122,11 @@ public class RECIPES_Machines { CI.getTieredGTPPMachineCasing(6, 4), ItemList.Component_Grinder_Tungsten.get(16), new Object[] { CI.getTieredCircuitOreDictName(6), 8 }, - ALLOY.INCONEL_625.getGear(8), - ALLOY.INCONEL_625.getPlate(32), - ALLOY.ZERON_100.getPlateDouble(8), - ALLOY.ZERON_100.getPlateDouble(8), - ALLOY.ZERON_100.getScrew(64), + MaterialsAlloy.INCONEL_625.getGear(8), + MaterialsAlloy.INCONEL_625.getPlate(32), + MaterialsAlloy.ZERON_100.getPlateDouble(8), + MaterialsAlloy.ZERON_100.getPlateDouble(8), + MaterialsAlloy.ZERON_100.getScrew(64), CI.getTieredComponentOfMaterial(Materials.NiobiumTitanium, OrePrefixes.wireFine, 32), CI.getTieredComponentOfMaterial(Materials.NiobiumTitanium, OrePrefixes.wireFine, 32), CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.foil, 16), @@ -3141,50 +3141,50 @@ public class RECIPES_Machines { .addTo(AssemblyLine); // Isa Mill Gearbox - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(7), ItemList.Casing_Gearbox_Titanium.get(2), - ALLOY.INCONEL_625.getGear(4), + MaterialsAlloy.INCONEL_625.getGear(4), CI.getTieredComponentOfMaterial(Materials.HSSE, OrePrefixes.gearGtSmall, 8), - ALLOY.INCONEL_625.getPlate(16), - ALLOY.ZERON_100.getBolt(16)) + MaterialsAlloy.INCONEL_625.getPlate(16), + MaterialsAlloy.ZERON_100.getBolt(16)) .itemOutputs(GregtechItemList.Casing_IsaMill_Gearbox.get(1)) - .fluidInputs(ALLOY.TUNGSTENSTEEL.getFluidStack(8 * 144)) + .fluidInputs(MaterialsAlloy.TUNGSTENSTEEL.getFluidStack(8 * 144)) .duration(2 * MINUTES) .eut(TierEU.RECIPE_LuV) .addTo(assemblerRecipes); // Isa Mill Casing - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(7), CI.getTieredGTPPMachineCasing(5, 1), - ALLOY.INCONEL_625.getPlate(8), - ALLOY.ZERON_100.getRod(4), + MaterialsAlloy.INCONEL_625.getPlate(8), + MaterialsAlloy.ZERON_100.getRod(4), CI.getTieredComponentOfMaterial(Materials.HSSG, OrePrefixes.gearGtSmall, 4), - ALLOY.ZERON_100.getScrew(8)) + MaterialsAlloy.ZERON_100.getScrew(8)) .itemOutputs(GregtechItemList.Casing_IsaMill_Casing.get(1)) - .fluidInputs(ELEMENT.getInstance().TITANIUM.getFluidStack(4 * 144)) + .fluidInputs(MaterialsElements.getInstance().TITANIUM.getFluidStack(4 * 144)) .duration(2 * MINUTES) .eut(TierEU.RECIPE_LuV) .addTo(assemblerRecipes); // Isa Mill Pipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(7), CI.getTieredGTPPMachineCasing(4, 2), - ALLOY.INCONEL_625.getPlateDouble(4), - ALLOY.INCOLOY_MA956.getRing(8), + MaterialsAlloy.INCONEL_625.getPlateDouble(4), + MaterialsAlloy.INCOLOY_MA956.getRing(8), CI.getTieredComponentOfMaterial(Materials.HSSE, OrePrefixes.plate, 8), - ALLOY.INCOLOY_MA956.getBolt(16)) + MaterialsAlloy.INCOLOY_MA956.getBolt(16)) .itemOutputs(GregtechItemList.Casing_IsaMill_Pipe.get(1)) - .fluidInputs(ELEMENT.getInstance().ALUMINIUM.getFluidStack(8 * 144)) + .fluidInputs(MaterialsElements.getInstance().ALUMINIUM.getFluidStack(8 * 144)) .duration(8 * MINUTES) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); // Flotation Cell Controller - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemList.Distillation_Tower.get(1)) .metadata(RESEARCH_TIME, 20 * MINUTES) .itemInputs( @@ -3192,11 +3192,11 @@ public class RECIPES_Machines { CI.getTieredGTPPMachineCasing(5, 4), ItemList.Machine_IV_Distillery.get(1), new Object[] { CI.getTieredCircuitOreDictName(6), 8 }, - ALLOY.STELLITE.getGear(8), - ALLOY.STELLITE.getPlate(32), - ALLOY.HASTELLOY_N.getPlateDouble(8), - ALLOY.HASTELLOY_N.getPlateDouble(8), - ALLOY.HASTELLOY_N.getScrew(64), + MaterialsAlloy.STELLITE.getGear(8), + MaterialsAlloy.STELLITE.getPlate(32), + MaterialsAlloy.HASTELLOY_N.getPlateDouble(8), + MaterialsAlloy.HASTELLOY_N.getPlateDouble(8), + MaterialsAlloy.HASTELLOY_N.getScrew(64), CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64), CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64), CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32), @@ -3211,21 +3211,21 @@ public class RECIPES_Machines { .addTo(AssemblyLine); // Flotation Cell Casing - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(7), CI.getTieredGTPPMachineCasing(4, 1), - ALLOY.AQUATIC_STEEL.getPlate(8), - ALLOY.STELLITE.getRing(8), + MaterialsAlloy.AQUATIC_STEEL.getPlate(8), + MaterialsAlloy.STELLITE.getRing(8), CI.getTieredComponentOfMaterial(Materials.HSSG, OrePrefixes.plateDouble, 4), - ALLOY.HASTELLOY_N.getScrew(8)) + MaterialsAlloy.HASTELLOY_N.getScrew(8)) .itemOutputs(GregtechItemList.Casing_Flotation_Cell.get(1)) - .fluidInputs(ALLOY.STAINLESS_STEEL.getFluidStack(8 * 144)) + .fluidInputs(MaterialsAlloy.STAINLESS_STEEL.getFluidStack(8 * 144)) .duration(2 * MINUTES) .eut(TierEU.RECIPE_LuV) .addTo(assemblerRecipes); // Milling Bus - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(7), CI.getTieredGTPPMachineCasing(5, 1), @@ -3234,7 +3234,7 @@ public class RECIPES_Machines { CI.getTieredComponentOfMaterial(Materials.TungstenSteel, OrePrefixes.plate, 32), CI.getTieredComponentOfMaterial(Materials.SolderingAlloy, OrePrefixes.wireFine, 16)) .itemOutputs(GregtechItemList.Bus_Milling_Balls.get(1)) - .fluidInputs(ELEMENT.getInstance().TUNGSTEN.getFluidStack(8 * 144)) + .fluidInputs(MaterialsElements.getInstance().TUNGSTEN.getFluidStack(8 * 144)) .duration(4 * MINUTES) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); @@ -3244,12 +3244,12 @@ public class RECIPES_Machines { private static void sparging() { // Sparge Tower Research - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(8), - ELEMENT.getInstance().HELIUM.getCell(8), - ELEMENT.getInstance().FLUORINE.getCell(8), - ALLOY.HS188A.getIngot(8), + MaterialsElements.getInstance().HELIUM.getCell(8), + MaterialsElements.getInstance().FLUORINE.getCell(8), + MaterialsAlloy.HS188A.getIngot(8), ItemList.Distillation_Tower.get(1)) .itemOutputs(ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_10_SPARGING, 1)) .duration(5 * MINUTES) @@ -3257,7 +3257,7 @@ public class RECIPES_Machines { .addTo(assemblerRecipes); // Sparge Tower Controller - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_10_SPARGING, 1)) .metadata(RESEARCH_TIME, 20 * MINUTES) .itemInputs( @@ -3265,11 +3265,11 @@ public class RECIPES_Machines { CI.getTieredGTPPMachineCasing(4, 4), ItemList.Machine_IV_Distillery.get(1), new Object[] { CI.getTieredCircuitOreDictName(5), 8 }, - ALLOY.HS188A.getGear(8), - ALLOY.HS188A.getPlate(32), - ALLOY.HASTELLOY_N.getPlateDouble(8), - ALLOY.HASTELLOY_N.getPlateDouble(8), - ALLOY.HASTELLOY_N.getScrew(64), + MaterialsAlloy.HS188A.getGear(8), + MaterialsAlloy.HS188A.getPlate(32), + MaterialsAlloy.HASTELLOY_N.getPlateDouble(8), + MaterialsAlloy.HASTELLOY_N.getPlateDouble(8), + MaterialsAlloy.HASTELLOY_N.getScrew(64), CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64), CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64), CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32), @@ -3284,16 +3284,16 @@ public class RECIPES_Machines { .addTo(AssemblyLine); // Sparge Tower Casing - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(8), CI.getTieredGTPPMachineCasing(3, 1), - ALLOY.HS188A.getPlate(2), - ALLOY.HASTELLOY_N.getRing(4), + MaterialsAlloy.HS188A.getPlate(2), + MaterialsAlloy.HASTELLOY_N.getRing(4), CI.getTieredComponentOfMaterial(Materials.TungstenSteel, OrePrefixes.plateDouble, 4), - ALLOY.HASTELLOY_N.getScrew(4)) + MaterialsAlloy.HASTELLOY_N.getScrew(4)) .itemOutputs(GregtechItemList.Casing_Sparge_Tower_Exterior.get(1)) - .fluidInputs(ALLOY.STAINLESS_STEEL.getFluidStack(8 * 144)) + .fluidInputs(MaterialsAlloy.STAINLESS_STEEL.getFluidStack(8 * 144)) .duration(2 * MINUTES) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); @@ -3306,7 +3306,7 @@ public class RECIPES_Machines { long[] voltageTiers = new long[] { TierEU.RECIPE_LV, TierEU.RECIPE_MV, TierEU.RECIPE_HV }; for (int i = 1; i < 4; i++) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedBioCircuit(10 + i), CI.getTieredMachineCasing(i), @@ -3322,7 +3322,7 @@ public class RECIPES_Machines { } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedBioCircuit(14), aChisels[2], @@ -3335,7 +3335,7 @@ public class RECIPES_Machines { .duration(20 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedBioCircuit(14), ItemList.Casing_SolidSteel.get(2), @@ -3353,16 +3353,16 @@ public class RECIPES_Machines { private static void rockBreaker() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(12), ItemList.Machine_EV_RockBreaker.get(1), - ALLOY.STAINLESS_STEEL.getPlate(8), - ALLOY.STAINLESS_STEEL.getRing(4), + MaterialsAlloy.STAINLESS_STEEL.getPlate(8), + MaterialsAlloy.STAINLESS_STEEL.getRing(4), CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.plateDouble, 8), - ALLOY.EGLIN_STEEL.getScrew(8)) + MaterialsAlloy.EGLIN_STEEL.getScrew(8)) .itemOutputs(GregtechItemList.Controller_IndustrialRockBreaker.get(1)) - .fluidInputs(ELEMENT.getInstance().ALUMINIUM.getFluidStack(144 * 8)) + .fluidInputs(MaterialsElements.getInstance().ALUMINIUM.getFluidStack(144 * 8)) .duration(2 * MINUTES) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); @@ -3370,18 +3370,18 @@ public class RECIPES_Machines { } private static void fakeMachineCasingCovers() { - int aMaxTier = GT_Values.VOLTAGE_NAMES.length; + int aMaxTier = GTValues.VOLTAGE_NAMES.length; ItemStack aTier[] = new ItemStack[aMaxTier]; for (int i = 0; i < aMaxTier; i++) { aTier[i] = ItemUtils.simpleMetaStack(CoverManager.Cover_Gt_Machine_Casing, i, 7); } // Add recipes for new ones for (int i = 0; i < aMaxTier; i++) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getTieredMachineCasing(i)) .itemOutputs(aTier[i]) .duration(i * 5 * SECONDS) - .eut(GT_Values.VP[i]) + .eut(GTValues.VP[i]) .addTo(cutterRecipes); } } @@ -3415,9 +3415,9 @@ public class RECIPES_Machines { // Input Buses for (int tier = 1; tier < mSuperBusesInput.length + 1; tier++) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(17), + GTUtility.getIntegratedCircuit(17), mInputHatch[tier - 1], CI.getElectricMotor(tier, 2), CI.getConveyor(tier, 5), @@ -3426,15 +3426,15 @@ public class RECIPES_Machines { .itemOutputs(mSuperBusesInput[tier - 1].get(1)) .fluidInputs(CI.getAlternativeTieredFluid(tier, 144 * 8)) .duration(60 * SECONDS) - .eut(GT_Values.VP[tier]) + .eut(GTValues.VP[tier]) .addTo(assemblerRecipes); } // Output Buses for (int tier = 1; tier < mSuperBusesOutput.length + 1; tier++) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(18), + GTUtility.getIntegratedCircuit(18), mOutputHatch[tier - 1], CI.getElectricPiston(tier, 2), CI.getConveyor(tier, 5), @@ -3443,7 +3443,7 @@ public class RECIPES_Machines { .itemOutputs(mSuperBusesOutput[tier - 1].get(1)) .fluidInputs(CI.getTertiaryTieredFluid(tier, 144 * 8)) .duration(60 * SECONDS) - .eut(GT_Values.VP[tier]) + .eut(GTValues.VP[tier]) .addTo(assemblerRecipes); } @@ -3458,9 +3458,9 @@ public class RECIPES_Machines { GregtechItemList.GT_MetaTileEntity_ChiselBus_HV.get(1), }; for (int tier = 1; tier < mChiselBuses.length + 1; tier++) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(17), + GTUtility.getIntegratedCircuit(17), mSuperBusesInput[tier - 1], CI.getSensor(tier, 1), CI.getRobotArm(tier, 2), @@ -3469,7 +3469,7 @@ public class RECIPES_Machines { .itemOutputs(mChiselBuses[tier - 1]) .fluidInputs(CI.getAlternativeTieredFluid(tier, 144 * 2)) .duration(60 * SECONDS) - .eut(GT_Values.VP[tier + 1]) + .eut(GTValues.VP[tier + 1]) .addTo(assemblerRecipes); } @@ -3486,9 +3486,9 @@ public class RECIPES_Machines { for (int i = 0; i < 4; i++) { int componentTier = i + 5; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(17), + GTUtility.getIntegratedCircuit(17), mSuperBusesInput[i], CI.getSensor(componentTier, 1), CI.getFluidRegulator(componentTier, 1), @@ -3497,7 +3497,7 @@ public class RECIPES_Machines { .itemOutputs(mSolidifierHatches[i]) .fluidInputs(CI.getTieredFluid(componentTier, 144 * 2)) .duration(30 * SECONDS) - .eut(GT_Values.VP[componentTier]) + .eut(GTValues.VP[componentTier]) .addTo(assemblerRecipes); } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RecipesRareEarthProcessing.java index 0cf0152c53..e8597a9f48 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesRareEarthProcessing.java @@ -5,33 +5,33 @@ import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes; import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes; import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gtPlusPlus.core.material.MISC_MATERIALS.BRINE; -import static gtPlusPlus.core.material.MISC_MATERIALS.HYDROGEN_CHLORIDE; -import static gtPlusPlus.core.material.MISC_MATERIALS.HYDROGEN_CHLORIDE_MIX; -import static gtPlusPlus.core.material.MISC_MATERIALS.RARE_EARTH_HIGH; -import static gtPlusPlus.core.material.MISC_MATERIALS.RARE_EARTH_LOW; -import static gtPlusPlus.core.material.MISC_MATERIALS.RARE_EARTH_MID; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gtPlusPlus.core.material.MaterialMisc.BRINE; +import static gtPlusPlus.core.material.MaterialMisc.HYDROGEN_CHLORIDE; +import static gtPlusPlus.core.material.MaterialMisc.HYDROGEN_CHLORIDE_MIX; +import static gtPlusPlus.core.material.MaterialMisc.RARE_EARTH_HIGH; +import static gtPlusPlus.core.material.MaterialMisc.RARE_EARTH_LOW; +import static gtPlusPlus.core.material.MaterialMisc.RARE_EARTH_MID; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.material.MaterialGenerator; -import gtPlusPlus.core.material.ORES; +import gtPlusPlus.core.material.MaterialsOres; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -public class RECIPES_RareEarthProcessing { +public class RecipesRareEarthProcessing { public static void init() { @@ -55,8 +55,8 @@ public class RECIPES_RareEarthProcessing { } // Add Process for creating Brine - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 16L)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 16L)) .fluidInputs(Materials.SaltWater.getFluid(2000L)) .fluidOutputs(FluidUtils.getFluidStack(mBrine, 4000)) .duration(20 * SECONDS) @@ -64,29 +64,29 @@ public class RECIPES_RareEarthProcessing { .addTo(brewingRecipes); // Chloralkali process - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1), ItemList.Cell_Empty.get(2L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1), ItemList.Cell_Empty.get(2L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 1L), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1L)) + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1L)) .fluidInputs(FluidUtils.getFluidStack(mBrine, 2000)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(electrolyzerRecipes); // Generate Special Laser Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 1L), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L), CI.getNumberedBioCircuit(2)) .itemOutputs(ItemUtils.getSimpleStack(ModItems.cellHydrogenChlorideMix, 2)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(GregtechItemList.Laser_Lens_WoodsGlass.get(0)) .fluidInputs(HYDROGEN_CHLORIDE_MIX.getFluidStack(4000)) .fluidOutputs(HYDROGEN_CHLORIDE.getFluidStack(4000)) @@ -96,13 +96,13 @@ public class RECIPES_RareEarthProcessing { .addTo(laserEngraverRecipes); // Set Material Tiers correctly - ORES.GREENOCKITE.vTier = 1; + MaterialsOres.GREENOCKITE.vTier = 1; RARE_EARTH_LOW.vTier = 1; RARE_EARTH_MID.vTier = 3; RARE_EARTH_HIGH.vTier = 5; // Set Material Voltages correctly - ORES.GREENOCKITE.vVoltageMultiplier = 30; + MaterialsOres.GREENOCKITE.vVoltageMultiplier = 30; RARE_EARTH_LOW.vVoltageMultiplier = 30; RARE_EARTH_MID.vVoltageMultiplier = 480; RARE_EARTH_HIGH.vVoltageMultiplier = 7680; @@ -127,8 +127,8 @@ public class RECIPES_RareEarthProcessing { .getFluid(); // LV Rare Earth - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L)) .itemOutputs(RARE_EARTH_LOW.getCrushed(2), RARE_EARTH_LOW.getCrushed(2), RARE_EARTH_LOW.getCrushed(2)) .fluidInputs(Materials.SulfuricAcid.getFluid(1000L)) .duration(30 * SECONDS) @@ -136,8 +136,8 @@ public class RECIPES_RareEarthProcessing { .addTo(chemicalBathRecipes); // HV Rare Earth - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L)) .itemOutputs(RARE_EARTH_MID.getCrushed(2), RARE_EARTH_MID.getCrushed(2), RARE_EARTH_MID.getCrushed(2)) .outputChances(10000, 9000, 8000) .fluidInputs(FluidUtils.getFluidStack(aHydrochloric, 1000)) @@ -146,8 +146,8 @@ public class RECIPES_RareEarthProcessing { .addTo(chemicalBathRecipes); // IV Rare Earth - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L)) .itemOutputs(RARE_EARTH_HIGH.getCrushed(2), RARE_EARTH_HIGH.getCrushed(2), RARE_EARTH_HIGH.getCrushed(2)) .outputChances(10000, 9000, 8000) .fluidInputs(FluidUtils.getHydrofluoricAcid(1000)) @@ -156,8 +156,8 @@ public class RECIPES_RareEarthProcessing { .addTo(chemicalBathRecipes); // IV Rare Earth - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L)) .itemOutputs(RARE_EARTH_HIGH.getCrushed(2), RARE_EARTH_HIGH.getCrushed(2), RARE_EARTH_HIGH.getCrushed(2)) .outputChances(9000, 8000, 7000) .fluidInputs(Materials.HydrofluoricAcid.getFluid(2000L)) diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesSeleniumProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RecipesSeleniumProcessing.java new file mode 100644 index 0000000000..68f38dc5c2 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesSeleniumProcessing.java @@ -0,0 +1,154 @@ +package gtPlusPlus.core.recipe; + +import static gregtech.api.recipe.RecipeMaps.pyrolyseRecipes; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gtPlusPlus.api.recipe.GTPPRecipeMaps.alloyBlastSmelterRecipes; +import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; + +import gregtech.api.enums.GTValues; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; +import gregtech.api.util.GTUtility; +import gtPlusPlus.core.material.MaterialMisc; +import gtPlusPlus.core.material.MaterialsElements; +import gtPlusPlus.core.recipe.common.CI; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.MaterialUtils; + +public class RecipesSeleniumProcessing { + + public static void init() { + + // We need this + MaterialUtils.generateSpecialDustAndAssignToAMaterial(MaterialMisc.SELENIUM_DIOXIDE, false); + + // Makes Selenium Dioxide + processCopperRecipes(); + + // Liquify the Dried Dioxide + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(13), MaterialMisc.SELENIUM_DIOXIDE.getDust(1)) + .fluidInputs(FluidUtils.getSteam(500)) + .fluidOutputs(MaterialMisc.SELENIUM_DIOXIDE.getFluidStack(1000)) + .duration(24 * SECONDS) + .eut(1024) + .addTo(pyrolyseRecipes); + + // Produce Selenious Acid + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(14), MaterialMisc.SELENIUM_DIOXIDE.getCell(1)) + .itemOutputs(CI.emptyCells(1)) + .fluidInputs(FluidUtils.getHotWater(4000)) + .fluidOutputs(MaterialMisc.SELENIOUS_ACID.getFluidStack(1000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(pyrolyseRecipes); + + // Make Selenium + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(14), MaterialsElements.getInstance().CARBON.getDust(16)) + .itemOutputs( + MaterialsElements.getInstance().SELENIUM.getIngot(1), + MaterialsElements.getInstance().SELENIUM.getIngot(1)) + .outputChances(100_00, 20_00) + .fluidInputs(MaterialMisc.SELENIOUS_ACID.getFluidStack(750), Materials.SulfuricAcid.getFluid(8000)) + .fluidOutputs(MaterialsElements.getInstance().SELENIUM.getFluidStack(144 * 1)) + .eut(TierEU.RECIPE_IV) + .duration(5 * MINUTES) + .addTo(alloyBlastSmelterRecipes); + } + + public static void processCopperRecipes() { + + // Copper + GTValues.RA.stdBuilder() + .itemInputs( + CI.getNumberedAdvancedCircuit(23), + ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Copper, 1)) + .itemOutputs( + ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Copper, 1), + MaterialMisc.SELENIUM_DIOXIDE.getDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1)) + .outputChances(100_00, 1_00, 1_00, 5_00, 5_00, 5_00, 10_00, 10_00, 10_00) + .fluidInputs(FluidUtils.getHotWater(1000)) + .fluidOutputs(MaterialMisc.SELENIUM_DIOXIDE.getFluidStack(20)) + .eut(1024) + .duration(40 * SECONDS) + .addTo(chemicalDehydratorRecipes); + + // Tetra + GTValues.RA.stdBuilder() + .itemInputs( + CI.getNumberedAdvancedCircuit(23), + ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Tetrahedrite, 1)) + .itemOutputs( + ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Tetrahedrite, 1), + MaterialMisc.SELENIUM_DIOXIDE.getDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1)) + .outputChances(100_00, 1_00, 1_00, 3_00, 3_00, 3_00, 8_00, 8_00, 8_00) + .fluidInputs(FluidUtils.getHotWater(1000)) + .fluidOutputs(MaterialMisc.SELENIUM_DIOXIDE.getFluidStack(10)) + .eut(1024) + .duration(40 * SECONDS) + .addTo(chemicalDehydratorRecipes); + + // Chalco + GTValues.RA.stdBuilder() + .itemInputs( + CI.getNumberedAdvancedCircuit(23), + ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1)) + .itemOutputs( + ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Chalcopyrite, 1), + MaterialMisc.SELENIUM_DIOXIDE.getDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1)) + .outputChances(100_00, 1_00, 1_00, 3_00, 3_00, 3_00, 8_00, 8_00, 8_00) + .fluidInputs(FluidUtils.getHotWater(1000)) + .fluidOutputs(MaterialMisc.SELENIUM_DIOXIDE.getFluidStack(10)) + .eut(1024) + .duration(40 * SECONDS) + .addTo(chemicalDehydratorRecipes); + + // Malachite + GTValues.RA.stdBuilder() + .itemInputs( + CI.getNumberedAdvancedCircuit(23), + ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Malachite, 1)) + .itemOutputs( + ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Malachite, 1), + MaterialMisc.SELENIUM_DIOXIDE.getDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getSmallDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1), + MaterialMisc.SELENIUM_DIOXIDE.getTinyDust(1)) + .outputChances(100_00, 1_00, 1_00, 3_00, 3_00, 3_00, 8_00, 8_00, 8_00) + .fluidInputs(FluidUtils.getHotWater(1000)) + .fluidOutputs(MaterialMisc.SELENIUM_DIOXIDE.getFluidStack(10)) + .eut(1024) + .duration(40 * SECONDS) + .addTo(chemicalDehydratorRecipes); + } +} diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java b/src/main/java/gtPlusPlus/core/recipe/RecipesTools.java index 229b7cc045..f8fa439021 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesTools.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class RECIPES_Tools { +public class RecipesTools { // Outputs public static ItemStack RECIPE_SandStone = new ItemStack(Blocks.sandstone, 2); diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java index a26887ad1f..addc3df7e4 100644 --- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java @@ -4,21 +4,21 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.ExternalMaterials; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.item.chemistry.GenericChem; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.recipe.LOADER_Machine_Components; +import gtPlusPlus.core.material.MaterialsAlloy; +import gtPlusPlus.core.material.MaterialsElements; +import gtPlusPlus.core.recipe.LoaderMachineComponents; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -31,11 +31,11 @@ public class CI { public static ItemStack _NULL = ItemUtils.getErrorStack(1); // bits - public static long bits = GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED; - public static long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED; + public static long bits = GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED; + public static long bitsd = GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED; // Circuits public static Object circuitPrimitive; @@ -265,17 +265,17 @@ public class CI { } else if (tier == 3) { return Materials.Steel; } else if (tier == 4) { - return ALLOY.EGLIN_STEEL; + return MaterialsAlloy.EGLIN_STEEL; } else if (tier == 5) { return Materials.Aluminium; } else if (tier == 6) { - return ALLOY.MARAGING250; + return MaterialsAlloy.MARAGING250; } else if (tier == 7) { - return ALLOY.TANTALLOY_61; + return MaterialsAlloy.TANTALLOY_61; } else if (tier == 8) { - return ALLOY.INCONEL_792; + return MaterialsAlloy.INCONEL_792; } else if (tier == 9) { - return ALLOY.ZERON_100; + return MaterialsAlloy.ZERON_100; } else if (tier == 10) { return Materials.NaquadahEnriched; } else if (tier == 11) { @@ -405,26 +405,31 @@ public class CI { gearboxCasing_Tier_4 = ItemList.Casing_Gearbox_TungstenSteel.get(1); // Machine Components - LOADER_Machine_Components.initialise(); + LoaderMachineComponents.initialise(); } public static ItemStack emptyCells(int i) { return ItemUtils.getEmptyCell(i); } - private static final Material[] aMaterial_Main = new Material[] { ALLOY.POTIN, ALLOY.TUMBAGA, ALLOY.EGLIN_STEEL, - ALLOY.TANTALUM_CARBIDE, ALLOY.INCOLOY_DS, ALLOY.INCONEL_625, ALLOY.ZERON_100, ALLOY.PIKYONIUM, - ELEMENT.STANDALONE.ADVANCED_NITINOL, ALLOY.ABYSSAL, ALLOY.QUANTUM, ELEMENT.STANDALONE.HYPOGEN }; + private static final Material[] aMaterial_Main = new Material[] { MaterialsAlloy.POTIN, MaterialsAlloy.TUMBAGA, + MaterialsAlloy.EGLIN_STEEL, MaterialsAlloy.TANTALUM_CARBIDE, MaterialsAlloy.INCOLOY_DS, + MaterialsAlloy.INCONEL_625, MaterialsAlloy.ZERON_100, MaterialsAlloy.PIKYONIUM, + MaterialsElements.STANDALONE.ADVANCED_NITINOL, MaterialsAlloy.ABYSSAL, MaterialsAlloy.QUANTUM, + MaterialsElements.STANDALONE.HYPOGEN }; - private static final Material[] aMaterial_Secondary = new Material[] { ALLOY.STEEL, ALLOY.SILICON_CARBIDE, - ALLOY.BLOODSTEEL, ALLOY.TANTALUM_CARBIDE, ALLOY.INCONEL_792, ALLOY.ARCANITE, ALLOY.LAFIUM, ALLOY.CINOBITE, - ALLOY.TITANSTEEL, ALLOY.OCTIRON, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN, ELEMENT.STANDALONE.HYPOGEN }; + private static final Material[] aMaterial_Secondary = new Material[] { MaterialsAlloy.STEEL, + MaterialsAlloy.SILICON_CARBIDE, MaterialsAlloy.BLOODSTEEL, MaterialsAlloy.TANTALUM_CARBIDE, + MaterialsAlloy.INCONEL_792, MaterialsAlloy.ARCANITE, MaterialsAlloy.LAFIUM, MaterialsAlloy.CINOBITE, + MaterialsAlloy.TITANSTEEL, MaterialsAlloy.OCTIRON, MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN, + MaterialsElements.STANDALONE.HYPOGEN }; - private static final Material[] aMaterial_Tertiary = new Material[] { ELEMENT.getInstance().LEAD, - ELEMENT.getInstance().ALUMINIUM, ELEMENT.STANDALONE.BLACK_METAL, ELEMENT.getInstance().TITANIUM, - ALLOY.HASTELLOY_N, ALLOY.ENERGYCRYSTAL, ALLOY.TRINIUM_NAQUADAH_CARBON, ALLOY.TRINIUM_REINFORCED_STEEL, // Arceus - ALLOY.TITANSTEEL, ELEMENT.STANDALONE.ASTRAL_TITANIUM, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN, - ELEMENT.STANDALONE.HYPOGEN }; + private static final Material[] aMaterial_Tertiary = new Material[] { MaterialsElements.getInstance().LEAD, + MaterialsElements.getInstance().ALUMINIUM, MaterialsElements.STANDALONE.BLACK_METAL, + MaterialsElements.getInstance().TITANIUM, MaterialsAlloy.HASTELLOY_N, MaterialsAlloy.ENERGYCRYSTAL, + MaterialsAlloy.TRINIUM_NAQUADAH_CARBON, MaterialsAlloy.TRINIUM_REINFORCED_STEEL, // Arceus + MaterialsAlloy.TITANSTEEL, MaterialsElements.STANDALONE.ASTRAL_TITANIUM, + MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN, MaterialsElements.STANDALONE.HYPOGEN }; private static final Materials[] aMaterial_Cables = new Materials[] { Materials.Tin, Materials.Cobalt, Materials.AnnealedCopper, Materials.Gold, Materials.Titanium, Materials.Nichrome, Materials.Platinum, @@ -454,7 +459,7 @@ public class CI { if (a == null) { ItemStack aCell = getTieredComponent(OrePrefixes.liquid, aTier, 1); if (aCell != null) { - a = GT_Utility.getFluidForFilledItem(aCell, true); + a = GTUtility.getFluidForFilledItem(aCell, true); a.amount = aAmount; } } @@ -517,7 +522,7 @@ public class CI { } if (aPrefix == OrePrefixes.circuit) { - return GT_OreDictUnificator.get(OrePrefixes.circuit, aMaterial_Circuits[aTier], aAmount); + return GTOreDictUnificator.get(OrePrefixes.circuit, aMaterial_Circuits[aTier], aAmount); } // Check for Cables first, catch SuperConductor case and swap to wire. @@ -571,11 +576,11 @@ public class CI { } else if (aTier == 4) { return ItemUtils.getOrePrefixStack(aPrefix, Materials.TungstenSteel, aAmount); } else if (aTier == 5) { - return ItemUtils.getOrePrefixStack(aPrefix, ALLOY.MARAGING350, aAmount); + return ItemUtils.getOrePrefixStack(aPrefix, MaterialsAlloy.MARAGING350, aAmount); } else if (aTier == 6) { - return ItemUtils.getOrePrefixStack(aPrefix, ALLOY.STABALLOY, aAmount); + return ItemUtils.getOrePrefixStack(aPrefix, MaterialsAlloy.STABALLOY, aAmount); } else if (aTier == 7) { - return ItemUtils.getOrePrefixStack(aPrefix, ALLOY.HASTELLOY_X, aAmount); + return ItemUtils.getOrePrefixStack(aPrefix, MaterialsAlloy.HASTELLOY_X, aAmount); } else if (aTier == 8) { return ItemUtils.getOrePrefixStack(aPrefix, Materials.Ultimate, aAmount); } else if (aTier == 9) { @@ -926,7 +931,7 @@ public class CI { if (i > 8) { i = 8; } - return ItemUtils.simpleMetaStack(GregTech_API.sBlockCasings5, i, 1); + return ItemUtils.simpleMetaStack(GregTechAPI.sBlockCasings5, i, 1); } public static ItemStack getNumberedBioCircuit(int i) { diff --git a/src/main/java/gtPlusPlus/core/slots/SlotDataStick.java b/src/main/java/gtPlusPlus/core/slots/SlotDataStick.java index 3b39da877a..066213aed2 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotDataStick.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotDataStick.java @@ -4,7 +4,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.recipe.common.CI; public class SlotDataStick extends Slot { @@ -26,8 +26,8 @@ public class SlotDataStick extends Slot { mDataItems[1] = CI.getDataOrb(); } if (mDataItems[0] != null && mDataItems[1] != null) { - if (GT_Utility.areStacksEqual(itemstack, mDataItems[0], true) - || GT_Utility.areStacksEqual(itemstack, mDataItems[1], true)) { + if (GTUtility.areStacksEqual(itemstack, mDataItems[0], true) + || GTUtility.areStacksEqual(itemstack, mDataItems[1], true)) { isValid = true; } } diff --git a/src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java b/src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java index 5e4072df6a..6eac7a78ee 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java @@ -5,7 +5,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.recipe.common.CI; public class SlotIntegratedCircuit extends Slot { @@ -40,7 +40,7 @@ public class SlotIntegratedCircuit extends Slot { public static synchronized boolean isItemValidForSlot(int aLockedCircuitNumber, final ItemStack itemstack) { boolean isValid = false; if (mCircuitItem == null) { - mCircuitItem = GT_Utility.getIntegratedCircuit(0) + mCircuitItem = GTUtility.getIntegratedCircuit(0) .getItem(); } if (mCircuitItem2 == null) { @@ -76,7 +76,7 @@ public class SlotIntegratedCircuit extends Slot { */ public static synchronized int isRegularProgrammableCircuit(final ItemStack itemstack) { if (mCircuitItem == null) { - mCircuitItem = GT_Utility.getIntegratedCircuit(0) + mCircuitItem = GTUtility.getIntegratedCircuit(0) .getItem(); } if (mCircuitItem2 == null) { diff --git a/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java index 56cf2fdbab..cfc152d832 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java +++ b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java @@ -3,7 +3,7 @@ package gtPlusPlus.core.tileentities; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.general.BlockSuperLight.TileEntitySuperLight; -import gtPlusPlus.core.block.machine.Machine_SuperJukebox.TileEntitySuperJukebox; +import gtPlusPlus.core.block.machine.BlockSuperJukebox.TileEntitySuperJukebox; import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer; import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest; import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; diff --git a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java index 98f1d67439..d5d348e0d8 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java +++ b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java @@ -15,16 +15,16 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; -import gregtech.GT_Mod; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.GTMod; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.interfaces.IDescribable; import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.net.GT_Packet_Block_Event; -import gregtech.api.util.GT_CoverBehavior; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.net.GTPacketBlockEvent; +import gregtech.api.util.CoverBehavior; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gregtech.api.util.ISerializableObject; import gregtech.common.covers.CoverInfo; import gtPlusPlus.api.interfaces.ILazyCoverable; @@ -297,9 +297,9 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT return this.canAccessData() ? this.mInventory.isValidSlot(aIndex) : false; } - private final GT_CoverBehavior[] mCoverBehaviors = new GT_CoverBehavior[] { GregTech_API.sNoBehavior, - GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, - GregTech_API.sNoBehavior }; + private final CoverBehavior[] mCoverBehaviors = new CoverBehavior[] { GregTechAPI.sNoBehavior, + GregTechAPI.sNoBehavior, GregTechAPI.sNoBehavior, GregTechAPI.sNoBehavior, GregTechAPI.sNoBehavior, + GregTechAPI.sNoBehavior }; protected TileEntityBase mMetaTileEntity; protected long mStoredEnergy = 0; protected int mAverageEUInputIndex = 0, mAverageEUOutputIndex = 0; @@ -309,7 +309,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT mActiveEUOutputs = new boolean[] { false, false, false, false, false, false }; private byte[] mSidedRedstone = new byte[] { 15, 15, 15, 15, 15, 15 }; private int[] mCoverSides = new int[] { 0, 0, 0, 0, 0, 0 }, mCoverData = new int[] { 0, 0, 0, 0, 0, 0 }, - mTimeStatistics = new int[GregTech_API.TICKS_FOR_LAG_AVERAGING]; + mTimeStatistics = new int[GregTechAPI.TICKS_FOR_LAG_AVERAGING]; private boolean mHasEnoughEnergy = true; protected boolean mRunningThroughTick = false; protected boolean mInputDisabled = false; @@ -763,14 +763,14 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT public final boolean getOpacity(int aX, int aY, int aZ) { return this.ignoreUnloadedChunks && this.crossedChunkBorder(aX, aZ) && !this.worldObj.blockExists(aX, aY, aZ) ? false - : GT_Utility.isOpaqueBlock(this.worldObj, aX, aY, aZ); + : GTUtility.isOpaqueBlock(this.worldObj, aX, aY, aZ); } @Override public final boolean getAir(int aX, int aY, int aZ) { return this.ignoreUnloadedChunks && this.crossedChunkBorder(aX, aZ) && !this.worldObj.blockExists(aX, aY, aZ) ? true - : GT_Utility.isBlockAir(this.worldObj, aX, aY, aZ); + : GTUtility.isBlockAir(this.worldObj, aX, aY, aZ); } @Override @@ -846,9 +846,9 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT @Override public final void sendBlockEvent(byte aID, byte aValue) { - GT_Values.NW.sendPacketToAllPlayersInRange( + GTValues.NW.sendPacketToAllPlayersInRange( this.worldObj, - new GT_Packet_Block_Event(this.xCoord, (short) this.yCoord, this.zCoord, aID, aValue), + new GTPacketBlockEvent(this.xCoord, (short) this.yCoord, this.zCoord, aID, aValue), this.xCoord, this.zCoord); } @@ -858,7 +858,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT } public final void setOnFire() { - GT_Utility.setCoordsOnFire(this.worldObj, this.xCoord, this.yCoord, this.zCoord, false); + GTUtility.setCoordsOnFire(this.worldObj, this.xCoord, this.yCoord, this.zCoord, false); } public final void setToFire() { @@ -926,8 +926,8 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT } @Override - public GT_CoverBehavior getCoverBehaviorAtSide(ForgeDirection side) { - return side != ForgeDirection.UNKNOWN ? mCoverBehaviors[side.ordinal()] : GregTech_API.sNoBehavior; + public CoverBehavior getCoverBehaviorAtSide(ForgeDirection side) { + return side != ForgeDirection.UNKNOWN ? mCoverBehaviors[side.ordinal()] : GregTechAPI.sNoBehavior; } @Override @@ -944,7 +944,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT final int ordinalSide = side.ordinal(); mCoverSides[ordinalSide] = aID; mCoverData[ordinalSide] = 0; - mCoverBehaviors[ordinalSide] = (GT_CoverBehavior) GregTech_API.getCoverBehaviorNew(aID); + mCoverBehaviors[ordinalSide] = (CoverBehavior) GregTechAPI.getCoverBehaviorNew(aID); return true; } return false; @@ -958,7 +958,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT @Override public void setCoverItemAtSide(ForgeDirection side, ItemStack aCover) { - GregTech_API.getCoverBehaviorNew(aCover) + GregTechAPI.getCoverBehaviorNew(aCover) .placeCover(side, aCover, this); } @@ -970,7 +970,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT @Override public ItemStack getCoverItemAtSide(ForgeDirection side) { - return GT_Utility.intToStack(getCoverIDAtSide(side)); + return GTUtility.intToStack(getCoverIDAtSide(side)); } @Override @@ -1056,12 +1056,12 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT } public String getOwnerName() { - if (GT_Utility.isStringInvalid(mOwnerName)) return "Player"; + if (GTUtility.isStringInvalid(mOwnerName)) return "Player"; return mOwnerName; } public String setOwnerName(String aName) { - if (GT_Utility.isStringInvalid(aName)) return mOwnerName = "Player"; + if (GTUtility.isStringInvalid(aName)) return mOwnerName = "Player"; return mOwnerName = aName; } @@ -1222,15 +1222,15 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT @Override public boolean addStackToSlot(int aIndex, ItemStack aStack) { - if (GT_Utility.isStackInvalid(aStack)) return true; + if (GTUtility.isStackInvalid(aStack)) return true; if (aIndex < 0 || aIndex >= getSizeInventory()) return false; ItemStack tStack = getStackInSlot(aIndex); - if (GT_Utility.isStackInvalid(tStack)) { + if (GTUtility.isStackInvalid(tStack)) { setInventorySlotContents(aIndex, aStack); return true; } - aStack = GT_OreDictUnificator.get(aStack); - if (GT_Utility.areStacksEqual(tStack, aStack) + aStack = GTOreDictUnificator.get(aStack); + if (GTUtility.areStacksEqual(tStack, aStack) && tStack.stackSize + aStack.stackSize <= Math.min(aStack.getMaxStackSize(), getInventoryStackLimit())) { tStack.stackSize += aStack.stackSize; return true; @@ -1240,7 +1240,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT @Override public boolean addStackToSlot(int aIndex, ItemStack aStack, int aAmount) { - return addStackToSlot(aIndex, GT_Utility.copyAmount(aAmount, aStack)); + return addStackToSlot(aIndex, GTUtility.copyAmount(aAmount, aStack)); } @Override @@ -1290,8 +1290,8 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT this.doExplosion( this.oOutput * (long) (this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity() ? 4 : (this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity() / 2L ? 2 : 1))); - GT_Mod arg9999 = GT_Mod.instance; - GT_Mod.achievements.issueAchievement( + GTMod arg9999 = GTMod.instance; + GTMod.achievements.issueAchievement( this.getWorldObj() .getPlayerEntityByName(this.mOwnerName), "electricproblems"); @@ -1300,10 +1300,10 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT public void doExplosion(long aAmount) { if (this.canAccessData()) { - if (GregTech_API.sMachineWireFire && this.mMetaTileEntity.isElectric()) { + if (GregTechAPI.sMachineWireFire && this.mMetaTileEntity.isElectric()) { try { this.mReleaseEnergy = true; - Util.emitEnergyToNetwork(GT_Values.V[5], Math.max(1L, this.getStoredEU() / GT_Values.V[5]), this); + Util.emitEnergyToNetwork(GTValues.V[5], Math.max(1L, this.getStoredEU() / GTValues.V[5]), this); } catch (Exception arg4) {} } this.mReleaseEnergy = false; diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java index ce28dd0b3e..113440e8b5 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java @@ -9,7 +9,7 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.inventories.InventoryCircuitProgrammer; import gtPlusPlus.core.recipe.common.CI; @@ -109,7 +109,7 @@ public class TileEntityCircuitProgrammer extends TileEntity implements ISidedInv // Check Circuit Type ItemStack aOutput; if (aTypeInSlot == 0) { - aOutput = GT_Utility.getIntegratedCircuit(e); + aOutput = GTUtility.getIntegratedCircuit(e); } else if (aTypeInSlot == 1) { aOutput = CI.getNumberedBioCircuit(e); } else if (aTypeInSlot == 2) { diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java index 4b3fd3f087..a6754b00b0 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java @@ -25,13 +25,13 @@ import com.cleanroommc.modularui.widgets.TextWidget; import com.cleanroommc.modularui.widgets.slot.SlotGroup; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.inventories.Inventory_DecayablesChest; +import gtPlusPlus.core.inventories.InventoryDecayablesChest; import gtPlusPlus.core.item.materials.DustDecayable; import gtPlusPlus.core.util.minecraft.ItemUtils; public class TileEntityDecayablesChest extends TileEntity implements ISidedInventory, IGuiHolder { - private final Inventory_DecayablesChest inventoryContents; + private final InventoryDecayablesChest inventoryContents; /** Determines if the check for adjacent chests has taken place. */ public boolean adjacentChestChecked; @@ -57,10 +57,10 @@ public class TileEntityDecayablesChest extends TileEntity implements ISidedInven private int tickCount = 0; public TileEntityDecayablesChest() { - this.inventoryContents = new Inventory_DecayablesChest(); + this.inventoryContents = new InventoryDecayablesChest(); } - public Inventory_DecayablesChest getInventory() { + public InventoryDecayablesChest getInventory() { return this.inventoryContents; } diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java index 1a09b6b423..49d466d70d 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java @@ -17,7 +17,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.FishingHooks; import gregtech.api.enums.Materials; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.inventories.InventoryFishTrap; import gtPlusPlus.core.util.math.MathUtils; @@ -76,7 +76,7 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory { } for (final ItemStack contents : this.getInventory() .getInventory()) { - if (GT_Utility.areStacksEqual(loot, contents)) { + if (GTUtility.areStacksEqual(loot, contents)) { if (contents.stackSize < contents.getMaxStackSize()) { contents.stackSize++; this.markDirty(); diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java index a9bc2b0049..7f1cde2476 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java @@ -12,8 +12,8 @@ import net.minecraftforge.fluids.FluidStack; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.container.Container_VolumetricFlaskSetter; -import gtPlusPlus.core.inventories.Inventory_VolumetricFlaskSetter; +import gtPlusPlus.core.container.ContainerVolumetricFlaskSetter; +import gtPlusPlus.core.inventories.InventoryVolumetricFlaskSetter; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper; @@ -21,7 +21,7 @@ import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper; public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISidedInventory { private int tickCount = 0; - private final Inventory_VolumetricFlaskSetter inventoryContents; + private final InventoryVolumetricFlaskSetter inventoryContents; private String customName; public int locationX; public int locationY; @@ -30,7 +30,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide private int aCustomValue = 1000; public TileEntityVolumetricFlaskSetter() { - this.inventoryContents = new Inventory_VolumetricFlaskSetter(); + this.inventoryContents = new InventoryVolumetricFlaskSetter(); this.setTileLocation(); } @@ -62,7 +62,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide public final boolean hasFlask() { for (int i = 0; i < this.getInventory() .getInventory().length - 1; i++) { - if (i == Container_VolumetricFlaskSetter.SLOT_OUTPUT) { + if (i == ContainerVolumetricFlaskSetter.SLOT_OUTPUT) { continue; } if (this.getInventory() @@ -73,7 +73,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide return false; } - public Inventory_VolumetricFlaskSetter getInventory() { + public InventoryVolumetricFlaskSetter getInventory() { return this.inventoryContents; } @@ -124,9 +124,9 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide // Check if there is output in slot. Boolean hasOutput = false; - if (aInputs[Container_VolumetricFlaskSetter.SLOT_OUTPUT] != null) { + if (aInputs[ContainerVolumetricFlaskSetter.SLOT_OUTPUT] != null) { hasOutput = true; - if (aInputs[Container_VolumetricFlaskSetter.SLOT_OUTPUT].stackSize >= 16) { + if (aInputs[ContainerVolumetricFlaskSetter.SLOT_OUTPUT].stackSize >= 16) { return false; } } @@ -145,7 +145,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide log("Skipping Custom slot as value <= 0"); continue; } - if (e == Container_VolumetricFlaskSetter.SLOT_OUTPUT) { + if (e == ContainerVolumetricFlaskSetter.SLOT_OUTPUT) { continue; } @@ -163,7 +163,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide } // Existing Output else { - ItemStack f = aInputs[Container_VolumetricFlaskSetter.SLOT_OUTPUT]; + ItemStack f = aInputs[ContainerVolumetricFlaskSetter.SLOT_OUTPUT]; FluidStack aFluidInCheckedSlot = VolumetricFlaskHelper.getFlaskFluid(f); int aTypeInCheckedSlot = getFlaskType(f); // Check that the Circuit in the Output slot is not null and the same type as the circuit input. @@ -214,7 +214,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide VolumetricFlaskHelper.setFluid(aOutput, aOutputFluid); } this.setInventorySlotContents(e, aInputStack); - this.setInventorySlotContents(Container_VolumetricFlaskSetter.SLOT_OUTPUT, aOutput); + this.setInventorySlotContents(ContainerVolumetricFlaskSetter.SLOT_OUTPUT, aOutput); return true; } } @@ -359,7 +359,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide @Override public boolean canExtractItem(final int aSlot, final ItemStack p_102008_2_, final int p_102008_3_) { - return aSlot == Container_VolumetricFlaskSetter.SLOT_OUTPUT; + return aSlot == ContainerVolumetricFlaskSetter.SLOT_OUTPUT; } public String getCustomName() { diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java index dfdb7104b0..66378f0f7a 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java @@ -27,11 +27,11 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.oredict.OreDictionary; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.BTF_FluidTank; import gtPlusPlus.core.inventories.InventoryPestKiller; -import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.material.MaterialMisc; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.EntityUtils; @@ -186,7 +186,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory, if (f != null) { if (f.isFluidEqual(FluidUtils.getWildcardFluidStack("formaldehyde", 1))) { return 1; - } else if (f.isFluidEqual(MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(1))) { + } else if (f.isFluidEqual(MaterialMisc.HYDROGEN_CYANIDE.getFluidStack(1))) { return 2; } } @@ -330,7 +330,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory, if (this.getInventory() .getInventory()[0] == null) { return true; - } else if (GT_Utility.areStacksEqual( + } else if (GTUtility.areStacksEqual( aStack, this.getInventory() .getInventory()[0])) { @@ -471,7 +471,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory, ArrayList<ItemStack> t2Cells = OreDictionary.getOres("cellHydrogenCyanide"); didFill = addFluid(t1Cells, aInput, FluidUtils.getWildcardFluidStack("formaldehyde", 1000)); if (!didFill) { - didFill = addFluid(t2Cells, aInput, MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(1000)); + didFill = addFluid(t2Cells, aInput, MaterialMisc.HYDROGEN_CYANIDE.getFluidStack(1000)); } } @@ -495,7 +495,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory, public boolean addFluid(ArrayList<ItemStack> inputs, ItemStack aInput, FluidStack aFluidForInput) { for (ItemStack a : inputs) { - if (GT_Utility.areStacksEqual(a, aInput)) { + if (GTUtility.areStacksEqual(a, aInput)) { if (mTank.getFluid() == null || mTank.getFluid() .isFluidEqual(aFluidForInput)) { boolean didFill = fill(ForgeDirection.UNKNOWN, aFluidForInput, true) > 0; diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java index 7c90ddc1c2..02641f1e08 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java @@ -9,9 +9,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import gregtech.api.enums.ItemList; -import gregtech.common.items.GT_MetaGenerated_Item_01; +import gregtech.common.items.MetaGeneratedItem01; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.container.Container_ProjectTable; +import gtPlusPlus.core.container.ContainerProjectTable; import gtPlusPlus.core.inventories.projecttable.InventoryProjectMain; import gtPlusPlus.core.inventories.projecttable.InventoryProjectOutput; import gtPlusPlus.core.util.minecraft.NBTUtils; @@ -28,7 +28,7 @@ public class TileEntityProjectTable extends TileEntity public InventoryProjectMain inventoryGrid; public InventoryProjectOutput inventoryOutputs; - private Container_ProjectTable container; + private ContainerProjectTable container; public TileEntityProjectTable() { this.inventoryGrid = new InventoryProjectMain(); // number of slots - without product slot @@ -36,7 +36,7 @@ public class TileEntityProjectTable extends TileEntity this.canUpdate(); } - public void setContainer(Container_ProjectTable container) { + public void setContainer(ContainerProjectTable container) { this.container = container; } @@ -122,7 +122,7 @@ public class TileEntityProjectTable extends TileEntity // Data stick ItemStack dataStick = this.inventoryOutputs.getStackInSlot(0); if (dataStick != null && this.container != null && container.getOutputContent() != null) { - if ((dataStick.getItem() instanceof GT_MetaGenerated_Item_01 && dataStick.getItemDamage() == 32708) + if ((dataStick.getItem() instanceof MetaGeneratedItem01 && dataStick.getItemDamage() == 32708) || (dataStick == ItemList.Tool_DataStick.get(1)) || (dataStick == GregtechItemList.Old_Tool_DataStick.get(1)) || (dataStick.getItem() instanceof MetaGeneratedGregtechItems diff --git a/src/main/java/gtPlusPlus/core/util/Utils.java b/src/main/java/gtPlusPlus/core/util/Utils.java index 610cc4f8fa..c3c877388b 100644 --- a/src/main/java/gtPlusPlus/core/util/Utils.java +++ b/src/main/java/gtPlusPlus/core/util/Utils.java @@ -26,15 +26,15 @@ import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.EnumUtils; import cpw.mods.fml.common.FMLCommonHandler; -import gregtech.api.GregTech_API; -import gregtech.api.enums.TC_Aspects; -import gregtech.api.enums.TC_Aspects.TC_AspectStack; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_Utility; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.TCAspects; +import gregtech.api.enums.TCAspects.TC_AspectStack; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.NBTUtils; @@ -56,7 +56,7 @@ public class Utils { .isClient(); } - public static TC_AspectStack getTcAspectStack(final TC_Aspects aspect, final long size) { + public static TC_AspectStack getTcAspectStack(final TCAspects aspect, final long size) { return getTcAspectStack(aspect.name(), (int) size); } @@ -64,7 +64,7 @@ public class Utils { return getTcAspectStack(aspect, (int) size); } - public static TC_AspectStack getTcAspectStack(final TC_Aspects aspect, final int size) { + public static TC_AspectStack getTcAspectStack(final TCAspects aspect, final int size) { return getTcAspectStack(aspect.name(), size); } @@ -75,14 +75,14 @@ public class Utils { if (aspect.equalsIgnoreCase("COGNITIO")) { // Adds in Compat for older GT Versions which Misspell aspects. try { - if (EnumUtils.isValidEnum(TC_Aspects.class, "COGNITIO")) { + if (EnumUtils.isValidEnum(TCAspects.class, "COGNITIO")) { Logger.WARNING("TC Aspect found - " + aspect); - returnValue = new TC_AspectStack(TC_Aspects.valueOf("COGNITIO"), size); + returnValue = new TC_AspectStack(TCAspects.valueOf("COGNITIO"), size); } else { 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); + returnValue = new TC_AspectStack(TCAspects.valueOf("COGNITO"), size); } } catch (final NoSuchFieldError r) { Logger.INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus"); @@ -90,14 +90,14 @@ public class Utils { } else if (aspect.equalsIgnoreCase("EXANIMUS")) { // Adds in Compat for older GT Versions which Misspell aspects. try { - if (EnumUtils.isValidEnum(TC_Aspects.class, "EXANIMUS")) { + if (EnumUtils.isValidEnum(TCAspects.class, "EXANIMUS")) { Logger.WARNING("TC Aspect found - " + aspect); - returnValue = new TC_AspectStack(TC_Aspects.valueOf("EXANIMUS"), size); + returnValue = new TC_AspectStack(TCAspects.valueOf("EXANIMUS"), size); } else { 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); + returnValue = new TC_AspectStack(TCAspects.valueOf("EXAMINIS"), size); } } catch (final NoSuchFieldError r) { Logger.INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus"); @@ -106,21 +106,21 @@ public class Utils { } else if (aspect.equalsIgnoreCase("PRAECANTATIO")) { // Adds in Compat for older GT Versions which Misspell aspects. try { - if (EnumUtils.isValidEnum(TC_Aspects.class, "PRAECANTATIO")) { + if (EnumUtils.isValidEnum(TCAspects.class, "PRAECANTATIO")) { Logger.WARNING("TC Aspect found - " + aspect); - returnValue = new TC_AspectStack(TC_Aspects.valueOf("PRAECANTATIO"), size); + returnValue = new TC_AspectStack(TCAspects.valueOf("PRAECANTATIO"), size); } else { 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); + returnValue = new TC_AspectStack(TCAspects.valueOf("PRAECANTIO"), size); } } catch (final NoSuchFieldError r) { Logger.INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus"); } } else { Logger.WARNING("TC Aspect found - " + aspect); - returnValue = new TC_AspectStack(TC_Aspects.valueOf(aspect), size); + returnValue = new TC_AspectStack(TCAspects.valueOf(aspect), size); } return returnValue; @@ -352,17 +352,17 @@ public class Utils { } public static String addBookTitleLocalization(final String aTitle) { - return GT_LanguageManager - .addStringLocalization("Book." + aTitle + ".Name", aTitle, !GregTech_API.sPostloadFinished); + return GTLanguageManager + .addStringLocalization("Book." + aTitle + ".Name", aTitle, !GregTechAPI.sPostloadFinished); } public static String[] addBookPagesLocalization(final String aTitle, final String[] aPages) { String[] aLocalizationPages = new String[aPages.length]; for (byte i = 0; i < aPages.length; i = (byte) (i + 1)) { - aLocalizationPages[i] = GT_LanguageManager.addStringLocalization( + aLocalizationPages[i] = GTLanguageManager.addStringLocalization( "Book." + aTitle + ".Page" + ((i < 10) ? "0" + i : Byte.valueOf(i)), aPages[i], - !GregTech_API.sPostloadFinished); + !GregTechAPI.sPostloadFinished); } return aLocalizationPages; } @@ -370,16 +370,16 @@ public class Utils { public static ItemStack getWrittenBook(ItemStack book, int ID, String mapping, String title, String author, String[] pages) { - if (GT_Utility.isStringInvalid(mapping)) { + if (GTUtility.isStringInvalid(mapping)) { return null; } - ItemStack stack = CORE.sBookList.get(mapping); + ItemStack stack = GTPPCore.sBookList.get(mapping); if (stack != null) { - return GT_Utility.copyAmount(1L, stack); + return GTUtility.copyAmount(1L, stack); } - if (GT_Utility.isStringInvalid(title) || GT_Utility.isStringInvalid(author) || pages.length <= 0) { + if (GTUtility.isStringInvalid(title) || GTUtility.isStringInvalid(author) || pages.length <= 0) { return null; } @@ -400,11 +400,11 @@ public class Utils { NBTList.appendTag(new NBTTagString(pages[i])); } else { Logger.INFO("WARNING: String for written Book too long! -> " + pages[i]); - GT_Log.err.println("WARNING: String for written Book too long! -> " + pages[i]); + GTLog.err.println("WARNING: String for written Book too long! -> " + pages[i]); } } else { Logger.INFO("WARNING: Too much Pages for written Book! -> " + title); - GT_Log.err.println("WARNING: Too much Pages for written Book! -> " + title); + GTLog.err.println("WARNING: Too much Pages for written Book! -> " + title); break; } } @@ -423,14 +423,14 @@ public class Utils { mapping, title, author); - GT_Log.out.println(logMessage); + GTLog.out.println(logMessage); NBTUtils.createIntegerTagCompound(stack, "stats", "mMeta", ID); - CORE.sBookList.put(mapping, stack); + GTPPCore.sBookList.put(mapping, stack); Logger.INFO(String.format("Creating book: %s by %s. Using Meta %d.", title, author, ID)); - return GT_Utility.copy(stack); + return GTUtility.copy(stack); } } diff --git a/src/main/java/gtPlusPlus/core/util/math/MathUtils.java b/src/main/java/gtPlusPlus/core/util/math/MathUtils.java index ac3ef2e947..4fb34bd158 100644 --- a/src/main/java/gtPlusPlus/core/util/math/MathUtils.java +++ b/src/main/java/gtPlusPlus/core/util/math/MathUtils.java @@ -4,15 +4,15 @@ import java.text.NumberFormat; import java.util.Map; import java.util.Random; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.Utils; public class MathUtils { - static final Random rand = CORE.RANDOM; + static final Random rand = GTPPCore.RANDOM; /** Formats a number with group separator and at most 2 fraction digits. */ private static final NumberFormat sNumberFormat = NumberFormat.getInstance(); @@ -273,7 +273,7 @@ public class MathUtils { } public static int safeInt(long number) { - return number > GT_Values.V[GT_Values.V.length - 1] ? safeInt(GT_Values.V[GT_Values.V.length - 1], 1) + return number > GTValues.V[GTValues.V.length - 1] ? safeInt(GTValues.V[GTValues.V.length - 1], 1) : number < Integer.MIN_VALUE ? Integer.MIN_VALUE : (int) number; } @@ -391,7 +391,7 @@ public class MathUtils { /** * Inverts the value, making Positives into Negatives and vice versa. - * + * * @param aPositive - An int value, either positive or negative. * @return - Inverted int Value. */ @@ -484,7 +484,7 @@ public class MathUtils { /** * Balances a number within a range. - * + * * @param aInput - The number to balance * @param aMin - The minimum bounds * @param aMax - The maximum bounds diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java index 87bd0e60c6..f0fbd2f253 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java @@ -11,7 +11,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.handler.events.EntityDeathHandler; import ic2.core.IC2Potion; @@ -49,7 +49,7 @@ public class EntityUtils { if ((radiationLevel > 0) && (entityHolding instanceof final EntityLivingBase entityLiving)) { if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode) { if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving) - && !GT_Utility.isWearingFullRadioHazmat(entityLiving)) { + && !GTUtility.isWearingFullRadioHazmat(entityLiving)) { if (entityLiving.getActivePotionEffect(IC2Potion.radiation) != null) { entityLiving.getActivePotionEffect(IC2Potion.radiation); } @@ -120,8 +120,8 @@ public class EntityUtils { if (!world.isRemote) { if ((heatLevel > 0) && (entityHolding instanceof final EntityLivingBase entityLiving)) { if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode) { - if (!GT_Utility.isWearingFullHeatHazmat(entityLiving)) { - GT_Utility.applyHeatDamage(entityLiving, heatLevel); + if (!GTUtility.isWearingFullHeatHazmat(entityLiving)) { + GTUtility.applyHeatDamage(entityLiving, heatLevel); } } } @@ -134,7 +134,7 @@ public class EntityUtils { /** * Provides the ability to provide custom drops upon the death of EntityLivingBase objects. - * + * * @param aMobClass - The Base Class you want to drop this item. * @param aStack - The ItemStack, stack size is not respected. * @param aMaxAmount - The maximum size of the ItemStack which drops. diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java index 2b6e96541d..95ba020887 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java @@ -2,7 +2,7 @@ package gtPlusPlus.core.util.minecraft; import static gregtech.api.recipe.RecipeMaps.fluidCannerRecipes; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import java.util.HashMap; @@ -16,10 +16,10 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; import gregtech.api.enums.Dyes; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.FluidGT6; import gtPlusPlus.core.item.base.BaseItemComponent; @@ -302,7 +302,7 @@ public class FluidUtils { } if (register) { - GT_LanguageManager.addStringLocalization(rFluid.getUnlocalizedName(), aLocalName); + GTLanguageManager.addStringLocalization(rFluid.getUnlocalizedName(), aLocalName); if (FluidRegistry.registerFluid(rFluid)) { switch (aState) { case 0 -> { @@ -375,7 +375,7 @@ public class FluidUtils { if ((aFullContainer != null) && (aEmptyContainer != null) && !FluidContainerRegistry .registerFluidContainer(new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Cell_Empty.get(1L)) .itemOutputs(aFullContainer) .fluidInputs(new FluidStack(rFluid, aFluidAmount)) @@ -529,7 +529,7 @@ public class FluidUtils { aGenerateCell); if (dustStack != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(dustStack) .fluidOutputs(FluidUtils.getFluidStack(gtFluid, amountPerItem)) .duration(1 * SECONDS) @@ -537,7 +537,7 @@ public class FluidUtils { .addTo(fluidExtractionRecipes); } if (dustStack2 != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(dustStack2) .fluidOutputs(FluidUtils.getFluidStack(gtFluid, amountPerItem)) .duration(1 * SECONDS) diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java index bedc0d2439..1e211290cd 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -5,7 +5,7 @@ import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.enums.Mods.Minecraft; import static gregtech.api.recipe.RecipeMaps.packagerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import java.util.ArrayList; import java.util.HashMap; @@ -25,15 +25,15 @@ import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gregtech.common.items.MetaGeneratedTool01; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; @@ -41,16 +41,16 @@ import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.base.dusts.BaseItemDustUnique; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.item.chemistry.GenericChem; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.CORE_Preloader; -import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool; +import gtPlusPlus.preloader.PreloaderCore; +import gtPlusPlus.xmod.gregtech.api.items.GTMetaTool; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_DustGeneration; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenDustGeneration; public class ItemUtils { @@ -94,7 +94,7 @@ public class ItemUtils { } public static ItemStack getIC2Cell(final int meta) { - return GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", 1L, meta); + return GTModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", 1L, meta); } public static ItemStack getEmptyCell() { @@ -105,7 +105,7 @@ public class ItemUtils { if (ItemList.Cell_Empty.hasBeenSet()) { return ItemList.Cell_Empty.get(i); } - final ItemStack temp = GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", i, 0); + final ItemStack temp = GTModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", i, 0); return temp != null ? temp : null; } @@ -122,7 +122,7 @@ public class ItemUtils { if (em != null) { final ItemStack metaStack = new ItemStack(em, 1, meta); - GT_OreDictUnificator.registerOre(oreDictName, metaStack); + GTOreDictUnificator.registerOre(oreDictName, metaStack); } } catch (final NullPointerException e) { @@ -308,7 +308,7 @@ public class ItemUtils { } public static ItemStack getItemStackOfAmountFromOreDictNoBroken(String oredictName, final int amount) { - if (CORE_Preloader.DEBUG_MODE) { + if (PreloaderCore.DEBUG_MODE) { Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(1)); Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(2)); Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(3)); @@ -353,7 +353,7 @@ public class ItemUtils { } public static ItemStack getGregtechDust(final Materials material, final int amount) { - final ItemStack returnValue = GT_OreDictUnificator.get(OrePrefixes.dust, material, 1L); + final ItemStack returnValue = GTOreDictUnificator.get(OrePrefixes.dust, material, 1L); if (returnValue != null) { if (ItemUtils.checkForInvalidItems(returnValue)) { return returnValue.copy(); @@ -371,7 +371,7 @@ public class ItemUtils { public static Item[] generateSpecialUseDusts(final String unlocalizedName, final String materialName, String mChemForm, final int Colour) { - GT_LanguageManager.addStringLocalization("gtplusplus.material." + materialName, materialName); + GTLanguageManager.addStringLocalization("gtplusplus.material." + materialName, materialName); final Item[] output = { new BaseItemDustUnique("itemDust" + unlocalizedName, materialName, mChemForm, Colour, "Dust"), new BaseItemDustUnique("itemDustSmall" + unlocalizedName, materialName, mChemForm, Colour, "Small"), @@ -383,15 +383,15 @@ public class ItemUtils { final ItemStack smallDust = ItemUtils.getSimpleStack(output[1]); final ItemStack tinyDust = ItemUtils.getSimpleStack(output[2]); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, smallDust), ItemList.Schematic_Dust.get(0)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, smallDust), ItemList.Schematic_Dust.get(0)) .itemOutputs(normalDust) .duration(5 * SECONDS) .eut(4) .addTo(packagerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9, tinyDust), ItemList.Schematic_Dust.get(0)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9, tinyDust), ItemList.Schematic_Dust.get(0)) .itemOutputs(normalDust) .duration(5 * SECONDS) .eut(4) @@ -503,7 +503,7 @@ public class ItemUtils { output = new Item[] { new BaseItemDustUnique("itemDust" + unlocalizedName, materialName, Colour, "Dust") }; } - new RecipeGen_DustGeneration(material, disableExtraRecipes); + new RecipeGenDustGeneration(material, disableExtraRecipes); return output; } @@ -657,7 +657,7 @@ public class ItemUtils { if (mPrefix == OrePrefixes.rod) { mPrefix = OrePrefixes.stick; } - ItemStack aGtStack = GT_OreDictUnificator.get(mPrefix, mMat, mAmount); + ItemStack aGtStack = GTOreDictUnificator.get(mPrefix, mMat, mAmount); if (aGtStack == null) { Logger .INFO("Failed to find `" + mPrefix + MaterialUtils.getMaterialName(mMat) + "` in OD. [Prefix Search]"); @@ -695,7 +695,7 @@ public class ItemUtils { } public static boolean registerFuel(ItemStack aBurnable, int burn) { - return CORE.burnables.add(new Pair<>(burn, aBurnable)); + return GTPPCore.burnables.add(new Pair<>(burn, aBurnable)); } public static boolean checkForInvalidItems(ItemStack mInput) { @@ -772,8 +772,8 @@ public class ItemUtils { IInventory aTemp = aInputInventory; for (int i = 0; i < p.length; ++i) { for (int j = i + 1; j < p.length; ++j) { - if (p[j] != null && (p[i] == null || GT_Utility.areStacksEqual(p[i], p[j]))) { - GT_Utility.moveStackFromSlotAToSlotB(aTemp, aTemp, j, i, (byte) 64, (byte) 1, (byte) 64, (byte) 1); + if (p[j] != null && (p[i] == null || GTUtility.areStacksEqual(p[i], p[j]))) { + GTUtility.moveStackFromSlotAToSlotB(aTemp, aTemp, j, i, (byte) 64, (byte) 1, (byte) 64, (byte) 1); } } } @@ -840,9 +840,9 @@ public class ItemUtils { final Item mItem = aStack.getItem(); final Item aSkookum = ItemUtils.getItemFromFQRN("miscutils:gt.plusplus.metatool.01"); final Class aSkookClass = aSkookum.getClass(); - if (aSkookClass.isInstance(mItem) || mItem instanceof GT_MetaGenerated_Tool_01 + if (aSkookClass.isInstance(mItem) || mItem instanceof MetaGeneratedTool01 || mItem instanceof MetaGeneratedGregtechTools - || mItem instanceof Gregtech_MetaTool + || mItem instanceof GTMetaTool || mItem == aSkookum) { return true; } @@ -884,7 +884,7 @@ public class ItemUtils { } public static ItemStack getNullStack() { - return GT_Values.NI; + return GTValues.NI; } public static ItemStack depleteStack(ItemStack aStack) { @@ -908,7 +908,7 @@ public class ItemUtils { Item aItem = aStack.getItem(); if (aItem == CI.getNumberedBioCircuit(0) .getItem() || aItem - == GT_Utility.getIntegratedCircuit(0) + == GTUtility.getIntegratedCircuit(0) .getItem() || aItem == CI.getNumberedAdvancedCircuit(0) .getItem()) { @@ -919,91 +919,91 @@ public class ItemUtils { } public static boolean isCatalyst(ItemStack aStack) { - if (GT_Utility.areStacksEqual(aStack, GenericChem.mBlueCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mBlueCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mBrownCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mBrownCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mOrangeCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mOrangeCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mPurpleCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mPurpleCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mRedCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mRedCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mYellowCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mYellowCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mPinkCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mPinkCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mFormaldehydeCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mFormaldehydeCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mSolidAcidCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mSolidAcidCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mInfiniteMutationCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mInfiniteMutationCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, AgriculturalChem.mGreenCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, AgriculturalChem.mGreenCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mPlatinumGroupCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mPlatinumGroupCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mPlasticPolymerCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mPlasticPolymerCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mRubberPolymerCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mRubberPolymerCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mAdhesionPromoterCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mAdhesionPromoterCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mTitaTungstenIndiumCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mTitaTungstenIndiumCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mRadioactivityCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mRadioactivityCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mRareEarthGroupCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mRareEarthGroupCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mSimpleNaquadahCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mSimpleNaquadahCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mAdvancedNaquadahCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mAdvancedNaquadahCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mRawIntelligenceCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mRawIntelligenceCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mUltimatePlasticCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mUltimatePlasticCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mBiologicalIntelligenceCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mBiologicalIntelligenceCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.TemporalHarmonyCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.TemporalHarmonyCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mLimpidWaterCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mLimpidWaterCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mFlawlessWaterCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mFlawlessWaterCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mParticleAccelerationCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mParticleAccelerationCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mSynchrotronCapableCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mSynchrotronCapableCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mAlgagenicGrowthPromoterCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mAlgagenicGrowthPromoterCatalyst, true)) { return true; } @@ -1011,10 +1011,10 @@ public class ItemUtils { } public static boolean isMillingBall(ItemStack aStack) { - if (GT_Utility.areStacksEqual(aStack, GenericChem.mMillingBallAlumina, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mMillingBallAlumina, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mMillingBallSoapstone, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mMillingBallSoapstone, true)) { return true; } return false; diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java index 9aa8b3c0fa..6675e19891 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java @@ -13,7 +13,7 @@ import gregtech.api.enums.Element; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TextureSet; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.TypeCounter; @@ -22,7 +22,7 @@ import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes; import gtPlusPlus.core.item.base.foil.BaseItemFoil; import gtPlusPlus.core.item.base.wire.BaseItemFineWire; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialStack; import gtPlusPlus.core.material.state.MaterialState; @@ -73,7 +73,7 @@ public class MaterialUtils { int radioactivity = 0; if (material.isRadioactive()) { ItemStack aDustStack = ItemUtils.getOrePrefixStack(OrePrefixes.dust, material, 1); - radioactivity = aDustStack != null ? GT_Utility.getRadioactivityLevel(aDustStack) : 0; + radioactivity = aDustStack != null ? GTUtility.getRadioactivityLevel(aDustStack) : 0; if (radioactivity == 0) { long aProtons = material.getProtons(); radioactivity = (int) Math.min(Math.max((aProtons / 30), 1), 9); @@ -275,7 +275,7 @@ public class MaterialUtils { + "' & fallback '" + aFallbackMaterialName + "', returning _NULL."); - CORE.crash(); + GTPPCore.crash(); } return g; } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java index 3abc92b69e..16e5652e82 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java @@ -2,7 +2,7 @@ package gtPlusPlus.core.util.minecraft; import java.util.HashMap; -import gregtech.common.GT_Worldgen_GT_Ore_Layer; +import gregtech.common.WorldgenGTOreLayer; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -18,12 +18,11 @@ public class MiningUtils { String aTextWorldGen; if (MiningUtils.findAndMapOreTypesFromGT()) { int mapKey = 0; - for (AutoMap<GT_Worldgen_GT_Ore_Layer> g : MiningUtils.mOreMaps) { - for (GT_Worldgen_GT_Ore_Layer h : g) { + for (AutoMap<WorldgenGTOreLayer> g : MiningUtils.mOreMaps) { + for (WorldgenGTOreLayer h : g) { try { - aTextWorldGen = (String) ReflectionUtils - .getField(GT_Worldgen_GT_Ore_Layer.class, "aTextWorldgen") + aTextWorldGen = (String) ReflectionUtils.getField(WorldgenGTOreLayer.class, "aTextWorldgen") .get(h); } catch (IllegalArgumentException | IllegalAccessException e) { aTextWorldGen = h.mWorldGenName; @@ -37,14 +36,14 @@ public class MiningUtils { } } - public static AutoMap<GT_Worldgen_GT_Ore_Layer>[] mOreMaps = new AutoMap[7]; - private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Overworld = new AutoMap<>(); - private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Nether = new AutoMap<>(); - private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_End = new AutoMap<>(); - private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Moon = new AutoMap<>(); - private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Mars = new AutoMap<>(); - private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Comets = new AutoMap<>(); - private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Misc = new AutoMap<>(); + public static AutoMap<WorldgenGTOreLayer>[] mOreMaps = new AutoMap[7]; + private static final AutoMap<WorldgenGTOreLayer> Ores_Overworld = new AutoMap<>(); + private static final AutoMap<WorldgenGTOreLayer> Ores_Nether = new AutoMap<>(); + private static final AutoMap<WorldgenGTOreLayer> Ores_End = new AutoMap<>(); + private static final AutoMap<WorldgenGTOreLayer> Ores_Moon = new AutoMap<>(); + private static final AutoMap<WorldgenGTOreLayer> Ores_Mars = new AutoMap<>(); + private static final AutoMap<WorldgenGTOreLayer> Ores_Comets = new AutoMap<>(); + private static final AutoMap<WorldgenGTOreLayer> Ores_Misc = new AutoMap<>(); public static boolean findAndMapOreTypesFromGT() { // Gets Moon ID @@ -92,11 +91,11 @@ public class MiningUtils { Ores_End.clear(); Ores_Misc.clear(); - for (GT_Worldgen_GT_Ore_Layer x : GT_Worldgen_GT_Ore_Layer.sList) { + for (WorldgenGTOreLayer x : WorldgenGTOreLayer.sList) { if (x.mEnabled) { try { - aEndAsteroids = ReflectionUtils.getField(GT_Worldgen_GT_Ore_Layer.class, "mEndAsteroid") + aEndAsteroids = ReflectionUtils.getField(WorldgenGTOreLayer.class, "mEndAsteroid") .getBoolean(x); } catch (IllegalArgumentException | IllegalAccessException e) { aEndAsteroids = false; diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java index 4b0f15b81e..bff2a25386 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; public class NBTUtils { @@ -18,7 +18,7 @@ public class NBTUtils { public static void setBookTitle(ItemStack aStack, String aTitle) { NBTTagCompound tNBT = getNBT(aStack); tNBT.setString("title", aTitle); - GT_Utility.ItemNBT.setNBT(aStack, tNBT); + GTUtility.ItemNBT.setNBT(aStack, tNBT); } public static ItemStack[] readItemsFromNBT(ItemStack itemstack) { @@ -82,7 +82,7 @@ public class NBTUtils { public static void setBoolean(ItemStack aStack, String aTag, boolean aBoolean) { NBTTagCompound tNBT = getNBT(aStack); tNBT.setBoolean(aTag, aBoolean); - GT_Utility.ItemNBT.setNBT(aStack, tNBT); + GTUtility.ItemNBT.setNBT(aStack, tNBT); } public static boolean getBoolean(ItemStack aStack, String aTag) { @@ -93,7 +93,7 @@ public class NBTUtils { public static void setInteger(ItemStack aStack, String aTag, int aInt) { NBTTagCompound tNBT = getNBT(aStack); tNBT.setInteger(aTag, aInt); - GT_Utility.ItemNBT.setNBT(aStack, tNBT); + GTUtility.ItemNBT.setNBT(aStack, tNBT); } public static int getInteger(ItemStack aStack, String aTag) { @@ -104,7 +104,7 @@ public class NBTUtils { public static void setLong(ItemStack aStack, String aTag, long aInt) { NBTTagCompound tNBT = getNBT(aStack); tNBT.setLong(aTag, aInt); - GT_Utility.ItemNBT.setNBT(aStack, tNBT); + GTUtility.ItemNBT.setNBT(aStack, tNBT); } public static long getLong(ItemStack aStack, String aTag) { @@ -115,7 +115,7 @@ public class NBTUtils { public static void setString(ItemStack aStack, String aTag, String aString) { NBTTagCompound tNBT = getNBT(aStack); tNBT.setString(aTag, aString); - GT_Utility.ItemNBT.setNBT(aStack, tNBT); + GTUtility.ItemNBT.setNBT(aStack, tNBT); } public static String getString(ItemStack aStack, String aTag) { diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java index ba7353cba6..5e29ddb53e 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java @@ -18,6 +18,7 @@ import net.minecraftforge.common.util.FakePlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -41,7 +42,7 @@ public class PlayerUtils { } public static void messagePlayer(final EntityPlayer P, final String S) { - gregtech.api.util.GT_Utility.sendChatToPlayer(P, S); + GTUtility.sendChatToPlayer(P, S); } public static void messagePlayer(final EntityPlayer P, final IChatComponent S) { diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java index ed2da4d7f7..6df6974030 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java @@ -16,17 +16,17 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.objects.ItemData; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.GTplusplus; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.ShapedRecipe; -import gtPlusPlus.core.handler.COMPAT_HANDLER; +import gtPlusPlus.core.handler.CompatHandler; import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler; import gtPlusPlus.core.handler.Recipes.RegistrationHandler; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.data.ArrayUtils; @@ -64,11 +64,11 @@ public class RecipeUtils { Object[] o = new Object[] { slot_1, slot_2, slot_3, slot_4, slot_5, slot_6, slot_7, slot_8, slot_9 }; try { - int size = COMPAT_HANDLER.mRecipesToGenerate.size(); - COMPAT_HANDLER.mRecipesToGenerate.put(new InternalRecipeObject(o, resultItem, false)); + int size = CompatHandler.mRecipesToGenerate.size(); + CompatHandler.mRecipesToGenerate.put(new InternalRecipeObject(o, resultItem, false)); // Utils.LOG_WARNING("Success! Added a recipe for "+resultItem.getDisplayName()); - if (COMPAT_HANDLER.mRecipesToGenerate.size() > size) { - if (!COMPAT_HANDLER.areInitItemsLoaded) { + if (CompatHandler.mRecipesToGenerate.size() > size) { + if (!CompatHandler.areInitItemsLoaded) { RegistrationHandler.recipesSuccess++; } else { LateRegistrationHandler.recipesSuccess++; @@ -78,7 +78,7 @@ public class RecipeUtils { Logger.RECIPE( "[Fix] Invalid Recipe detected for: " + resultItem != null ? resultItem.getUnlocalizedName() : "INVALID OUTPUT ITEM"); - if (!COMPAT_HANDLER.areInitItemsLoaded) { + if (!CompatHandler.areInitItemsLoaded) { RegistrationHandler.recipesFailed++; } else { LateRegistrationHandler.recipesFailed++; @@ -163,18 +163,18 @@ public class RecipeUtils { InputItem9 }; if (gtPlusPlus.GTplusplus.CURRENT_LOAD_PHASE != GTplusplus.INIT_PHASE.POST_INIT) { - CORE.crash( + GTPPCore.crash( "Load Phase " + gtPlusPlus.GTplusplus.CURRENT_LOAD_PHASE + " should be " + GTplusplus.INIT_PHASE.POST_INIT + ". Unable to register recipe."); } - int size = COMPAT_HANDLER.mGtRecipesToGenerate.size(); - COMPAT_HANDLER.mGtRecipesToGenerate.put(new InternalRecipeObject(o, OutputItem, true)); + int size = CompatHandler.mGtRecipesToGenerate.size(); + CompatHandler.mGtRecipesToGenerate.put(new InternalRecipeObject(o, OutputItem, true)); - if (COMPAT_HANDLER.mGtRecipesToGenerate.size() > size) { - if (!COMPAT_HANDLER.areInitItemsLoaded) { + if (CompatHandler.mGtRecipesToGenerate.size() > size) { + if (!CompatHandler.areInitItemsLoaded) { RegistrationHandler.recipesSuccess++; } else { LateRegistrationHandler.recipesSuccess++; @@ -195,7 +195,7 @@ public class RecipeUtils { return false; } // let gregtech handle shapeless recipes. - if (GT_ModHandler.addShapelessCraftingRecipe(OutputItem, inputItems)) { + if (GTModHandler.addShapelessCraftingRecipe(OutputItem, inputItems)) { return true; } return false; @@ -294,7 +294,7 @@ public class RecipeUtils { boolean rReturn = false; ArrayList<IRecipe> tList = (ArrayList) CraftingManager.getInstance() .getRecipeList(); - aOutput = GT_OreDictUnificator.get(aOutput); + aOutput = GTOreDictUnificator.get(aOutput); int tList_sS = tList.size(); for (int i = 0; i < tList_sS; ++i) { @@ -302,19 +302,19 @@ public class RecipeUtils { if (!aNotRemoveShapelessRecipes || !(tRecipe instanceof ShapelessRecipes) && !(tRecipe instanceof ShapelessOreRecipe)) { if (aOnlyRemoveNativeHandlers) { - if (!gregtech.api.util.GT_ModHandler.sNativeRecipeClasses.contains( + if (!GTModHandler.sNativeRecipeClasses.contains( tRecipe.getClass() .getName())) { continue; } - } else if (gregtech.api.util.GT_ModHandler.sSpecialRecipeClasses.contains( + } else if (GTModHandler.sSpecialRecipeClasses.contains( tRecipe.getClass() .getName())) { continue; } ItemStack tStack = tRecipe.getRecipeOutput(); - if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(tStack), aOutput, aIgnoreNBT)) { + if (GTUtility.areStacksEqual(GTOreDictUnificator.get(tStack), aOutput, aIgnoreNBT)) { tList.remove(i--); tList_sS = tList.size(); rReturn = true; @@ -372,7 +372,7 @@ public class RecipeUtils { "Cleaned a " + o.getClass() .getSimpleName() + " from recipe input."); Logger.INFO("ERROR"); - CORE.crash("Bad Shaped Recipe."); + GTPPCore.crash("Bad Shaped Recipe."); } } Logger.RECIPE("Using String: " + aFullString); @@ -414,10 +414,10 @@ public class RecipeUtils { ShapedOreRecipe aRecipe = new ShapedOreRecipe(aOutputStack, aDataObject); - int size = COMPAT_HANDLER.mRecipesToGenerate.size(); - COMPAT_HANDLER.mRecipesToGenerate.put(new InternalRecipeObject2(aRecipe)); - if (COMPAT_HANDLER.mRecipesToGenerate.size() > size) { - if (!COMPAT_HANDLER.areInitItemsLoaded) { + int size = CompatHandler.mRecipesToGenerate.size(); + CompatHandler.mRecipesToGenerate.put(new InternalRecipeObject2(aRecipe)); + if (CompatHandler.mRecipesToGenerate.size() > size) { + if (!CompatHandler.areInitItemsLoaded) { RegistrationHandler.recipesSuccess++; } else { LateRegistrationHandler.recipesSuccess++; diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java index 4e6e508c15..d9cf2e3769 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java @@ -6,16 +6,16 @@ import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.ArrayUtils; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; -import gregtech.common.GT_Pollution; +import gregtech.common.Pollution; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.base.cell.BaseItemCell; -import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.material.MaterialGenerator; +import gtPlusPlus.core.material.MaterialMisc; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -24,19 +24,19 @@ public class PollutionUtils { public static AutoMap<FluidStack> mPollutionFluidStacks = new AutoMap<>(); public static boolean isPollutionEnabled() { - return GT_Mod.gregtechproxy.mPollution; + return GTMod.gregtechproxy.mPollution; } public static boolean addPollution(IGregTechTileEntity te, int pollutionValue) { - if (GT_Mod.gregtechproxy.mPollution) { - GT_Pollution.addPollution(te, pollutionValue); + if (GTMod.gregtechproxy.mPollution) { + Pollution.addPollution(te, pollutionValue); return true; } return false; } public static void addPollution(IHasWorldObjectAndCoords aTileOfSomeSort, int pollutionValue) { - if (GT_Mod.gregtechproxy.mPollution) { + if (GTMod.gregtechproxy.mPollution) { Chunk c = aTileOfSomeSort.getWorld() .getChunkFromBlockCoords(aTileOfSomeSort.getXCoord(), aTileOfSomeSort.getZCoord()); addPollution(c, pollutionValue); @@ -44,8 +44,8 @@ public class PollutionUtils { } public static void addPollution(Chunk aChunk, int pollutionValue) { - if (GT_Mod.gregtechproxy.mPollution) { - GT_Pollution.addPollution(aChunk, pollutionValue); + if (GTMod.gregtechproxy.mPollution) { + Pollution.addPollution(aChunk, pollutionValue); } } @@ -74,7 +74,7 @@ public class PollutionUtils { } public static void nullifyPollution(Chunk aChunk) { - if (GT_Mod.gregtechproxy.mPollution) { + if (GTMod.gregtechproxy.mPollution) { if (aChunk == null) { return; } @@ -86,11 +86,11 @@ public class PollutionUtils { } public static int getPollution(IGregTechTileEntity te) { - return GT_Pollution.getPollution(te); + return Pollution.getPollution(te); } public static int getPollution(Chunk te) { - return GT_Pollution.getPollution(te); + return Pollution.getPollution(te); } public static void setPollutionFluids() { @@ -103,33 +103,33 @@ public class PollutionUtils { if (CD != null) { Logger.INFO("[PollutionCompat] Found carbon dioxide fluid, registering it."); PollutionUtils.mPollutionFluidStacks.put(CD); - MISC_MATERIALS.CARBON_DIOXIDE.registerComponentForMaterial(CD); + MaterialMisc.CARBON_DIOXIDE.registerComponentForMaterial(CD); ItemStack cellCD = ItemUtils.getItemStackOfAmountFromOreDict("cellCarbonDioxide", 1); if (ItemUtils.checkForInvalidItems(cellCD)) { Logger.INFO("[PollutionCompat] Found carbon dioxide cell, registering component."); - MISC_MATERIALS.CARBON_DIOXIDE.registerComponentForMaterial(OrePrefixes.cell, cellCD); + MaterialMisc.CARBON_DIOXIDE.registerComponentForMaterial(OrePrefixes.cell, cellCD); } else { Logger.INFO("[PollutionCompat] Did not find carbon dioxide cell, registering new component."); - new BaseItemCell(MISC_MATERIALS.CARBON_DIOXIDE); + new BaseItemCell(MaterialMisc.CARBON_DIOXIDE); } } else { - MaterialGenerator.generate(MISC_MATERIALS.CARBON_DIOXIDE, false, false); + MaterialGenerator.generate(MaterialMisc.CARBON_DIOXIDE, false, false); } if (CM != null) { Logger.INFO("[PollutionCompat] Found carbon monoxide fluid, registering it."); PollutionUtils.mPollutionFluidStacks.put(CM); - MISC_MATERIALS.CARBON_MONOXIDE.registerComponentForMaterial(CM); + MaterialMisc.CARBON_MONOXIDE.registerComponentForMaterial(CM); ItemStack cellCD = ItemUtils.getItemStackOfAmountFromOreDict("cellCarbonMonoxide", 1); if (ItemUtils.checkForInvalidItems(cellCD)) { Logger.INFO("[PollutionCompat] Found carbon monoxide cell, registering component."); - MISC_MATERIALS.CARBON_MONOXIDE.registerComponentForMaterial(OrePrefixes.cell, cellCD); + MaterialMisc.CARBON_MONOXIDE.registerComponentForMaterial(OrePrefixes.cell, cellCD); } else { Logger.INFO("[PollutionCompat] Did not find carbon monoxide cell, registering new component."); - new BaseItemCell(MISC_MATERIALS.CARBON_MONOXIDE); + new BaseItemCell(MaterialMisc.CARBON_MONOXIDE); } } else { - MaterialGenerator.generate(MISC_MATERIALS.CARBON_MONOXIDE, false, false); + MaterialGenerator.generate(MaterialMisc.CARBON_MONOXIDE, false, false); } if (SD != null) { diff --git a/src/main/java/gtPlusPlus/core/util/recipe/GT_RecipeUtils.java b/src/main/java/gtPlusPlus/core/util/recipe/GTRecipeUtils.java index c5498e4f59..980068ed97 100644 --- a/src/main/java/gtPlusPlus/core/util/recipe/GT_RecipeUtils.java +++ b/src/main/java/gtPlusPlus/core/util/recipe/GTRecipeUtils.java @@ -11,18 +11,18 @@ import org.apache.commons.lang3.ArrayUtils; import gnu.trove.map.hash.TCustomHashMap; import gnu.trove.set.hash.TCustomHashSet; -import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GTRecipe; import gtPlusPlus.api.objects.Logger; -public class GT_RecipeUtils { +public class GTRecipeUtils { - public static List<GT_Recipe> removeDuplicates(List<GT_Recipe> inputRecipes, String recipeMapName) { - TCustomHashSet<GT_Recipe> recipesHashSet = new TCustomHashSet<>(RecipeHashStrat.RecipeHashingStrategy); - ArrayList<GT_Recipe> recipeOutput = new ArrayList<>(); - TCustomHashMap<GT_Recipe, ItemStack> circuitMap = new TCustomHashMap<>(RecipeHashStrat.RecipeHashingStrategy); + public static List<GTRecipe> removeDuplicates(List<GTRecipe> inputRecipes, String recipeMapName) { + TCustomHashSet<GTRecipe> recipesHashSet = new TCustomHashSet<>(RecipeHashStrat.RecipeHashingStrategy); + ArrayList<GTRecipe> recipeOutput = new ArrayList<>(); + TCustomHashMap<GTRecipe, ItemStack> circuitMap = new TCustomHashMap<>(RecipeHashStrat.RecipeHashingStrategy); int removedRecipeCount = 0; - for (GT_Recipe recipeInput : inputRecipes) { + for (GTRecipe recipeInput : inputRecipes) { ItemStack savedCircuit = null; // create a new input ItemStack array that does not contain programmable circuits if they were in the recipe ArrayList<ItemStack> itemInputsWithoutProgrammableCircuit = new ArrayList<>(); @@ -37,7 +37,7 @@ public class GT_RecipeUtils { savedCircuit = itemStack; } } - GT_Recipe newRecipe = new GT_Recipe( + GTRecipe newRecipe = new GTRecipe( false, itemInputsWithoutProgrammableCircuit.toArray(new ItemStack[0]), recipeInput.mOutputs, @@ -72,7 +72,7 @@ public class GT_RecipeUtils { } // iterate over all recipes without duplicates and add them to the output. If the recipe had a programmable // circuit in it then add it back with its damage value coming from the circuit map. - for (GT_Recipe filteredRecipe : recipesHashSet) { + for (GTRecipe filteredRecipe : recipesHashSet) { // check to see if the recipe is in the circuit map if (circuitMap.contains(filteredRecipe)) { // add the circuit back diff --git a/src/main/java/gtPlusPlus/core/util/recipe/RecipeHashStrat.java b/src/main/java/gtPlusPlus/core/util/recipe/RecipeHashStrat.java index 18323a4c8b..1a730c9cbf 100644 --- a/src/main/java/gtPlusPlus/core/util/recipe/RecipeHashStrat.java +++ b/src/main/java/gtPlusPlus/core/util/recipe/RecipeHashStrat.java @@ -9,24 +9,24 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import gnu.trove.strategy.HashingStrategy; -import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GTRecipe; public class RecipeHashStrat { - public static final HashingStrategy<GT_Recipe> RecipeHashingStrategy = new HashingStrategy<>() { + public static final HashingStrategy<GTRecipe> RecipeHashingStrategy = new HashingStrategy<>() { @Override - public int computeHashCode(GT_Recipe recipe) { + public int computeHashCode(GTRecipe recipe) { return com.google.common.base.Objects.hashCode(recipe.mDuration, recipe.mEUt); } @Override - public boolean equals(GT_Recipe recipe1, GT_Recipe recipe2) { + public boolean equals(GTRecipe recipe1, GTRecipe recipe2) { return areRecipesEqual(recipe1, recipe2); } }; - public static boolean areRecipesEqual(GT_Recipe recipe1, GT_Recipe recipe2) { + public static boolean areRecipesEqual(GTRecipe recipe1, GTRecipe recipe2) { // both item outputs use a copy to prevent interfering with chance based output orders // sort all the arrays for recipe1 RecipeHashStrat.sortItemStackArray(recipe1.mInputs); diff --git a/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java b/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java index fc02cd8b74..f33d3d90d7 100644 --- a/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java +++ b/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java @@ -5,13 +5,13 @@ import static gtPlusPlus.api.recipe.GTPPRecipeMaps.cokeOvenRecipes; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.enums.GTValues; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; public final class AddGregtechRecipe { - public static boolean importPyroRecipe(GT_Recipe aRecipe) { + public static boolean importPyroRecipe(GTRecipe aRecipe) { int aModifiedTime = (int) (aRecipe.mDuration * 0.8); @@ -29,7 +29,7 @@ public final class AddGregtechRecipe { } int aCircuitNumber = -1; - Item aCircuit = GT_Utility.getIntegratedCircuit(1) + Item aCircuit = GTUtility.getIntegratedCircuit(1) .getItem(); boolean hasCircuit = false; @@ -54,12 +54,12 @@ public final class AddGregtechRecipe { } ItemStack[] inputs; if (aInputItem == null) { - inputs = new ItemStack[] { GT_Utility.getIntegratedCircuit(aCircuitNumber) }; + inputs = new ItemStack[] { GTUtility.getIntegratedCircuit(aCircuitNumber) }; } else { - inputs = new ItemStack[] { GT_Utility.getIntegratedCircuit(aCircuitNumber), aInputItem }; + inputs = new ItemStack[] { GTUtility.getIntegratedCircuit(aCircuitNumber), aInputItem }; } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(inputs) .itemOutputs(aRecipe.mOutputs) .fluidInputs(aRecipe.mFluidInputs) diff --git a/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java b/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java new file mode 100644 index 0000000000..403198d6df --- /dev/null +++ b/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java @@ -0,0 +1,193 @@ +package gtPlusPlus.everglades; + +import static gregtech.api.enums.Mods.GTPlusPlusEverglades; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.File; + +import net.minecraft.block.Block; +import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.common.config.Configuration; + +import bwcrossmod.galacticgreg.MTEVoidMinerBase; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.enums.Mods; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.lib.GTPPCore.Everglades; +import gtPlusPlus.core.material.MaterialGenerator; +import gtPlusPlus.core.material.MaterialsOres; +import gtPlusPlus.everglades.biome.BiomeEverglades; +import gtPlusPlus.everglades.block.DarkWorldContentLoader; +import gtPlusPlus.everglades.dimension.DimensionEverglades; +import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Base; +import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Ore_Layer; +import gtPlusPlus.everglades.gen.gt.WorldGen_Ores; +import gtPlusPlus.preloader.PreloaderCore; +import gtPlusPlus.xmod.gregtech.HandlerGT; +import gtPlusPlus.xmod.gregtech.api.util.GTPPConfig; + +@Mod( + modid = Mods.Names.G_T_PLUS_PLUS_EVERGLADES, + name = Everglades.NAME, + version = Everglades.VERSION, + dependencies = "required-after:Forge; after:dreamcraft; after:IC2; required-after:gregtech; required-after:miscutils;") +public class GTPPEverglades implements ActionListener { + + // Mod Instance + @Mod.Instance(Mods.Names.G_T_PLUS_PLUS_EVERGLADES) + public static GTPPEverglades instance; + + // Dark World Handler + protected static volatile BiomeEverglades Everglades_Biome; + protected static volatile DimensionEverglades Everglades_Dimension; + + // Pre-Init + @Mod.EventHandler + public void preInit(final FMLPreInitializationEvent event) { + Logger.INFO("Loading " + GTPlusPlusEverglades.ID + " V" + Everglades.VERSION); + + // Setup + setVars(event); + + setEvergladesBiome(new BiomeEverglades()); + Everglades_Dimension = new DimensionEverglades(); + + // Load Dark World + getEvergladesBiome().instance = instance; + Everglades_Dimension.instance = instance; + getEvergladesBiome().preInit(event); + + // Load/Set Custom Ore Gen + HandlerGT.sCustomWorldgenFile = new GTPPConfig( + new Configuration( + new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg"))); + } + + @EventHandler + public void load(final FMLInitializationEvent e) { + Logger.INFO("Begin resource allocation for " + GTPlusPlusEverglades.ID + " V" + Everglades.VERSION); + + // Load World and Biome + GameRegistry.registerWorldGenerator(new WorldGen_GT_Base(), Short.MAX_VALUE); + getEvergladesBiome().load(); + Everglades_Dimension.load(); + addToVoidMinerDrops(); + } + + public static synchronized void GenerateOreMaterials() { + MaterialGenerator.generateOreMaterial(MaterialsOres.CROCROITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.GEIKIELITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.NICHROMITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.TITANITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.ZIMBABWEITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.ZIRCONILITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.GADOLINITE_CE); + MaterialGenerator.generateOreMaterial(MaterialsOres.GADOLINITE_Y); + MaterialGenerator.generateOreMaterial(MaterialsOres.LEPERSONNITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.SAMARSKITE_Y); + MaterialGenerator.generateOreMaterial(MaterialsOres.SAMARSKITE_YB); + MaterialGenerator.generateOreMaterial(MaterialsOres.XENOTIME); + MaterialGenerator.generateOreMaterial(MaterialsOres.YTTRIAITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.YTTRIALITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.YTTROCERITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.ZIRCON); + MaterialGenerator.generateOreMaterial(MaterialsOres.POLYCRASE); + MaterialGenerator.generateOreMaterial(MaterialsOres.ZIRCOPHYLLITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.ZIRKELITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.LANTHANITE_LA); + MaterialGenerator.generateOreMaterial(MaterialsOres.LANTHANITE_CE); + MaterialGenerator.generateOreMaterial(MaterialsOres.LANTHANITE_ND); + MaterialGenerator.generateOreMaterial(MaterialsOres.AGARDITE_Y); + MaterialGenerator.generateOreMaterial(MaterialsOres.AGARDITE_CD); + MaterialGenerator.generateOreMaterial(MaterialsOres.AGARDITE_LA); + MaterialGenerator.generateOreMaterial(MaterialsOres.AGARDITE_ND); + MaterialGenerator.generateOreMaterial(MaterialsOres.HIBONITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.CERITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.FLUORCAPHITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.FLORENCITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.CRYOLITE); + + MaterialGenerator.generateOreMaterial(MaterialsOres.LAUTARITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.LAFOSSAITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.DEMICHELEITE_BR); + MaterialGenerator.generateOreMaterial(MaterialsOres.COMANCHEITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.PERROUDITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.HONEAITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.ALBURNITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.MIESSIITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.KASHINITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.IRARSITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.GREENOCKITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.RADIOBARITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.DEEP_EARTH_REACTOR_FUEL_DEPOSIT); + + } + + protected synchronized void setVars(FMLPreInitializationEvent event) { + // Init WorldGen config. + HandlerGT.sCustomWorldgenFile = new GTPPConfig( + new Configuration( + new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg"))); + + if (DimensionManager.isDimensionRegistered(DimensionEverglades.DIMID)) { + DimensionEverglades.DIMID = DimensionManager.getNextFreeDimId(); + } + + /* + * Set World Generation Values + */ + WorldGen_Ores.generateValidOreVeins(); + WorldGen_GT_Base.oreveinPercentage = 64; + WorldGen_GT_Base.oreveinAttempts = 16; + WorldGen_GT_Base.oreveinMaxPlacementAttempts = 4; + if (PreloaderCore.DEBUG_MODE || GTPPCore.DEVENV) { + WorldGen_GT_Base.debugWorldGen = true; + } + DarkWorldContentLoader.run(); + } + + public void addToVoidMinerDrops() { + for (WorldGen_GT_Ore_Layer t : WorldGen_Ores.validOreveins.values()) { + addVMDrop(t.mPrimaryMeta, 0, t.mWeight); + addVMDrop(t.mSecondaryMeta, 0, t.mWeight); + addVMDrop(t.mBetweenMeta, 0, t.mWeight / 8f); + addVMDrop(t.mSporadicMeta, 0, t.mWeight / 8f); + } + } + + public void addVMDrop(Block block, int meta, float weight) { + MTEVoidMinerBase.addBlockToDimensionList(GTPPCore.EVERGLADES_ID, block, meta, weight); + } + + @EventHandler + public void serverLoad(FMLServerStartingEvent event) { + getEvergladesBiome().serverLoad(event); + } + + @EventHandler + public static void postInit(final FMLPostInitializationEvent e) { + Logger.INFO("Finished loading Everglades plugin for GT++."); + } + + public static synchronized BiomeEverglades getEvergladesBiome() { + return Everglades_Biome; + } + + public static synchronized void setEvergladesBiome(BiomeEverglades darkWorld_Biome) { + Everglades_Biome = darkWorld_Biome; + } + + @Override + public void actionPerformed(ActionEvent arg0) { + // TODO Auto-generated method stub + + } +} diff --git a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java deleted file mode 100644 index 3cb8893b16..0000000000 --- a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java +++ /dev/null @@ -1,194 +0,0 @@ -package gtPlusPlus.everglades; - -import static gregtech.api.enums.Mods.GTPlusPlusEverglades; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.File; - -import net.minecraft.block.Block; -import net.minecraftforge.common.DimensionManager; -import net.minecraftforge.common.config.Configuration; - -import com.github.bartimaeusnek.crossmod.galacticgreg.GT_TileEntity_VoidMiner_Base; - -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerStartingEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.Mods; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.CORE.Everglades; -import gtPlusPlus.core.material.MaterialGenerator; -import gtPlusPlus.core.material.ORES; -import gtPlusPlus.everglades.biome.Biome_Everglades; -import gtPlusPlus.everglades.block.DarkWorldContentLoader; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; -import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Base; -import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Ore_Layer; -import gtPlusPlus.everglades.gen.gt.WorldGen_Ores; -import gtPlusPlus.preloader.CORE_Preloader; -import gtPlusPlus.xmod.gregtech.HANDLER_GT; -import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config; - -@Mod( - modid = Mods.Names.G_T_PLUS_PLUS_EVERGLADES, - name = Everglades.NAME, - version = Everglades.VERSION, - dependencies = "required-after:Forge; after:dreamcraft; after:IC2; required-after:gregtech; required-after:miscutils;") -public class GTplusplus_Everglades implements ActionListener { - - // Mod Instance - @Mod.Instance(Mods.Names.G_T_PLUS_PLUS_EVERGLADES) - public static GTplusplus_Everglades instance; - - // Dark World Handler - protected static volatile Biome_Everglades Everglades_Biome; - protected static volatile Dimension_Everglades Everglades_Dimension; - - // Pre-Init - @Mod.EventHandler - public void preInit(final FMLPreInitializationEvent event) { - Logger.INFO("Loading " + GTPlusPlusEverglades.ID + " V" + Everglades.VERSION); - - // Setup - setVars(event); - - setEvergladesBiome(new Biome_Everglades()); - Everglades_Dimension = new Dimension_Everglades(); - - // Load Dark World - getEvergladesBiome().instance = instance; - Everglades_Dimension.instance = instance; - getEvergladesBiome().preInit(event); - - // Load/Set Custom Ore Gen - HANDLER_GT.sCustomWorldgenFile = new GTPP_Config( - new Configuration( - new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg"))); - } - - @EventHandler - public void load(final FMLInitializationEvent e) { - Logger.INFO("Begin resource allocation for " + GTPlusPlusEverglades.ID + " V" + Everglades.VERSION); - - // Load World and Biome - GameRegistry.registerWorldGenerator(new WorldGen_GT_Base(), Short.MAX_VALUE); - getEvergladesBiome().load(); - Everglades_Dimension.load(); - addToVoidMinerDrops(); - } - - public static synchronized void GenerateOreMaterials() { - MaterialGenerator.generateOreMaterial(ORES.CROCROITE); - MaterialGenerator.generateOreMaterial(ORES.GEIKIELITE); - MaterialGenerator.generateOreMaterial(ORES.NICHROMITE); - MaterialGenerator.generateOreMaterial(ORES.TITANITE); - MaterialGenerator.generateOreMaterial(ORES.ZIMBABWEITE); - MaterialGenerator.generateOreMaterial(ORES.ZIRCONILITE); - MaterialGenerator.generateOreMaterial(ORES.GADOLINITE_CE); - MaterialGenerator.generateOreMaterial(ORES.GADOLINITE_Y); - MaterialGenerator.generateOreMaterial(ORES.LEPERSONNITE); - MaterialGenerator.generateOreMaterial(ORES.SAMARSKITE_Y); - MaterialGenerator.generateOreMaterial(ORES.SAMARSKITE_YB); - MaterialGenerator.generateOreMaterial(ORES.XENOTIME); - MaterialGenerator.generateOreMaterial(ORES.YTTRIAITE); - MaterialGenerator.generateOreMaterial(ORES.YTTRIALITE); - MaterialGenerator.generateOreMaterial(ORES.YTTROCERITE); - MaterialGenerator.generateOreMaterial(ORES.ZIRCON); - MaterialGenerator.generateOreMaterial(ORES.POLYCRASE); - MaterialGenerator.generateOreMaterial(ORES.ZIRCOPHYLLITE); - MaterialGenerator.generateOreMaterial(ORES.ZIRKELITE); - MaterialGenerator.generateOreMaterial(ORES.LANTHANITE_LA); - MaterialGenerator.generateOreMaterial(ORES.LANTHANITE_CE); - MaterialGenerator.generateOreMaterial(ORES.LANTHANITE_ND); - MaterialGenerator.generateOreMaterial(ORES.AGARDITE_Y); - MaterialGenerator.generateOreMaterial(ORES.AGARDITE_CD); - MaterialGenerator.generateOreMaterial(ORES.AGARDITE_LA); - MaterialGenerator.generateOreMaterial(ORES.AGARDITE_ND); - MaterialGenerator.generateOreMaterial(ORES.HIBONITE); - MaterialGenerator.generateOreMaterial(ORES.CERITE); - MaterialGenerator.generateOreMaterial(ORES.FLUORCAPHITE); - MaterialGenerator.generateOreMaterial(ORES.FLORENCITE); - MaterialGenerator.generateOreMaterial(ORES.CRYOLITE); - - MaterialGenerator.generateOreMaterial(ORES.LAUTARITE); - MaterialGenerator.generateOreMaterial(ORES.LAFOSSAITE); - MaterialGenerator.generateOreMaterial(ORES.DEMICHELEITE_BR); - MaterialGenerator.generateOreMaterial(ORES.COMANCHEITE); - MaterialGenerator.generateOreMaterial(ORES.PERROUDITE); - MaterialGenerator.generateOreMaterial(ORES.HONEAITE); - MaterialGenerator.generateOreMaterial(ORES.ALBURNITE); - MaterialGenerator.generateOreMaterial(ORES.MIESSIITE); - MaterialGenerator.generateOreMaterial(ORES.KASHINITE); - MaterialGenerator.generateOreMaterial(ORES.IRARSITE); - MaterialGenerator.generateOreMaterial(ORES.GREENOCKITE); - MaterialGenerator.generateOreMaterial(ORES.RADIOBARITE); - MaterialGenerator.generateOreMaterial(ORES.DEEP_EARTH_REACTOR_FUEL_DEPOSIT); - - } - - protected synchronized void setVars(FMLPreInitializationEvent event) { - // Init WorldGen config. - HANDLER_GT.sCustomWorldgenFile = new GTPP_Config( - new Configuration( - new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg"))); - - if (DimensionManager.isDimensionRegistered(Dimension_Everglades.DIMID)) { - Dimension_Everglades.DIMID = DimensionManager.getNextFreeDimId(); - } - - /* - * Set World Generation Values - */ - WorldGen_Ores.generateValidOreVeins(); - WorldGen_GT_Base.oreveinPercentage = 64; - WorldGen_GT_Base.oreveinAttempts = 16; - WorldGen_GT_Base.oreveinMaxPlacementAttempts = 4; - if (CORE_Preloader.DEBUG_MODE || CORE.DEVENV) { - WorldGen_GT_Base.debugWorldGen = true; - } - DarkWorldContentLoader.run(); - } - - public void addToVoidMinerDrops() { - for (WorldGen_GT_Ore_Layer t : WorldGen_Ores.validOreveins.values()) { - addVMDrop(t.mPrimaryMeta, 0, t.mWeight); - addVMDrop(t.mSecondaryMeta, 0, t.mWeight); - addVMDrop(t.mBetweenMeta, 0, t.mWeight / 8f); - addVMDrop(t.mSporadicMeta, 0, t.mWeight / 8f); - } - } - - public void addVMDrop(Block block, int meta, float weight) { - GT_TileEntity_VoidMiner_Base.addBlockToDimensionList(CORE.EVERGLADES_ID, block, meta, weight); - } - - @EventHandler - public void serverLoad(FMLServerStartingEvent event) { - getEvergladesBiome().serverLoad(event); - } - - @EventHandler - public static void postInit(final FMLPostInitializationEvent e) { - Logger.INFO("Finished loading Everglades plugin for GT++."); - } - - public static synchronized Biome_Everglades getEvergladesBiome() { - return Everglades_Biome; - } - - public static synchronized void setEvergladesBiome(Biome_Everglades darkWorld_Biome) { - Everglades_Biome = darkWorld_Biome; - } - - @Override - public void actionPerformed(ActionEvent arg0) { - // TODO Auto-generated method stub - - } -} diff --git a/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java b/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java index f9b57b14c8..8394bd8385 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java +++ b/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java @@ -14,16 +14,16 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.entity.monster.EntitySickBlaze; import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.everglades.dimension.DimensionEverglades; -public class Biome_Everglades { +public class BiomeEverglades { public static BiomeGenEverglades biome = new BiomeGenEverglades(); public Object instance; - public Biome_Everglades() {} + public BiomeEverglades() {} public void load() { BiomeDictionary.registerBiomeType(biome, BiomeDictionary.Type.DEAD); @@ -38,14 +38,14 @@ public class Biome_Everglades { @SuppressWarnings("unchecked") public BiomeGenEverglades() { - super(CORE.EVERGLADESBIOME_ID); + super(GTPPCore.EVERGLADESBIOME_ID); // this.setBiomeID(); - this.theBiomeDecorator = new BiomeGenerator_Custom(); + this.theBiomeDecorator = new CustomBiomeGenerator(); this.theBiomeDecorator.treesPerChunk = 10; // Logger.INFO("Dark World Temperature Category: "+getTempCategory()); this.setBiomeName("Toxic Everglades"); - this.topBlock = Dimension_Everglades.blockTopLayer; - this.fillerBlock = Dimension_Everglades.blockSecondLayer; + this.topBlock = DimensionEverglades.blockTopLayer; + this.fillerBlock = DimensionEverglades.blockSecondLayer; this.enableRain = true; this.enableSnow = false; this.rainfall = 0.7F; diff --git a/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java b/src/main/java/gtPlusPlus/everglades/biome/CustomBiomeGenerator.java index fce5efca36..4df290b560 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java +++ b/src/main/java/gtPlusPlus/everglades/biome/CustomBiomeGenerator.java @@ -46,26 +46,26 @@ import net.minecraftforge.event.terraingen.OreGenEvent; import net.minecraftforge.event.terraingen.TerrainGen; import gtPlusPlus.everglades.gen.WorldGenDeadLilly; -import gtPlusPlus.everglades.gen.WorldGenMinable_Custom; +import gtPlusPlus.everglades.gen.WorldGenMinableCustom; -public class BiomeGenerator_Custom extends BiomeDecorator { +public class CustomBiomeGenerator extends BiomeDecorator { public WorldGenerator fluoriteGen; - public BiomeGenerator_Custom() { + public CustomBiomeGenerator() { // Basic Blocks - this.sandGen = new WorldGenMinable_Custom(Blocks.sand, 12); - this.gravelAsSandGen = new WorldGenMinable_Custom(Blocks.gravel, 8); - this.dirtGen = new WorldGenMinable_Custom(Blocks.dirt, 32); - this.gravelGen = new WorldGenMinable_Custom(Blocks.gravel, 12); + this.sandGen = new WorldGenMinableCustom(Blocks.sand, 12); + this.gravelAsSandGen = new WorldGenMinableCustom(Blocks.gravel, 8); + this.dirtGen = new WorldGenMinableCustom(Blocks.dirt, 32); + this.gravelGen = new WorldGenMinableCustom(Blocks.gravel, 12); // Oregen - this.coalGen = new WorldGenMinable_Custom(Blocks.coal_ore, 16); - this.ironGen = new WorldGenMinable_Custom(Blocks.iron_ore, 12); - this.goldGen = new WorldGenMinable_Custom(Blocks.gold_ore, 12); - this.redstoneGen = new WorldGenMinable_Custom(Blocks.redstone_ore, 10); - this.diamondGen = new WorldGenMinable_Custom(Blocks.diamond_ore, 12); - this.lapisGen = new WorldGenMinable_Custom(Blocks.lapis_ore, 8); + this.coalGen = new WorldGenMinableCustom(Blocks.coal_ore, 16); + this.ironGen = new WorldGenMinableCustom(Blocks.iron_ore, 12); + this.goldGen = new WorldGenMinableCustom(Blocks.gold_ore, 12); + this.redstoneGen = new WorldGenMinableCustom(Blocks.redstone_ore, 10); + this.diamondGen = new WorldGenMinableCustom(Blocks.diamond_ore, 12); + this.lapisGen = new WorldGenMinableCustom(Blocks.lapis_ore, 8); // Nature this.yellowFlowerGen = new WorldGenFlowers(Blocks.yellow_flower); diff --git a/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java b/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java index fe799fbe42..e0c96d88b4 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java +++ b/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java @@ -6,7 +6,7 @@ import net.minecraft.world.gen.layer.IntCache; public class GenLayerBiomes extends GenLayer { - protected BiomeGenBase[] allowedBiomes = { Biome_Everglades.biome, }; + protected BiomeGenBase[] allowedBiomes = { BiomeEverglades.biome, }; public GenLayerBiomes(long seed) { super(seed); diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java index eafa67980d..16ad852e75 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java @@ -21,9 +21,9 @@ import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.BlockPos; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; +import gtPlusPlus.everglades.dimension.DimensionEverglades; import gtPlusPlus.everglades.world.TeleporterDimensionMod; public class BlockEvergladesPortal extends BlockBreakable implements ITileTooltip { @@ -75,7 +75,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti for (BlockPos side : portal.getSurroundingBlocks()) { Block b = side.getBlockAtPos(); - if (b == Dimension_Everglades.blockPortalFrame || b == Dimension_Everglades.portalBlock) { + if (b == DimensionEverglades.blockPortalFrame || b == DimensionEverglades.portalBlock) { blockCount++; } } @@ -135,12 +135,12 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti public boolean tryToCreatePortal(World par1World, int par2, int par3, int par4) { byte b0 = 0; byte b1 = 0; - if (par1World.getBlock(par2 - 1, par3, par4) == Dimension_Everglades.blockPortalFrame - || par1World.getBlock(par2 + 1, par3, par4) == Dimension_Everglades.blockPortalFrame) { + if (par1World.getBlock(par2 - 1, par3, par4) == DimensionEverglades.blockPortalFrame + || par1World.getBlock(par2 + 1, par3, par4) == DimensionEverglades.blockPortalFrame) { b0 = 1; } - if (par1World.getBlock(par2, par3, par4 - 1) == Dimension_Everglades.blockPortalFrame - || par1World.getBlock(par2, par3, par4 + 1) == Dimension_Everglades.blockPortalFrame) { + if (par1World.getBlock(par2, par3, par4 - 1) == DimensionEverglades.blockPortalFrame + || par1World.getBlock(par2, par3, par4 + 1) == DimensionEverglades.blockPortalFrame) { b1 = 1; } if (b0 == b1) { @@ -158,7 +158,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti if (l != -1 && l != 2 || i1 != -1 && i1 != 3) { Block j1 = par1World.getBlock(par2 + b0 * l, par3 + i1, par4 + b1 * l); if (flag) { - if (j1 != Dimension_Everglades.blockPortalFrame) { + if (j1 != DimensionEverglades.blockPortalFrame) { return false; } } @@ -189,7 +189,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti World par1World = portal.world; for (BlockPos side : portal.getSurroundingBlocks()) { Block b = side.getBlockAtPos(); - if (b == Dimension_Everglades.blockPortalFrame || b == Dimension_Everglades.portalBlock) { + if (b == DimensionEverglades.blockPortalFrame || b == DimensionEverglades.portalBlock) { blockCount++; } } @@ -208,22 +208,22 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti for (i1 = y; par1World.getBlock(x, i1 - 1, z) == this; --i1) { ; } - if (par1World.getBlock(x, i1 - 1, z) != Dimension_Everglades.blockPortalFrame) { + if (par1World.getBlock(x, i1 - 1, z) != DimensionEverglades.blockPortalFrame) { par1World.setBlockToAir(x, y, z); } else { int j1; for (j1 = 1; j1 < 4 && par1World.getBlock(x, i1 + j1, z) == this; ++j1) { ; } - if (j1 == 3 && par1World.getBlock(x, i1 + j1, z) == Dimension_Everglades.blockPortalFrame) { + if (j1 == 3 && par1World.getBlock(x, i1 + j1, z) == DimensionEverglades.blockPortalFrame) { boolean flag = par1World.getBlock(x - 1, y, z) == this || par1World.getBlock(x + 1, y, z) == this; boolean flag1 = par1World.getBlock(x, y, z - 1) == this || par1World.getBlock(x, y, z + 1) == this; if (flag && flag1) { par1World.setBlockToAir(x, y, z); } else { - if ((par1World.getBlock(x + b0, y, z + b1) != Dimension_Everglades.blockPortalFrame + if ((par1World.getBlock(x + b0, y, z + b1) != DimensionEverglades.blockPortalFrame || par1World.getBlock(x - b0, y, z - b1) != this) - && (par1World.getBlock(x - b0, y, z - b1) != Dimension_Everglades.blockPortalFrame + && (par1World.getBlock(x - b0, y, z - b1) != DimensionEverglades.blockPortalFrame || par1World.getBlock(x + b0, y, z + b1) != this)) { par1World.setBlockToAir(x, y, z); } @@ -288,14 +288,14 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti && ((par5Entity instanceof EntityPlayerMP thePlayer))) { if (thePlayer.timeUntilPortal > 0) { thePlayer.timeUntilPortal = 100; - } else if (thePlayer.dimension != Dimension_Everglades.DIMID) { + } else if (thePlayer.dimension != DimensionEverglades.DIMID) { thePlayer.timeUntilPortal = 100; thePlayer.mcServer.getConfigurationManager() .transferPlayerToDimension( thePlayer, - Dimension_Everglades.DIMID, + DimensionEverglades.DIMID, new TeleporterDimensionMod( - thePlayer.mcServer.worldServerForDimension(Dimension_Everglades.DIMID))); + thePlayer.mcServer.worldServerForDimension(DimensionEverglades.DIMID))); } else { thePlayer.timeUntilPortal = 100; thePlayer.mcServer.getConfigurationManager() @@ -322,33 +322,33 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti * A randomly called display update to be able to add particles or other items for display */ public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - if (CORE.RANDOM.nextInt(100) == 0) { + if (GTPPCore.RANDOM.nextInt(100) == 0) { par1World.playSound( par2 + 0.5D, par3 + 0.5D, par4 + 0.5D, "portal.portal", 0.5F, - CORE.RANDOM.nextFloat() * 0.4F + 0.8F, + GTPPCore.RANDOM.nextFloat() * 0.4F + 0.8F, false); } for (int l = 0; l < 4; ++l) { - double d0 = par2 + CORE.RANDOM.nextFloat(); - double d1 = par3 + CORE.RANDOM.nextFloat(); - double d2 = par4 + CORE.RANDOM.nextFloat(); + double d0 = par2 + GTPPCore.RANDOM.nextFloat(); + double d1 = par3 + GTPPCore.RANDOM.nextFloat(); + double d2 = par4 + GTPPCore.RANDOM.nextFloat(); double d3 = 0.0D; double d4 = 0.0D; double d5 = 0.0D; - int i1 = CORE.RANDOM.nextInt(2) * 2 - 1; - d3 = (CORE.RANDOM.nextFloat() - 0.5D) * 0.5D; - d4 = (CORE.RANDOM.nextFloat() - 0.5D) * 0.5D; - d5 = (CORE.RANDOM.nextFloat() - 0.5D) * 0.5D; + int i1 = GTPPCore.RANDOM.nextInt(2) * 2 - 1; + d3 = (GTPPCore.RANDOM.nextFloat() - 0.5D) * 0.5D; + d4 = (GTPPCore.RANDOM.nextFloat() - 0.5D) * 0.5D; + d5 = (GTPPCore.RANDOM.nextFloat() - 0.5D) * 0.5D; if (par1World.getBlock(par2 - 1, par3, par4) != this && par1World.getBlock(par2 + 1, par3, par4) != this) { d0 = par2 + 0.5D + 0.25D * i1; - d3 = CORE.RANDOM.nextFloat() * 2.0F * i1; + d3 = GTPPCore.RANDOM.nextFloat() * 2.0F * i1; } else { d2 = par4 + 0.5D + 0.25D * i1; - d5 = CORE.RANDOM.nextFloat() * 2.0F * i1; + d5 = GTPPCore.RANDOM.nextFloat() * 2.0F * i1; } par1World.spawnParticle("reddust", d0 + 0.1D, d1, d2, d3, d4, d5); par1World.spawnParticle("smoke", d0, d1 + 0.1D, d2, 0, 0, 0); diff --git a/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java b/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java index 7cbc1cb5e0..dd6a35d008 100644 --- a/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java +++ b/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java @@ -1,11 +1,11 @@ package gtPlusPlus.everglades.block; -import static gtPlusPlus.everglades.dimension.Dimension_Everglades.blockFluidLakes; -import static gtPlusPlus.everglades.dimension.Dimension_Everglades.blockPortalFrame; -import static gtPlusPlus.everglades.dimension.Dimension_Everglades.blockSecondLayer; -import static gtPlusPlus.everglades.dimension.Dimension_Everglades.blockTopLayer; -import static gtPlusPlus.everglades.dimension.Dimension_Everglades.portalBlock; -import static gtPlusPlus.everglades.dimension.Dimension_Everglades.portalItem; +import static gtPlusPlus.everglades.dimension.DimensionEverglades.blockFluidLakes; +import static gtPlusPlus.everglades.dimension.DimensionEverglades.blockPortalFrame; +import static gtPlusPlus.everglades.dimension.DimensionEverglades.blockSecondLayer; +import static gtPlusPlus.everglades.dimension.DimensionEverglades.blockTopLayer; +import static gtPlusPlus.everglades.dimension.DimensionEverglades.portalBlock; +import static gtPlusPlus.everglades.dimension.DimensionEverglades.portalItem; import net.minecraft.init.Blocks; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java index ad0c601092..f49046cd2b 100644 --- a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java +++ b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java @@ -32,7 +32,7 @@ import net.minecraftforge.event.terraingen.PopulateChunkEvent; import net.minecraftforge.event.terraingen.TerrainGen; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; +import gtPlusPlus.everglades.dimension.DimensionEverglades; public class ChunkProviderModded implements IChunkProvider { @@ -181,11 +181,11 @@ public class ChunkProviderModded implements IChunkProvider { for (int k3 = 0; k3 < 4; ++k3) { if ((d15 += d16) > 0.0D) { - p_147424_3_[j3 += short1] = Dimension_Everglades.blockMainFiller; + p_147424_3_[j3 += short1] = DimensionEverglades.blockMainFiller; } else if (k2 * 8 + l2 < b0) { try { - p_147424_3_[j3 += short1] = Dimension_Everglades.blockFluidLakes; // River Fluid - // . + p_147424_3_[j3 += short1] = DimensionEverglades.blockFluidLakes; // River Fluid + // . } catch (Throwable t) { p_147424_3_[j3 += short1] = Blocks.water; // River Fluid Fallback } @@ -446,8 +446,7 @@ public class ChunkProviderModded implements IChunkProvider { l1 = this.rand.nextInt(256); i2 = l + this.rand.nextInt(16) + 8; try { - (new WorldGenLakes(Dimension_Everglades.blockFluidLakes)) - .generate(this.worldObj, this.rand, k1, l1, i2); + (new WorldGenLakes(DimensionEverglades.blockFluidLakes)).generate(this.worldObj, this.rand, k1, l1, i2); } catch (NullPointerException n) { n.getStackTrace(); (new WorldGenLakes(Blocks.lava)).generate(this.worldObj, this.rand, k1, l1, i2); diff --git a/src/main/java/gtPlusPlus/everglades/dimension/Dimension_Everglades.java b/src/main/java/gtPlusPlus/everglades/dimension/DimensionEverglades.java index 0520c5850b..702a3210a2 100644 --- a/src/main/java/gtPlusPlus/everglades/dimension/Dimension_Everglades.java +++ b/src/main/java/gtPlusPlus/everglades/dimension/DimensionEverglades.java @@ -4,15 +4,15 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraftforge.common.DimensionManager; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.everglades.block.BlockEvergladesPortal; import gtPlusPlus.everglades.item.ItemEvergladesPortalTrigger; import gtPlusPlus.everglades.world.WorldProviderMod; -public class Dimension_Everglades { +public class DimensionEverglades { public Object instance; - public static int DIMID = CORE.EVERGLADES_ID; + public static int DIMID = GTPPCore.EVERGLADES_ID; public static BlockEvergladesPortal portalBlock; public static ItemEvergladesPortalTrigger portalItem; public static Block blockTopLayer; diff --git a/src/main/java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java b/src/main/java/gtPlusPlus/everglades/gen/WorldGenMinableCustom.java index e3ce830f27..0b2062ca88 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java +++ b/src/main/java/gtPlusPlus/everglades/gen/WorldGenMinableCustom.java @@ -1,6 +1,6 @@ package gtPlusPlus.everglades.gen; -import static gtPlusPlus.core.lib.CORE.PI; +import static gtPlusPlus.core.lib.GTPPCore.PI; import java.util.Random; @@ -12,7 +12,7 @@ import net.minecraft.world.gen.feature.WorldGenMinable; import gtPlusPlus.api.objects.Logger; -public class WorldGenMinable_Custom extends WorldGenMinable { +public class WorldGenMinableCustom extends WorldGenMinable { /** The block to generate. */ private Block oreToGenerate; @@ -23,18 +23,18 @@ public class WorldGenMinable_Custom extends WorldGenMinable { /** The meta of the block. */ private int mineableBlockMeta; - public WorldGenMinable_Custom(final Block block, final int count) { + public WorldGenMinableCustom(final Block block, final int count) { super(block, count, Blocks.stone); } - public WorldGenMinable_Custom(final Block block, final int count, final Block target) { + public WorldGenMinableCustom(final Block block, final int count, final Block target) { super(block, count, target); this.oreToGenerate = block; this.numberOfBlocks = count; this.blockToReplace = target; } - public WorldGenMinable_Custom(final Block block, final int meta, final int number, final Block target) { + public WorldGenMinableCustom(final Block block, final int meta, final int number, final Block target) { this(block, number, target); this.mineableBlockMeta = meta; } diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java index a35b528726..9ce91e3e4d 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java @@ -8,7 +8,7 @@ import java.util.concurrent.ConcurrentHashMap; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; -import gtPlusPlus.xmod.gregtech.HANDLER_GT; +import gtPlusPlus.xmod.gregtech.HandlerGT; public abstract class WorldGen_GT { @@ -18,7 +18,7 @@ public abstract class WorldGen_GT { public WorldGen_GT(String aName, List aList, boolean aDefault) { this.mWorldGenName = aName; - this.mEnabled = HANDLER_GT.sCustomWorldgenFile.get("worldgen", this.mWorldGenName, aDefault); + this.mEnabled = HandlerGT.sCustomWorldgenFile.get("worldgen", this.mWorldGenName, aDefault); if (this.mEnabled) { aList.add(this); } @@ -38,7 +38,7 @@ public abstract class WorldGen_GT { String aDimName = aWorld.provider.getDimensionName(); Boolean tAllowed = (Boolean) this.mDimensionMap.get(aDimName); if (tAllowed == null) { - boolean tValue = HANDLER_GT.sCustomWorldgenFile + boolean tValue = HandlerGT.sCustomWorldgenFile .get("worldgen.dimensions." + this.mWorldGenName, aDimName, aDimensionType == aAllowedDimensionType); this.mDimensionMap.put(aDimName, Boolean.valueOf(tValue)); return tValue; diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java index ac93a847fa..d7f0815368 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java @@ -14,12 +14,12 @@ import net.minecraft.world.gen.feature.WorldGenMinable; import cpw.mods.fml.common.IWorldGenerator; import gregtech.api.objects.XSTR; -import gregtech.api.util.GT_Log; -import gregtech.common.GT_Worldgenerator; +import gregtech.api.util.GTLog; +import gregtech.common.GTWorldgenerator; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; -import gtPlusPlus.xmod.gregtech.HANDLER_GT; +import gtPlusPlus.core.material.MaterialsElements; +import gtPlusPlus.everglades.dimension.DimensionEverglades; +import gtPlusPlus.xmod.gregtech.HandlerGT; public class WorldGen_GT_Base implements IWorldGenerator { @@ -60,10 +60,10 @@ public class WorldGen_GT_Base implements IWorldGenerator { 0, 0, 0, - ELEMENT.getInstance().IRON, - ELEMENT.getInstance().IRON, - ELEMENT.getInstance().IRON, - ELEMENT.getInstance().IRON); + MaterialsElements.getInstance().IRON, + MaterialsElements.getInstance().IRON, + MaterialsElements.getInstance().IRON, + MaterialsElements.getInstance().IRON); public static Hashtable<Long, WorldGen_GT_Ore_Layer> validOreveins = new Hashtable<>(1024); @@ -73,21 +73,21 @@ public class WorldGen_GT_Base implements IWorldGenerator { public WorldGen_GT_Base() { if (debugWorldGen) { - GT_Log.out.println("GTPP_Worldgenerator created"); + GTLog.out.println("GTPP_Worldgenerator created"); } } @Override public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) { - if (world.provider.dimensionId == Dimension_Everglades.DIMID) { + if (world.provider.dimensionId == DimensionEverglades.DIMID) { generateSafely(random, chunkX, chunkZ, world, chunkGenerator, chunkProvider); } } public synchronized void generateSafely(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) { - int xDim = Dimension_Everglades.DIMID; + int xDim = DimensionEverglades.DIMID; switch (world.provider.dimensionId) { case -1: // Nether // generateNether(world, random, chunkX * 16, chunkZ * 16); @@ -118,7 +118,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { new XSTR(Math.abs(aRandom.nextInt()) + 1), aX, aZ, - Dimension_Everglades.DIMID, + DimensionEverglades.DIMID, aWorld, aChunkGenerator, aChunkProvider, @@ -127,7 +127,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { } else { Logger.WORLD("Locked List addition. Fail."); } - if (debugWorldGen) GT_Log.out.println( + if (debugWorldGen) GTLog.out.println( "ADD WorldSeed:" + aWorld.getSeed() + " DimId" + aWorld.provider.dimensionId @@ -149,7 +149,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { // chunks get done later. for (int i = 0; i < mList_sS; i++) { WorldGenContainer toRun = (WorldGenContainer) WorldGen_GT_Base.mList.get(0); - if (debugWorldGen) GT_Log.out.println( + if (debugWorldGen) GTLog.out.println( "RUN WorldSeed:" + aWorld.getSeed() + " DimId" + aWorld.provider.dimensionId @@ -269,7 +269,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { } if (debugWorldGen) { - GT_Log.out.println( + GTLog.out.println( " Finding oreveins for oreveinSeed=" + oreveinSeed + " mX=" + this.mX @@ -341,7 +341,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { this.mChunkProvider); switch (placementResult) { case WorldGen_GT_Ore_Layer.ORE_PLACED -> { - if (debugWorldGen) GT_Log.out.println( + if (debugWorldGen) GTLog.out.println( " Added oreveinSeed=" + oreveinSeed + " tries at oremix=" + i @@ -365,7 +365,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { // Orevein didn't reach this chunk, // can't add it yet to the hash Logger.INFO("[World Generation Debug] NO_OVERLAP"); - if (debugWorldGen) GT_Log.out.println( + if (debugWorldGen) GTLog.out.println( " Added far oreveinSeed=" + oreveinSeed + " " + (tWorldGen).mWorldGenName @@ -379,7 +379,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { oreveinFound = true; } case WorldGen_GT_Ore_Layer.NO_OVERLAP_AIR_BLOCK -> { - if (debugWorldGen) GT_Log.out.println( + if (debugWorldGen) GTLog.out.println( " No overlap and air block in test spot=" + oreveinSeed + " " + (tWorldGen).mWorldGenName @@ -396,7 +396,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { } break; // Try the next orevein } catch (Throwable e) { - if (debugWorldGen) GT_Log.out.println( + if (debugWorldGen) GTLog.out.println( "Exception occurred on oreVein" + tWorldGen + " oreveinSeed=" + oreveinSeed @@ -408,7 +408,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { + oreseedX + " oreseedZ=" + oreseedZ); - e.printStackTrace(GT_Log.err); + e.printStackTrace(GTLog.err); } } } @@ -416,7 +416,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { // Only add an empty orevein if are unable to place a vein // at the oreseed chunk. if ((!oreveinFound) && (this.mX == oreseedX) && (this.mZ == oreseedZ)) { - if (debugWorldGen) GT_Log.out.println( + if (debugWorldGen) GTLog.out.println( " Empty oreveinSeed=" + oreveinSeed + " mX=" + this.mX @@ -435,7 +435,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { validOreveins.put(oreveinSeed, noOresInVein); } } else if (oreveinPercentageRoll >= oreveinPercentage) { - if (debugWorldGen) GT_Log.out.println( + if (debugWorldGen) GTLog.out.println( " Skipped oreveinSeed=" + oreveinSeed + " mX=" + this.mX @@ -455,7 +455,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { } } else { // oreseed is located in the previously processed table - if (debugWorldGen) GT_Log.out + if (debugWorldGen) GTLog.out .print(" Valid oreveinSeed=" + oreveinSeed + " validOreveins.size()=" + validOreveins.size() + " "); WorldGen_GT_Ore_Layer tWorldGen = validOreveins.get(oreveinSeed); oreveinRNG.setSeed(oreveinSeed ^ (Block.getIdFromBlock(tWorldGen.mPrimaryMeta))); // Reset @@ -484,10 +484,10 @@ public class WorldGen_GT_Base implements IWorldGenerator { this.mChunkProvider); switch (placementResult) { case WorldGen_GT_Ore_Layer.NO_ORE_IN_BOTTOM_LAYER -> { - if (debugWorldGen) GT_Log.out.println(" No ore in bottom layer"); + if (debugWorldGen) GTLog.out.println(" No ore in bottom layer"); } case WorldGen_GT_Ore_Layer.NO_OVERLAP -> { - if (debugWorldGen) GT_Log.out.println(" No overlap"); + if (debugWorldGen) GTLog.out.println(" No overlap"); } } } @@ -522,8 +522,8 @@ public class WorldGen_GT_Base implements IWorldGenerator { for (int x = wXbox; x < eXbox; x++) { for (int z = nZbox; z < sZbox; z++) { // Determine if this X/Z is an orevein seed - if (GT_Worldgenerator.isOreChunk(x, z)) { - if (debugWorldGen) GT_Log.out.println("Adding seed x=" + x + " z=" + z); + if (GTWorldgenerator.isOreChunk(x, z)) { + if (debugWorldGen) GTLog.out.println("Adding seed x=" + x + " z=" + z); seedList.add(new NearbySeeds(x, z)); } } @@ -532,7 +532,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { // Now process each oreseed vs this requested chunk for (; seedList.size() != 0; seedList.remove(0)) { if (debugWorldGen) - GT_Log.out.println("Processing seed x=" + seedList.get(0).mX + " z=" + seedList.get(0).mZ); + GTLog.out.println("Processing seed x=" + seedList.get(0).mX + " z=" + seedList.get(0).mZ); worldGenFindVein(seedList.get(0).mX, seedList.get(0).mZ); } @@ -540,9 +540,9 @@ public class WorldGen_GT_Base implements IWorldGenerator { // Do leftover worldgen for this chunk (GT_Stones and GT_small_ores) try { - for (WorldGen_GT tWorldGen : HANDLER_GT.sWorldgenListEverglades) { + for (WorldGen_GT tWorldGen : HandlerGT.sWorldgenListEverglades) { /* - * if (debugWorldGen) GT_Log.out.println( "tWorldGen.mWorldGenName="+tWorldGen.mWorldGenName ); + * if (debugWorldGen) GTLog.out.println( "tWorldGen.mWorldGenName="+tWorldGen.mWorldGenName ); */ tWorldGen.executeWorldgen( this.mWorld, @@ -555,7 +555,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { this.mChunkProvider); } } catch (Throwable e) { - e.printStackTrace(GT_Log.err); + e.printStackTrace(GTLog.err); } long leftOverTime = System.nanoTime(); @@ -567,7 +567,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { long endTime = System.nanoTime(); long duration = (endTime - startTime); if (debugWorldGen) { - GT_Log.out.println( + GTLog.out.println( " Oregen took " + (oregenTime - startTime) + " Leftover gen took " + (leftOverTime - oregenTime) diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java index 90aea7b71a..bfeeff8910 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java @@ -15,16 +15,16 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; -import gregtech.api.util.GT_Log; -import gregtech.common.blocks.GT_Block_Ores; -import gregtech.common.blocks.GT_TileEntity_Ores; +import gregtech.api.util.GTLog; +import gregtech.common.blocks.BlockOres; +import gregtech.common.blocks.TileEntityOres; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; -import gtPlusPlus.xmod.gregtech.HANDLER_GT; +import gtPlusPlus.everglades.dimension.DimensionEverglades; +import gtPlusPlus.xmod.gregtech.HandlerGT; public class WorldGen_GT_Ore_Layer extends WorldGen_GT { @@ -85,23 +85,23 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { boolean GC_UNUSED3, Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic) { super(aName, sList, aDefault); Logger.WORLD("Creating Ore Layer Object"); - this.mOverworld = HANDLER_GT.sCustomWorldgenFile + this.mOverworld = HandlerGT.sCustomWorldgenFile .get(aTextWorldgen + this.mWorldGenName, "Overworld", aOverworld); - this.mNether = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Nether", aNether); - this.mEnd = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "TheEnd", aEnd); + this.mNether = HandlerGT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Nether", aNether); + this.mEnd = HandlerGT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "TheEnd", aEnd); this.mMinY = 5; short mMaxY = 14; if (mMaxY < (this.mMinY + 7)) { - GT_Log.out.println("Oremix " + this.mWorldGenName + " has invalid Min/Max heights!"); + GTLog.out.println("Oremix " + this.mWorldGenName + " has invalid Min/Max heights!"); mMaxY = (short) (this.mMinY + 7); } this.mMaxY = mMaxY; - this.mWeight = ((short) HANDLER_GT.sCustomWorldgenFile + this.mWeight = ((short) HandlerGT.sCustomWorldgenFile .get(aTextWorldgen + this.mWorldGenName, "RandomWeight", aWeight)); - this.mDensity = ((short) HANDLER_GT.sCustomWorldgenFile + this.mDensity = ((short) HandlerGT.sCustomWorldgenFile .get(aTextWorldgen + this.mWorldGenName, "Density", aDensity)); this.mSize = ((short) Math - .max(1, HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize))); + .max(1, HandlerGT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize))); this.mPrimary = aPrimary; this.mSecondary = aSecondary; this.mBetween = aBetween; @@ -136,14 +136,14 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { } if (mWorldGenName.equals("vein0")) { - if (debugWorldGen) GT_Log.out.println(" NoOresInVein-vein0"); + if (debugWorldGen) GTLog.out.println(" NoOresInVein-vein0"); // This is a special empty orevein Logger.WORLD("[World Generation Debug] Special Empty Vein placed."); return ORE_PLACED; } - if (aDimensionType != Dimension_Everglades.DIMID) { + if (aDimensionType != DimensionEverglades.DIMID) { /* - * // Debug code, but spams log if (debugWorldGen) { GT_Log.out.println( "Wrong dimension" ); } + * // Debug code, but spams log if (debugWorldGen) { GTLog.out.println( "Wrong dimension" ); } */ Logger.WORLD("[World Generation Debug] Wrong dimension."); return WRONG_DIMENSION; @@ -164,19 +164,19 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { Block tBlock = aWorld.getBlock(aChunkX + 8, tMinY, aChunkZ + 8); if (tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.stone) || tBlock - .isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Dimension_Everglades.blockSecondLayer) + .isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, DimensionEverglades.blockSecondLayer) || tBlock - .isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Dimension_Everglades.blockMainFiller) + .isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, DimensionEverglades.blockMainFiller) || tBlock.isReplaceableOreGen( aWorld, aChunkX + 8, tMinY, aChunkZ + 8, - Dimension_Everglades.blockSecondaryFiller) + DimensionEverglades.blockSecondaryFiller) || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.netherrack) || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.end_stone) - || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTech_API.sBlockGranites) - || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTech_API.sBlockStones)) { + || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTechAPI.sBlockGranites) + || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTechAPI.sBlockStones)) { // Didn't reach, but could have placed. Save orevein for future use. return NO_OVERLAP; } else { @@ -195,8 +195,8 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { if (tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.stone) || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.netherrack) || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.end_stone) - || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTech_API.sBlockGranites) - || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTech_API.sBlockStones)) { + || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTechAPI.sBlockGranites) + || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTechAPI.sBlockStones)) { // Didn't reach, but could have placed. Save orevein for future use. return NO_OVERLAP; } else { @@ -207,7 +207,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { if (debugWorldGen) { String tDimensionName = aWorld.provider.getDimensionName(); - GT_Log.out.print( + GTLog.out.print( "Trying Orevein:" + this.mWorldGenName + " Dimension=" + tDimensionName @@ -254,7 +254,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { } } /* - * if ((placeCount[1]+placeCount[3])==0) { if (debugWorldGen) GT_Log.out.println( " No ore in bottom layer" ); + * if ((placeCount[1]+placeCount[3])==0) { if (debugWorldGen) GTLog.out.println( " No ore in bottom layer" ); * return NO_ORE_IN_BOTTOM_LAYER; // Exit early, didn't place anything in the bottom layer } */ Logger.WORLD("[World Generation Debug] Trying to set Ores?"); @@ -359,7 +359,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { } if (debugWorldGen) { String tDimensionName = aWorld.provider.getDimensionName(); - GT_Log.out.println( + GTLog.out.println( "Generated Orevein:" + this.mWorldGenName + " Dimension=" + tDimensionName @@ -408,7 +408,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { } // Set GT ORE - if (aMetaData instanceof GT_Block_Ores) { + if (aMetaData instanceof BlockOres) { if (ore1String.equals("unset")) { ore1String = Utils.sanitizeString( this.mPrimary.getLocalizedName() @@ -527,11 +527,11 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone) || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.sand) || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.dirt) - || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockGranites) - || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockStones) - || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_Everglades.blockSecondLayer) - || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_Everglades.blockMainFiller) - || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_Everglades.blockSecondaryFiller) + || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTechAPI.sBlockGranites) + || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTechAPI.sBlockStones) + || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, DimensionEverglades.blockSecondLayer) + || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, DimensionEverglades.blockMainFiller) + || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, DimensionEverglades.blockSecondaryFiller) || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.sandstone)) { if (aWorld.setBlock(aX, aY, aZ, tOreBlock, 0, 3)) { @@ -550,7 +550,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { Method setOres = null; try { - setOres = GT_TileEntity_Ores.class.getDeclaredMethod( + setOres = TileEntityOres.class.getDeclaredMethod( "setOreBlock", World.class, int.class, diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java index e45b4bcd20..6ccdcaf115 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java @@ -2,9 +2,9 @@ package gtPlusPlus.everglades.gen.gt; import java.util.Hashtable; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.ORES; -import gtPlusPlus.core.material.nuclear.FLUORIDES; +import gtPlusPlus.core.material.MaterialsElements; +import gtPlusPlus.core.material.MaterialsOres; +import gtPlusPlus.core.material.nuclear.MaterialsFluorides; public class WorldGen_Ores { @@ -15,10 +15,10 @@ public class WorldGen_Ores { 1, 1, 128, - ELEMENT.getInstance().IRON, - ELEMENT.getInstance().IRON, - ELEMENT.getInstance().IRON, - ELEMENT.getInstance().IRON); + MaterialsElements.getInstance().IRON, + MaterialsElements.getInstance().IRON, + MaterialsElements.getInstance().IRON, + MaterialsElements.getInstance().IRON); /** * Custom ore Veins @@ -30,10 +30,10 @@ public class WorldGen_Ores { 30, 2, 16, - ORES.AGARDITE_CD, - ORES.AGARDITE_LA, - ORES.DEMICHELEITE_BR, - ORES.IRARSITE); + MaterialsOres.AGARDITE_CD, + MaterialsOres.AGARDITE_LA, + MaterialsOres.DEMICHELEITE_BR, + MaterialsOres.IRARSITE); public static WorldGen_GT_Ore_Layer Vein2 = new WorldGen_GT_Ore_Layer( "vein2", @@ -42,10 +42,10 @@ public class WorldGen_Ores { 30, 2, 16, - ORES.AGARDITE_ND, - ORES.AGARDITE_Y, - ORES.KASHINITE, - ORES.CERITE); + MaterialsOres.AGARDITE_ND, + MaterialsOres.AGARDITE_Y, + MaterialsOres.KASHINITE, + MaterialsOres.CERITE); public static WorldGen_GT_Ore_Layer Vein3 = new WorldGen_GT_Ore_Layer( "vein3", @@ -54,10 +54,10 @@ public class WorldGen_Ores { 30, 3, 32, - ORES.CERITE, - ORES.NICHROMITE, - ORES.XENOTIME, - ORES.HIBONITE); + MaterialsOres.CERITE, + MaterialsOres.NICHROMITE, + MaterialsOres.XENOTIME, + MaterialsOres.HIBONITE); public static WorldGen_GT_Ore_Layer Vein4 = new WorldGen_GT_Ore_Layer( "vein4", @@ -66,10 +66,10 @@ public class WorldGen_Ores { 40, 3, 32, - ORES.GEIKIELITE, - ORES.CRYOLITE, - ORES.GADOLINITE_CE, - ORES.AGARDITE_ND); + MaterialsOres.GEIKIELITE, + MaterialsOres.CRYOLITE, + MaterialsOres.GADOLINITE_CE, + MaterialsOres.AGARDITE_ND); public static WorldGen_GT_Ore_Layer Vein5 = new WorldGen_GT_Ore_Layer( "vein5", @@ -78,10 +78,10 @@ public class WorldGen_Ores { 20, 2, 48, - ORES.HIBONITE, - ORES.YTTRIALITE, - ORES.ZIRCONILITE, - ORES.CERITE); + MaterialsOres.HIBONITE, + MaterialsOres.YTTRIALITE, + MaterialsOres.ZIRCONILITE, + MaterialsOres.CERITE); public static WorldGen_GT_Ore_Layer Vein6 = new WorldGen_GT_Ore_Layer( "vein6", 0, @@ -89,10 +89,10 @@ public class WorldGen_Ores { 20, 2, 48, - ORES.XENOTIME, - ORES.ZIRKELITE, - ORES.CROCROITE, - ORES.IRARSITE); + MaterialsOres.XENOTIME, + MaterialsOres.ZIRKELITE, + MaterialsOres.CROCROITE, + MaterialsOres.IRARSITE); public static WorldGen_GT_Ore_Layer Vein7 = new WorldGen_GT_Ore_Layer( "vein7", 40, @@ -100,10 +100,10 @@ public class WorldGen_Ores { 20, 2, 48, - ORES.HONEAITE, - ORES.MIESSIITE, - ORES.SAMARSKITE_Y, - ORES.SAMARSKITE_YB); + MaterialsOres.HONEAITE, + MaterialsOres.MIESSIITE, + MaterialsOres.SAMARSKITE_Y, + MaterialsOres.SAMARSKITE_YB); public static WorldGen_GT_Ore_Layer Vein8 = new WorldGen_GT_Ore_Layer( "vein8", 0, @@ -111,10 +111,10 @@ public class WorldGen_Ores { 20, 2, 48, - ORES.TITANITE, - ORES.ZIMBABWEITE, - ORES.ZIRCON, - ORES.FLORENCITE); + MaterialsOres.TITANITE, + MaterialsOres.ZIMBABWEITE, + MaterialsOres.ZIRCON, + MaterialsOres.FLORENCITE); public static WorldGen_GT_Ore_Layer Vein9 = new WorldGen_GT_Ore_Layer( "vein9", @@ -123,10 +123,10 @@ public class WorldGen_Ores { 20, 1, 48, - ORES.LANTHANITE_CE, - FLUORIDES.FLUORITE, - ORES.LAFOSSAITE, - ORES.FLORENCITE); + MaterialsOres.LANTHANITE_CE, + MaterialsFluorides.FLUORITE, + MaterialsOres.LAFOSSAITE, + MaterialsOres.FLORENCITE); public static WorldGen_GT_Ore_Layer Vein10 = new WorldGen_GT_Ore_Layer( "vein10", 20, @@ -134,10 +134,10 @@ public class WorldGen_Ores { 20, 2, 32, - ORES.GEIKIELITE, - ORES.YTTROCERITE, - ORES.LANTHANITE_LA, - ORES.RADIOBARITE); + MaterialsOres.GEIKIELITE, + MaterialsOres.YTTROCERITE, + MaterialsOres.LANTHANITE_LA, + MaterialsOres.RADIOBARITE); public static WorldGen_GT_Ore_Layer Vein11 = new WorldGen_GT_Ore_Layer( "vein11", 30, @@ -145,10 +145,10 @@ public class WorldGen_Ores { 20, 1, 48, - FLUORIDES.FLUORITE, - ORES.KASHINITE, - ORES.ZIRCON, - ORES.CRYOLITE); + MaterialsFluorides.FLUORITE, + MaterialsOres.KASHINITE, + MaterialsOres.ZIRCON, + MaterialsOres.CRYOLITE); public static WorldGen_GT_Ore_Layer Vein12 = new WorldGen_GT_Ore_Layer( "vein12", 40, @@ -156,10 +156,10 @@ public class WorldGen_Ores { 20, 3, 32, - ORES.CERITE, - ORES.ALBURNITE, - ORES.MIESSIITE, - ORES.HIBONITE); + MaterialsOres.CERITE, + MaterialsOres.ALBURNITE, + MaterialsOres.MIESSIITE, + MaterialsOres.HIBONITE); /** * Best Rarest Veins 2017 @@ -171,10 +171,10 @@ public class WorldGen_Ores { 5, 1, 16, - ORES.CRYOLITE, - ORES.RADIOBARITE, - ORES.HONEAITE, - ORES.FLORENCITE); + MaterialsOres.CRYOLITE, + MaterialsOres.RADIOBARITE, + MaterialsOres.HONEAITE, + MaterialsOres.FLORENCITE); public static WorldGen_GT_Ore_Layer Vein14 = new WorldGen_GT_Ore_Layer( "vein14", @@ -183,10 +183,10 @@ public class WorldGen_Ores { 8, 2, 16, - ORES.DEMICHELEITE_BR, - ORES.PERROUDITE, - ORES.IRARSITE, - ORES.RADIOBARITE); + MaterialsOres.DEMICHELEITE_BR, + MaterialsOres.PERROUDITE, + MaterialsOres.IRARSITE, + MaterialsOres.RADIOBARITE); public static WorldGen_GT_Ore_Layer Vein15 = new WorldGen_GT_Ore_Layer( "vein15", @@ -195,10 +195,10 @@ public class WorldGen_Ores { 5, 3, 24, - ORES.FLUORCAPHITE, - ORES.LAFOSSAITE, - ORES.GADOLINITE_CE, - ORES.GADOLINITE_Y); + MaterialsOres.FLUORCAPHITE, + MaterialsOres.LAFOSSAITE, + MaterialsOres.GADOLINITE_CE, + MaterialsOres.GADOLINITE_Y); public static WorldGen_GT_Ore_Layer Vein16 = new WorldGen_GT_Ore_Layer( "vein16", @@ -207,10 +207,10 @@ public class WorldGen_Ores { 4, 2, 32, - ORES.YTTROCERITE, - ORES.LEPERSONNITE, - ORES.LAUTARITE, - FLUORIDES.FLUORITE); + MaterialsOres.YTTROCERITE, + MaterialsOres.LEPERSONNITE, + MaterialsOres.LAUTARITE, + MaterialsFluorides.FLUORITE); public static WorldGen_GT_Ore_Layer Vein17 = new WorldGen_GT_Ore_Layer( "vein17", @@ -219,10 +219,10 @@ public class WorldGen_Ores { 4, 1, 32, - ORES.FLORENCITE, - ORES.LAUTARITE, - ORES.SAMARSKITE_YB, - ORES.POLYCRASE); + MaterialsOres.FLORENCITE, + MaterialsOres.LAUTARITE, + MaterialsOres.SAMARSKITE_YB, + MaterialsOres.POLYCRASE); public static WorldGen_GT_Ore_Layer Vein18 = new WorldGen_GT_Ore_Layer( "vein18", 15, @@ -230,10 +230,10 @@ public class WorldGen_Ores { 4, 1, 48, - ORES.GADOLINITE_CE, - ORES.GADOLINITE_Y, - ORES.AGARDITE_LA, - ORES.AGARDITE_CD); + MaterialsOres.GADOLINITE_CE, + MaterialsOres.GADOLINITE_Y, + MaterialsOres.AGARDITE_LA, + MaterialsOres.AGARDITE_CD); public static Hashtable<Long, WorldGen_GT_Ore_Layer> validOreveins = new Hashtable<>(1024); diff --git a/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java b/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java index be15c2a0d2..a39a863cfc 100644 --- a/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java +++ b/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java @@ -16,7 +16,7 @@ import net.minecraft.world.World; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; +import gtPlusPlus.everglades.dimension.DimensionEverglades; public class ItemEvergladesPortalTrigger extends Item { @@ -99,7 +99,7 @@ public class ItemEvergladesPortalTrigger extends Item { "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); - if (Dimension_Everglades.portalBlock.tryToCreatePortal(par3World, par4, par5, par6)) { + if (DimensionEverglades.portalBlock.tryToCreatePortal(par3World, par4, par5, par6)) { // Make a Portal } else { if (!par3World.isRemote) { diff --git a/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java index 51f549ad9c..7e463e194c 100644 --- a/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java +++ b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java @@ -15,7 +15,7 @@ import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.Teleporter; import net.minecraft.world.WorldServer; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; +import gtPlusPlus.everglades.dimension.DimensionEverglades; public class TeleporterDimensionMod extends Teleporter { @@ -66,7 +66,7 @@ public class TeleporterDimensionMod extends Teleporter { int i2 = k + i1 * b1 - l * b0; boolean flag = j1 < 0; this.worldServerInstance - .setBlock(k1, l1, i2, flag ? Dimension_Everglades.blockPortalFrame : Blocks.air); + .setBlock(k1, l1, i2, flag ? DimensionEverglades.blockPortalFrame : Blocks.air); } } } @@ -110,9 +110,9 @@ public class TeleporterDimensionMod extends Teleporter { double d5 = l1 + 0.5D - par1Entity.posZ; for (int i2 = this.worldServerInstance.getActualHeight() - 1; i2 >= 0; --i2) { - if (this.worldServerInstance.getBlock(l3, i2, l1) == Dimension_Everglades.portalBlock) { + if (this.worldServerInstance.getBlock(l3, i2, l1) == DimensionEverglades.portalBlock) { while (this.worldServerInstance.getBlock(l3, i2 - 1, l1) - == Dimension_Everglades.portalBlock) { + == DimensionEverglades.portalBlock) { --i2; } @@ -143,19 +143,19 @@ public class TeleporterDimensionMod extends Teleporter { d7 = k + 0.5D; int i4 = -1; - if (this.worldServerInstance.getBlock(i - 1, j, k) == Dimension_Everglades.portalBlock) { + if (this.worldServerInstance.getBlock(i - 1, j, k) == DimensionEverglades.portalBlock) { i4 = 2; } - if (this.worldServerInstance.getBlock(i + 1, j, k) == Dimension_Everglades.portalBlock) { + if (this.worldServerInstance.getBlock(i + 1, j, k) == DimensionEverglades.portalBlock) { i4 = 0; } - if (this.worldServerInstance.getBlock(i, j, k - 1) == Dimension_Everglades.portalBlock) { + if (this.worldServerInstance.getBlock(i, j, k - 1) == DimensionEverglades.portalBlock) { i4 = 3; } - if (this.worldServerInstance.getBlock(i, j, k + 1) == Dimension_Everglades.portalBlock) { + if (this.worldServerInstance.getBlock(i, j, k + 1) == DimensionEverglades.portalBlock) { i4 = 1; } @@ -396,7 +396,7 @@ public class TeleporterDimensionMod extends Teleporter { j4 = k2 + (j3 - 1) * l2 - i3 * l5; flag = k3 < 0; this.worldServerInstance - .setBlock(l3, i4, j4, flag ? Dimension_Everglades.blockPortalFrame : Blocks.air); + .setBlock(l3, i4, j4, flag ? DimensionEverglades.blockPortalFrame : Blocks.air); } } } @@ -413,7 +413,7 @@ public class TeleporterDimensionMod extends Teleporter { l3, i4, j4, - flag ? Dimension_Everglades.blockPortalFrame : Dimension_Everglades.portalBlock, + flag ? DimensionEverglades.blockPortalFrame : DimensionEverglades.portalBlock, 0, 2); } diff --git a/src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java b/src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java index c8a69a3b0e..2b36246e49 100644 --- a/src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java +++ b/src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java @@ -8,7 +8,7 @@ import net.minecraft.world.chunk.IChunkProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.everglades.chunk.ChunkProviderModded; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; +import gtPlusPlus.everglades.dimension.DimensionEverglades; public class WorldProviderMod extends WorldProvider { @@ -17,7 +17,7 @@ public class WorldProviderMod extends WorldProvider { this.worldChunkMgr = new WorldChunkManagerCustom(this.worldObj.getSeed(), WorldType.AMPLIFIED); this.isHellWorld = false; this.hasNoSky = false; - this.dimensionId = Dimension_Everglades.DIMID; + this.dimensionId = DimensionEverglades.DIMID; } @Override diff --git a/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java b/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java index fc54fd76d5..3563c7a040 100644 --- a/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java +++ b/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java @@ -14,7 +14,7 @@ import net.minecraft.util.StatCollector; import codechicken.lib.gui.GuiDraw; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.handler.Recipes.DecayableRecipe; import gtPlusPlus.core.item.base.dusts.BaseItemDustUnique; import gtPlusPlus.core.item.materials.DustDecayable; @@ -65,7 +65,7 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler { if (recipe.isValid()) { final ItemStack input = recipe.mInput.copy(); final ItemStack output = recipe.mOutput.copy(); - if (!GT_Utility.areStacksEqual(result, output, true)) { + if (!GTUtility.areStacksEqual(result, output, true)) { continue; } // Logger.INFO("Showing Usage result for "+ItemUtils.getItemName(result)); @@ -104,7 +104,7 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler { if (recipe.isValid()) { final ItemStack input = recipe.mInput.copy(); final ItemStack output = recipe.mOutput.copy(); - if (!GT_Utility.areStacksEqual(ingredient, input, true)) { + if (!GTUtility.areStacksEqual(ingredient, input, true)) { continue; } // Logger.INFO("Showing up Usage results for "+ItemUtils.getItemName(ingredient)); @@ -251,8 +251,8 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler { if (p.time == this.time) { ItemStack aInput = p.input.item; ItemStack aOutput = p.output.item; - if (GT_Utility.areStacksEqual(aInput, this.input.item, true)) { - if (GT_Utility.areStacksEqual(aOutput, this.output.item, true)) { + if (GTUtility.areStacksEqual(aInput, this.input.item, true)) { + if (GTUtility.areStacksEqual(aOutput, this.output.item, true)) { return true; } } diff --git a/src/main/java/gtPlusPlus/nei/NEI_GTPP_Config.java b/src/main/java/gtPlusPlus/nei/GTPPNEIConfig.java index 16cc1e8cbf..1cd6a2acb6 100644 --- a/src/main/java/gtPlusPlus/nei/NEI_GTPP_Config.java +++ b/src/main/java/gtPlusPlus/nei/GTPPNEIConfig.java @@ -14,12 +14,12 @@ import gregtech.api.recipe.RecipeMaps; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -public class NEI_GTPP_Config implements IConfigureNEI { +public class GTPPNEIConfig implements IConfigureNEI { public static boolean sIsAdded = true; @@ -32,8 +32,8 @@ public class NEI_GTPP_Config implements IConfigureNEI { API.registerUsageHandler(new DecayableRecipeHandler()); API.addRecipeCatalyst(new ItemStack(ModBlocks.blockDecayablesChest, 1), "GTPP_Decayables"); - Logger.INFO("NEI Registration: Registering NEI handler for " + GT_NEI_LFTR_Sparging.mNEIName); - new GT_NEI_LFTR_Sparging(); + Logger.INFO("NEI Registration: Registering NEI handler for " + LFTRSpargingNEIHandler.mNEIName); + new LFTRSpargingNEIHandler(); API.addRecipeCatalyst(GregtechItemList.Controller_Sparge_Tower.get(1), "gtpp.recipe.lftr.sparging"); for (GregtechItemList item : Arrays.asList( @@ -82,7 +82,7 @@ public class NEI_GTPP_Config implements IConfigureNEI { @SubscribeEvent public void registerHandlerInfo(NEIRegisterHandlerInfosEvent event) { event.registerHandlerInfo( - new HandlerInfo.Builder("gtpp.recipe.lftr.sparging", CORE.name, Mods.GTPlusPlus.ID) + new HandlerInfo.Builder("gtpp.recipe.lftr.sparging", GTPPCore.name, Mods.GTPlusPlus.ID) .setDisplayStack(GregtechItemList.Controller_Sparge_Tower.get(1)) .setShiftY(6) .setHeight(135) diff --git a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java b/src/main/java/gtPlusPlus/nei/LFTRSpargingNEIHandler.java index c7c657f04a..37a578f718 100644 --- a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java +++ b/src/main/java/gtPlusPlus/nei/LFTRSpargingNEIHandler.java @@ -21,31 +21,31 @@ import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.GuiUsageRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; import cpw.mods.fml.common.event.FMLInterModComms; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.ItemData; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gregtech.api.util.GasSpargingRecipe; import gregtech.api.util.GasSpargingRecipeMap; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { +public class LFTRSpargingNEIHandler extends TemplateRecipeHandler { public static final String mNEIName = GasSpargingRecipeMap.mNEIDisplayName; private SoftReference<List<GasSpargingRecipeNEI>> mCachedRecipes = null; - public GT_NEI_LFTR_Sparging() { + public LFTRSpargingNEIHandler() { this.transferRects.add( new TemplateRecipeHandler.RecipeTransferRect( new Rectangle(65, 13, 36, 18), this.getOverlayIdentifier(), new Object[0])); - if (!NEI_GTPP_Config.sIsAdded) { + if (!GTPPNEIConfig.sIsAdded) { FMLInterModComms.sendRuntimeMessage( - GT_Values.GT, + GTValues.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); @@ -117,25 +117,25 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { @Override public void loadCraftingRecipes(ItemStack aResult) { - ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult); + ItemData tPrefixMaterial = GTOreDictUnificator.getAssociation(aResult); ArrayList<ItemStack> tResults = new ArrayList<>(); tResults.add(aResult); - tResults.add(GT_OreDictUnificator.get(true, aResult)); + tResults.add(GTOreDictUnificator.get(true, aResult)); if ((tPrefixMaterial != null) && (!tPrefixMaterial.mBlackListed) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { - tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); + tResults.add(GTOreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); } } - FluidStack tFluid = GT_Utility.getFluidForFilledItem(aResult, true); + FluidStack tFluid = GTUtility.getFluidForFilledItem(aResult, true); FluidStack tFluidStack; if (tFluid != null) { tFluidStack = tFluid; - tResults.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - } else tFluidStack = GT_Utility.getFluidFromDisplayStack(aResult); + tResults.add(GTUtility.getFluidDisplayStack(tFluid, false)); + } else tFluidStack = GTUtility.getFluidFromDisplayStack(aResult); if (tFluidStack != null) { - tResults.addAll(GT_Utility.getContainersFromFluid(tFluidStack)); + tResults.addAll(GTUtility.getContainersFromFluid(tFluidStack)); } for (GasSpargingRecipeNEI recipe : getCache()) { if (tResults.stream() @@ -145,24 +145,24 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { @Override public void loadUsageRecipes(ItemStack aInput) { - ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput); + ItemData tPrefixMaterial = GTOreDictUnificator.getAssociation(aInput); ArrayList<ItemStack> tInputs = new ArrayList<>(); tInputs.add(aInput); - tInputs.add(GT_OreDictUnificator.get(false, aInput)); + tInputs.add(GTOreDictUnificator.get(false, aInput)); if ((tPrefixMaterial != null) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { - tInputs.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); + tInputs.add(GTOreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); } } - FluidStack tFluid = GT_Utility.getFluidForFilledItem(aInput, true); + FluidStack tFluid = GTUtility.getFluidForFilledItem(aInput, true); FluidStack tFluidStack; if (tFluid != null) { tFluidStack = tFluid; - tInputs.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - } else tFluidStack = GT_Utility.getFluidFromDisplayStack(aInput); + tInputs.add(GTUtility.getFluidDisplayStack(tFluid, false)); + } else tFluidStack = GTUtility.getFluidFromDisplayStack(aInput); if (tFluidStack != null) { - tInputs.addAll(GT_Utility.getContainersFromFluid(tFluidStack)); + tInputs.addAll(GTUtility.getContainersFromFluid(tFluidStack)); } for (GasSpargingRecipeNEI recipe : getCache()) { if (tInputs.stream() @@ -199,10 +199,10 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { for (final PositionedStack tStack : tRecipe.mOutputs) { if (aStack == tStack.item) { if (ItemList.Display_Fluid.isStackEqual(tStack.item, true, true)) { - if (GT_Utility.areStacksEqual(aStack, aSpentFuel, true)) { + if (GTUtility.areStacksEqual(aStack, aSpentFuel, true)) { break; } - if (GT_Utility.areStacksEqual(aStack, aSpargeInput, true)) { + if (GTUtility.areStacksEqual(aStack, aSpargeInput, true)) { currenttip.add("The amount returned is the remainder after all other outputs."); } currenttip.add( @@ -218,7 +218,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { } } for (final PositionedStack tStack : tRecipe.mInputs) { - if (GT_Utility.areStacksEqual(aStack, tStack.item)) { + if (GTUtility.areStacksEqual(aStack, tStack.item)) { if ((gregtech.api.enums.ItemList.Display_Fluid.isStackEqual(tStack.item, true, true)) || (tStack.item.stackSize != 0)) { break; @@ -254,13 +254,13 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { } final ArrayList<ItemStack> tDisplayStacks = new ArrayList<>(); for (final ItemStack tStack : this.items) { - if (GT_Utility.isStackValid(tStack)) { + if (GTUtility.isStackValid(tStack)) { if (tStack.getItemDamage() == 32767) { final List<ItemStack> permutations = codechicken.nei.ItemList.itemMap.get(tStack.getItem()); if (!permutations.isEmpty()) { ItemStack stack; for (final Iterator<ItemStack> i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks - .add(GT_Utility.copyAmount(tStack.stackSize, new Object[] { stack }))) { + .add(GTUtility.copyAmount(tStack.stackSize, new Object[] { stack }))) { stack = i$.next(); } } else { @@ -269,7 +269,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { tDisplayStacks.add(base); } } else { - tDisplayStacks.add(GT_Utility.copy(new Object[] { tStack })); + tDisplayStacks.add(GTUtility.copy(new Object[] { tStack })); } } } @@ -295,32 +295,23 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { if (tRecipe.mFluidInputs.length > 0) { if ((tRecipe.mFluidInputs[0] != null) && (tRecipe.mFluidInputs[0].getFluid() != null)) { this.mInputs.add( - new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[0], true), - 30, - 5)); + new FixedPositionedStack(GTUtility.getFluidDisplayStack(tRecipe.mFluidInputs[0], true), 30, 5)); } if ((tRecipe.mFluidInputs.length > 1) && (tRecipe.mFluidInputs[1] != null) && (tRecipe.mFluidInputs[1].getFluid() != null)) { this.mInputs.add( - new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[1], true), - 12, - 5)); + new FixedPositionedStack(GTUtility.getFluidDisplayStack(tRecipe.mFluidInputs[1], true), 12, 5)); } if ((tRecipe.mFluidInputs.length > 2) && (tRecipe.mFluidInputs[2] != null) && (tRecipe.mFluidInputs[2].getFluid() != null)) { this.mInputs.add( - new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[2], true), - 48, - 5)); + new FixedPositionedStack(GTUtility.getFluidDisplayStack(tRecipe.mFluidInputs[2], true), 48, 5)); } if ((tRecipe.mFluidInputs.length > 3) && (tRecipe.mFluidInputs[3] != null) && (tRecipe.mFluidInputs[3].getFluid() != null)) { this.mInputs.add( new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[3], true), + GTUtility.getFluidDisplayStack(tRecipe.mFluidInputs[3], true), 12, 23)); } @@ -328,7 +319,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { && (tRecipe.mFluidInputs[4].getFluid() != null)) { this.mInputs.add( new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[4], true), + GTUtility.getFluidDisplayStack(tRecipe.mFluidInputs[4], true), 30, 23)); } @@ -336,7 +327,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { && (tRecipe.mFluidInputs[5].getFluid() != null)) { this.mInputs.add( new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[5], true), + GTUtility.getFluidDisplayStack(tRecipe.mFluidInputs[5], true), 48, 23)); } @@ -344,7 +335,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { && (tRecipe.mFluidInputs[6].getFluid() != null)) { this.mInputs.add( new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[6], true), + GTUtility.getFluidDisplayStack(tRecipe.mFluidInputs[6], true), 12, 41)); } @@ -352,7 +343,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { && (tRecipe.mFluidInputs[7].getFluid() != null)) { this.mInputs.add( new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[7], true), + GTUtility.getFluidDisplayStack(tRecipe.mFluidInputs[7], true), 30, 41)); } @@ -360,7 +351,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { && (tRecipe.mFluidInputs[8].getFluid() != null)) { this.mInputs.add( new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[8], true), + GTUtility.getFluidDisplayStack(tRecipe.mFluidInputs[8], true), 48, 41)); } @@ -371,7 +362,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { if ((tRecipe.mFluidOutputs[0] != null) && (tRecipe.mFluidOutputs[0].getFluid() != null)) { this.mOutputs.add( new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[0], false), + GTUtility.getFluidDisplayStack(tRecipe.mFluidOutputs[0], false), 120, 5, tRecipe.getMaxOutput(tStartIndex++))); @@ -380,7 +371,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { && (tRecipe.mFluidOutputs[1].getFluid() != null)) { this.mOutputs.add( new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[1], true), + GTUtility.getFluidDisplayStack(tRecipe.mFluidOutputs[1], true), 102, 5, tRecipe.getMaxOutput(tStartIndex++))); @@ -389,7 +380,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { && (tRecipe.mFluidOutputs[2].getFluid() != null)) { this.mOutputs.add( new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[2], false), + GTUtility.getFluidDisplayStack(tRecipe.mFluidOutputs[2], false), 138, 5, tRecipe.getMaxOutput(tStartIndex++))); @@ -398,7 +389,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { && (tRecipe.mFluidOutputs[3].getFluid() != null)) { this.mOutputs.add( new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[3], false), + GTUtility.getFluidDisplayStack(tRecipe.mFluidOutputs[3], false), 102, 23, tRecipe.getMaxOutput(tStartIndex++))); @@ -407,7 +398,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { && (tRecipe.mFluidOutputs[4].getFluid() != null)) { this.mOutputs.add( new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[4], false), + GTUtility.getFluidDisplayStack(tRecipe.mFluidOutputs[4], false), 120, 23, tRecipe.getMaxOutput(tStartIndex++))); @@ -416,7 +407,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { && (tRecipe.mFluidOutputs[5].getFluid() != null)) { this.mOutputs.add( new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[5], false), + GTUtility.getFluidDisplayStack(tRecipe.mFluidOutputs[5], false), 138, 23, tRecipe.getMaxOutput(tStartIndex++))); @@ -425,7 +416,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { && (tRecipe.mFluidOutputs[6].getFluid() != null)) { this.mOutputs.add( new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[6], false), + GTUtility.getFluidDisplayStack(tRecipe.mFluidOutputs[6], false), 102, 41, tRecipe.getMaxOutput(tStartIndex++))); @@ -434,7 +425,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { && (tRecipe.mFluidOutputs[7].getFluid() != null)) { this.mOutputs.add( new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[7], false), + GTUtility.getFluidDisplayStack(tRecipe.mFluidOutputs[7], false), 120, 41, tRecipe.getMaxOutput(tStartIndex++))); @@ -443,7 +434,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { && (tRecipe.mFluidOutputs[8].getFluid() != null)) { this.mOutputs.add( new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[8], false), + GTUtility.getFluidDisplayStack(tRecipe.mFluidOutputs[8], false), 138, 41, tRecipe.getMaxOutput(tStartIndex++))); @@ -473,7 +464,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { if (GasSpargingRecipeNEI.class.isInstance(obj)) { GasSpargingRecipeNEI p = (GasSpargingRecipeNEI) obj; if (p != null) { - if (GT_Utility.areStacksEqual(p.mInputs.get(0).item, this.mInputs.get(0).item, true)) { + if (GTUtility.areStacksEqual(p.mInputs.get(0).item, this.mInputs.get(0).item, true)) { if (p.mOutputs.size() == this.mOutputs.size()) { return true; } @@ -486,7 +477,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { @Override public List<PositionedStack> getIngredients() { - return this.getCycledIngredients(GT_NEI_LFTR_Sparging.this.cycleticks / 10, this.mInputs); + return this.getCycledIngredients(LFTRSpargingNEIHandler.this.cycleticks / 10, this.mInputs); } @Override diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java b/src/main/java/gtPlusPlus/plugin/agrichem/AgrichemCore.java index 0c3d7d2867..6e5cc47e3a 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/AgrichemCore.java @@ -2,17 +2,17 @@ package gtPlusPlus.plugin.agrichem; import gtPlusPlus.api.interfaces.IPlugin; import gtPlusPlus.plugin.agrichem.block.AgrichemFluids; -import gtPlusPlus.plugin.manager.Core_Manager; +import gtPlusPlus.plugin.manager.CoreManager; // Called by Core_Manager#veryEarlyInit @SuppressWarnings("unused") -public class Core_Agrichem implements IPlugin { +public class AgrichemCore implements IPlugin { - static final Core_Agrichem mInstance; + static final AgrichemCore mInstance; static { - mInstance = new Core_Agrichem(); - Core_Manager.registerPlugin(mInstance); + mInstance = new AgrichemCore(); + CoreManager.registerPlugin(mInstance); mInstance.log("Preparing " + mInstance.getPluginName() + " for use."); } diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java index de5e010350..f6d95952c6 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java @@ -11,14 +11,14 @@ import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.recipe.RecipeMaps.latheRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER; -import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; -import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE; -import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; +import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE; +import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalPlantRecipes; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.cokeOvenRecipes; @@ -38,21 +38,21 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.objects.GT_ItemStack; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeConstants; +import gregtech.api.objects.GTItemStack; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeConstants; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.item.chemistry.AgriculturalChem; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.material.MaterialMisc; +import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -163,7 +163,7 @@ public class BioRecipes { .getFluid(); mSulfuricWasteWater = FluidUtils.getFluidStack("sulfuricapatite", 1) .getFluid(); - mAmmonia = MISC_MATERIALS.AMMONIA.getFluidStack(1) + mAmmonia = MaterialMisc.AMMONIA.getFluidStack(1) .getFluid(); mEthylene = FluidUtils.getFluidStack("ethylene", 1) .getFluid(); @@ -187,9 +187,9 @@ public class BioRecipes { .getFluid(); mLiquidPlastic = FluidUtils.getWildcardFluidStack("plastic", 1) .getFluid(); - mCarbonDioxide = MISC_MATERIALS.CARBON_DIOXIDE.getFluidStack(1) + mCarbonDioxide = MaterialMisc.CARBON_DIOXIDE.getFluidStack(1) .getFluid(); - mCarbonMonoxide = MISC_MATERIALS.CARBON_MONOXIDE.getFluidStack(1) + mCarbonMonoxide = MaterialMisc.CARBON_MONOXIDE.getFluidStack(1) .getFluid(); mChlorine = FluidUtils.getFluidStack("chlorine", 1) .getFluid(); @@ -250,18 +250,18 @@ public class BioRecipes { ItemUtils.registerFuel(ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 1), 4800); // Combustion Fuels - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellButanol", 1)) .metadata(FUEL_VALUE, 400) .metadata(FUEL_TYPE, 0) .duration(0) .eut(0) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); } private static void recipeGreenAlgae() { // Compost - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 4)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1)) .duration(20 * SECONDS) @@ -269,7 +269,7 @@ public class BioRecipes { .addTo(maceratorRecipes); // Turn into Cellulose - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getGreenAlgaeRecipeChip(), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 10)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 5)) .duration(7 * SECONDS + 10 * TICKS) @@ -279,7 +279,7 @@ public class BioRecipes { private static void recipeBrownAlgae() { // Compost - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 2)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1)) .duration(20 * SECONDS) @@ -287,7 +287,7 @@ public class BioRecipes { .addTo(maceratorRecipes); // Alginic acid - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 10)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mAlginicAcid, 2)) .duration(2 * SECONDS) @@ -295,7 +295,7 @@ public class BioRecipes { .addTo(extractorRecipes); // Lithium Chloride - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBrownAlgaeRecipeChip(), ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 20)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mLithiumChloride, 5)) .duration(6 * SECONDS) @@ -304,7 +304,7 @@ public class BioRecipes { .addTo(blastFurnaceRecipes); // Sodium Carbonate - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBrownAlgaeRecipeChip(), ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 40)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 20)) .fluidInputs(FluidUtils.getDistilledWater(2000)) @@ -315,7 +315,7 @@ public class BioRecipes { private static void recipeGoldenBrownAlgae() { // Compost - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 1)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1)) .duration(20 * SECONDS) @@ -323,7 +323,7 @@ public class BioRecipes { .addTo(maceratorRecipes); // Turn into Cellulose - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getGoldenBrownAlgaeRecipeChip(), ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 10)) @@ -335,7 +335,7 @@ public class BioRecipes { private static void recipeRedAlgae() { // Compost - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 1)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 2)) .duration(20 * SECONDS) @@ -343,7 +343,7 @@ public class BioRecipes { .addTo(maceratorRecipes); // Turn into Cellulose - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getRedAlgaeRecipeChip(), ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 10)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mRedCelluloseFiber, 5)) .duration(7 * SECONDS + 10 * TICKS) @@ -353,7 +353,7 @@ public class BioRecipes { private static void recipeCelluloseFibre() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 8), ItemUtils.getSimpleStack(AgriculturalChem.mAlginicAcid, 2)) @@ -363,7 +363,7 @@ public class BioRecipes { .addTo(UniversalChemical); // Craft into Wood Pellets - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 12)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 24)) .duration(2 * SECONDS + 8 * TICKS) @@ -371,7 +371,7 @@ public class BioRecipes { .addTo(assemblerRecipes); // Methanol Extraction - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 12)) .fluidOutputs(Materials.Methanol.getFluid(1000L)) .duration(7 * SECONDS + 10 * TICKS) @@ -379,7 +379,7 @@ public class BioRecipes { .addTo(fluidExtractionRecipes); // Compost - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 3)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1)) .duration(20 * SECONDS) @@ -387,7 +387,7 @@ public class BioRecipes { .addTo(maceratorRecipes); // Plastic - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBioChip(16), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 4)) .fluidInputs( FluidUtils.getFluidStack(BioRecipes.mAceticAcid, 500), @@ -414,7 +414,7 @@ public class BioRecipes { ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 2)); // Extruder Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 12), ItemUtils.getSimpleStack(AgriculturalChem.mPelletMold, 0)) @@ -424,7 +424,7 @@ public class BioRecipes { .addTo(extruderRecipes); // Assembly Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 8)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 2)) .duration(5 * SECONDS) @@ -432,7 +432,7 @@ public class BioRecipes { .addTo(assemblerRecipes); // CO2 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1)) .fluidOutputs(FluidUtils.getFluidStack(mCarbonDioxide, 70)) .duration(10 * SECONDS) @@ -446,10 +446,10 @@ public class BioRecipes { true, true, ItemUtils.getItemStackOfAmountFromOreDict("gemCharcoal", 3), - GT_Values.NF, + GTValues.NF, 1200); } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 2), getBioChip(3)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("gemCharcoal", 3)) .eut(16) @@ -460,7 +460,7 @@ public class BioRecipes { private static void recipeWoodBricks() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBioChip(3), ItemUtils.getOrePrefixStack(OrePrefixes.dust, Materials.Wood, 50)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 1)) .duration(1 * MINUTES + 40 * SECONDS) @@ -471,7 +471,7 @@ public class BioRecipes { private static void recipeCellulosePulp() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 4)) .itemOutputs(ItemUtils.getSimpleStack(Items.paper, 4)) .duration(2 * SECONDS) @@ -481,12 +481,12 @@ public class BioRecipes { private static void recipeCatalystCarrier() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getBioChip(20), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 8L), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 4L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Tin, 6L)) + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 8L), + GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 4L), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.Tin, 6L)) .itemOutputs(CI.getEmptyCatalyst(1)) .duration(5 * MINUTES) .eut(16) @@ -495,12 +495,12 @@ public class BioRecipes { private static void recipeAluminiumSilverCatalyst() { // Assembler Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getBioChip(4), CI.getEmptyCatalyst(10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 4L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 4L)) .itemOutputs(CI.getGreenCatalyst(10)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) @@ -510,7 +510,7 @@ public class BioRecipes { private static void recipeAceticAcid() { // CH4O + CO = C2H4O2 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getGreenCatalyst(0)) .fluidInputs( FluidUtils.getFluidStack(BioRecipes.mMethanol, 700), @@ -521,7 +521,7 @@ public class BioRecipes { .metadata(CHEMPLANT_CASING_TIER, 1) .addTo(chemicalPlantRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedBioCircuit(14)) .fluidInputs(FluidUtils.getFluidStack(mFermentationBase, 1000)) .fluidOutputs(FluidUtils.getFluidStack(mAceticAcid, 1000)) @@ -532,10 +532,10 @@ public class BioRecipes { .addTo(chemicalDehydratorRecipes); } - public static final HashSet<GT_ItemStack> mFruits = new HashSet<>(); - public static final HashSet<GT_ItemStack> mVege = new HashSet<>(); - public static final HashSet<GT_ItemStack> mNuts = new HashSet<>(); - public static final HashSet<GT_ItemStack> mSeeds = new HashSet<>(); + public static final HashSet<GTItemStack> mFruits = new HashSet<>(); + public static final HashSet<GTItemStack> mVege = new HashSet<>(); + public static final HashSet<GTItemStack> mNuts = new HashSet<>(); + public static final HashSet<GTItemStack> mSeeds = new HashSet<>(); public static final AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<>(); public static final AutoMap<ItemStack> mList_Master_Seeds = new AutoMap<>(); @@ -551,33 +551,33 @@ public class BioRecipes { processOreDictEntry("listAllSeed", mSeeds); if (!mFruits.isEmpty()) { - for (GT_ItemStack g : mFruits) { + for (GTItemStack g : mFruits) { mList_Master_FruitVege.put(g.toStack()); } } if (!mVege.isEmpty()) { - for (GT_ItemStack g : mVege) { + for (GTItemStack g : mVege) { mList_Master_FruitVege.put(g.toStack()); } } if (!mNuts.isEmpty()) { - for (GT_ItemStack g : mNuts) { + for (GTItemStack g : mNuts) { mList_Master_FruitVege.put(g.toStack()); } } if (!mSeeds.isEmpty()) { - for (GT_ItemStack g : mSeeds) { + for (GTItemStack g : mSeeds) { mList_Master_Seeds.put(g.toStack()); } } } // Make Fermentation - private static void processOreDictEntry(String aOreName, HashSet<GT_ItemStack> mfruits2) { + private static void processOreDictEntry(String aOreName, HashSet<GTItemStack> mfruits2) { ArrayList<ItemStack> aTemp = OreDictionary.getOres(aOreName); if (!aTemp.isEmpty()) { for (ItemStack stack : aTemp) { - mfruits2.add(new GT_ItemStack(stack)); + mfruits2.add(new GTItemStack(stack)); } } } @@ -592,7 +592,7 @@ public class BioRecipes { continue; } if (ItemUtils.checkForInvalidItems(a)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBioChip(2), ItemUtils.getSimpleStack(a, 10)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000)) @@ -605,7 +605,7 @@ public class BioRecipes { } for (ItemStack a : aSeeds) { if (ItemUtils.checkForInvalidItems(a)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBioChip(3), ItemUtils.getSimpleStack(a, 20)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000)) @@ -618,7 +618,7 @@ public class BioRecipes { } // Sugar Cane - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBioChip(4), ItemUtils.getSimpleStack(Items.reeds, 32)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000)) @@ -626,7 +626,7 @@ public class BioRecipes { .eut(TierEU.RECIPE_LV) .metadata(CHEMPLANT_CASING_TIER, 0) .addTo(chemicalPlantRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getBioChip(5), ItemUtils.getSimpleStack(Items.reeds, 32), @@ -641,7 +641,7 @@ public class BioRecipes { // Sugar Beet if (OreDictUtils.containsValidEntries("cropSugarbeet")) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBioChip(4), ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 4)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000)) @@ -649,7 +649,7 @@ public class BioRecipes { .eut(TierEU.RECIPE_LV) .metadata(CHEMPLANT_CASING_TIER, 0) .addTo(chemicalPlantRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getBioChip(5), ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 4), @@ -664,7 +664,7 @@ public class BioRecipes { } // Produce Acetone, Butanol and Ethanol - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getBioChip(5), ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 6), @@ -683,7 +683,7 @@ public class BioRecipes { private static void recipePropionicAcid() { // C2H4 + CO + H2O = C3H6O2 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getGreenCatalyst(0)) .fluidInputs( FluidUtils.getFluidStack(BioRecipes.mEthylene, 1000), @@ -699,7 +699,7 @@ public class BioRecipes { private static void recipeEthanol() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(BioRecipes.getBioChip(2)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mEthanol, 100)) @@ -709,7 +709,7 @@ public class BioRecipes { } private static void recipeGoldenBrownCelluloseFiber() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 5)) .fluidOutputs(Materials.Ammonia.getGas(500)) .duration(15 * SECONDS) @@ -718,7 +718,7 @@ public class BioRecipes { } private static void recipeRedCelluloseFiber() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mRedCelluloseFiber, 3)) .itemOutputs(ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 5)) .duration(5 * SECONDS) @@ -728,7 +728,7 @@ public class BioRecipes { private static void recipeSodiumHydroxide() { // NaCl·H2O = NaOH + Cl + H - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBioChip(4)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 3)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mSalineWater, 1000)) @@ -740,7 +740,7 @@ public class BioRecipes { .metadata(CHEMPLANT_CASING_TIER, 1) .addTo(chemicalPlantRecipes); // Na + H2O = NaOH + H - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBioChip(5), ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 5)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 15)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 5000)) @@ -756,7 +756,7 @@ public class BioRecipes { if (OreDictUtils.containsValidEntries("fuelCoke")) { // Na2CO3 + Al2O3 =C= 2NaAlO2 + CO2 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getBioChip(18), ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 1), @@ -771,7 +771,7 @@ public class BioRecipes { } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getBioChip(18), ItemUtils.getItemStackOfAmountFromOreDict("dustCoal", 2), @@ -788,8 +788,8 @@ public class BioRecipes { private static void recipePelletMold() { GregtechItemList.Pellet_Mold.set(ItemUtils.getSimpleStack(AgriculturalChem.mPelletMold, 1)); - GT_Values.RA.stdBuilder() - .itemInputs(ALLOY.TUMBAGA.getBlock(1)) + GTValues.RA.stdBuilder() + .itemInputs(MaterialsAlloy.TUMBAGA.getBlock(1)) .itemOutputs(GregtechItemList.Pellet_Mold.get(1)) .duration(7 * MINUTES + 30 * SECONDS) .eut(TierEU.RECIPE_MV / 4 * 3) @@ -857,7 +857,7 @@ public class BioRecipes { } for (String aOreName : aOreNames) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedBioCircuit(14), ItemUtils.getSimpleStack(aOreCache.get(aOreName), aOreData2.get(aOreName))) @@ -875,7 +875,7 @@ public class BioRecipes { .addTo(chemicalPlantRecipes); } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(AgriculturalChem.mCleanAluminiumMix, 3), ItemUtils.getSimpleStack(AgriculturalChem.mPelletMold, 0)) @@ -887,7 +887,7 @@ public class BioRecipes { private static void recipeAlumina() { // 2NaAlO2 + 2NaOH + 2CO2 = Al2O3 + 2Na2CO3 + H2O - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(AgriculturalChem.mSodiumAluminate, 8), ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 6)) @@ -903,11 +903,11 @@ public class BioRecipes { private static void recipeAluminium() { // 2Al2O3 + 3C = 4Al + 3CO2 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 3L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 3L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L)) .fluidOutputs(Materials.CarbonDioxide.getGas(3000L)) .duration(2 * MINUTES) .eut(TierEU.RECIPE_MV) @@ -916,17 +916,17 @@ public class BioRecipes { } private static void recipeLithiumChloride() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RockSalt, 8), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.RockSalt, 8), ItemUtils.getSimpleStack(AgriculturalChem.mLithiumChloride, 10)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 2), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lithium, 3), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lithium, 3), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lithium, 5), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 2), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Potassium, 5)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 2), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lithium, 3), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lithium, 3), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lithium, 5), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 2), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Potassium, 5)) .outputChances(7500, 8000, 8500, 9000, 7500, 8500) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mAir, 4000)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mChlorine, 500)) @@ -934,17 +934,17 @@ public class BioRecipes { .eut(TierEU.RECIPE_MV / 2) .addTo(multiblockChemicalReactorRecipes); if (OreDictUtils.containsValidEntries("dustPotash")) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potash, 10), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Potash, 10), ItemUtils.getSimpleStack(AgriculturalChem.mLithiumChloride, 16)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 3), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lithium, 5), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lithium, 5), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lithium, 7), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 2)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 3), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lithium, 5), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lithium, 5), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lithium, 7), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 2), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 2)) .outputChances(7500, 8000, 8500, 9000, 9000, 9000) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mThermalWater, 2000)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mChlorine, 250)) @@ -956,7 +956,7 @@ public class BioRecipes { private static void recipeSulfuricAcid() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getBioChip(7), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 10), @@ -967,7 +967,7 @@ public class BioRecipes { .eut(60) .metadata(CHEMPLANT_CASING_TIER, 1) .addTo(chemicalPlantRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getBioChip(7), ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 2), @@ -984,7 +984,7 @@ public class BioRecipes { private static void recipeUrea() { // 2NH3 + CO2 = CH4N2O + H2O - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBioChip(9)) .fluidInputs( FluidUtils.getFluidStack(BioRecipes.mAmmonia, 600), @@ -996,7 +996,7 @@ public class BioRecipes { .eut(TierEU.RECIPE_LV) .metadata(CHEMPLANT_CASING_TIER, 1) .addTo(chemicalPlantRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBioChip(9)) .fluidInputs( FluidUtils.getFluidStack(BioRecipes.mUrea, 200), @@ -1011,7 +1011,7 @@ public class BioRecipes { private static void recipeRawBioResin() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getBioChip(3), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 5), @@ -1027,7 +1027,7 @@ public class BioRecipes { private static void recipeLiquidResin() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBioChip(3), ItemUtils.getSimpleStack(AgriculturalChem.mRawBioResin, 1)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mEthanol, 200)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mLiquidResin, 500)) @@ -1035,7 +1035,7 @@ public class BioRecipes { .eut(TierEU.RECIPE_LV) .metadata(CHEMPLANT_CASING_TIER, 1) .addTo(chemicalPlantRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBioChip(3), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 8)) .itemOutputs(ItemUtils.getSimpleStack(Ic2Items.resin, 32)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mLiquidResin, 144)) @@ -1050,7 +1050,7 @@ public class BioRecipes { ItemStack aFert; if (Forestry.isModLoaded()) { aFert = ItemUtils.getSimpleStack(AgriculturalChem.aFertForestry, 32); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getBioChip(11), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 16), @@ -1065,7 +1065,7 @@ public class BioRecipes { } aFert = ItemUtils.getSimpleStack(AgriculturalChem.aFertIC2, 32); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getBioChip(12), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 16), @@ -1081,7 +1081,7 @@ public class BioRecipes { private static void recipeMethane() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBioChip(12), ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 10)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 500)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mMethane, 500)) @@ -1089,7 +1089,7 @@ public class BioRecipes { .eut(64) .metadata(CHEMPLANT_CASING_TIER, 1) .addTo(chemicalPlantRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getBioChip(13), ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 8), @@ -1107,7 +1107,7 @@ public class BioRecipes { private static void recipeBenzene() { // 6CH4 = C6H6 + 18H - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBioChip(19), CI.getGreenCatalyst(0)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mMethane, 6000)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mBenzene, 1000), Materials.Hydrogen.getGas(18000)) @@ -1121,7 +1121,7 @@ public class BioRecipes { private static void recipeStyrene() { // C8H10 = C8H8 + 2H - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getBioChip(20), CI.getGreenCatalyst(0)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mEthylbenzene, 100)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mStyrene, 100), Materials.Hydrogen.getGas(200)) @@ -1133,7 +1133,7 @@ public class BioRecipes { } private static void recipeBioChip() { - GT_ModHandler.addShapelessCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 0L), 0, new Object[] { OrePrefixes.circuit.get(Materials.ULV) }); @@ -1239,7 +1239,7 @@ public class BioRecipes { public static boolean addCraftingRecipe(ItemStack aResult, long aBitMask, Object[] aRecipe) { Method mAddRecipe = ReflectionUtils.getMethod( - GT_ModHandler.class, + GTModHandler.class, "addCraftingRecipe", ItemStack.class, Enchantment[].class, diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java index 22ae6f29c6..edd41535e7 100644 --- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java +++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java @@ -7,7 +7,7 @@ import gtPlusPlus.api.interfaces.IPlugin; import gtPlusPlus.core.util.Utils; import gtPlusPlus.plugin.fixes.interfaces.IBugFix; import gtPlusPlus.plugin.fixes.vanilla.music.MusicTocker; -import gtPlusPlus.preloader.CORE_Preloader; +import gtPlusPlus.preloader.PreloaderCore; public class VanillaBackgroundMusicFix implements IBugFix { @@ -17,11 +17,11 @@ public class VanillaBackgroundMusicFix implements IBugFix { public VanillaBackgroundMusicFix(IPlugin minstance) { mParent = minstance; - if (CORE_Preloader.enableWatchdogBGM > 0 && Utils.isClient()) { + if (PreloaderCore.enableWatchdogBGM > 0 && Utils.isClient()) { mParent.log("[BGM] Registering BGM delay Fix."); enabled = true; mFixInstance = new MusicTocker(mParent); - } else if (CORE_Preloader.enableWatchdogBGM > 0 && Utils.isServer()) { + } else if (PreloaderCore.enableWatchdogBGM > 0 && Utils.isServer()) { mParent.log("[BGM] Tried registering BGM delay Fix on Server, disabling."); enabled = false; } else { @@ -36,7 +36,7 @@ public class VanillaBackgroundMusicFix implements IBugFix { } public void manage() { - if (CORE_Preloader.enableWatchdogBGM > 0 && Utils.isClient()) { + if (PreloaderCore.enableWatchdogBGM > 0 && Utils.isClient()) { TimerTask task = new ManageTask(this.mFixInstance); Timer timer = new Timer("BGM-WatchDog"); long delay = 1000 * 60; @@ -54,7 +54,7 @@ public class VanillaBackgroundMusicFix implements IBugFix { @Override public void run() { - if (CORE_Preloader.enableWatchdogBGM > 0 && Utils.isClient()) { + if (PreloaderCore.enableWatchdogBGM > 0 && Utils.isClient()) { if (!A.mVanillaManager) { A.run(); } diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java index 60ab048ca3..bf69ead5e2 100644 --- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java +++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java @@ -13,7 +13,7 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.plugin.fixes.interfaces.IBugFix; -import gtPlusPlus.preloader.CORE_Preloader; +import gtPlusPlus.preloader.PreloaderCore; public class VanillaBedHeightFix implements IBugFix { @@ -23,7 +23,7 @@ public class VanillaBedHeightFix implements IBugFix { public VanillaBedHeightFix(IPlugin minstance) { mParent = minstance; Method m; - if (!CORE_Preloader.DEV_ENVIRONMENT) { + if (!PreloaderCore.DEV_ENVIRONMENT) { m = ReflectionUtils.getMethod(EntityPlayer.class, "func_71018_a", int.class, int.class, int.class); } else { m = ReflectionUtils.getMethod( diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaFixesCore.java index cc181756c0..b6cfb9d3ba 100644 --- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java +++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaFixesCore.java @@ -6,25 +6,25 @@ import net.minecraft.item.ItemStack; import gtPlusPlus.api.interfaces.IPlugin; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.plugin.manager.Core_Manager; +import gtPlusPlus.plugin.manager.CoreManager; // Called by Core_Manager#veryEarlyInit @SuppressWarnings("unused") -public class Core_VanillaFixes implements IPlugin { +public class VanillaFixesCore implements IPlugin { - static final Core_VanillaFixes mInstance; + static final VanillaFixesCore mInstance; static final VanillaBedHeightFix mBedFixInstance; static final VanillaBackgroundMusicFix mMusicFixInstance; static { - mInstance = new Core_VanillaFixes(); + mInstance = new VanillaFixesCore(); mBedFixInstance = new VanillaBedHeightFix(mInstance); mMusicFixInstance = new VanillaBackgroundMusicFix(mInstance); mInstance.log("Preparing " + mInstance.getPluginName() + " for use."); } - Core_VanillaFixes() { - Core_Manager.registerPlugin(this); + VanillaFixesCore() { + CoreManager.registerPlugin(this); } @Override diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java index c669f93f62..b0e0474bdd 100644 --- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java +++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java @@ -15,7 +15,7 @@ import gregtech.api.objects.XSTR; import gtPlusPlus.api.interfaces.IPlugin; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.CORE_Preloader; +import gtPlusPlus.preloader.PreloaderCore; @SideOnly(Side.CLIENT) public class MusicTocker extends MusicTicker implements Runnable { @@ -37,7 +37,7 @@ public class MusicTocker extends MusicTicker implements Runnable { } private static int getDelay() { - return CORE_Preloader.enableWatchdogBGM; + return PreloaderCore.enableWatchdogBGM; } private boolean inject() { diff --git a/src/main/java/gtPlusPlus/plugin/manager/Core_Manager.java b/src/main/java/gtPlusPlus/plugin/manager/CoreManager.java index be1dafd231..d547ace5cb 100644 --- a/src/main/java/gtPlusPlus/plugin/manager/Core_Manager.java +++ b/src/main/java/gtPlusPlus/plugin/manager/CoreManager.java @@ -5,7 +5,7 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.util.reflect.ReflectionUtils; -public class Core_Manager { +public class CoreManager { public static AutoMap<IPlugin> mPlugins = new AutoMap<>(); diff --git a/src/main/java/gtPlusPlus/preloader/CORE_Preloader.java b/src/main/java/gtPlusPlus/preloader/PreloaderCore.java index 146c92764b..cabee48bc9 100644 --- a/src/main/java/gtPlusPlus/preloader/CORE_Preloader.java +++ b/src/main/java/gtPlusPlus/preloader/PreloaderCore.java @@ -7,7 +7,7 @@ import java.util.List; import cpw.mods.fml.common.versioning.ArtifactVersion; -public class CORE_Preloader { +public class PreloaderCore { public static final String NAME = "GT++ Preloader"; public static final String MODID = "GT++_Preloader"; diff --git a/src/main/java/gtPlusPlus/preloader/Preloader_GT_OreDict.java b/src/main/java/gtPlusPlus/preloader/PreloaderGTOreDict.java index 9a350ab5e4..be5fc10090 100644 --- a/src/main/java/gtPlusPlus/preloader/Preloader_GT_OreDict.java +++ b/src/main/java/gtPlusPlus/preloader/PreloaderGTOreDict.java @@ -7,60 +7,54 @@ import net.minecraft.item.ItemStack; import org.apache.logging.log4j.Level; import cpw.mods.fml.relauncher.FMLRelaunchLog; -import gregtech.common.items.GT_MetaGenerated_Item_01; -import gtPlusPlus.core.lib.CORE; +import gregtech.common.items.MetaGeneratedItem01; +import gregtech.common.items.MetaGeneratedItem03; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; -public class Preloader_GT_OreDict { +public class PreloaderGTOreDict { public static boolean shouldPreventRegistration(final String string, final ItemStack bannedItem) { if (bannedItem == null) { return false; - } else if (!CORE_Preloader.enableOldGTcircuits) { + } else if (!PreloaderCore.enableOldGTcircuits) { return false; } try { - if (CORE_Preloader.enableOldGTcircuits) { + if (PreloaderCore.enableOldGTcircuits) { if ((bannedItem != null) && ItemUtils.getModId(bannedItem) .toLowerCase() .equals(GregTech.ID)) { final int damageValue = bannedItem.getItemDamage() - 32000; - if (bannedItem.getItem() instanceof GT_MetaGenerated_Item_01) { // 700-720 + if (bannedItem.getItem() instanceof MetaGeneratedItem01) { // 700-720 if ((damageValue >= 700) && (damageValue <= 720)) { return true; } - } else { - if (ReflectionUtils.doesClassExist("gregtech.common.items.GT_MetaGenerated_Item_03")) { // 6/11/12/14/16/20/30-57/69-73/79-96 - final Class<?> MetaItem03 = ReflectionUtils - .getClass("gregtech.common.items.GT_MetaGenerated_Item_03"); - if (isInstanceOf(MetaItem03, bannedItem.getItem())) { - if ((damageValue == 6) || (damageValue == 7) - || (damageValue == 11) - || (damageValue == 12) - || (damageValue == 14) - || (damageValue == 16) - || (damageValue == 20) - || (damageValue == 21) - || (damageValue == 22)) { - return true; - } else if ((damageValue >= 30) && (damageValue <= 57)) { - return true; - } else if ((damageValue >= 69) && (damageValue <= 73)) { - return true; - } else if ((damageValue >= 78) && (damageValue <= 96)) { - return true; - } - } + } else if (bannedItem.getItem() instanceof MetaGeneratedItem03) { + if ((damageValue == 6) || (damageValue == 7) + || (damageValue == 11) + || (damageValue == 12) + || (damageValue == 14) + || (damageValue == 16) + || (damageValue == 20) + || (damageValue == 21) + || (damageValue == 22)) { + return true; + } else if ((damageValue >= 30) && (damageValue <= 57)) { + return true; + } else if ((damageValue >= 69) && (damageValue <= 73)) { + return true; + } else if ((damageValue >= 78) && (damageValue <= 96)) { + return true; } } } } } catch (final Throwable e) { - if (CORE.ConfigSwitches.showHiddenNEIItems) { + if (GTPPCore.ConfigSwitches.showHiddenNEIItems) { FMLRelaunchLog.log( "[GT++ ASM] OreDictTransformer", Level.INFO, diff --git a/src/main/java/gtPlusPlus/preloader/Preloader_Logger.java b/src/main/java/gtPlusPlus/preloader/PreloaderLogger.java index 477e1371e3..e5f193a3fd 100644 --- a/src/main/java/gtPlusPlus/preloader/Preloader_Logger.java +++ b/src/main/java/gtPlusPlus/preloader/PreloaderLogger.java @@ -4,9 +4,9 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -public class Preloader_Logger { +public class PreloaderLogger { - private Preloader_Logger() {} + private PreloaderLogger() {} // Logging Functions public static final Logger MODLOGGER = LogManager.getLogger("GT++ ASM"); diff --git a/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java b/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java index b4a49c275c..5fa903906a 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java +++ b/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java @@ -9,7 +9,7 @@ import net.minecraftforge.common.config.Property; import org.apache.logging.log4j.Level; import cpw.mods.fml.common.FMLLog; -import gtPlusPlus.preloader.Preloader_Logger; +import gtPlusPlus.preloader.PreloaderLogger; public class AsmConfig { @@ -130,11 +130,11 @@ public class AsmConfig { config.save(); } - Preloader_Logger.INFO("Gt Nbt Fix - Enabled: " + enableGtNbtFix); - Preloader_Logger.INFO("Gt Tooltip Fix - Enabled: " + enableGtTooltipFix); - Preloader_Logger.INFO("COFH Patch - Enabled: " + enableCofhPatch); - Preloader_Logger.INFO("Thaumcraft Aspect Safety Patch - Enabled: " + enableTcAspectSafety); - Preloader_Logger + PreloaderLogger.INFO("Gt Nbt Fix - Enabled: " + enableGtNbtFix); + PreloaderLogger.INFO("Gt Tooltip Fix - Enabled: " + enableGtTooltipFix); + PreloaderLogger.INFO("COFH Patch - Enabled: " + enableCofhPatch); + PreloaderLogger.INFO("Thaumcraft Aspect Safety Patch - Enabled: " + enableTcAspectSafety); + PreloaderLogger .INFO("Fix bad usage of EntityLivingBase.setHealth Patch - Enabled: " + enabledFixEntitySetHealth); } catch (Exception var3) { diff --git a/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java b/src/main/java/gtPlusPlus/preloader/asm/PreloaderDummyContainer.java index c77f570a8d..8e0684e53f 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java +++ b/src/main/java/gtPlusPlus/preloader/asm/PreloaderDummyContainer.java @@ -15,17 +15,17 @@ import cpw.mods.fml.common.DummyModContainer; import cpw.mods.fml.common.LoadController; import cpw.mods.fml.common.ModMetadata; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import gtPlusPlus.preloader.CORE_Preloader; -import gtPlusPlus.preloader.Preloader_Logger; +import gtPlusPlus.preloader.PreloaderCore; +import gtPlusPlus.preloader.PreloaderLogger; -public class Preloader_DummyContainer extends DummyModContainer { +public class PreloaderDummyContainer extends DummyModContainer { - public Preloader_DummyContainer() { + public PreloaderDummyContainer() { super(new ModMetadata()); ModMetadata meta = getMetadata(); - meta.modId = CORE_Preloader.MODID; - meta.name = CORE_Preloader.NAME; - meta.version = CORE_Preloader.VERSION; + meta.modId = PreloaderCore.MODID; + meta.name = PreloaderCore.NAME; + meta.version = PreloaderCore.VERSION; meta.credits = "Roll Credits ..."; meta.authorList = Collections.singletonList("Alkalus"); meta.screenshots = new String[0]; @@ -40,7 +40,7 @@ public class Preloader_DummyContainer extends DummyModContainer { @Subscribe public void preInit(FMLPreInitializationEvent event) { - Preloader_Logger.INFO("Loading " + CORE_Preloader.MODID + " V" + CORE_Preloader.VERSION); + PreloaderLogger.INFO("Loading " + PreloaderCore.MODID + " V" + PreloaderCore.VERSION); // Handle GT++ Config handleConfigFile(event); } @@ -51,7 +51,7 @@ public class Preloader_DummyContainer extends DummyModContainer { config.load(); // BGM Watchdog - CORE_Preloader.enableWatchdogBGM = config.getInt( + PreloaderCore.enableWatchdogBGM = config.getInt( "enableWatchdogBGM", "features", 0, @@ -60,7 +60,7 @@ public class Preloader_DummyContainer extends DummyModContainer { "Set to a value greater than 0 to reduce the ticks taken to delay between BGM tracks. Acceptable Values are 1-32767, where 0 is disabled. Vanilla Uses 12,000 & 24,000. 200 is 10s."); // Circuits - CORE_Preloader.enableOldGTcircuits = config.getBoolean( + PreloaderCore.enableOldGTcircuits = config.getBoolean( "enableOldGTcircuits", GregTech.ID, false, diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java index 82526b1290..89554db7a1 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java @@ -56,7 +56,7 @@ public class Preloader_ClassTransformer { .log("[GT++ ASM] OreDictTransformer", Level.INFO, "Injecting target method. [Unobfuscated]"); super.visitMethodInsn( INVOKESTATIC, - "gtPlusPlus/preloader/Preloader_GT_OreDict", + "gtPlusPlus/preloader/PreloaderGTOreDict", "shouldPreventRegistration", "(Ljava/lang/String;Lnet/minecraft/item/ItemStack;)Z", false); @@ -65,7 +65,7 @@ public class Preloader_ClassTransformer { .log("[GT++ ASM] OreDictTransformer", Level.INFO, "Injecting target method. [Obfuscated]"); super.visitMethodInsn( INVOKESTATIC, - "gtPlusPlus/preloader/Preloader_GT_OreDict", + "gtPlusPlus/preloader/PreloaderGTOreDict", "shouldPreventRegistration", "(Ljava/lang/String;Ladd;)Z", false); diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java index 922ce88e27..06372740e4 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java @@ -9,8 +9,8 @@ import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.CORE_Preloader; -import gtPlusPlus.preloader.Preloader_Logger; +import gtPlusPlus.preloader.PreloaderCore; +import gtPlusPlus.preloader.PreloaderLogger; import gtPlusPlus.preloader.asm.AsmConfig; import gtPlusPlus.preloader.asm.transformers.Preloader_ClassTransformer.OreDictionaryVisitor; @@ -51,14 +51,14 @@ public class Preloader_Transformer_Handler implements IClassTransformer { // Do not transform if using lwjgl3 && !ReflectionUtils.doesClassExist("org.lwjgl.system.Platform")) { boolean isClientSettingsClass = !transformedName.equals("org.lwjgl.input.Keyboard"); - Preloader_Logger.INFO("LWJGL Keybinding index out of bounds fix", "Transforming " + transformedName); + PreloaderLogger.INFO("LWJGL Keybinding index out of bounds fix", "Transforming " + transformedName); return new ClassTransformer_LWJGL_Keyboard(basicClass, isClientSettingsClass).getWriter() .toByteArray(); } // Fix the OreDictionary - Forge if (transformedName.equals(FORGE_ORE_DICTIONARY) && AsmConfig.enableOreDictPatch) { - Preloader_Logger.INFO("OreDictTransformer", "Transforming " + transformedName); + PreloaderLogger.INFO("OreDictTransformer", "Transforming " + transformedName); ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES); new ClassReader(basicClass).accept(new OreDictionaryVisitor(classWriter), 0); return classWriter.toByteArray(); @@ -66,15 +66,15 @@ public class Preloader_Transformer_Handler implements IClassTransformer { // Fix the OreDictionary COFH if (transformedName.equals(COFH_ORE_DICTIONARY_ARBITER) - && (AsmConfig.enableCofhPatch || CORE_Preloader.DEV_ENVIRONMENT)) { - Preloader_Logger.INFO("COFH", "Transforming " + transformedName); + && (AsmConfig.enableCofhPatch || PreloaderCore.DEV_ENVIRONMENT)) { + PreloaderLogger.INFO("COFH", "Transforming " + transformedName); return new ClassTransformer_COFH_OreDictionaryArbiter(basicClass).getWriter() .toByteArray(); } if (IC2_WRENCH_PATCH_CLASS_NAMES.contains(transformedName)) { - Preloader_Logger.INFO("IC2 getHarvestTool Patch", "Transforming " + transformedName); - return new ClassTransformer_IC2_GetHarvestTool(basicClass, !CORE_Preloader.DEV_ENVIRONMENT, transformedName) + PreloaderLogger.INFO("IC2 getHarvestTool Patch", "Transforming " + transformedName); + return new ClassTransformer_IC2_GetHarvestTool(basicClass, !PreloaderCore.DEV_ENVIRONMENT, transformedName) .getWriter() .toByteArray(); } @@ -82,8 +82,8 @@ public class Preloader_Transformer_Handler implements IClassTransformer { // Fix Thaumcraft stuff // Patching ItemWispEssence to allow invalid item handling if (transformedName.equals(THAUMCRAFT_ITEM_WISP_ESSENCE) && AsmConfig.enableTcAspectSafety) { - Preloader_Logger.INFO("Thaumcraft WispEssence_Patch", "Transforming " + transformedName); - return new ClassTransformer_TC_ItemWispEssence(basicClass, !CORE_Preloader.DEV_ENVIRONMENT).getWriter() + PreloaderLogger.INFO("Thaumcraft WispEssence_Patch", "Transforming " + transformedName); + return new ClassTransformer_TC_ItemWispEssence(basicClass, !PreloaderCore.DEV_ENVIRONMENT).getWriter() .toByteArray(); } diff --git a/src/main/java/gtPlusPlus/recipes/CokeAndPyrolyseOven.java b/src/main/java/gtPlusPlus/recipes/CokeAndPyrolyseOven.java index 32d4ab55cf..8dd97eb4be 100644 --- a/src/main/java/gtPlusPlus/recipes/CokeAndPyrolyseOven.java +++ b/src/main/java/gtPlusPlus/recipes/CokeAndPyrolyseOven.java @@ -1,8 +1,8 @@ package gtPlusPlus.recipes; import static gregtech.api.recipe.RecipeMaps.pyrolyseRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.cokeOvenRecipes; import java.util.ArrayList; @@ -10,15 +10,15 @@ import java.util.ArrayList; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -36,10 +36,10 @@ public class CokeAndPyrolyseOven { // Try use all woods found ArrayList<ItemStack> aLogData = OreDictionary.getOres("logWood"); for (ItemStack stack : aLogData) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(20), ItemUtils.getSimpleStack(stack, 20)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 24L)) - .fluidInputs(GT_ModHandler.getSteam(1000)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(20), ItemUtils.getSimpleStack(stack, 20)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 24L)) + .fluidInputs(GTModHandler.getSteam(1000)) .fluidOutputs(FluidUtils.getFluidStack("fluid.coalgas", 1440)) .duration(72 * SECONDS) .eut(TierEU.RECIPE_LV) @@ -47,24 +47,24 @@ public class CokeAndPyrolyseOven { } // Coal to Coke - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(22), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16L)) + GTUtility.getIntegratedCircuit(22), + GTOreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16L)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 10)) - .fluidInputs(GT_ModHandler.getSteam(1000)) + .fluidInputs(GTModHandler.getSteam(1000)) .fluidOutputs(FluidUtils.getFluidStack("fluid.coalgas", 2880)) .duration(36 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(pyrolyseRecipes); // Coke & Coal - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L), + GTOreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L), ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 6)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 14)) - .fluidInputs(GT_ModHandler.getSteam(2000)) + .fluidInputs(GTModHandler.getSteam(2000)) .fluidOutputs(FluidUtils.getFluidStack("fluid.coalgas", 5040)) .eut(240) .duration(1 * MINUTES) @@ -73,7 +73,7 @@ public class CokeAndPyrolyseOven { private static void convertPyroToCokeOven() { int aCount = 0; - for (GT_Recipe g : RecipeMaps.pyrolyseRecipes.getAllRecipes()) { + for (GTRecipe g : RecipeMaps.pyrolyseRecipes.getAllRecipes()) { if (AddGregtechRecipe.importPyroRecipe(g.copy())) { aCount++; } diff --git a/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java b/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java index 4462f81fc7..4ccde441b3 100644 --- a/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java +++ b/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java @@ -12,12 +12,12 @@ import org.apache.commons.lang3.ArrayUtils; import advsolar.common.AdvancedSolarPanel; import gregtech.api.enums.Materials; import gregtech.api.enums.Mods; -import gregtech.api.items.GT_MetaGenerated_Tool; +import gregtech.api.items.MetaGeneratedTool; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Recipe; -import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.api.util.GTRecipe; +import gregtech.common.items.MetaGeneratedTool01; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; @@ -36,12 +36,12 @@ public class RecipeRemovals { // Doesn't actually remove recipes, just hide them private static void removeCrudeTurbineRotors() { int aRemoved = 0; - int CUT = CORE.turbineCutoffBase; + int CUT = GTPPCore.turbineCutoffBase; Item aU; - Collection<GT_Recipe> aAssRecipes = RecipeMaps.assemblerRecipes.getAllRecipes(); + Collection<GTRecipe> aAssRecipes = RecipeMaps.assemblerRecipes.getAllRecipes(); // 170, 172, 174, 176 if (aAssRecipes.size() > 0) { - for (GT_Recipe aG : aAssRecipes) { + for (GTRecipe aG : aAssRecipes) { if (ArrayUtils.isNotEmpty(aG.mOutputs)) { for (ItemStack aI : aG.mOutputs) { if (aI == null) { @@ -51,7 +51,7 @@ public class RecipeRemovals { if (aU == null) { continue; } - if (aU instanceof GT_MetaGenerated_Tool_01) { + if (aU instanceof MetaGeneratedTool01) { int aMeta = aI.getItemDamage(); // Found a Turbine if (aMeta >= 170 && aMeta <= 176) { @@ -75,9 +75,9 @@ public class RecipeRemovals { aType = "Huge "; } } - Materials aMainMaterial = GT_MetaGenerated_Tool.getPrimaryMaterial(aI); - Materials aSecondaryMaterial = GT_MetaGenerated_Tool.getSecondaryMaterial(aI); - long rotorDurabilityMax = GT_MetaGenerated_Tool.getToolMaxDamage(aI); + Materials aMainMaterial = MetaGeneratedTool.getPrimaryMaterial(aI); + Materials aSecondaryMaterial = MetaGeneratedTool.getSecondaryMaterial(aI); + long rotorDurabilityMax = MetaGeneratedTool.getToolMaxDamage(aI); if (rotorDurabilityMax < aCutoff) { Logger.WARNING( "[Turbine Cleanup] " + getMaterialName(aMainMaterial) diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java b/src/main/java/gtPlusPlus/xmod/bartcrops/CropsPlusPlusHandler.java index 9ca5488280..b5d3316388 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/CropsPlusPlusHandler.java @@ -3,7 +3,7 @@ package gtPlusPlus.xmod.bartcrops; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -public class HANDLER_CropsPlusPlus { +public class CropsPlusPlusHandler { public static void preInit(FMLPreInitializationEvent preinit) { LoaderOfTheCrops.load(preinit); diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java index c794c40878..f71a84eaff 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.bartcrops.abstracts; -import gtPlusPlus.preloader.CORE_Preloader; +import gtPlusPlus.preloader.PreloaderCore; import ic2.api.crops.ICropTile; public abstract class BaseAestheticCrop extends BaseHarvestableCrop { @@ -24,7 +24,7 @@ public abstract class BaseAestheticCrop extends BaseHarvestableCrop { @Override public int growthDuration(ICropTile crop) { - return CORE_Preloader.DEBUG_MODE ? 1 : 225; + return PreloaderCore.DEBUG_MODE ? 1 : 225; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java index 80325edff0..db0a0cb4f1 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.bartcrops.abstracts; -import gtPlusPlus.preloader.CORE_Preloader; +import gtPlusPlus.preloader.PreloaderCore; import ic2.api.crops.ICropTile; public abstract class BaseHarvestableCrop extends BaseCrop { @@ -45,7 +45,7 @@ public abstract class BaseHarvestableCrop extends BaseCrop { @Override public int growthDuration(ICropTile crop) { short r; - if (CORE_Preloader.DEBUG_MODE) { + if (PreloaderCore.DEBUG_MODE) { r = 1; } else if (crop.getSize() == 2) { r = 200; diff --git a/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java b/src/main/java/gtPlusPlus/xmod/bartworks/BWUtils.java index e3fdc9ae0a..2802e2f2e4 100644 --- a/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java +++ b/src/main/java/gtPlusPlus/xmod/bartworks/BWUtils.java @@ -2,12 +2,11 @@ package gtPlusPlus.xmod.bartworks; import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; - +import bartworks.system.material.Werkstoff; +import bartworks.system.material.WerkstoffLoader; import gregtech.api.enums.OrePrefixes; -public class BW_Utils { +public class BWUtils { public static ItemStack getCorrespondingItemStack(OrePrefixes orePrefixes, short werkstoffID, int amount) { Werkstoff werkstoff = Werkstoff.werkstoffHashMap.get(werkstoffID); diff --git a/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java b/src/main/java/gtPlusPlus/xmod/bop/BiomesOPlentyHandler.java index 7727eaef38..b1e97782af 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java +++ b/src/main/java/gtPlusPlus/xmod/bop/BiomesOPlentyHandler.java @@ -10,9 +10,9 @@ import net.minecraft.item.ItemStack; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; +import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator; -public class HANDLER_BiomesOPlenty { +public class BiomesOPlentyHandler { public static Item mPineCone; @@ -33,7 +33,7 @@ public class HANDLER_BiomesOPlenty { public static Block colorizedSaplings; public static void preInit() { - BOP_Block_Registrator.run(); + BOPBlockRegistrator.run(); if (BiomesOPlenty.isModLoaded()) { setFields(); registerPineconeToOreDict(); @@ -41,7 +41,7 @@ public class HANDLER_BiomesOPlenty { } public static void postInit() { - BOP_Block_Registrator.recipes(); + BOPBlockRegistrator.recipes(); } private static void registerPineconeToOreDict() { diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/BOPBlockRegistrator.java index 4a3c91e9cb..0cb1852dee 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/BOPBlockRegistrator.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.bop.blocks; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.loaders.oreprocessing.ProcessingLog.addPyrolyeOvenRecipes; import net.minecraft.block.Block; @@ -10,13 +10,13 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import gregtech.GT_Mod; -import gregtech.api.enums.GT_Values; +import gregtech.GTMod; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; @@ -27,7 +27,7 @@ import gtPlusPlus.xmod.bop.blocks.rainforest.LeavesRainforestTree; import gtPlusPlus.xmod.bop.blocks.rainforest.LogRainforestTree; import gtPlusPlus.xmod.bop.blocks.rainforest.SaplingRainforestTree; -public class BOP_Block_Registrator { +public class BOPBlockRegistrator { public static Block log_Rainforest; public static Block leaves_Rainforest; @@ -71,7 +71,7 @@ public class BOP_Block_Registrator { RecipeUtils.addShapelessGregtechRecipe( new ItemStack[] { aStack }, ItemUtils - .getSimpleStack(Item.getItemFromBlock(Blocks.planks), GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 4)); + .getSimpleStack(Item.getItemFromBlock(Blocks.planks), GTMod.gregtechproxy.mNerfedWoodPlank ? 2 : 4)); RecipeUtils.recipeBuilder( CI.craftingToolSaw, null, @@ -83,91 +83,90 @@ public class BOP_Block_Registrator { null, null, ItemUtils.getSimpleStack(Item.getItemFromBlock(Blocks.planks), 4)); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 2L), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "sLf", 'L', GT_Utility.copyAmount(1L, aStack) }); + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 2L), + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, + new Object[] { "sLf", 'L', GTUtility.copyAmount(1L, aStack) }); final short aMeta = (short) aStack.getItemDamage(); - if (GT_Utility.areStacksEqual( - GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), + if (GTUtility.areStacksEqual( + GTModHandler.getSmeltingOutput(GTUtility.copyAmount(1L, aStack), false, null), new ItemStack(Items.coal, 1, 1))) { addPyrolyeOvenRecipes(aStack); - GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack)); + GTModHandler.removeFurnaceSmelting(GTUtility.copyAmount(1L, aStack)); } if (aMeta == 32767) { for (int i = 0; i < 32767; ++i) { - if (GT_Utility.areStacksEqual( - GT_ModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null), + if (GTUtility.areStacksEqual( + GTModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null), new ItemStack(Items.coal, 1, 1))) { addPyrolyeOvenRecipes(aStack); - GT_ModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i)); + GTModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i)); } - final ItemStack tStack = GT_ModHandler.getRecipeOutput(new ItemStack(aStack.getItem(), 1, i)); + final ItemStack tStack = GTModHandler.getRecipeOutput(new ItemStack(aStack.getItem(), 1, i)); if (tStack == null) { if (i >= 16) { break; } } else { - final ItemStack tPlanks = GT_Utility.copy(tStack); + final ItemStack tPlanks = GTUtility.copy(tStack); tPlanks.stackSize = tPlanks.stackSize * 3 / 2; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(aStack.getItem(), 1, i)) .itemOutputs( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack.stackSize) + GTUtility.copyAmount( + GTMod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack.stackSize) : (((long) tStack.stackSize) * 5L / 4), tStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) .duration(10 * SECONDS) .eut(8) .addTo(cutterRecipes); - GT_ModHandler.removeRecipe(new ItemStack(aStack.getItem(), 1, i)); - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack.stackSize) + GTModHandler.removeRecipe(new ItemStack(aStack.getItem(), 1, i)); + GTModHandler.addCraftingRecipe( + GTUtility.copyAmount( + GTMod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack.stackSize) : (((long) tStack.stackSize) * 5L / 4), tStack), new Object[] { "s", "L", 'L', new ItemStack(aStack.getItem(), 1, i) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility - .copyAmount(tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), + GTModHandler.addShapelessCraftingRecipe( + GTUtility.copyAmount(tStack.stackSize / (GTMod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), new Object[] { new ItemStack(aStack.getItem(), 1, i) }); } } } else { - final ItemStack tStack2 = GT_ModHandler.getRecipeOutput(GT_Utility.copyAmount(1L, aStack)); + final ItemStack tStack2 = GTModHandler.getRecipeOutput(GTUtility.copyAmount(1L, aStack)); if (tStack2 != null) { - final ItemStack tPlanks2 = GT_Utility.copy(tStack2); + final ItemStack tPlanks2 = GTUtility.copy(tStack2); tPlanks2.stackSize = tPlanks2.stackSize * 3 / 2; - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1L, aStack)) .itemOutputs( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack2.stackSize) + GTUtility.copyAmount( + GTMod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack2.stackSize) : (((long) tStack2.stackSize) * 5L / 4), tStack2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) .duration(10 * SECONDS) .eut(8) .addTo(cutterRecipes); - GT_ModHandler.removeRecipe(GT_Utility.copyAmount(1L, aStack)); - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack2.stackSize) + GTModHandler.removeRecipe(GTUtility.copyAmount(1L, aStack)); + GTModHandler.addCraftingRecipe( + GTUtility.copyAmount( + GTMod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack2.stackSize) : (((long) tStack2.stackSize) * 5L / 4), tStack2), - new Object[] { "s", "L", 'L', GT_Utility.copyAmount(1L, aStack) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(tStack2.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack2), - new Object[] { GT_Utility.copyAmount(1L, aStack) }); + new Object[] { "s", "L", 'L', GTUtility.copyAmount(1L, aStack) }); + GTModHandler.addShapelessCraftingRecipe( + GTUtility.copyAmount(tStack2.stackSize / (GTMod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack2), + new Object[] { GTUtility.copyAmount(1L, aStack) }); } } - if (GT_Utility.areStacksEqual( - GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), + if (GTUtility.areStacksEqual( + GTModHandler.getSmeltingOutput(GTUtility.copyAmount(1L, aStack), false, null), new ItemStack(Items.coal, 1, 1))) { addPyrolyeOvenRecipes(aStack); - GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack)); + GTModHandler.removeFurnaceSmelting(GTUtility.copyAmount(1L, aStack)); } } } diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java index 93f7e59a1e..4136e7f8e5 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java @@ -10,7 +10,7 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; +import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator; import gtPlusPlus.xmod.bop.blocks.base.LeavesBase; public class LeavesPineTree extends LeavesBase { @@ -23,7 +23,7 @@ public class LeavesPineTree extends LeavesBase { @Override public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { - return Item.getItemFromBlock(BOP_Block_Registrator.sapling_Pine); + return Item.getItemFromBlock(BOPBlockRegistrator.sapling_Pine); } @Override // Drops when Leaf is broken diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java index 2c2bb38af6..b37a4dc3d9 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java @@ -10,7 +10,7 @@ import net.minecraft.world.gen.feature.WorldGenTrees; import net.minecraft.world.gen.feature.WorldGenerator; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.bop.blocks.base.SaplingBase; import gtPlusPlus.xmod.bop.world.features.trees.WorldGenPineTree; @@ -44,7 +44,7 @@ public class SaplingPineTree extends SaplingBase { Object obj = new WorldGenPineTree(); if (obj != null) { world.setBlockToAir(x, y, z); - if (!((WorldGenerator) obj).generate(world, CORE.RANDOM, x, y, z)) { + if (!((WorldGenerator) obj).generate(world, GTPPCore.RANDOM, x, y, z)) { world.setBlock(x, y, z, this, 0, 2); } } diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java index 816b666a40..30f57e1ce6 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java @@ -7,7 +7,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; +import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator; import gtPlusPlus.xmod.bop.blocks.base.LeavesBase; public class LeavesRainforestTree extends LeavesBase { @@ -20,6 +20,6 @@ public class LeavesRainforestTree extends LeavesBase { @Override public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { - return Item.getItemFromBlock(BOP_Block_Registrator.sapling_Rainforest); + return Item.getItemFromBlock(BOPBlockRegistrator.sapling_Rainforest); } } diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java index 362eb2f541..a9cb0e2c98 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java @@ -10,7 +10,7 @@ import net.minecraft.world.gen.feature.WorldGenTrees; import net.minecraft.world.gen.feature.WorldGenerator; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; +import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator; import gtPlusPlus.xmod.bop.blocks.base.SaplingBase; import gtPlusPlus.xmod.bop.world.features.trees.WorldGenRainForestTree_Ex; @@ -43,8 +43,8 @@ public class SaplingRainforestTree extends SaplingBase { world.setBlock(x, y, z, block, 0, 4); } Object o = new WorldGenRainForestTree_Ex( - BOP_Block_Registrator.log_Rainforest, - BOP_Block_Registrator.leaves_Rainforest, + BOPBlockRegistrator.log_Rainforest, + BOPBlockRegistrator.leaves_Rainforest, 0, 0, true, diff --git a/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java index bc97042c82..5d33b482a6 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java @@ -10,7 +10,7 @@ import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraftforge.common.util.ForgeDirection; import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; +import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator; public class WorldGenPineTree extends WorldGenAbstractTree { @@ -49,7 +49,7 @@ public class WorldGenPineTree extends WorldGenAbstractTree { int c; int r = MathUtils.randInt(1, 3); for (c = 0; c < height; ++c) { - this.buildBlock(world, x, y + h, z, BOP_Block_Registrator.log_Pine, 0); + this.buildBlock(world, x, y + h, z, BOPBlockRegistrator.log_Pine, 0); h++; if (c >= r && c % 2 == 0) { this.generateBranch(world, random, x, y + h, z, c); @@ -64,16 +64,16 @@ public class WorldGenPineTree extends WorldGenAbstractTree { public void generateTop(World world, int x, int y, int z) { for (int i = -1; i < 2; ++i) { for (int j = -1; j < 2; ++j) { - this.buildBlock(world, x + i, y, z + j, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + i, y, z + j, BOPBlockRegistrator.leaves_Pine, 0); } } - this.buildBlock(world, x, y, z, BOP_Block_Registrator.log_Pine, 0); - this.buildBlock(world, x + 1, y + 1, z, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x, y + 1, z - 1, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x, y + 1, z + 1, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x - 1, y + 1, z, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x, y + 2, z, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x, y, z, BOPBlockRegistrator.log_Pine, 0); + this.buildBlock(world, x + 1, y + 1, z, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x, y + 1, z - 1, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x, y + 1, z + 1, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x - 1, y + 1, z, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x, y + 2, z, BOPBlockRegistrator.leaves_Pine, 0); } public void generateBranch(World world, Random rand, int x, int y, int z, int n) { @@ -81,7 +81,7 @@ public class WorldGenPineTree extends WorldGenAbstractTree { int var99998; for (var99999 = -1; var99999 < 2; ++var99999) { for (var99998 = -1; var99998 < 2; ++var99998) { - this.buildBlock(world, x + var99999, y, z + var99998, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + var99999, y, z + var99998, BOPBlockRegistrator.leaves_Pine, 0); } } @@ -91,72 +91,72 @@ public class WorldGenPineTree extends WorldGenAbstractTree { int var99996 = rand.nextInt(2); if (n % 2 == 0) { if (var99998 == 0) { - this.buildBlock(world, x + 1, y - 1, z - 2, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x + 2, y - 1, z - 1, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 1, y - 1, z - 2, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y - 1, z - 1, BOPBlockRegistrator.leaves_Pine, 0); if (var99999 == 0) { - this.buildBlock(world, x + 2, y - 2, z - 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y - 2, z - 2, BOPBlockRegistrator.leaves_Pine, 0); } else { - this.buildBlock(world, x + 2, y - 1, z - 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y - 1, z - 2, BOPBlockRegistrator.leaves_Pine, 0); } } else { - this.buildBlock(world, x + 1, y, z - 2, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x + 2, y, z - 1, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x + 2, y, z - 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 1, y, z - 2, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y, z - 1, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y, z - 2, BOPBlockRegistrator.leaves_Pine, 0); } if (var99997 == 0) { - this.buildBlock(world, x - 2, y - 1, z + 1, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x - 1, y - 1, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y - 1, z + 1, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x - 1, y - 1, z + 2, BOPBlockRegistrator.leaves_Pine, 0); if (var99996 == 0) { - this.buildBlock(world, x - 2, y - 2, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y - 2, z + 2, BOPBlockRegistrator.leaves_Pine, 0); } else { - this.buildBlock(world, x - 2, y - 1, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y - 1, z + 2, BOPBlockRegistrator.leaves_Pine, 0); } } else { - this.buildBlock(world, x - 2, y, z + 1, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x - 1, y, z + 2, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x - 2, y, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y, z + 1, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x - 1, y, z + 2, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y, z + 2, BOPBlockRegistrator.leaves_Pine, 0); } } else { if (var99998 == 0) { - this.buildBlock(world, x + 2, y - 1, z + 1, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x + 1, y - 1, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y - 1, z + 1, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x + 1, y - 1, z + 2, BOPBlockRegistrator.leaves_Pine, 0); if (var99999 == 0) { - this.buildBlock(world, x + 2, y - 2, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y - 2, z + 2, BOPBlockRegistrator.leaves_Pine, 0); } else { - this.buildBlock(world, x + 2, y - 1, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y - 1, z + 2, BOPBlockRegistrator.leaves_Pine, 0); } } else { - this.buildBlock(world, x + 2, y, z + 1, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x + 1, y, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y, z + 1, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x + 1, y, z + 2, BOPBlockRegistrator.leaves_Pine, 0); if (var99999 == 0) { - this.buildBlock(world, x + 2, y - 1, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y - 1, z + 2, BOPBlockRegistrator.leaves_Pine, 0); } else { - this.buildBlock(world, x + 2, y, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y, z + 2, BOPBlockRegistrator.leaves_Pine, 0); } } if (var99997 == 0) { - this.buildBlock(world, x - 1, y - 1, z - 2, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x - 2, y - 1, z - 1, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 1, y - 1, z - 2, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y - 1, z - 1, BOPBlockRegistrator.leaves_Pine, 0); if (var99996 == 0) { - this.buildBlock(world, x - 2, y - 2, z - 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y - 2, z - 2, BOPBlockRegistrator.leaves_Pine, 0); } else { - this.buildBlock(world, x - 2, y - 1, z - 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y - 1, z - 2, BOPBlockRegistrator.leaves_Pine, 0); } } else { - this.buildBlock(world, x - 1, y, z - 2, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x - 2, y, z - 1, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 1, y, z - 2, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y, z - 1, BOPBlockRegistrator.leaves_Pine, 0); if (var99996 == 0) { - this.buildBlock(world, x - 2, y - 1, z - 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y - 1, z - 2, BOPBlockRegistrator.leaves_Pine, 0); } else { - this.buildBlock(world, x - 2, y, z - 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y, z - 2, BOPBlockRegistrator.leaves_Pine, 0); } } } - this.buildBlock(world, x, y, z, BOP_Block_Registrator.log_Pine, 0); - this.buildBlock(world, x, y + 1, z, BOP_Block_Registrator.log_Pine, 0); + this.buildBlock(world, x, y, z, BOPBlockRegistrator.log_Pine, 0); + this.buildBlock(world, x, y + 1, z, BOPBlockRegistrator.log_Pine, 0); } public void buildBlock(World world, int x, int y, int z, Block block, int meta) { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java b/src/main/java/gtPlusPlus/xmod/forestry/ForestryHandler.java index dc2d277283..963c793cee 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/ForestryHandler.java @@ -2,21 +2,21 @@ package gtPlusPlus.xmod.forestry; import static gregtech.api.enums.Mods.Forestry; -import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry; -import gtPlusPlus.xmod.forestry.bees.recipe.FR_Gregtech_Recipes; +import gtPlusPlus.xmod.forestry.bees.items.FRItemRegistry; +import gtPlusPlus.xmod.forestry.bees.recipe.FRGregTechRecipes; import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees; -public class HANDLER_FR { +public class ForestryHandler { public static void preInit() { if (Forestry.isModLoaded()) { - FR_ItemRegistry.Register(); + FRItemRegistry.Register(); } } public static void postInit() { if (Forestry.isModLoaded()) { - FR_Gregtech_Recipes.registerItems(); + FRGregTechRecipes.registerItems(); new GTPP_Bees(); } } diff --git a/src/main/java/gtPlusPlus/xmod/forestry/ForestryTreeHandler.java b/src/main/java/gtPlusPlus/xmod/forestry/ForestryTreeHandler.java index 1f64eacb5c..49b048977e 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/ForestryTreeHandler.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/ForestryTreeHandler.java @@ -11,7 +11,7 @@ import forestry.api.arboriculture.TreeManager; import forestry.arboriculture.genetics.TreeDefinition; import forestry.plugins.PluginArboriculture; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntityTreeFarm; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTETreeFarm; public class ForestryTreeHandler { @@ -45,7 +45,7 @@ public class ForestryTreeHandler { } } - GregtechMetaTileEntityTreeFarm.registerForestryTree( + MTETreeFarm.registerForestryTree( speciesUID, sapling == null ? null : sapling.copy(), log == null ? null : log.copy(), @@ -83,7 +83,7 @@ public class ForestryTreeHandler { } } - GregtechMetaTileEntityTreeFarm.registerForestryTree( + MTETreeFarm.registerForestryTree( speciesUID, sapling == null ? null : sapling.copy(), log == null ? null : log.copy(), diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java index d908850658..05ab3c8711 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.forestry.bees.custom; import gregtech.api.enums.Materials; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; import gtPlusPlus.core.util.Utils; public enum CustomCombs { @@ -11,8 +11,8 @@ public enum CustomCombs { SILICON("silicon", true, Materials.Silicon, 100), RUBBER("rubber", true, Materials.Rubber, 100), PLASTIC("polyethylene", true, Materials.Plastic, 75), - PTFE("polytetrafluoroethylene", true, GTPP_Bees.PTFE, 50), - PBS("styrene-butadiene", true, GTPP_Bees.PBS, 25), + PTFE("polytetrafluoroethylene", true, GTPPBees.PTFE, 50), + PBS("styrene-butadiene", true, GTPPBees.PBS, 25), // Fuels BIOMASS("biomass", true, Materials.Biomass, 100), @@ -82,7 +82,7 @@ public enum CustomCombs { public String getName() { // return "gt.comb."+this.name; - return GT_LanguageManager.addStringLocalization( + return GTLanguageManager.addStringLocalization( "comb." + this.name, this.name.substring(0, 1) .toUpperCase() + this.name.substring(1) + " Comb"); diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java index 0cdb49a9b5..7f7553bf1d 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java @@ -27,21 +27,21 @@ import forestry.apiculture.genetics.BeeDefinition; import forestry.apiculture.genetics.BeeVariation; import forestry.apiculture.genetics.IBeeDefinition; import forestry.core.genetics.alleles.AlleleHelper; -import gregtech.loaders.misc.GT_BeeDefinition; +import gregtech.loaders.misc.GTBeeDefinition; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -public enum GTPP_Bee_Definition implements IBeeDefinition { +public enum GTPPBeeDefinition implements IBeeDefinition { - SILICON(GTPP_Branch_Definition.ORGANIC, "Silicon", true, Utils.rgbtoHexValue(75, 75, 75), + SILICON(GTPPBranchDefinition.ORGANIC, "Silicon", true, Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(getSlagComb(), 0.10f); - beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SILICON), 0.20f); + beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.SILICON), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); } @@ -60,13 +60,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition { } }, - RUBBER(GTPP_Branch_Definition.ORGANIC, "Rubber", true, Utils.rgbtoHexValue(55, 55, 55), + RUBBER(GTPPBranchDefinition.ORGANIC, "Rubber", true, Utils.rgbtoHexValue(55, 55, 55), Utils.rgbtoHexValue(75, 75, 75)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(getSlagComb(), 0.10f); - beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.RUBBER), 0.30f); + beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.RUBBER), 0.30f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); } @@ -85,13 +85,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition { } }, - PLASTIC(GTPP_Branch_Definition.ORGANIC, "Plastic", true, Utils.rgbtoHexValue(245, 245, 245), + PLASTIC(GTPPBranchDefinition.ORGANIC, "Plastic", true, Utils.rgbtoHexValue(245, 245, 245), Utils.rgbtoHexValue(175, 175, 175)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(getStoneComb(), 0.30f); - beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.PLASTIC), 0.15f); + beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.PLASTIC), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); } @@ -107,13 +107,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition { } }, - PTFE(GTPP_Branch_Definition.ORGANIC, "Ptfe", true, Utils.rgbtoHexValue(150, 150, 150), + PTFE(GTPPBranchDefinition.ORGANIC, "Ptfe", true, Utils.rgbtoHexValue(150, 150, 150), Utils.rgbtoHexValue(75, 75, 75)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(getStoneComb(), 0.30f); - beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.PTFE), 0.10f); + beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.PTFE), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); } @@ -129,12 +129,12 @@ public enum GTPP_Bee_Definition implements IBeeDefinition { } }, - PBS(GTPP_Branch_Definition.ORGANIC, "Pbs", true, Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14)) { + PBS(GTPPBranchDefinition.ORGANIC, "Pbs", true, Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(getStoneComb(), 0.30f); - beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.PBS), 0.10f); + beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.PBS), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); } @@ -153,13 +153,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition { /** * Fuels */ - BIOMASS(GTPP_Branch_Definition.ORGANIC, "Biomass", true, Utils.rgbtoHexValue(33, 225, 24), + BIOMASS(GTPPBranchDefinition.ORGANIC, "Biomass", true, Utils.rgbtoHexValue(33, 225, 24), Utils.rgbtoHexValue(23, 175, 14)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SAND), 0.40f); - beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.BIOMASS), 0.20f); + beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.SAND), 0.40f); + beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.BIOMASS), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); } @@ -176,13 +176,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition { } }, - ETHANOL(GTPP_Branch_Definition.ORGANIC, "Ethanol", true, Utils.rgbtoHexValue(255, 128, 0), + ETHANOL(GTPPBranchDefinition.ORGANIC, "Ethanol", true, Utils.rgbtoHexValue(255, 128, 0), Utils.rgbtoHexValue(220, 156, 32)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SAND), 0.40f); - beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.ETHANOL), 0.20f); + beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.SAND), 0.40f); + beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.ETHANOL), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); } @@ -202,13 +202,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition { /** * Materials */ - FLUORINE(GTPP_Branch_Definition.ORGANIC, "Fluorine", true, Utils.rgbtoHexValue(30, 230, 230), + FLUORINE(GTPPBranchDefinition.ORGANIC, "Fluorine", true, Utils.rgbtoHexValue(30, 230, 230), Utils.rgbtoHexValue(10, 150, 150)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(getStoneComb(), 0.40f); - beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.FLUORINE), 0.05f); + beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.FLUORINE), 0.05f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.COLD); } @@ -231,15 +231,15 @@ public enum GTPP_Bee_Definition implements IBeeDefinition { // Coke // Force - FORCE(GTPP_Branch_Definition.METAL, "Force", true, Utils.rgbtoHexValue(250, 250, 20), + FORCE(GTPPBranchDefinition.METAL, "Force", true, Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(getStoneComb(), 0.30f); - beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SAND), 0.25f); - beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.FORCE), 0.25f); - beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SALT), 0.05f); + beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.SAND), 0.25f); + beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.FORCE), 0.25f); + beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.SALT), 0.05f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.HOT); } @@ -260,13 +260,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition { }, // Nikolite - NIKOLITE(GTPP_Branch_Definition.METAL, "Nikolite", true, Utils.rgbtoHexValue(60, 180, 200), + NIKOLITE(GTPPBranchDefinition.METAL, "Nikolite", true, Utils.rgbtoHexValue(60, 180, 200), Utils.rgbtoHexValue(40, 150, 170)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(getStoneComb(), 0.30f); - beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.NIKOLITE), 0.05f); + beeSpecies.addProduct(GTPPBees.combs.getStackForType(CustomCombs.NIKOLITE), 0.05f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.HOT); } @@ -289,7 +289,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition { /* * CLAY(GTPP_Branch_Definition.ORGANIC, "Clay", true, 0x19d0ec, 0xffdc16) { * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f); + * beeSpecies.addProduct(GTModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f); * beeSpecies.addProduct(new ItemStack(Items.clay_ball, 1), 0.15f); beeSpecies.setHumidity(EnumHumidity.DAMP); * beeSpecies.setTemperature(EnumTemperature.NORMAL); } * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.MEADOWS.getTemplate(); } @@ -297,7 +297,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition { * registerMutation(getSpecies("Industrious"), getSpecies("Diligent"), 20); } }, * SLIMEBALL(GTPP_Branch_Definition.ORGANIC, "SlimeBall", true, 0x4E9E55, 0x00FF15) { * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 15), 0.30f); + * beeSpecies.addProduct(GTModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 15), 0.30f); * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STICKY), 0.30f); * beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); } * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.MARSHY.getTemplate(); } @@ -306,14 +306,14 @@ public enum GTPP_Bee_Definition implements IBeeDefinition { * 0x906237, 0x58300B) { * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.LIGNIE), 0.30f); - * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.15f); + * beeSpecies.addProduct(GTModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.15f); * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); } * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.RURAL.getTemplate(); } * @Override protected void registerMutations() { IBeeMutationCustom tMutation = * registerMutation(getSpecies("Rural"), CLAY.species, 20); } }, STICKYRESIN(GTPP_Branch_Definition.ORGANIC, * "StickyResin", true, 0x2E8F5B, 0xDCC289) { * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f); + * beeSpecies.addProduct(GTModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f); * beeSpecies.addProduct(ItemList.IC2_Resin.get(1, new Object[0]), 0.15f); * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); } * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.MEADOWS.getTemplate(); } @@ -328,7 +328,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition { * registerMutation(getSpecies("Industrious"), PEAT.species, 18); } }, OIL(GTPP_Branch_Definition.ORGANIC, "Oil", * true, 0x4C4C4C, 0x333333) { * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f); + * beeSpecies.addProduct(GTModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f); * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.OIL), 0.15f); * beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); * beeSpecies.setNocturnal(); } @@ -476,13 +476,13 @@ public enum GTPP_Bee_Definition implements IBeeDefinition { ; - private final GTPP_Branch_Definition branch; + private final GTPPBranchDefinition branch; private final IAlleleBeeSpeciesCustom species; private IAllele[] template; private IBeeGenome genome; - GTPP_Bee_Definition(GTPP_Branch_Definition branch, String binomial, boolean dominant, int primary, int secondary) { + GTPPBeeDefinition(GTPPBranchDefinition branch, String binomial, boolean dominant, int primary, int secondary) { String lowercaseName = this.toString() .toLowerCase(Locale.ENGLISH); String species = "species" + WordUtils.capitalize(lowercaseName); @@ -505,10 +505,10 @@ public enum GTPP_Bee_Definition implements IBeeDefinition { } public static void initBees() { - for (GTPP_Bee_Definition bee : values()) { + for (GTPPBeeDefinition bee : values()) { bee.init(); } - for (GTPP_Bee_Definition bee : values()) { + for (GTPPBeeDefinition bee : values()) { bee.registerMutations(); } } @@ -574,11 +574,11 @@ public enum GTPP_Bee_Definition implements IBeeDefinition { } private static ItemStack getSlagComb() { - return issStackValid(ItemUtils.getSimpleStack(GTPP_Bees.Comb_Slag, 1)); + return issStackValid(ItemUtils.getSimpleStack(GTPPBees.Comb_Slag, 1)); } private static ItemStack getStoneComb() { - return issStackValid(ItemUtils.getSimpleStack(GTPP_Bees.Comb_Stone, 1)); + return issStackValid(ItemUtils.getSimpleStack(GTPPBees.Comb_Stone, 1)); } private static ItemStack issStackValid(ItemStack result) { @@ -590,8 +590,8 @@ public enum GTPP_Bee_Definition implements IBeeDefinition { public static IAlleleBeeSpecies getGregtechBeeType(String name) { try { - Enum<GT_BeeDefinition> gtBeeEnumObject = Enum.valueOf(GT_BeeDefinition.class, name); - Field gtBeesField = FieldUtils.getDeclaredField(GT_BeeDefinition.class, "species", true); + Enum<GTBeeDefinition> gtBeeEnumObject = Enum.valueOf(GTBeeDefinition.class, name); + Field gtBeesField = FieldUtils.getDeclaredField(GTBeeDefinition.class, "species", true); gtBeesField.setAccessible(true); ReflectionUtils.makeFieldAccessible(gtBeesField); Object beeType = gtBeesField.get(gtBeeEnumObject); diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBees.java index 4d04e3ad31..f0cd284bdf 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBees.java @@ -2,8 +2,8 @@ package gtPlusPlus.xmod.forestry.bees.custom; import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -15,11 +15,11 @@ import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.reflect.FieldUtils; -import gregtech.GT_Mod; -import gregtech.api.enums.GT_Values; +import gregtech.GTMod; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.item.base.ingots.BaseItemIngot_OLD; +import gtPlusPlus.core.item.base.ingots.BaseItemIngotOld; import gtPlusPlus.core.item.base.misc.BaseItemMisc; import gtPlusPlus.core.item.base.misc.BaseItemMisc.MiscTypes; import gtPlusPlus.core.util.Utils; @@ -27,7 +27,7 @@ import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -public class GTPP_Bees { +public class GTPPBees { // Custom Comb Drop Base Items public static Item dropForceGem; @@ -49,7 +49,7 @@ public class GTPP_Bees { // public static GTPP_Branch_Definition definition; - public GTPP_Bees() { + public GTPPBees() { if (Forestry.isModLoaded()) { // Set Materials and Comb stacks from GT via Reflection @@ -59,7 +59,7 @@ public class GTPP_Bees { try { combs = new ItemCustomComb(); combs.initCombsRecipes(); - GTPP_Bee_Definition.initBees(); + GTPPBeeDefinition.initBees(); } catch (Throwable t) { Logger.BEES("Failed to load bees, probably due to an ancient forestry version"); t.printStackTrace(); @@ -77,7 +77,7 @@ public class GTPP_Bees { .generateSpecialUseDusts("Nikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200))[2]; if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotNikolite", 1) == null) { - new BaseItemIngot_OLD("itemIngotNikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200), 0); + new BaseItemIngotOld("itemIngotNikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200), 0); } dropFluorineBlob = new BaseItemMisc("Fluorine", new short[] { 30, 230, 230 }, 64, MiscTypes.DROP, null); @@ -91,7 +91,7 @@ public class GTPP_Bees { } private void addExtractorRecipe(ItemStack input, FluidStack output) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(input) .fluidOutputs(output) .duration(1 * SECONDS + 10 * TICKS) @@ -101,9 +101,9 @@ public class GTPP_Bees { private static boolean tryGetBeesBoolean() { try { - Class<?> mProxy = Class.forName("gregtech.GT_Mod.gregtechproxy"); + Class<?> mProxy = Class.forName("gregtech.GTMod.gregtechproxy"); Field mNerf = FieldUtils.getDeclaredField(mProxy, "mGTBees", true); - boolean returnValue = (boolean) mNerf.get(GT_Mod.gregtechproxy); + boolean returnValue = (boolean) mNerf.get(GTMod.gregtechproxy); return returnValue; } catch (ClassNotFoundException | IllegalArgumentException | IllegalAccessException e) { return false; @@ -113,7 +113,7 @@ public class GTPP_Bees { private void setMaterials() { try { - Class<?> gtBees = Class.forName("gregtech.loaders.misc.GT_Bees"); + Class<?> gtBees = Class.forName("gregtech.loaders.misc.GTBees"); Class<?> gtCombItemClass = Class.forName("gregtech.common.items.ItemComb"); Class gtCombEnumClass = Class.forName("gregtech.common.items.CombType"); Field gtCombs = FieldUtils.getDeclaredField(gtBees, "combs", true); diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBranchDefinition.java index 94e6078c49..ca35849172 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBranchDefinition.java @@ -7,7 +7,7 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; import gtPlusPlus.api.objects.Logger; -public enum GTPP_Branch_Definition { +public enum GTPPBranchDefinition { ORGANIC("ORGANIC"), GEM("GEM"), @@ -18,7 +18,7 @@ public enum GTPP_Branch_Definition { final String mFieldName; final Enum mActualValues; - GTPP_Branch_Definition(String mValue) { + GTPPBranchDefinition(String mValue) { this.mFieldName = mValue; this.mActualValues = setEnumVar(mValue); } @@ -26,7 +26,7 @@ public enum GTPP_Branch_Definition { public final IAllele[] getTemplate() { Class gtBranchDefClass; try { - gtBranchDefClass = Class.forName("gregtech.loaders.misc.GT_BranchDefinition"); + gtBranchDefClass = Class.forName("gregtech.loaders.misc.GTBranchDefinition"); Enum enumA = mActualValues; Method methodMyMethod = gtBranchDefClass.getMethod("getTemplate"); @@ -47,7 +47,7 @@ public enum GTPP_Branch_Definition { public final IClassification getBranch() { Class gtBranchDefClass; try { - gtBranchDefClass = Class.forName("gregtech.loaders.misc.GT_BranchDefinition"); + gtBranchDefClass = Class.forName("gregtech.loaders.misc.GTBranchDefinition"); Enum enum_MY_SAMPLE_ENUM = mActualValues; Method methodMyMethod = gtBranchDefClass.getMethod("getBranch"); @@ -66,7 +66,7 @@ public enum GTPP_Branch_Definition { private Enum setEnumVar(String value) { try { - Class gtBranchDefClass = Class.forName("gregtech.loaders.misc.GT_BranchDefinition"); + Class gtBranchDefClass = Class.forName("gregtech.loaders.misc.GTBranchDefinition"); Enum branchDef = Enum.valueOf(gtBranchDefClass, value); return branchDef; } catch (ClassNotFoundException e) { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java index 63c0ae53ec..0ff3625a25 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java @@ -2,8 +2,8 @@ package gtPlusPlus.xmod.forestry.bees.custom; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import java.util.List; @@ -17,11 +17,11 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.core.util.minecraft.ItemUtils; public class ItemCustomComb extends Item { @@ -101,37 +101,37 @@ public class ItemCustomComb extends Item { ItemStack tComb; tComb = getStackForType(CustomCombs.SILICON); - addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Silicon, 1), 30); + addSpecialCent(tComb, GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Silicon, 1), 30); // addProcess(tComb, Materials.Silver, 100); // addProcess(tComb, Materials.Galena, 100); // Rubbers tComb = getStackForType(CustomCombs.RUBBER); - addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Rubber, 1), 30); + addSpecialCent(tComb, GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Rubber, 1), 30); tComb = getStackForType(CustomCombs.PLASTIC); - addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plastic, 1), 20); + addSpecialCent(tComb, GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plastic, 1), 20); tComb = getStackForType(CustomCombs.PTFE); - addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, GTPP_Bees.PTFE, 1), 10); + addSpecialCent(tComb, GTOreDictUnificator.get(OrePrefixes.dustTiny, GTPPBees.PTFE, 1), 10); tComb = getStackForType(CustomCombs.PBS); - addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, GTPP_Bees.PBS, 1), 5); + addSpecialCent(tComb, GTOreDictUnificator.get(OrePrefixes.dustTiny, GTPPBees.PBS, 1), 5); // Fuels tComb = getStackForType(CustomCombs.BIOMASS); - addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPP_Bees.dropBiomassBlob), 5); + addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPPBees.dropBiomassBlob), 5); tComb = getStackForType(CustomCombs.PBS); - addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPP_Bees.dropEthanolBlob), 5); + addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPPBees.dropEthanolBlob), 5); // Misc Materials tComb = getStackForType(CustomCombs.FORCE); - addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPP_Bees.dropForceGem), 5); + addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPPBees.dropForceGem), 5); tComb = getStackForType(CustomCombs.FLUORINE); - addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPP_Bees.dropFluorineBlob), 5); + addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPPBees.dropFluorineBlob), 5); tComb = getStackForType(CustomCombs.NIKOLITE); - addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPP_Bees.dropNikoliteDust), 5); + addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPPBees.dropNikoliteDust), 5); } public void addSpecialCent(ItemStack tComb, ItemStack aOutput, int chance) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(tComb) .itemOutputs(aOutput, ItemList.FR_Wax.get(1)) .outputChances(chance * 100, 3000) diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPCombType.java index be1aa48d3c..6c594fc83a 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPCombType.java @@ -2,12 +2,12 @@ package gtPlusPlus.xmod.forestry.bees.handler; import net.minecraft.item.ItemStack; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees; -public enum GTPP_CombType { +public enum GTPPCombType { DRAGONBLOOD(0, "Dragonblood", true, 30, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20)), FORCE(1, "Force", true, 30, Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5)); @@ -21,15 +21,15 @@ public enum GTPP_CombType { private final String mNameUnlocal; private final int[] mColour; - private static void map(int aId, GTPP_CombType aType) { + private static void map(int aId, GTPPCombType aType) { GTPP_Bees.sCombMappings.put(aId, aType); } - public static GTPP_CombType get(int aID) { + public static GTPPCombType get(int aID) { return GTPP_Bees.sCombMappings.get(aID); } - GTPP_CombType(int aID, String aName, boolean aShow, int aChance, int... aColour) { + GTPPCombType(int aID, String aName, boolean aShow, int aChance, int... aColour) { this.mID = aID; this.mName = aName; this.mNameUnlocal = aName.toLowerCase() @@ -41,7 +41,7 @@ public enum GTPP_CombType { this.mMaterial = GTPP_Bees.sMaterialMappings.get( aName.toLowerCase() .replaceAll(" ", "")); - GT_LanguageManager.addStringLocalization("gtplusplus.comb." + this.mNameUnlocal, this.mName + " Comb"); + GTLanguageManager.addStringLocalization("gtplusplus.comb." + this.mNameUnlocal, this.mName + " Comb"); } public void setHidden() { @@ -49,7 +49,7 @@ public enum GTPP_CombType { } public String getName() { - return GT_LanguageManager.getTranslation("gtplusplus.comb." + this.mNameUnlocal); + return GTLanguageManager.getTranslation("gtplusplus.comb." + this.mNameUnlocal); } public int[] getColours() { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPDropType.java index 089b8cebf1..0ae34d599c 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPDropType.java @@ -2,12 +2,12 @@ package gtPlusPlus.xmod.forestry.bees.handler; import net.minecraft.item.ItemStack; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees; -public enum GTPP_DropType { +public enum GTPPDropType { DRAGONBLOOD(0, "Dragonblood", true, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20)), FORCE(1, "Force", true, Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5)); @@ -21,15 +21,15 @@ public enum GTPP_DropType { private final String mNameUnlocal; private final int[] mColour; - private static void map(int aId, GTPP_DropType aType) { + private static void map(int aId, GTPPDropType aType) { GTPP_Bees.sDropMappings.put(aId, aType); } - public static GTPP_DropType get(int aID) { + public static GTPPDropType get(int aID) { return GTPP_Bees.sDropMappings.get(aID); } - private GTPP_DropType(int aID, String aName, boolean aShow, int... aColour) { + private GTPPDropType(int aID, String aName, boolean aShow, int... aColour) { this.mID = aID; this.mName = aName; this.mNameUnlocal = aName.toLowerCase() @@ -40,7 +40,7 @@ public enum GTPP_DropType { this.mMaterial = GTPP_Bees.sMaterialMappings.get( aName.toLowerCase() .replaceAll(" ", "")); - GT_LanguageManager.addStringLocalization("gtplusplus.drop." + this.mNameUnlocal, this.mName + " Drop"); + GTLanguageManager.addStringLocalization("gtplusplus.drop." + this.mNameUnlocal, this.mName + " Drop"); } public void setHidden() { @@ -48,7 +48,7 @@ public enum GTPP_DropType { } public String getName() { - return GT_LanguageManager.getTranslation("gtplusplus.drop." + this.mNameUnlocal); + return GTLanguageManager.getTranslation("gtplusplus.drop." + this.mNameUnlocal); } public int[] getColours() { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPPollenType.java index 56a8f37daf..08b8f84dca 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPPollenType.java @@ -2,12 +2,12 @@ package gtPlusPlus.xmod.forestry.bees.handler; import net.minecraft.item.ItemStack; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees; -public enum GTPP_PollenType { +public enum GTPPPollenType { DRAGONBLOOD(0, "Dragonblood", true, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20)); @@ -20,15 +20,15 @@ public enum GTPP_PollenType { private final String mNameUnlocal; private final int[] mColour; - private static void map(int aId, GTPP_PollenType aType) { + private static void map(int aId, GTPPPollenType aType) { GTPP_Bees.sPollenMappings.put(aId, aType); } - public static GTPP_PollenType get(int aID) { + public static GTPPPollenType get(int aID) { return GTPP_Bees.sPollenMappings.get(aID); } - private GTPP_PollenType(int aID, String aName, boolean aShow, int... aColour) { + private GTPPPollenType(int aID, String aName, boolean aShow, int... aColour) { this.mID = aID; this.mName = aName; this.mNameUnlocal = aName.toLowerCase() @@ -39,7 +39,7 @@ public enum GTPP_PollenType { this.mMaterial = GTPP_Bees.sMaterialMappings.get( aName.toLowerCase() .replaceAll(" ", "")); - GT_LanguageManager.addStringLocalization("gtplusplus.pollen." + this.mNameUnlocal, this.mName + " Pollen"); + GTLanguageManager.addStringLocalization("gtplusplus.pollen." + this.mNameUnlocal, this.mName + " Pollen"); } public void setHidden() { @@ -47,7 +47,7 @@ public enum GTPP_PollenType { } public String getName() { - return GT_LanguageManager.getTranslation("gtplusplus.pollen." + this.mNameUnlocal); + return GTLanguageManager.getTranslation("gtplusplus.pollen." + this.mNameUnlocal); } public int[] getColours() { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPPropolisType.java index fc70d6232e..f97da9f4df 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPPropolisType.java @@ -2,12 +2,12 @@ package gtPlusPlus.xmod.forestry.bees.handler; import net.minecraft.item.ItemStack; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees; -public enum GTPP_PropolisType { +public enum GTPPPropolisType { DRAGONBLOOD(0, "Dragonblood", true, Utils.rgbtoHexValue(220, 20, 20)), FORCE(1, "Force", true, Utils.rgbtoHexValue(250, 250, 20)); @@ -21,15 +21,15 @@ public enum GTPP_PropolisType { private final String mNameUnlocal; private final int mColour; - private static void map(int aId, GTPP_PropolisType aType) { + private static void map(int aId, GTPPPropolisType aType) { GTPP_Bees.sPropolisMappings.put(aId, aType); } - public static GTPP_PropolisType get(int aID) { + public static GTPPPropolisType get(int aID) { return GTPP_Bees.sPropolisMappings.get(aID); } - private GTPP_PropolisType(int aID, String aName, boolean aShow, int aColour) { + private GTPPPropolisType(int aID, String aName, boolean aShow, int aColour) { this.mID = aID; this.mName = aName; this.mNameUnlocal = aName.toLowerCase() @@ -40,7 +40,7 @@ public enum GTPP_PropolisType { this.mMaterial = GTPP_Bees.sMaterialMappings.get( aName.toLowerCase() .replaceAll(" ", "")); - GT_LanguageManager.addStringLocalization("gtplusplus.propolis." + this.mNameUnlocal, this.mName + " Propolis"); + GTLanguageManager.addStringLocalization("gtplusplus.propolis." + this.mNameUnlocal, this.mName + " Propolis"); } public void setHidden() { @@ -48,7 +48,7 @@ public enum GTPP_PropolisType { } public String getName() { - return GT_LanguageManager.getTranslation("gtplusplus.propolis." + this.mNameUnlocal); + return GTLanguageManager.getTranslation("gtplusplus.propolis." + this.mNameUnlocal); } public int getColours() { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRItemRegistry.java index b61a91710e..ab2353cc37 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRItemRegistry.java @@ -19,28 +19,28 @@ import cpw.mods.fml.common.registry.GameRegistry; import forestry.core.utils.StringUtil; import gregtech.api.enums.Mods; -public class FR_ItemRegistry { +public class FRItemRegistry { // ----- Apiary Frames ---------------------- // Magic Bee Frame Items - public static MB_ItemFrame hiveFrameAccelerated; - public static MB_ItemFrame hiveFrameVoid; - public static MB_ItemFrame hiveFrameMutagenic; - public static MB_ItemFrame hiveFrameBusy; + public static MBItemFrame hiveFrameAccelerated; + public static MBItemFrame hiveFrameVoid; + public static MBItemFrame hiveFrameMutagenic; + public static MBItemFrame hiveFrameBusy; // Extra Bee Frame Items - public static MB_ItemFrame hiveFrameCocoa; - public static MB_ItemFrame hiveFrameCaged; - public static MB_ItemFrame hiveFrameSoul; - public static MB_ItemFrame hiveFrameClay; - public static MB_ItemFrame hiveFrameNova; + public static MBItemFrame hiveFrameCocoa; + public static MBItemFrame hiveFrameCaged; + public static MBItemFrame hiveFrameSoul; + public static MBItemFrame hiveFrameClay; + public static MBItemFrame hiveFrameNova; // Frame Items added by bartimaeusnek - public static MB_ItemFrame hiveFrameDecay; - public static MB_ItemFrame hiveFrameSlow; - public static MB_ItemFrame hiveFrameStalilize; - public static MB_ItemFrame hiveFrameArborist; + public static MBItemFrame hiveFrameDecay; + public static MBItemFrame hiveFrameSlow; + public static MBItemFrame hiveFrameStalilize; + public static MBItemFrame hiveFrameArborist; @Optional.Method(modid = Mods.Names.FORESTRY) public static void Register() { @@ -52,19 +52,19 @@ public class FR_ItemRegistry { // Magic Bee like Frames - hiveFrameVoid = new MB_ItemFrame( - MB_FrameType.USELESS, + hiveFrameVoid = new MBItemFrame( + MBFrameType.USELESS, EnumRarity.common, "No more cheaty frames for GTNH players."); - hiveFrameAccelerated = new MB_ItemFrame( - MB_FrameType.ACCELERATED, + hiveFrameAccelerated = new MBItemFrame( + MBFrameType.ACCELERATED, "Longevity for bees isn't very common, especially if they're working harder."); - hiveFrameMutagenic = new MB_ItemFrame( - MB_FrameType.MUTAGENIC, + hiveFrameMutagenic = new MBItemFrame( + MBFrameType.MUTAGENIC, EnumRarity.epic, "Evolution of the fittest, finest and fastest."); - hiveFrameBusy = new MB_ItemFrame(MB_FrameType.BUSY, "Your bee will work harder and longer than you expected."); + hiveFrameBusy = new MBItemFrame(MBFrameType.BUSY, "Your bee will work harder and longer than you expected."); ChestGenHooks.addItem( ChestGenHooks.STRONGHOLD_CORRIDOR, new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 14)); @@ -91,17 +91,17 @@ public class FR_ItemRegistry { new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 3, 12)); // Frame Items added by bartimaeusnek - hiveFrameDecay = new MB_ItemFrame( - MB_FrameType.DECAYING, + hiveFrameDecay = new MBItemFrame( + MBFrameType.DECAYING, EnumRarity.uncommon, "Who really needs stable genetics?"); - hiveFrameSlow = new MB_ItemFrame(MB_FrameType.SLOWING, EnumRarity.common, "The journey is its own reward."); - hiveFrameStalilize = new MB_ItemFrame( - MB_FrameType.STABILIZING, + hiveFrameSlow = new MBItemFrame(MBFrameType.SLOWING, EnumRarity.common, "The journey is its own reward."); + hiveFrameStalilize = new MBItemFrame( + MBFrameType.STABILIZING, EnumRarity.rare, "If you wish your bees to keep their form."); - hiveFrameArborist = new MB_ItemFrame( - MB_FrameType.ARBORISTS, + hiveFrameArborist = new MBItemFrame( + MBFrameType.ARBORISTS, EnumRarity.common, "Who need Bees when you can have Trees?"); ChestGenHooks.addItem( diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRStringUtil.java index c63401aecf..80b44268c5 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRStringUtil.java @@ -2,7 +2,7 @@ package gtPlusPlus.xmod.forestry.bees.items; import net.minecraft.util.StatCollector; -public class FR_StringUtil { +public class FRStringUtil { public static String getLocalizedString(final String key) { if (StatCollector.canTranslate(key)) { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBFrameType.java index 418c05587f..aaee356868 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBFrameType.java @@ -3,7 +3,7 @@ package gtPlusPlus.xmod.forestry.bees.items; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeModifier; -public enum MB_FrameType implements IBeeModifier { +public enum MBFrameType implements IBeeModifier { // ExtraBees Clone Frames // Name, FrameHP, territory (1f), Mutation rate, lifespan rate, production rate, genetic decay (1f) @@ -43,12 +43,12 @@ public enum MB_FrameType implements IBeeModifier { private final boolean isSunlit; private final boolean isHellish; - MB_FrameType(final String name, final int damage, final float territory, final float mutation, final float lifespan, + MBFrameType(final String name, final int damage, final float territory, final float mutation, final float lifespan, final float production, final float geneticDecay) { this(name, damage, territory, mutation, lifespan, production, 1f, geneticDecay, false, false, false, false); } - MB_FrameType(final String name, final int damage, final float territory, final float mutation, final float lifespan, + MBFrameType(final String name, final int damage, final float territory, final float mutation, final float lifespan, final float production, final float flowering, final float geneticDecay, final boolean sealed, final boolean lit, final boolean sunlit, final boolean hellish) { this.frameName = name; @@ -71,7 +71,7 @@ public enum MB_FrameType implements IBeeModifier { } public String getLocalizedName() { - return FR_StringUtil.getLocalizedString("frame." + this.frameName); + return FRStringUtil.getLocalizedString("frame." + this.frameName); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBItemFrame.java index e5d36d15e8..b196598f43 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBItemFrame.java @@ -21,17 +21,17 @@ import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IHiveFrame; import gtPlusPlus.core.creative.AddToCreativeTab; -public class MB_ItemFrame extends Item implements IHiveFrame { +public class MBItemFrame extends Item implements IHiveFrame { - private final MB_FrameType type; + private final MBFrameType type; private EnumRarity rarity_value = EnumRarity.uncommon; private final String toolTip; - public MB_ItemFrame(final MB_FrameType frameType, final String description) { + public MBItemFrame(final MBFrameType frameType, final String description) { this(frameType, EnumRarity.uncommon, description); } - public MB_ItemFrame(final MB_FrameType frameType, final EnumRarity rarity, final String description) { + public MBItemFrame(final MBFrameType frameType, final EnumRarity rarity, final String description) { super(); this.type = frameType; this.setMaxDamage(this.type.maxDamage); diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPComb.java index 16f364f595..c77c7fcb8a 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPComb.java @@ -2,7 +2,7 @@ package gtPlusPlus.xmod.forestry.bees.items.output; import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.GTPlusPlus; -import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER; +import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalPlantRecipes; import java.util.List; @@ -17,20 +17,20 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; -import gregtech.api.enums.GT_Values; -import gregtech.api.util.GT_ModHandler; +import gregtech.api.enums.GTValues; +import gregtech.api.util.GTModHandler; import gtPlusPlus.core.material.Material; -import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType; -import gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType; -import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PropolisType; +import gtPlusPlus.xmod.forestry.bees.handler.GTPPCombType; +import gtPlusPlus.xmod.forestry.bees.handler.GTPPDropType; +import gtPlusPlus.xmod.forestry.bees.handler.GTPPPropolisType; import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees; -public class GTPP_Comb extends Item { +public class GTPPComb extends Item { @SideOnly(Side.CLIENT) private IIcon secondIcon; - public GTPP_Comb() { + public GTPPComb() { super(); this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); @@ -38,18 +38,18 @@ public class GTPP_Comb extends Item { GameRegistry.registerItem(this, "gtpp.comb", GTPlusPlus.ID); } - public ItemStack getStackForType(GTPP_CombType type) { + public ItemStack getStackForType(GTPPCombType type) { return new ItemStack(this, 1, type.mID); } - public ItemStack getStackForType(GTPP_CombType type, int count) { + public ItemStack getStackForType(GTPPCombType type, int count) { return new ItemStack(this, count, type.mID); } @Override @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tabs, List list) { - for (GTPP_CombType type : GTPP_CombType.values()) { + for (GTPPCombType type : GTPPCombType.values()) { if (type.mShowInList) { list.add(this.getStackForType(type)); } @@ -82,11 +82,11 @@ public class GTPP_Comb extends Item { @Override @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int pass) { - int colour = GTPP_CombType.get(stack.getItemDamage()) + int colour = GTPPCombType.get(stack.getItemDamage()) .getColours()[0]; if (pass >= 1) { - colour = GTPP_CombType.get(stack.getItemDamage()) + colour = GTPPCombType.get(stack.getItemDamage()) .getColours()[1]; } @@ -95,31 +95,31 @@ public class GTPP_Comb extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { - return GTPP_CombType.get(stack.getItemDamage()) + return GTPPCombType.get(stack.getItemDamage()) .getName(); } public static void initCombsRecipes() { addChemicalRecipe( - GTPP_CombType.DRAGONBLOOD, - new ItemStack[] { GT_ModHandler.getModItem(Forestry.ID, "refractoryWax", 1L, 0), - GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.DRAGONBLOOD), - GTPP_Bees.drop.getStackForType(GTPP_DropType.DRAGONBLOOD) }, + GTPPCombType.DRAGONBLOOD, + new ItemStack[] { GTModHandler.getModItem(Forestry.ID, "refractoryWax", 1L, 0), + GTPP_Bees.propolis.getStackForType(GTPPPropolisType.DRAGONBLOOD), + GTPP_Bees.drop.getStackForType(GTPPDropType.DRAGONBLOOD) }, new int[] { 3000, 1500, 500 }); addChemicalRecipe( - GTPP_CombType.FORCE, - new ItemStack[] { GT_ModHandler.getModItem(Forestry.ID, "beeswax", 1L, 0), - GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.FORCE), - GTPP_Bees.drop.getStackForType(GTPP_DropType.FORCE) }, + GTPPCombType.FORCE, + new ItemStack[] { GTModHandler.getModItem(Forestry.ID, "beeswax", 1L, 0), + GTPP_Bees.propolis.getStackForType(GTPPPropolisType.FORCE), + GTPP_Bees.drop.getStackForType(GTPPDropType.FORCE) }, new int[] { 5000, 3000, 1000 }); } - public static void addChemicalRecipe(GTPP_CombType aInputStack, ItemStack[] aOutputs, int[] aChances) { + public static void addChemicalRecipe(GTPPCombType aInputStack, ItemStack[] aOutputs, int[] aChances) { Material aMat = aInputStack.mMaterial; long aEU = aMat.vVoltageMultiplier; int aTier = Math.max(aMat.vTier / 2, 1); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aInputStack.getStackForType(aTier)) .itemOutputs(aOutputs) .duration(aTier * 20 * 60) diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPDrop.java index a84d11e74c..dd85ed6b2d 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPDrop.java @@ -2,7 +2,7 @@ package gtPlusPlus.xmod.forestry.bees.items.output; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import java.util.List; @@ -17,17 +17,17 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType; +import gtPlusPlus.xmod.forestry.bees.handler.GTPPDropType; import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees; -public class GTPP_Drop extends Item { +public class GTPPDrop extends Item { @SideOnly(Side.CLIENT) private IIcon secondIcon; - public GTPP_Drop() { + public GTPPDrop() { super(); this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); @@ -35,18 +35,18 @@ public class GTPP_Drop extends Item { GameRegistry.registerItem(this, "gtpp.drop", GTPlusPlus.ID); } - public ItemStack getStackForType(GTPP_DropType type) { + public ItemStack getStackForType(GTPPDropType type) { return new ItemStack(this, 1, type.mID); } - public ItemStack getStackForType(GTPP_DropType type, int count) { + public ItemStack getStackForType(GTPPDropType type, int count) { return new ItemStack(this, count, type.mID); } @Override @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tabs, List list) { - for (GTPP_DropType type : GTPP_DropType.values()) { + for (GTPPDropType type : GTPPDropType.values()) { if (type.mShowInList) { list.add(this.getStackForType(type)); } @@ -79,11 +79,11 @@ public class GTPP_Drop extends Item { @Override @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int pass) { - int colour = GTPP_DropType.get(stack.getItemDamage()) + int colour = GTPPDropType.get(stack.getItemDamage()) .getColours()[0]; if (pass >= 1) { - colour = GTPP_DropType.get(stack.getItemDamage()) + colour = GTPPDropType.get(stack.getItemDamage()) .getColours()[1]; } @@ -92,7 +92,7 @@ public class GTPP_Drop extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { - return GTPP_DropType.get(stack.getItemDamage()) + return GTPPDropType.get(stack.getItemDamage()) .getName(); } @@ -102,7 +102,7 @@ public class GTPP_Drop extends Item { public static void initDropsRecipes() { ItemStack tDrop; Logger.BEES("Processing recipes for " + GTPP_Bees.sDropMappings.size() + " Drops."); - for (GTPP_DropType aDrop : GTPP_Bees.sDropMappings.values()) { + for (GTPPDropType aDrop : GTPP_Bees.sDropMappings.values()) { tDrop = aDrop.getStackForType(1); if (addProcess( tDrop, @@ -120,7 +120,7 @@ public class GTPP_Drop extends Item { if (aOutput == null) { return false; } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(tDrop) .fluidOutputs(aOutput) .duration(aDuration * TICKS) diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPPollen.java index 7e959151a0..9c07f294c5 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPPollen.java @@ -14,14 +14,14 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; -import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PollenType; +import gtPlusPlus.xmod.forestry.bees.handler.GTPPPollenType; -public class GTPP_Pollen extends Item { +public class GTPPPollen extends Item { @SideOnly(Side.CLIENT) private IIcon secondIcon; - public GTPP_Pollen() { + public GTPPPollen() { super(); this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); @@ -29,18 +29,18 @@ public class GTPP_Pollen extends Item { GameRegistry.registerItem(this, "gtpp.pollen", GTPlusPlus.ID); } - public ItemStack getStackForType(GTPP_PollenType type) { + public ItemStack getStackForType(GTPPPollenType type) { return new ItemStack(this, 1, type.mID); } - public ItemStack getStackForType(GTPP_PollenType type, int count) { + public ItemStack getStackForType(GTPPPollenType type, int count) { return new ItemStack(this, count, type.mID); } @Override @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tabs, List list) { - for (GTPP_PollenType type : GTPP_PollenType.values()) { + for (GTPPPollenType type : GTPPPollenType.values()) { if (type.mShowInList) { list.add(this.getStackForType(type)); } @@ -73,11 +73,11 @@ public class GTPP_Pollen extends Item { @Override @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int pass) { - int colour = GTPP_PollenType.get(stack.getItemDamage()) + int colour = GTPPPollenType.get(stack.getItemDamage()) .getColours()[0]; if (pass >= 1) { - colour = GTPP_PollenType.get(stack.getItemDamage()) + colour = GTPPPollenType.get(stack.getItemDamage()) .getColours()[1]; } @@ -86,7 +86,7 @@ public class GTPP_Pollen extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { - return GTPP_PollenType.get(stack.getItemDamage()) + return GTPPPollenType.get(stack.getItemDamage()) .getName(); } } diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPPropolis.java index 1c1bd95d09..22d429a2e6 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPPPropolis.java @@ -2,7 +2,7 @@ package gtPlusPlus.xmod.forestry.bees.items.output; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.recipe.RecipeMaps.extractorRecipes; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import java.util.List; @@ -16,17 +16,17 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PropolisType; +import gtPlusPlus.xmod.forestry.bees.handler.GTPPPropolisType; import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees; -public class GTPP_Propolis extends Item { +public class GTPPPropolis extends Item { @SideOnly(Side.CLIENT) private IIcon secondIcon; - public GTPP_Propolis() { + public GTPPPropolis() { super(); this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); @@ -34,18 +34,18 @@ public class GTPP_Propolis extends Item { GameRegistry.registerItem(this, "gtpp.propolis", GTPlusPlus.ID); } - public ItemStack getStackForType(GTPP_PropolisType type) { + public ItemStack getStackForType(GTPPPropolisType type) { return new ItemStack(this, 1, type.mID); } - public ItemStack getStackForType(GTPP_PropolisType type, int count) { + public ItemStack getStackForType(GTPPPropolisType type, int count) { return new ItemStack(this, count, type.mID); } @Override @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tabs, List list) { - for (GTPP_PropolisType type : GTPP_PropolisType.values()) { + for (GTPPPropolisType type : GTPPPropolisType.values()) { if (type.mShowInList) { list.add(this.getStackForType(type)); } @@ -66,20 +66,20 @@ public class GTPP_Propolis extends Item { @Override @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int pass) { - return GTPP_PropolisType.get(stack.getItemDamage()) + return GTPPPropolisType.get(stack.getItemDamage()) .getColours(); } @Override public String getItemStackDisplayName(ItemStack stack) { - return GTPP_PropolisType.get(stack.getItemDamage()) + return GTPPPropolisType.get(stack.getItemDamage()) .getName(); } public static void initPropolisRecipes() { ItemStack tDrop; Logger.BEES("Processing recipes for " + GTPP_Bees.sPropolisMappings.size() + " Propolis."); - for (GTPP_PropolisType aProp : GTPP_Bees.sPropolisMappings.values()) { + for (GTPPPropolisType aProp : GTPP_Bees.sPropolisMappings.values()) { tDrop = aProp.getStackForType(1); if (addProcess( tDrop, @@ -98,7 +98,7 @@ public class GTPP_Propolis extends Item { if (aOutput == null) { return false; } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(tDrop) .itemOutputs(aOutput) .outputChances(aChance) diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FRGregTechRecipes.java index ce982cd67e..eec1dfa0fc 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FRGregTechRecipes.java @@ -8,9 +8,9 @@ import net.minecraft.item.ItemStack; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; -import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry; +import gtPlusPlus.xmod.forestry.bees.items.FRItemRegistry; -public class FR_Gregtech_Recipes { +public class FRGregTechRecipes { private static String rod_Electrum = "stickElectrum"; private static String rod_LongElectrum = "stickLongElectrum"; @@ -18,16 +18,16 @@ public class FR_Gregtech_Recipes { private static String rod_Uranium = "stickUranium"; private static String rod_LongUranium = "stickLongUranium"; private static String foil_Uranium235 = "foilUranium235"; - private static ItemStack hiveFrameAccelerated = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameAccelerated); - private static ItemStack hiveFrameMutagenic = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameMutagenic); - private static ItemStack hiveFrameVoid = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameVoid); - private static ItemStack hiveFrameBusy = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameBusy); + private static ItemStack hiveFrameAccelerated = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameAccelerated); + private static ItemStack hiveFrameMutagenic = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameMutagenic); + private static ItemStack hiveFrameVoid = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameVoid); + private static ItemStack hiveFrameBusy = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameBusy); - private static ItemStack hiveFrameCocoa = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameCocoa); - private static ItemStack hiveFrameCaged = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameCaged); - private static ItemStack hiveFrameSoul = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameSoul); - private static ItemStack hiveFrameClay = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameClay); - private static ItemStack hiveFrameNova = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameNova); + private static ItemStack hiveFrameCocoa = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameCocoa); + private static ItemStack hiveFrameCaged = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameCaged); + private static ItemStack hiveFrameSoul = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameSoul); + private static ItemStack hiveFrameClay = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameClay); + private static ItemStack hiveFrameNova = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameNova); private static ItemStack hiveFrameImpregnated = ItemUtils.getItemStackFromFQRN("Forestry:frameImpregnated", 1); private static ItemStack blockSoulSand = new ItemStack(Blocks.soul_sand, 1); @@ -35,10 +35,10 @@ public class FR_Gregtech_Recipes { private static ItemStack itemClayDust = new ItemStack(Items.clay_ball, 1); private static ItemStack itemCocoaBeans = new ItemStack(Items.dye, 1, 3); - private static ItemStack hiveFrameDecay = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameDecay); - private static ItemStack hiveFrameSlow = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameSlow); - private static ItemStack hiveFrameStalilize = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameStalilize); - private static ItemStack hiveFrameArborist = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameArborist); + private static ItemStack hiveFrameDecay = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameDecay); + private static ItemStack hiveFrameSlow = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameSlow); + private static ItemStack hiveFrameStalilize = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameStalilize); + private static ItemStack hiveFrameArborist = ItemUtils.getSimpleStack(FRItemRegistry.hiveFrameArborist); public static void registerItems() { // Magic Bee Like Frames diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_AlleleBeeSpecies.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPPAlleleBeeSpecies.java index 05ce6e56e6..76524388e5 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_AlleleBeeSpecies.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPPAlleleBeeSpecies.java @@ -9,9 +9,9 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IClassification; import forestry.apiculture.genetics.alleles.AlleleBeeSpecies; -public class GTPP_AlleleBeeSpecies extends AlleleBeeSpecies { +public class GTPPAlleleBeeSpecies extends AlleleBeeSpecies { - public GTPP_AlleleBeeSpecies(String uid, boolean dominant, String unlocalizedName, String authority, + public GTPPAlleleBeeSpecies(String uid, boolean dominant, String unlocalizedName, String authority, String unlocalizedDescription, IClassification branch, String binomial, int primaryColor, int secondaryColor) { super( uid, diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPPBeeMutation.java index d20b7ffb73..02e9ec0cbe 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPPBeeMutation.java @@ -20,12 +20,11 @@ import forestry.api.genetics.IMutationCondition; import forestry.apiculture.genetics.BeeMutation; import forestry.core.genetics.mutations.Mutation; -public class GTPP_Bee_Mutation extends BeeMutation { +public class GTPPBeeMutation extends BeeMutation { private final float split; - public GTPP_Bee_Mutation(IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, IAllele[] result, int chance, - float split) { + public GTPPBeeMutation(IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, IAllele[] result, int chance, float split) { super(bee0, bee1, result, chance); this.split = split; BeeManager.beeRoot.registerMutation(this); diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java index 73418bdab8..11397e3ef3 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java @@ -38,23 +38,24 @@ import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele.Lifespan; import forestry.core.genetics.alleles.EnumAllele.Tolerance; import gregtech.api.enums.Materials; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTModHandler; import gregtech.common.items.CombType; -import gregtech.loaders.misc.GT_Bees; -import gtPlusPlus.core.material.ELEMENT.STANDALONE; +import gregtech.loaders.misc.GTBeeDefinition; +import gregtech.loaders.misc.GTBees; import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialsElements.STANDALONE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType; +import gtPlusPlus.xmod.forestry.bees.handler.GTPPCombType; public enum GTPP_BeeDefinition implements IBeeDefinition { DRAGONBLOOD(GTPP_BranchDefinition.LEGENDARY, "Dragon Blood", STANDALONE.DRAGON_METAL, true, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); - beeSpecies.addSpecialty(GTPP_Bees.combs.getStackForType(GTPP_CombType.DRAGONBLOOD), 0.10f); + beeSpecies.addProduct(GTModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GTPP_Bees.combs.getStackForType(GTPPCombType.DRAGONBLOOD), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setHasEffect(); @@ -67,13 +68,13 @@ public enum GTPP_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation("DRAGONESSENCE", "NEUTRONIUM", 2); tMutation.restrictHumidity(ARID); tMutation.requireResource(STANDALONE.DRAGON_METAL.getBlock(), 1); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim + tMutation.addMutationCondition(new GTBees.DimensionMutationCondition(1, "End")); // End Dim }), FORCE(GTPP_BranchDefinition.LEGENDARY, "Force", STANDALONE.FORCE, true, Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5), beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALT), 0.15f); - beeSpecies.addSpecialty(GTPP_Bees.combs.getStackForType(GTPP_CombType.FORCE), 0.10f); + beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.STONE), 0.30f); + beeSpecies.addProduct(GTBees.combs.getStackForType(CombType.SALT), 0.15f); + beeSpecies.addSpecialty(GTPP_Bees.combs.getStackForType(GTPPCombType.FORCE), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.HOT); beeSpecies.setHasEffect(); @@ -89,15 +90,15 @@ public enum GTPP_BeeDefinition implements IBeeDefinition { }),; private final GTPP_BranchDefinition branch; - private final GTPP_AlleleBeeSpecies species; - private final Consumer<GTPP_AlleleBeeSpecies> mSpeciesProperties; + private final GTPPAlleleBeeSpecies species; + private final Consumer<GTPPAlleleBeeSpecies> mSpeciesProperties; private final Consumer<IAllele[]> mAlleles; private final Consumer<GTPP_BeeDefinition> mMutations; private IAllele[] template; private IBeeGenome genome; GTPP_BeeDefinition(GTPP_BranchDefinition branch, String binomial, Materials aMat, boolean dominant, int primary, - int secondary, Consumer<GTPP_AlleleBeeSpecies> aSpeciesProperties, Consumer<IAllele[]> aAlleles, + int secondary, Consumer<GTPPAlleleBeeSpecies> aSpeciesProperties, Consumer<IAllele[]> aAlleles, Consumer<GTPP_BeeDefinition> aMutations) { this( branch, @@ -112,7 +113,7 @@ public enum GTPP_BeeDefinition implements IBeeDefinition { } GTPP_BeeDefinition(GTPP_BranchDefinition branch, String binomial, Material aMat, boolean dominant, int primary, - int secondary, Consumer<GTPP_AlleleBeeSpecies> aSpeciesProperties, Consumer<IAllele[]> aAlleles, + int secondary, Consumer<GTPPAlleleBeeSpecies> aSpeciesProperties, Consumer<IAllele[]> aAlleles, Consumer<GTPP_BeeDefinition> aMutations) { this.mAlleles = aAlleles; this.mMutations = aMutations; @@ -123,13 +124,13 @@ public enum GTPP_BeeDefinition implements IBeeDefinition { String uid = "gtpp.bee.species" + species; String description = "for.description." + species; String name = "for.bees.species." + lowercaseName; - GT_LanguageManager.addStringLocalization("for.bees.species." + lowercaseName, species, true); + GTLanguageManager.addStringLocalization("for.bees.species." + lowercaseName, species, true); GTPP_Bees.sMaterialMappings.put( binomial.toLowerCase() .replaceAll(" ", ""), aMat); this.branch = branch; - this.species = new GTPP_AlleleBeeSpecies( + this.species = new GTPPAlleleBeeSpecies( uid, dominant, name, @@ -184,7 +185,7 @@ public enum GTPP_BeeDefinition implements IBeeDefinition { return ret; } - private final void setSpeciesProperties(GTPP_AlleleBeeSpecies species2) { + private final void setSpeciesProperties(GTPPAlleleBeeSpecies species2) { this.mSpeciesProperties.accept(species2); } @@ -239,7 +240,7 @@ public enum GTPP_BeeDefinition implements IBeeDefinition { */ private final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance, float chancedivider) { - return new GTPP_Bee_Mutation(parent1, parent2, this.getTemplate(), chance, chancedivider); + return new GTPPBeeMutation(parent1, parent2, this.getTemplate(), chance, chancedivider); } private final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, IAlleleBeeSpecies parent2, int chance, @@ -285,14 +286,12 @@ public enum GTPP_BeeDefinition implements IBeeDefinition { return new BeeVariation.RainResist(this); } - private static final Class sGtBees = ReflectionUtils.getClass("gregtech.loaders.misc.GT_BeeDefinition"); - public static IAlleleBeeSpecies getGregtechBeeType(String name) { try { - Enum aBeeObject = ReflectionUtils.getEnum(sGtBees, name); - Field gtBeesField = ReflectionUtils.getField(sGtBees, "species"); - IAlleleBeeSpecies beeType = ReflectionUtils.getFieldValue(gtBeesField, aBeeObject); - return beeType != null ? beeType : null; + // This is still cursed, but the species field is private and I don't want to go modify that right now + GTBeeDefinition aBeeObject = GTBeeDefinition.valueOf(name); + Field gtBeesField = ReflectionUtils.getField(GTBeeDefinition.class, "species"); + return ReflectionUtils.getFieldValue(gtBeesField, aBeeObject); } catch (Throwable t) { t.printStackTrace(); return null; diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java index 77b7d57954..bfdddcca8b 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java @@ -4,18 +4,18 @@ import static gregtech.api.enums.Mods.Forestry; import java.util.HashMap; -import gregtech.GT_Mod; +import gregtech.GTMod; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType; -import gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType; -import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PollenType; -import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PropolisType; -import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Comb; -import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Drop; -import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Pollen; -import gtPlusPlus.xmod.forestry.bees.items.output.GTPP_Propolis; +import gtPlusPlus.xmod.forestry.bees.handler.GTPPCombType; +import gtPlusPlus.xmod.forestry.bees.handler.GTPPDropType; +import gtPlusPlus.xmod.forestry.bees.handler.GTPPPollenType; +import gtPlusPlus.xmod.forestry.bees.handler.GTPPPropolisType; +import gtPlusPlus.xmod.forestry.bees.items.output.GTPPComb; +import gtPlusPlus.xmod.forestry.bees.items.output.GTPPDrop; +import gtPlusPlus.xmod.forestry.bees.items.output.GTPPPollen; +import gtPlusPlus.xmod.forestry.bees.items.output.GTPPPropolis; public class GTPP_Bees { @@ -25,32 +25,32 @@ public class GTPP_Bees { public static final byte MAGICBEES = 3; public static final byte GREGTECH = 4; - public static GTPP_Propolis propolis; - public static GTPP_Pollen pollen; - public static GTPP_Drop drop; - public static GTPP_Comb combs; + public static GTPPPropolis propolis; + public static GTPPPollen pollen; + public static GTPPDrop drop; + public static GTPPComb combs; public static HashMap<String, Material> sMaterialMappings = new HashMap<>(); - public static HashMap<Integer, GTPP_PropolisType> sPropolisMappings = new HashMap<>(); - public static HashMap<Integer, GTPP_PollenType> sPollenMappings = new HashMap<>(); - public static HashMap<Integer, GTPP_DropType> sDropMappings = new HashMap<>(); - public static HashMap<Integer, GTPP_CombType> sCombMappings = new HashMap<>(); + public static HashMap<Integer, GTPPPropolisType> sPropolisMappings = new HashMap<>(); + public static HashMap<Integer, GTPPPollenType> sPollenMappings = new HashMap<>(); + public static HashMap<Integer, GTPPDropType> sDropMappings = new HashMap<>(); + public static HashMap<Integer, GTPPCombType> sCombMappings = new HashMap<>(); public GTPP_Bees() { - if (Forestry.isModLoaded() && GT_Mod.gregtechproxy.mGTBees) { + if (Forestry.isModLoaded() && GTMod.gregtechproxy.mGTBees) { Logger.BEES("Creating required items."); - propolis = new GTPP_Propolis(); - pollen = new GTPP_Pollen(); - drop = new GTPP_Drop(); - combs = new GTPP_Comb(); + propolis = new GTPPPropolis(); + pollen = new GTPPPollen(); + drop = new GTPPDrop(); + combs = new GTPPComb(); Logger.BEES("Loading types."); initTypes(); Logger.BEES("Adding recipes."); - GTPP_Drop.initDropsRecipes(); - GTPP_Propolis.initPropolisRecipes(); - GTPP_Comb.initCombsRecipes(); + GTPPDrop.initDropsRecipes(); + GTPPPropolis.initPropolisRecipes(); + GTPPComb.initCombsRecipes(); Logger.BEES("Initialising bees."); GTPP_BeeDefinition.initBees(); @@ -60,10 +60,11 @@ public class GTPP_Bees { } private static void initTypes() { - ReflectionUtils.loadClass("gtPlusPlus.xmod.forestry.bees.registry.GTPP_BeeDefinition"); - ReflectionUtils.loadClass("gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType"); - ReflectionUtils.loadClass("gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType"); - ReflectionUtils.loadClass("gtPlusPlus.xmod.forestry.bees.handler.GTPP_PollenType"); - ReflectionUtils.loadClass("gtPlusPlus.xmod.forestry.bees.handler.GTPP_PropolisType"); + // This is stupid + ReflectionUtils.loadClass(GTPP_BeeDefinition.class.getName()); + ReflectionUtils.loadClass(GTPPCombType.class.getName()); + ReflectionUtils.loadClass(GTPPDropType.class.getName()); + ReflectionUtils.loadClass(GTPPPollenType.class.getName()); + ReflectionUtils.loadClass(GTPPPropolisType.class.getName()); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/main/java/gtPlusPlus/xmod/gregtech/HandlerGT.java index e95baf43df..286da597c8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/HandlerGT.java @@ -6,34 +6,34 @@ import java.util.ArrayList; import java.util.List; import cpw.mods.fml.common.event.FMLLoadCompleteEvent; -import gregtech.api.GregTech_API; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.util.GT_Config; -import gtPlusPlus.core.handler.COMPAT_HANDLER; +import gregtech.api.GregTechAPI; +import gregtech.api.items.MetaGeneratedTool; +import gregtech.api.util.GTConfig; +import gtPlusPlus.core.handler.CompatHandler; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.everglades.gen.gt.WorldGen_GT; import gtPlusPlus.recipes.CokeAndPyrolyseOven; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; -import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config; -import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; +import gtPlusPlus.xmod.gregtech.api.util.GTPPConfig; +import gtPlusPlus.xmod.gregtech.common.MetaGTProxy; import gtPlusPlus.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; -import gtPlusPlus.xmod.gregtech.loaders.Gregtech_Blocks; +import gtPlusPlus.xmod.gregtech.loaders.GTPPBlocks; import gtPlusPlus.xmod.gregtech.loaders.ProcessingAngleGrinder; import gtPlusPlus.xmod.gregtech.loaders.ProcessingElectricSnips; import gtPlusPlus.xmod.gregtech.loaders.misc.AddCustomMachineToPA; -import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_AlgaeFarm; -import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_MolecularTransformer; -import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_TreeFarm; +import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoaderAlgaeFarm; +import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoaderMolecularTransformer; +import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoaderTreeFarm; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits; -public class HANDLER_GT { +public class HandlerGT { - public static GT_Config mMaterialProperties = null; - public static GTPP_Config sCustomWorldgenFile = null; + public static GTConfig mMaterialProperties = null; + public static GTPPConfig sCustomWorldgenFile = null; public static final List<WorldGen_GT> sWorldgenListEverglades = new ArrayList<>(); - public static GT_MetaGenerated_Tool sMetaGeneratedToolInstance; + public static MetaGeneratedTool sMetaGeneratedToolInstance; public static void preInit() { @@ -47,13 +47,13 @@ public class HANDLER_GT { public static void init() { // Load General Blocks and set up some Basic Meta Tile Entity states - Gregtech_Blocks.run(); + GTPPBlocks.run(); // Add Custom Pipes, Wires and Cables. GregtechConduits.run(); // Register Tile Entities - COMPAT_HANDLER.registerGregtechMachines(); + CompatHandler.registerGregtechMachines(); sMetaGeneratedToolInstance = MetaGeneratedGregtechTools.getInstance(); } @@ -75,24 +75,24 @@ public class HANDLER_GT { if (GregtechItemList.Circuit_BioRecipeSelector.hasBeenSet()) { for (int i = 1; i <= 24; i++) { - GregTech_API.registerConfigurationCircuit(CI.getNumberedBioCircuit(i), 0); + GregTechAPI.registerConfigurationCircuit(CI.getNumberedBioCircuit(i), 0); } } if (GregtechItemList.Circuit_T3RecipeSelector.hasBeenSet()) { for (int i = 1; i <= 24; i++) { - GregTech_API.registerConfigurationCircuit(CI.getNumberedAdvancedCircuit(i), 3); + GregTechAPI.registerConfigurationCircuit(CI.getNumberedAdvancedCircuit(i), 3); } } } public static void onLoadComplete(FMLLoadCompleteEvent event) { CokeAndPyrolyseOven.onLoadComplete(); - Meta_GT_Proxy.fixIC2FluidNames(); - RecipeLoader_AlgaeFarm.generateRecipes(); - RecipeLoader_TreeFarm.generateRecipes(); + MetaGTProxy.fixIC2FluidNames(); + RecipeLoaderAlgaeFarm.generateRecipes(); + RecipeLoaderTreeFarm.generateRecipes(); if (AdvancedSolarPanel.isModLoaded()) { - RecipeLoader_MolecularTransformer.run(); + RecipeLoaderMolecularTransformer.run(); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index 708650dfe2..e51d60834f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -1,21 +1,21 @@ package gtPlusPlus.xmod.gregtech.api.enums; -import static gregtech.api.enums.GT_Values.W; +import static gregtech.api.enums.GTValues.W; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.xmod.gregtech.api.interfaces.GregtechItemContainer; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gtPlusPlus.xmod.gregtech.api.interfaces.IGregtechItemContainer; /** * Class containing all non-OreDict Items of GregTech. */ -public enum GregtechItemList implements GregtechItemContainer { +public enum GregtechItemList implements IGregtechItemContainer { /** * Items @@ -777,16 +777,16 @@ public enum GregtechItemList implements GregtechItemContainer { GT_Dehydrator_ZPM, // Fluid Storage Tanks - GT_FluidTank_ULV, - GT_FluidTank_LV, - GT_FluidTank_MV, - GT_FluidTank_HV, - GT_FluidTank_EV, - GT_FluidTank_IV, - GT_FluidTank_LuV, - GT_FluidTank_ZPM, - GT_FluidTank_UV, - GT_FluidTank_MAX, + GTFluidTank_ULV, + GTFluidTank_LV, + GTFluidTank_MV, + GTFluidTank_HV, + GTFluidTank_EV, + GTFluidTank_IV, + GTFluidTank_LuV, + GTFluidTank_ZPM, + GTFluidTank_UV, + GTFluidTank_MAX, // GT RTG RTG, @@ -845,14 +845,14 @@ public enum GregtechItemList implements GregtechItemContainer { return this; } final ItemStack aStack = new ItemStack(aItem, 1, 0); - this.mStack = GT_Utility.copyAmount(1, aStack); + this.mStack = GTUtility.copyAmount(1, aStack); return this; } @Override public GregtechItemList set(final ItemStack aStack) { this.mHasNotBeenSet = false; - this.mStack = GT_Utility.copyAmount(1, aStack); + this.mStack = GTUtility.copyAmount(1, aStack); return this; } @@ -861,7 +861,7 @@ public enum GregtechItemList implements GregtechItemContainer { if (this.mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); } - if (GT_Utility.isStackInvalid(this.mStack)) { + if (GTUtility.isStackInvalid(this.mStack)) { return null; } return this.mStack.getItem(); @@ -887,15 +887,15 @@ public enum GregtechItemList implements GregtechItemContainer { @Override public boolean isStackEqual(final Object aStack, final boolean aWildcard, final boolean aIgnoreNBT) { - if (GT_Utility.isStackInvalid(aStack)) { + if (GTUtility.isStackInvalid(aStack)) { return false; } - return GT_Utility + return GTUtility .areUnificationsEqual((ItemStack) aStack, aWildcard ? this.getWildcard(1) : this.get(1), aIgnoreNBT); } public static Block getBlockFromStack(Object aStack) { - if (GT_Utility.isStackInvalid(aStack)) return Blocks.air; + if (GTUtility.isStackInvalid(aStack)) return Blocks.air; return Block.getBlockFromItem(((ItemStack) aStack).getItem()); } @@ -904,10 +904,10 @@ public enum GregtechItemList implements GregtechItemContainer { if (this.mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); } - if (GT_Utility.isStackInvalid(this.mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); + if (GTUtility.isStackInvalid(this.mStack)) { + return GTUtility.copyAmount(aAmount, aReplacements); } - return GT_Utility.copyAmount(aAmount, GT_OreDictUnificator.get(this.mStack)); + return GTUtility.copyAmount(aAmount, GTOreDictUnificator.get(this.mStack)); } @Override @@ -915,10 +915,10 @@ public enum GregtechItemList implements GregtechItemContainer { if (this.mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); } - if (GT_Utility.isStackInvalid(this.mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); + if (GTUtility.isStackInvalid(this.mStack)) { + return GTUtility.copyAmount(aAmount, aReplacements); } - return GT_Utility.copyAmountAndMetaData(aAmount, W, GT_OreDictUnificator.get(this.mStack)); + return GTUtility.copyAmountAndMetaData(aAmount, W, GTOreDictUnificator.get(this.mStack)); } @Override @@ -926,10 +926,10 @@ public enum GregtechItemList implements GregtechItemContainer { if (this.mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); } - if (GT_Utility.isStackInvalid(this.mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); + if (GTUtility.isStackInvalid(this.mStack)) { + return GTUtility.copyAmount(aAmount, aReplacements); } - return GT_Utility.copyAmountAndMetaData(aAmount, 0, GT_OreDictUnificator.get(this.mStack)); + return GTUtility.copyAmountAndMetaData(aAmount, 0, GTOreDictUnificator.get(this.mStack)); } @Override @@ -937,31 +937,31 @@ public enum GregtechItemList implements GregtechItemContainer { if (this.mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); } - if (GT_Utility.isStackInvalid(this.mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); + if (GTUtility.isStackInvalid(this.mStack)) { + return GTUtility.copyAmount(aAmount, aReplacements); } - return GT_Utility - .copyAmountAndMetaData(aAmount, this.mStack.getMaxDamage() - 1, GT_OreDictUnificator.get(this.mStack)); + return GTUtility + .copyAmountAndMetaData(aAmount, this.mStack.getMaxDamage() - 1, GTOreDictUnificator.get(this.mStack)); } @Override public ItemStack getWithName(final long aAmount, final String aDisplayName, final Object... aReplacements) { final ItemStack rStack = this.get(1, aReplacements); - if (GT_Utility.isStackInvalid(rStack)) { + if (GTUtility.isStackInvalid(rStack)) { return null; } rStack.setStackDisplayName(aDisplayName); - return GT_Utility.copyAmount(aAmount, rStack); + return GTUtility.copyAmount(aAmount, rStack); } @Override public ItemStack getWithCharge(final long aAmount, final int aEnergy, final Object... aReplacements) { final ItemStack rStack = this.get(1, aReplacements); - if (GT_Utility.isStackInvalid(rStack)) { + if (GTUtility.isStackInvalid(rStack)) { return null; } - GT_ModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false); - return GT_Utility.copyAmount(aAmount, rStack); + GTModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false); + return GTUtility.copyAmount(aAmount, rStack); } @Override @@ -969,10 +969,10 @@ public enum GregtechItemList implements GregtechItemContainer { if (this.mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); } - if (GT_Utility.isStackInvalid(this.mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); + if (GTUtility.isStackInvalid(this.mStack)) { + return GTUtility.copyAmount(aAmount, aReplacements); } - return GT_Utility.copyAmountAndMetaData(aAmount, aMetaValue, GT_OreDictUnificator.get(this.mStack)); + return GTUtility.copyAmountAndMetaData(aAmount, aMetaValue, GTOreDictUnificator.get(this.mStack)); } @Override @@ -981,7 +981,7 @@ public enum GregtechItemList implements GregtechItemContainer { throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); } for (final Object tOreName : aOreNames) { - GT_OreDictUnificator.registerOre(tOreName, this.get(1)); + GTOreDictUnificator.registerOre(tOreName, this.get(1)); } return this; } @@ -992,7 +992,7 @@ public enum GregtechItemList implements GregtechItemContainer { throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); } for (final Object tOreName : aOreNames) { - GT_OreDictUnificator.registerOre(tOreName, this.getWildcard(1)); + GTOreDictUnificator.registerOre(tOreName, this.getWildcard(1)); } return this; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java index 655b242c04..fedd28f342 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java @@ -1,8 +1,8 @@ package gtPlusPlus.xmod.gregtech.api.enums; -import static gregtech.api.enums.GT_Values.B; -import static gregtech.api.enums.GT_Values.D2; -import static gregtech.api.enums.GT_Values.M; +import static gregtech.api.enums.GTValues.B; +import static gregtech.api.enums.GTValues.D2; +import static gregtech.api.enums.GTValues.M; import static gtPlusPlus.core.util.Utils.getTcAspectStack; import java.util.ArrayList; @@ -21,18 +21,18 @@ import gregtech.api.enums.Dyes; import gregtech.api.enums.Element; import gregtech.api.enums.Materials; import gregtech.api.enums.SubTag; -import gregtech.api.enums.TC_Aspects; -import gregtech.api.enums.TC_Aspects.TC_AspectStack; +import gregtech.api.enums.TCAspects; +import gregtech.api.enums.TCAspects.TC_AspectStack; import gregtech.api.enums.TextureSet; import gregtech.api.interfaces.IColorModulationContainer; import gregtech.api.interfaces.ICondition; import gregtech.api.interfaces.ISubTagContainer; import gregtech.api.objects.MaterialStack; -import gregtech.api.util.GT_Config; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; +import gregtech.api.util.GTConfig; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTUtility; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IOreRecipeRegistrator; import gtPlusPlus.xmod.gregtech.api.objects.GregtechItemData; import gtPlusPlus.xmod.gregtech.api.objects.GregtechMaterialStack; @@ -123,15 +123,15 @@ public enum GregtechOrePrefixes { public final List<TC_AspectStack> mAspects = new ArrayList<>(); public final Collection<GregtechOrePrefixes> mFamiliarPrefixes = new HashSet<>(); /** - * Used to determine the amount of Material this Prefix contains. Multiply or Divide GregTech_API.MATERIAL_UNIT to + * Used to determine the amount of Material this Prefix contains. Multiply or Divide GregTechAPI.MATERIAL_UNIT to * get the Amounts in comparision to one Ingot. 0 = Null Negative = Undefined Amount */ public final long mMaterialAmount; private final Collection<Materials> mNotGeneratedItems = new HashSet<>(), mIgnoredMaterials = new HashSet<>(), mGeneratedItems = new HashSet<>(); - private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessing = new ArrayList<>(); - private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessingFake = new ArrayList<>(); + private final ArrayList<IOreRecipeRegistrator> mOreProcessing = new ArrayList<>(); + private final ArrayList<IOreRecipeRegistrator> mOreProcessingFake = new ArrayList<>(); public final ItemStack mContainerItem = null; public final ICondition<ISubTagContainer> mCondition = null; public byte mDefaultStackSize = 64; @@ -170,64 +170,64 @@ public enum GregtechOrePrefixes { // TODO - Utilise some form of way to check if it's gt 5.9 if so, use string switch. if (this.name() .startsWith("ore")) { - getTcAspectStack(TC_Aspects.TERRA.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.TERRA.name(), 1).addToAspectList(this.mAspects); return; } if (this.name() .startsWith("wire") || this.name() .startsWith("cable")) { - getTcAspectStack(TC_Aspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects); return; } if (this.name() .startsWith("dust")) { - getTcAspectStack(TC_Aspects.PERDITIO.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.PERDITIO.name(), 1).addToAspectList(this.mAspects); return; } if (this.name() .startsWith("crushed")) { - getTcAspectStack(TC_Aspects.PERFODIO.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.PERFODIO.name(), 1).addToAspectList(this.mAspects); return; } if (this.name() .startsWith("ingot") || this.name() .startsWith("nugget")) { - getTcAspectStack(TC_Aspects.METALLUM.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.METALLUM.name(), 1).addToAspectList(this.mAspects); return; } if (this.name() .startsWith("armor")) { - getTcAspectStack(TC_Aspects.TUTAMEN.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.TUTAMEN.name(), 1).addToAspectList(this.mAspects); return; } if (this.name() .startsWith("stone")) { - getTcAspectStack(TC_Aspects.TERRA.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.TERRA.name(), 1).addToAspectList(this.mAspects); return; } if (this.name() .startsWith("pipe")) { - getTcAspectStack(TC_Aspects.ITER.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.ITER.name(), 1).addToAspectList(this.mAspects); return; } if (this.name() .startsWith("gear")) { - getTcAspectStack(TC_Aspects.MOTUS.name(), 1).addToAspectList(this.mAspects); - getTcAspectStack(TC_Aspects.MACHINA.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.MOTUS.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.MACHINA.name(), 1).addToAspectList(this.mAspects); return; } if (this.name() .startsWith("frame") || this.name() .startsWith("plate")) { - getTcAspectStack(TC_Aspects.FABRICO.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.FABRICO.name(), 1).addToAspectList(this.mAspects); return; } if (this.name() .startsWith("tool")) { - getTcAspectStack(TC_Aspects.INSTRUMENTUM.name(), 2).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.INSTRUMENTUM.name(), 2).addToAspectList(this.mAspects); return; } if (this.name() @@ -236,7 +236,7 @@ public enum GregtechOrePrefixes { .startsWith("crystal") || this.name() .startsWith("lens")) { - getTcAspectStack(TC_Aspects.VITREUS.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.VITREUS.name(), 1).addToAspectList(this.mAspects); return; } if (this.name() @@ -246,7 +246,7 @@ public enum GregtechOrePrefixes { } if (this.name() .startsWith("battery")) { - getTcAspectStack(TC_Aspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TCAspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects); } } @@ -282,7 +282,7 @@ public enum GregtechOrePrefixes { } public static GregtechOrePrefixes getPrefix(final String aPrefixName, final GregtechOrePrefixes aReplacement) { - final Object tObject = GT_Utility.getFieldContent(GregtechOrePrefixes.class, aPrefixName, false, false); + final Object tObject = GTUtility.getFieldContent(GregtechOrePrefixes.class, aPrefixName, false, false); if ((tObject != null) && (tObject instanceof GregtechOrePrefixes)) { return (GregtechOrePrefixes) tObject; } @@ -323,7 +323,7 @@ public enum GregtechOrePrefixes { return false; } for (final ItemStack tStack : this.mPrefixedItems) { - if (GT_Utility.areStacksEqual(aStack, tStack, !tStack.hasTagCompound())) { + if (GTUtility.areStacksEqual(aStack, tStack, !tStack.hasTagCompound())) { return true; } } @@ -353,7 +353,7 @@ public enum GregtechOrePrefixes { return this.mFamiliarPrefixes.add(aPrefix); } - public boolean add(final Interface_OreRecipeRegistrator aRegistrator) { + public boolean add(final IOreRecipeRegistrator aRegistrator) { if (aRegistrator == null) { return false; } @@ -364,19 +364,19 @@ public enum GregtechOrePrefixes { final ItemStack aStack) { if ((aMaterial != null) && ((aMaterial != GT_Materials._NULL) || this.mIsSelfReferencing || !this.mIsMaterialBased) - && GT_Utility.isStackValid(aStack)) { - for (final Interface_OreRecipeRegistrator tRegistrator : this.mOreProcessing) { + && GTUtility.isStackValid(aStack)) { + for (final IOreRecipeRegistrator tRegistrator : this.mOreProcessing) { if (D2) { - GT_Log.ore.println( + GTLog.ore.println( "Processing '" + aOreDictName + "' with the Prefix '" + this.name() + "' and the Material '" + aMaterial.name() + "' at " - + GT_Utility.getClassName(tRegistrator)); + + GTUtility.getClassName(tRegistrator)); } - tRegistrator.registerOre(this, aMaterial, aOreDictName, aModName, GT_Utility.copyAmount(1, aStack)); + tRegistrator.registerOre(this, aMaterial, aOreDictName, aModName, GTUtility.copyAmount(1, aStack)); } } } @@ -385,19 +385,19 @@ public enum GregtechOrePrefixes { public void processOre(final Materials aMaterial, final String aOreDictName, final String aModName, final ItemStack aStack) { if ((aMaterial != null) && ((aMaterial != Materials._NULL) || this.mIsSelfReferencing || !this.mIsMaterialBased) - && GT_Utility.isStackValid(aStack)) { - for (final Interface_OreRecipeRegistrator tRegistrator : this.mOreProcessingFake) { + && GTUtility.isStackValid(aStack)) { + for (final IOreRecipeRegistrator tRegistrator : this.mOreProcessingFake) { if (D2) { - GT_Log.ore.println( + GTLog.ore.println( "Processing '" + aOreDictName + "' with the Prefix '" + this.name() + "' and the Material '" + aMaterial.mName + "' at " - + GT_Utility.getClassName(tRegistrator)); + + GTUtility.getClassName(tRegistrator)); } - tRegistrator.registerOre(this, aMaterial, aOreDictName, aModName, GT_Utility.copyAmount(1, aStack)); + tRegistrator.registerOre(this, aMaterial, aOreDictName, aModName, GTUtility.copyAmount(1, aStack)); } } } @@ -432,7 +432,7 @@ public enum GregtechOrePrefixes { * */ _NULL(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "NULL", 0, 0, 0, 0, false, false, 1, 1, 1, - Dyes._NULL, Element._NULL, Arrays.asList(getTcAspectStack(TC_Aspects.VACUOS.name(), 1))), + Dyes._NULL, Element._NULL, Arrays.asList(getTcAspectStack(TCAspects.VACUOS.name(), 1))), // Lapis(526, TextureSet.SET_LAPIS, 1.0F, 0, 1, 1 | 4 | 8, 70, 70, 220, 0, "Lapis", 0, 0, -1, 0, false, false, // 3, 1, 1, Dyes.dyeBlue, 2, Arrays.asList(new MaterialStack(Materials.Lazurite, 12), new @@ -445,7 +445,7 @@ public enum GregtechOrePrefixes { new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1)), - Arrays.asList(getTcAspectStack("PRAECANTATIO", 2), getTcAspectStack(TC_Aspects.IGNIS, 1))), + Arrays.asList(getTcAspectStack("PRAECANTATIO", 2), getTcAspectStack(TCAspects.IGNIS, 1))), Cryotheum(21, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 102, 178, 255, 0, "Cryotheum", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeLightBlue, 2, Arrays.asList( @@ -453,7 +453,7 @@ public enum GregtechOrePrefixes { new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Snow, 1), new MaterialStack(Materials.Niter, 1)), - Arrays.asList(getTcAspectStack("PRAECANTATIO", 2), getTcAspectStack(TC_Aspects.GELUM, 1))), + Arrays.asList(getTcAspectStack("PRAECANTATIO", 2), getTcAspectStack(TCAspects.GELUM, 1))), Ender(22, TextureSet.SET_FLUID, 1.0F, 0, 2, 1, 255, 255, 255, 0, "Ender", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeGreen), @@ -462,57 +462,57 @@ public enum GregtechOrePrefixes { */ Symbiotic(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "IV Tier", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, - Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 4), getTcAspectStack(TC_Aspects.MACHINA, 4))), + Arrays.asList(getTcAspectStack(TCAspects.ELECTRUM, 4), getTcAspectStack(TCAspects.MACHINA, 4))), Neutronic(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "LuV Tier", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, - Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 6), getTcAspectStack(TC_Aspects.MACHINA, 6))), + Arrays.asList(getTcAspectStack(TCAspects.ELECTRUM, 6), getTcAspectStack(TCAspects.MACHINA, 6))), Quantum(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "ZPM Tier", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, - Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 8), getTcAspectStack(TC_Aspects.MACHINA, 8))), + Arrays.asList(getTcAspectStack(TCAspects.ELECTRUM, 8), getTcAspectStack(TCAspects.MACHINA, 8))), Superconductor(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 190, 240, 190, 0, "Superconductor", 0, 0, -1, 0, false, - false, 1, 1, 1, Dyes.dyeGreen, Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 8))), + false, 1, 1, 1, Dyes.dyeGreen, Arrays.asList(getTcAspectStack(TCAspects.ELECTRUM, 8))), Staballoy(30, TextureSet.SET_ROUGH, 10.0F, 5120, 4, 1 | 2 | 16 | 32 | 64 | 128, 68, 75, 66, 0, "Staballoy", 0, 0, 1500, 2800, true, false, 1, 3, 1, Dyes.dyeGreen, 2, Arrays.asList(new MaterialStack(Materials.Titanium, 1), new MaterialStack(Materials.Uranium, 9)), - Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), + Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))), Bedrockium(31, TextureSet.SET_FINE, 8.0F, 8196, 3, 1 | 2 | 16 | 32 | 64 | 128, 39, 39, 39, 0, "Bedrockium", 0, 0, -1, 0, false, false, 1, 5, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Carbon, 63), new MaterialStack(Materials.Carbon, 56)), - Arrays.asList(getTcAspectStack(TC_Aspects.VACUOS, 8), getTcAspectStack(TC_Aspects.TUTAMEN, 3))), + Arrays.asList(getTcAspectStack(TCAspects.VACUOS, 8), getTcAspectStack(TCAspects.TUTAMEN, 3))), BloodSteel(32, TextureSet.SET_METALLIC, 11.0F, 768, 4, 1 | 2 | 16 | 32 | 64 | 128, 142, 28, 0, 0, "Blood Steel", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Steel, 3)), - Arrays.asList(getTcAspectStack(TC_Aspects.VICTUS, 8), getTcAspectStack(TC_Aspects.IGNIS, 3))), + Arrays.asList(getTcAspectStack(TCAspects.VICTUS, 8), getTcAspectStack(TCAspects.IGNIS, 3))), Void(33, TextureSet.SET_METALLIC, 6.0F, 1280, 3, 1 | 2 | 16 | 32 | 64 | 128, 82, 17, 82, 0, "Void Metal", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeBlack, - Arrays.asList(getTcAspectStack("PRAECANTATIO", 5), getTcAspectStack(TC_Aspects.VACUOS, 7))), + Arrays.asList(getTcAspectStack("PRAECANTATIO", 5), getTcAspectStack(TCAspects.VACUOS, 7))), ConductiveIron(34, TextureSet.SET_METALLIC, 5.0F, 256, 2, 1 | 2, 164, 109, 100, 0, "Conductive Iron", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Iron, 6), new MaterialStack(Materials.Redstone, 2)), - Arrays.asList(getTcAspectStack(TC_Aspects.POTENTIA, 2), getTcAspectStack(TC_Aspects.METALLUM, 2))), + Arrays.asList(getTcAspectStack(TCAspects.POTENTIA, 2), getTcAspectStack(TCAspects.METALLUM, 2))), ElectricalSteel(35, TextureSet.SET_METALLIC, 7.0F, 768, 3, 1 | 2 | 64 | 128, 194, 194, 194, 0, "Electrical Steel", 0, 0, 1811, 1000, true, false, 3, 1, 1, Dyes.dyeLightGray, 2, Arrays.asList( new MaterialStack(Materials.Iron, 3), new MaterialStack(Materials.Coal, 2), new MaterialStack(Materials.Silicon, 2)), - Arrays.asList(getTcAspectStack(TC_Aspects.MAGNETO, 2), getTcAspectStack(TC_Aspects.ELECTRUM, 5))), + Arrays.asList(getTcAspectStack(TCAspects.MAGNETO, 2), getTcAspectStack(TCAspects.ELECTRUM, 5))), EnergeticAlloy(36, TextureSet.SET_SHINY, 5.0F, 512, 3, 1 | 2 | 64 | 128, 252, 152, 45, 0, "Energetic Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeOrange, 2, Arrays.asList( new MaterialStack(Materials.Gold, 3), new MaterialStack(Materials.Glowstone, 2), new MaterialStack(Materials.Redstone, 2)), - Arrays.asList(getTcAspectStack(TC_Aspects.POTENTIA, 4), getTcAspectStack(TC_Aspects.LUX, 3))), + Arrays.asList(getTcAspectStack(TCAspects.POTENTIA, 4), getTcAspectStack(TCAspects.LUX, 3))), VibrantAlloy(37, TextureSet.SET_SHINY, 7.0F, 1280, 4, 1 | 2 | 64 | 128, 204, 242, 142, 0, "Vibrant Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeLime, 2, Arrays.asList(new MaterialStack(Materials.EnergeticAlloy, 1), new MaterialStack(Materials.EnderPearl, 3)), - Arrays.asList(getTcAspectStack(TC_Aspects.MACHINA, 5), getTcAspectStack(TC_Aspects.TELUM, 4))), + Arrays.asList(getTcAspectStack(TCAspects.MACHINA, 5), getTcAspectStack(TCAspects.TELUM, 4))), PulsatingIron(38, TextureSet.SET_SHINY, 5.0F, 256, 2, 1 | 2 | 64 | 128, 50, 91, 21, 0, "Pulsating Iron", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeGreen, 2, Arrays.asList(new MaterialStack(Materials.Iron, 2), new MaterialStack(Materials.EnderPearl, 2)), - Arrays.asList(getTcAspectStack(TC_Aspects.ALIENIS, 3), getTcAspectStack(TC_Aspects.METALLUM, 3))), + Arrays.asList(getTcAspectStack(TCAspects.ALIENIS, 3), getTcAspectStack(TCAspects.METALLUM, 3))), /* TODO */ RedstoneAlloy(39, TextureSet.SET_METALLIC, 1.0F, 256, 2, 1 | 2 | 16 | 32 | 64, 178, 34, 34, 0, "Redstone Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Iron, 2), new MaterialStack(Materials.Redstone, 4))), @@ -521,14 +521,14 @@ public enum GregtechOrePrefixes { Tantalloy60(40, TextureSet.SET_DULL, 8.0F, 5120, 3, 1 | 2 | 16 | 32 | 64 | 128, 68, 75, 166, 0, "Tantalloy-60", 0, 0, 3035, 2200, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9)), - Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), + Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))), Tantalloy61(41, TextureSet.SET_DULL, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 122, 135, 196, 0, "Tantalloy-61", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList( new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), - Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), + Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))), Potin(42, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 201, 151, 129, 0, "Potin", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, @@ -536,42 +536,42 @@ public enum GregtechOrePrefixes { new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), - Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), + Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))), Inconel792(43, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 108, 240, 118, 0, "Inconel-792", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList( new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), - Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), + Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))), Inconel690(44, TextureSet.SET_DULL, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 118, 220, 138, 0, "Inconel-690", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList( new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), - Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), + Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))), MaragingSteel300(45, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 150, 150, 150, 0, "Maraging Steel 300", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList( new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), - Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), + Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))), MaragingSteel350(46, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 160, 160, 160, 0, "Maraging Steel 350", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList( new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), - Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), + Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))), HastelloyX(47, TextureSet.SET_SHINY, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 255, 193, 37, 0, "Hastelloy-X", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList( new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), - Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), + Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))), TriniumNaquadahCarbonite(48, TextureSet.SET_SHINY, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 255, 233, 0, 0, "Trinium Naquadah Carbonite", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, @@ -579,7 +579,7 @@ public enum GregtechOrePrefixes { new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), - Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), + Arrays.asList(getTcAspectStack(TCAspects.METALLUM, 8), getTcAspectStack(TCAspects.STRONTIO, 3))), // Radioactive Materials HydrofluoricAcid(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 200, 200, 200, 0, "Hydrofluoric Acid", 0, 0, @@ -727,8 +727,8 @@ public enum GregtechOrePrefixes { this.mToolSpeed = aToolSpeed; this.mIconSet = aIconSet; if (aMetaItemSubID >= 0) { - if (CORE.sMU_GeneratedMaterials[aMetaItemSubID] == null) { - CORE.sMU_GeneratedMaterials[aMetaItemSubID] = this; + if (GTPPCore.sMU_GeneratedMaterials[aMetaItemSubID] == null) { + GTPPCore.sMU_GeneratedMaterials[aMetaItemSubID] = this; } else { throw new IllegalArgumentException("The Index " + aMetaItemSubID + " is already used!"); } @@ -971,7 +971,7 @@ public enum GregtechOrePrefixes { } public static GT_Materials get(final String aMaterialName) { - final Object tObject = GT_Utility.getFieldContent(GT_Materials.class, aMaterialName, false, false); + final Object tObject = GTUtility.getFieldContent(GT_Materials.class, aMaterialName, false, false); if ((tObject != null) && (tObject instanceof GT_Materials)) { return (GT_Materials) tObject; } @@ -987,7 +987,7 @@ public enum GregtechOrePrefixes { * * @param aConfiguration */ - public static void init(final GT_Config aConfiguration) { + public static void init(final GTConfig aConfiguration) { for (final GT_Materials tMaterial : VALUES) { final String tString = tMaterial.toString() .toLowerCase(); @@ -1110,7 +1110,7 @@ public enum GregtechOrePrefixes { } for (final ItemStack tStack : this.mMaterialItems) { for (final ItemStack aStack : aStacks) { - if (GT_Utility.areStacksEqual(aStack, tStack, !tStack.hasTagCompound())) { + if (GTUtility.areStacksEqual(aStack, tStack, !tStack.hasTagCompound())) { return true; } } @@ -1127,7 +1127,7 @@ public enum GregtechOrePrefixes { } boolean temp = false; for (int i = 0; i < this.mMaterialItems.size(); i++) { - if (GT_Utility.areStacksEqual(aStack, this.mMaterialItems.get(i))) { + if (GTUtility.areStacksEqual(aStack, this.mMaterialItems.get(i))) { this.mMaterialItems.remove(i--); temp = true; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPPUITextures.java index e6276713f3..08cff8d55e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPPUITextures.java @@ -8,7 +8,7 @@ import java.util.stream.IntStream; import com.gtnewhorizons.modularui.api.drawable.AdaptableUITexture; import com.gtnewhorizons.modularui.api.drawable.UITexture; -public class GTPP_UITextures { +public class GTPPUITextures { public static final UITexture OVERLAY_SLOT_COAL = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/coal"); public static final UITexture OVERLAY_SLOT_CANISTER_DARK = UITexture diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java index e522d41799..1bc2050eee 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java @@ -6,7 +6,7 @@ import com.gtnewhorizons.modularui.api.forge.IItemHandlerModifiable; import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot; import com.gtnewhorizons.modularui.common.widget.SlotWidget; -import gregtech.api.items.GT_MetaGenerated_Tool; +import gregtech.api.items.MetaGeneratedTool; import ic2.api.info.Info; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; @@ -26,7 +26,7 @@ public class ElectricSlotWidget extends SlotWidget { private ElectricSlotWidget(BaseSlot slot) { super(slot); setFilter( - stack -> (accepts(stack)) || (stack.getItem() instanceof GT_MetaGenerated_Tool) + stack -> (accepts(stack)) || (stack.getItem() instanceof MetaGeneratedTool) || (stack.getItem() instanceof IElectricItem)); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IGregtechItemContainer.java index 9431739c45..ea9ab3602a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IGregtechItemContainer.java @@ -4,7 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public interface GregtechItemContainer { +public interface IGregtechItemContainer { public Item getItem(); @@ -24,13 +24,13 @@ public interface GregtechItemContainer { public ItemStack getWithDamage(long aAmount, long aMetaValue, Object... aReplacements); - public GregtechItemContainer set(Item aItem); + public IGregtechItemContainer set(Item aItem); - public GregtechItemContainer set(ItemStack aStack); + public IGregtechItemContainer set(ItemStack aStack); - public GregtechItemContainer registerOre(Object... aOreNames); + public IGregtechItemContainer registerOre(Object... aOreNames); - public GregtechItemContainer registerWildcardAsOre(Object... aOreNames); + public IGregtechItemContainer registerWildcardAsOre(Object... aOreNames); public ItemStack getWithCharge(long aAmount, int aEnergy, Object... aReplacements); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IItemBehaviour.java index 545a97288f..a68efc4fb8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IItemBehaviour.java @@ -12,9 +12,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import gregtech.api.enums.SubTag; -import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_Base; +import gtPlusPlus.xmod.gregtech.api.items.GTMetaItemBase; -public interface Interface_ItemBehaviour<E extends Item> { +public interface IItemBehaviour<E extends Item> { public boolean onLeftClickEntity(E aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity); @@ -36,7 +36,7 @@ public interface Interface_ItemBehaviour<E extends Item> { public ItemStack onDispense(E aItem, IBlockSource aSource, ItemStack aStack); - public boolean hasProjectile(Gregtech_MetaItem_Base aItem, SubTag aProjectileType, ItemStack aStack); + public boolean hasProjectile(GTMetaItemBase aItem, SubTag aProjectileType, ItemStack aStack); public EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY, double aZ); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IOreRecipeRegistrator.java index 6ae25525bd..4c8b1c2391 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IOreRecipeRegistrator.java @@ -6,7 +6,7 @@ import gregtech.api.enums.Materials; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; -public interface Interface_OreRecipeRegistrator { +public interface IOreRecipeRegistrator { /** * Contains a Code Fragment, used in the OrePrefix to register Recipes. Better than using a switch/case, like I did diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IToolStats.java index 97d952d4a1..98b446869c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IToolStats.java @@ -12,16 +12,15 @@ import net.minecraft.util.DamageSource; import net.minecraftforge.event.world.BlockEvent; import gregtech.api.interfaces.IIconContainer; -import gregtech.api.interfaces.IToolStats; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool; +import gregtech.api.items.MetaGeneratedTool; +import gtPlusPlus.xmod.gregtech.api.items.GTMetaTool; /** * The Stats for GT Tools. Not including any Material Modifiers. * <p/> * And this is supposed to not have any ItemStack Parameters as these are generic Stats. */ -public interface Interface_ToolStats extends IToolStats { +public interface IToolStats extends gregtech.api.interfaces.IToolStats { /** * Called when aPlayer crafts this Tool @@ -32,7 +31,7 @@ public interface Interface_ToolStats extends IToolStats { /** * Called when this gets added to a Tool Item */ - public void onStatsAddedToTool(Gregtech_MetaTool gregtech_MetaTool, int aID); + public void onStatsAddedToTool(GTMetaTool gregtech_MetaTool, int aID); /** * @return Damage the Tool receives when breaking a Block. 100 is one Damage Point (or 100 EU). @@ -198,5 +197,5 @@ public interface Interface_ToolStats extends IToolStats { * Called when this gets added to a Tool Item */ @Override - public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID); + public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTGenericItem.java index 3ad04ab014..d734328327 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTGenericItem.java @@ -25,31 +25,31 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.SubTag; import gregtech.api.interfaces.IProjectileItem; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.Utils; /** * Extended by most Items, also used as a fallback Item, to prevent the accidental deletion when Errors occur. */ -public class Gregtech_Generic_Item extends Item implements IProjectileItem { +public class GTGenericItem extends Item implements IProjectileItem { private final String mName, mTooltip; protected IIcon mIcon; - public Gregtech_Generic_Item(final String aUnlocalized, final String aEnglish, final String aEnglishTooltip) { + public GTGenericItem(final String aUnlocalized, final String aEnglish, final String aEnglishTooltip) { this(aUnlocalized, aEnglish, aEnglishTooltip, true); } - public Gregtech_Generic_Item(final String aUnlocalized, final String aEnglish, final String aEnglishTooltip, + public GTGenericItem(final String aUnlocalized, final String aEnglish, final String aEnglishTooltip, final boolean aWriteToolTipIntoLangFile) { super(); this.mName = aUnlocalized; - GT_LanguageManager.addStringLocalization(this.mName + ".name", aEnglish); - if (GT_Utility.isStringValid(aEnglishTooltip)) { - GT_LanguageManager.addStringLocalization( + GTLanguageManager.addStringLocalization(this.mName + ".name", aEnglish); + if (GTUtility.isStringValid(aEnglishTooltip)) { + GTLanguageManager.addStringLocalization( this.mTooltip = this.mName + ".tooltip_main", aEnglishTooltip, aWriteToolTipIntoLangFile); @@ -104,9 +104,9 @@ public class Gregtech_Generic_Item extends Item implements IProjectileItem { aList.add((aStack.getMaxDamage() - this.getDamage(aStack)) + " / " + aStack.getMaxDamage()); } if (this.mTooltip != null) { - aList.add(GT_LanguageManager.getTranslation(this.mTooltip)); + aList.add(GTLanguageManager.getTranslation(this.mTooltip)); } - if (GT_ModHandler.isElectricItem(aStack)) { + if (GTModHandler.isElectricItem(aStack)) { aList.add("Tier: " + this.getTier(aStack)); } this.addAdditionalToolTips(aList, aStack); @@ -164,7 +164,7 @@ public class Gregtech_Generic_Item extends Item implements IProjectileItem { @Override public ItemStack dispenseStack(final IBlockSource aSource, final ItemStack aStack) { - return ((Gregtech_Generic_Item) aStack.getItem()).onDispense(aSource, aStack); + return ((GTGenericItem) aStack.getItem()).onDispense(aSource, aStack); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java index 015ba9d716..c98023bad7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.api.items; -import static gregtech.api.enums.GT_Values.D1; +import static gregtech.api.enums.GTValues.D1; import static gregtech.api.enums.Mods.GTPlusPlus; import java.util.ArrayList; @@ -20,21 +20,21 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.SubTag; -import gregtech.api.enums.TC_Aspects.TC_AspectStack; +import gregtech.api.enums.TCAspects.TC_AspectStack; import gregtech.api.interfaces.IFoodStat; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.IItemContainer; import gregtech.api.objects.ItemData; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour; +import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IItemBehaviour; -public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { +public abstract class GTMetaItem extends GTMetaItemBase { /** * All instances of this Item Class are listed here. This gets used to register the Renderer to all Items of this @@ -42,7 +42,7 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { * <p/> * You can also use the unlocalized Name gotten from getUnlocalizedName() as Key if you want to get a specific Item. */ - public static final HashMap<String, Gregtech_MetaItem> sInstances = new HashMap<>(); + public static final HashMap<String, GTMetaItem> sInstances = new HashMap<>(); /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */ @@ -61,7 +61,7 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { * * @param aUnlocalized The Unlocalized Name of this Item. */ - public Gregtech_MetaItem(final String aUnlocalized, final short aOffset, final short aItemAmount) { + public GTMetaItem(final String aUnlocalized, final short aOffset, final short aItemAmount) { super(aUnlocalized); this.setCreativeTab(AddToCreativeTab.tabMachines); this.setHasSubtypes(true); @@ -94,8 +94,8 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { final ItemStack rStack = new ItemStack(this, 1, this.mOffset + aID); this.mEnabledItems.set(aID); this.mVisibleItems.set(aID); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".name", aEnglish); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".tooltip", aToolTip); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".name", aEnglish); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".tooltip", aToolTip); final List<TC_AspectStack> tAspects = new ArrayList<>(); // Important Stuff to do first for (final Object tRandomData : aRandomData) { @@ -105,7 +105,7 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { continue; } if (tRandomData == SubTag.NO_UNIFICATION) { - GT_OreDictUnificator.addToBlacklist(rStack); + GTOreDictUnificator.addToBlacklist(rStack); continue; } } @@ -115,10 +115,8 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { if (tRandomData != null) { boolean tUseOreDict = true; - if (tRandomData instanceof Interface_ItemBehaviour) { - this.addItemBehavior( - this.mOffset + aID, - (Interface_ItemBehaviour<Gregtech_MetaItem_Base>) tRandomData); + if (tRandomData instanceof IItemBehaviour) { + this.addItemBehavior(this.mOffset + aID, (IItemBehaviour<GTMetaItemBase>) tRandomData); tUseOreDict = false; } if (tRandomData instanceof IItemContainer) { @@ -133,21 +131,21 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { continue; } if (tRandomData instanceof ItemData) { - if (GT_Utility.isStringValid(tRandomData)) { - GT_OreDictUnificator.registerOre(tRandomData, rStack); + if (GTUtility.isStringValid(tRandomData)) { + GTOreDictUnificator.registerOre(tRandomData, rStack); } else { - GT_OreDictUnificator.addItemData(rStack, (ItemData) tRandomData); + GTOreDictUnificator.addItemData(rStack, (ItemData) tRandomData); } continue; } if (tUseOreDict) { - GT_OreDictUnificator.registerOre(tRandomData, rStack); + GTOreDictUnificator.registerOre(tRandomData, rStack); continue; } } } - if (GregTech_API.sThaumcraftCompat != null) { - GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false); + if (GregTechAPI.sThaumcraftCompat != null) { + GregTechAPI.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false); } return rStack; } @@ -161,7 +159,7 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { * @param aValue 200 = 1 Burn Process = 500 EU, max = 32767 (that is 81917.5 EU) * @return the Item itself for convenience in constructing. */ - public final Gregtech_MetaItem setBurnValue(final int aMetaValue, final int aValue) { + public final GTMetaItem setBurnValue(final int aMetaValue, final int aValue) { if ((aMetaValue < 0) || (aMetaValue >= (this.mOffset + this.mEnabledItems.length())) || (aValue < 0)) { return this; } @@ -184,8 +182,8 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { * this Battery charge/discharge-able. * @return the Item itself for convenience in constructing. */ - public final Gregtech_MetaItem setElectricStats(final int aMetaValue, final long aMaxCharge, - final long aTransferLimit, final long aTier, final long aSpecialData, final boolean aUseAnimations) { + public final GTMetaItem setElectricStats(final int aMetaValue, final long aMaxCharge, final long aTransferLimit, + final long aTier, final long aSpecialData, final boolean aUseAnimations) { if ((aMetaValue < 0) || (aMetaValue >= (this.mOffset + this.mEnabledItems.length()))) { return this; } @@ -215,8 +213,7 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { * this Battery charge/discharge-able. * @return the Item itself for convenience in constructing. */ - public final Gregtech_MetaItem setFluidContainerStats(final int aMetaValue, final long aCapacity, - final long aStacksize) { + public final GTMetaItem setFluidContainerStats(final int aMetaValue, final long aCapacity, final long aStacksize) { if ((aMetaValue < 0) || (aMetaValue >= (this.mOffset + this.mEnabledItems.length()))) { return this; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java index 3c4418c2bf..3e7fcf1486 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.api.items; -import static gregtech.api.enums.GT_Values.D1; -import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GTValues.D1; +import static gregtech.api.enums.GTValues.V; import java.util.ArrayList; import java.util.HashMap; @@ -22,22 +22,22 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; import gregtech.api.enums.SubTag; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour; +import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IItemBehaviour; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; -public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item +public abstract class GTMetaItemBase extends GTGenericItem implements ISpecialElectricItem, IElectricItemManager, IFluidContainerItem { /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */ - private final HashMap<Short, ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>>> mItemBehaviors = new HashMap<>(); + private final HashMap<Short, ArrayList<IItemBehaviour<GTMetaItemBase>>> mItemBehaviors = new HashMap<>(); /** * Creates the Item using these Parameters. @@ -45,7 +45,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item * @param aUnlocalized The Unlocalized Name of this Item. * @param aGeneratedPrefixList The OreDict Prefixes you want to have generated. */ - public Gregtech_MetaItem_Base(final String aUnlocalized) { + public GTMetaItemBase(final String aUnlocalized) { super(aUnlocalized, "Generated Item", null, false); this.setHasSubtypes(true); this.setMaxDamage(0); @@ -60,12 +60,11 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item * @param aBehavior the Click Behavior you want to add. * @return the Item itself for convenience in constructing. */ - public final Gregtech_MetaItem_Base addItemBehavior(final int aMetaValue, - final Interface_ItemBehaviour<Gregtech_MetaItem_Base> aBehavior) { + public final GTMetaItemBase addItemBehavior(final int aMetaValue, final IItemBehaviour<GTMetaItemBase> aBehavior) { if ((aMetaValue < 0) || (aMetaValue >= 32766) || (aBehavior == null)) { return this; } - ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors.get((short) aMetaValue); + ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) aMetaValue); if (tList == null) { tList = new ArrayList<>(1); this.mItemBehaviors.put((short) aMetaValue, tList); @@ -80,10 +79,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item @Override public boolean hasProjectile(final SubTag aProjectileType, final ItemStack aStack) { - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { if (tBehavior.hasProjectile(this, aProjectileType, aStack)) { return true; } @@ -95,10 +93,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item @Override public EntityArrow getProjectile(final SubTag aProjectileType, final ItemStack aStack, final World aWorld, final double aX, final double aY, final double aZ) { - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { final EntityArrow rArrow = tBehavior.getProjectile(this, aProjectileType, aStack, aWorld, aX, aY, aZ); if (rArrow != null) { return rArrow; @@ -111,10 +108,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item @Override public EntityArrow getProjectile(final SubTag aProjectileType, final ItemStack aStack, final World aWorld, final EntityLivingBase aEntity, final float aSpeed) { - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { final EntityArrow rArrow = tBehavior .getProjectile(this, aProjectileType, aStack, aWorld, aEntity, aSpeed); if (rArrow != null) { @@ -127,10 +123,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item @Override public ItemStack onDispense(final IBlockSource aSource, final ItemStack aStack) { - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { if (tBehavior.canDispense(this, aSource, aStack)) { return tBehavior.onDispense(this, aSource, aStack); } @@ -141,10 +136,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item @Override public boolean isItemStackUsable(final ItemStack aStack) { - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { if (!tBehavior.isItemStackUsable(this, aStack)) { return false; } @@ -157,10 +151,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item public boolean onLeftClickEntity(final ItemStack aStack, final EntityPlayer aPlayer, final Entity aEntity) { this.use(aStack, 0, aPlayer); this.isItemStackUsable(aStack); - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { try { if (tBehavior.onLeftClickEntity(this, aStack, aPlayer, aEntity)) { if (aStack.stackSize <= 0) { @@ -174,7 +167,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item } } catch (final Throwable e) { if (D1) { - e.printStackTrace(GT_Log.err); + e.printStackTrace(GTLog.err); } } } @@ -187,10 +180,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item final int aY, final int aZ, final int ordinalSide, final float hitX, final float hitY, final float hitZ) { this.use(aStack, 0, aPlayer); this.isItemStackUsable(aStack); - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { try { if (tBehavior.onItemUse(this, aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ)) { if (aStack.stackSize <= 0) { @@ -204,7 +196,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item } } catch (final Throwable e) { if (D1) { - e.printStackTrace(GT_Log.err); + e.printStackTrace(GTLog.err); } } } @@ -217,10 +209,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item final int aY, final int aZ, final int ordinalSide, final float hitX, final float hitY, final float hitZ) { this.use(aStack, 0, aPlayer); this.isItemStackUsable(aStack); - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { try { if (tBehavior .onItemUseFirst(this, aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ)) { @@ -235,7 +226,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item } } catch (final Throwable e) { if (D1) { - e.printStackTrace(GT_Log.err); + e.printStackTrace(GTLog.err); } } } @@ -247,15 +238,14 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item public ItemStack onItemRightClick(ItemStack aStack, final World aWorld, final EntityPlayer aPlayer) { this.use(aStack, 0, aPlayer); this.isItemStackUsable(aStack); - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { try { aStack = tBehavior.onItemRightClick(this, aStack, aWorld, aPlayer); } catch (final Throwable e) { if (D1) { - e.printStackTrace(GT_Log.err); + e.printStackTrace(GTLog.err); } } } @@ -267,8 +257,8 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item public final void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, List aList, final boolean aF3_H) { final String tKey = this.getUnlocalizedName(aStack) + ".tooltip", - tString = GT_LanguageManager.getTranslation(tKey); - if (GT_Utility.isStringValid(tString) && !tKey.equals(tString)) { + tString = GTLanguageManager.getTranslation(tKey); + if (GTUtility.isStringValid(tString) && !tKey.equals(tString)) { aList.add(tString); } @@ -277,7 +267,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item if (tStats[3] > 0) { aList.add( EnumChatFormatting.AQUA + "Contains " - + GT_Utility.formatNumbers(tStats[3]) + + GTUtility.formatNumbers(tStats[3]) + " EU Tier: " + (tStats[2] >= 0 ? tStats[2] : 0) + EnumChatFormatting.GRAY); @@ -289,11 +279,11 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item } else { aList.add( EnumChatFormatting.AQUA + "" - + GT_Utility.formatNumbers(tCharge) + + GTUtility.formatNumbers(tCharge) + " / " - + GT_Utility.formatNumbers(Math.abs(tStats[0])) + + GTUtility.formatNumbers(Math.abs(tStats[0])) + " EU - Voltage: " - + GT_Utility.formatNumbers( + + GTUtility.formatNumbers( V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)]) + EnumChatFormatting.GRAY); } @@ -305,20 +295,19 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item final FluidStack tFluid = this.getFluidContent(aStack); aList.add( EnumChatFormatting.BLUE - + ((tFluid == null ? "No Fluids Contained" : GT_Utility.getFluidName(tFluid, true))) + + ((tFluid == null ? "No Fluids Contained" : GTUtility.getFluidName(tFluid, true))) + EnumChatFormatting.GRAY); aList.add( EnumChatFormatting.BLUE - + (GT_Utility.formatNumbers(tFluid == null ? 0 : tFluid.amount) + "L / " - + GT_Utility.formatNumbers(tStats[0]) + + (GTUtility.formatNumbers(tFluid == null ? 0 : tFluid.amount) + "L / " + + GTUtility.formatNumbers(tStats[0]) + "L") + EnumChatFormatting.GRAY); } - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { aList = tBehavior.getAdditionalToolTips(this, aList, aStack); } } @@ -329,10 +318,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item @Override public void onUpdate(final ItemStack aStack, final World aWorld, final Entity aPlayer, final int aTimer, final boolean aIsInHand) { - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { tBehavior.onUpdate(this, aStack, aWorld, aPlayer, aTimer, aIsInHand); } } @@ -446,7 +434,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item } for (int i = 1; i < 5; i++) { final ItemStack tArmor = aPlayer.getEquipmentInSlot(i); - if (GT_ModHandler.isElectricItem(tArmor)) { + if (GTModHandler.isElectricItem(tArmor)) { final IElectricItem tArmorItem = (IElectricItem) tArmor.getItem(); if (tArmorItem.canProvideEnergy(tArmor) && (tArmorItem.getTier(tArmor) >= this.getTier(aStack))) { final double tCharge = ElectricItem.manager.discharge( @@ -533,11 +521,11 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item return 0; } - final ItemStack tStack = GT_Utility.fillFluidContainer(aFluid, aStack, false, false); + final ItemStack tStack = GTUtility.fillFluidContainer(aFluid, aStack, false, false); if (tStack != null) { aStack.setItemDamage(tStack.getItemDamage()); aStack.func_150996_a(tStack.getItem()); - return GT_Utility.getFluidForFilledItem(tStack, false).amount; + return GTUtility.getFluidForFilledItem(tStack, false).amount; } final Long[] tStats = this.getFluidContainerStats(aStack); @@ -592,9 +580,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item return null; } - FluidStack tFluid = GT_Utility.getFluidForFilledItem(aStack, false); + FluidStack tFluid = GTUtility.getFluidForFilledItem(aStack, false); if ((tFluid != null) && (maxDrain >= tFluid.amount)) { - final ItemStack tStack = GT_Utility.getContainerItem(aStack, false); + final ItemStack tStack = GTUtility.getContainerItem(aStack, false); if (tStack == null) { aStack.stackSize = 0; return tFluid; @@ -631,7 +619,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item public FluidStack getFluidContent(final ItemStack aStack) { final Long[] tStats = this.getFluidContainerStats(aStack); if ((tStats == null) || (tStats[0] <= 0)) { - return GT_Utility.getFluidForFilledItem(aStack, false); + return GTUtility.getFluidForFilledItem(aStack, false); } final NBTTagCompound tNBT = aStack.getTagCompound(); return tNBT == null ? null : FluidStack.loadFluidStackFromNBT(tNBT.getCompoundTag("GT.FluidContent")); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java index c04acb9537..31cdac4770 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java @@ -10,14 +10,14 @@ 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.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.IIconContainer; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; @@ -36,7 +36,7 @@ import gtPlusPlus.core.util.math.MathUtils; * These Items can also have special RightClick abilities, electric Charge or even be set to become a Food alike * Item. */ -public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { +public abstract class GTMetaItemX32 extends GTMetaItem { protected final OrePrefixes[] mGeneratedPrefixList; @@ -46,7 +46,7 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { * @param aUnlocalized The Unlocalized Name of this Item. * @param aGeneratedPrefixList The OreDict Prefixes you want to have generated. */ - public Gregtech_MetaItem_X32(final String aUnlocalized, final OrePrefixes... aGeneratedPrefixList) { + public GTMetaItemX32(final String aUnlocalized, final OrePrefixes... aGeneratedPrefixList) { super(aUnlocalized, (short) 32000, (short) 766); this.mGeneratedPrefixList = Arrays.copyOf(aGeneratedPrefixList, 32); @@ -55,27 +55,27 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { if (tPrefix == null) { continue; } - final Materials tMaterial = GregTech_API.sGeneratedMaterials[i % 1000]; + final Materials tMaterial = GregTechAPI.sGeneratedMaterials[i % 1000]; if (tMaterial == null) { continue; } if (this.doesMaterialAllowGeneration(tPrefix, tMaterial)) { final ItemStack tStack = new ItemStack(this, 1, i); - GT_LanguageManager.addStringLocalization( + GTLanguageManager.addStringLocalization( this.getUnlocalizedName(tStack) + ".name", this.getDefaultLocalization(tPrefix, tMaterial, i)); - GT_LanguageManager.addStringLocalization( + GTLanguageManager.addStringLocalization( this.getUnlocalizedName(tStack) + ".tooltip", - tMaterial.getToolTip(tPrefix.mMaterialAmount / GT_Values.M)); + tMaterial.getToolTip(tPrefix.mMaterialAmount / GTValues.M)); if (tPrefix.mIsUnificatable) { - GT_OreDictUnificator.set(tPrefix, tMaterial, tStack); + GTOreDictUnificator.set(tPrefix, tMaterial, tStack); } else { - GT_OreDictUnificator.registerOre(tPrefix.get(tMaterial), tStack); + GTOreDictUnificator.registerOre(tPrefix.get(tMaterial), tStack); } if (((tPrefix == OrePrefixes.stick) || (tPrefix == OrePrefixes.wireFine)) && ((tMaterial == Materials.Lead) || (tMaterial == Materials.Tin) || (tMaterial == Materials.SolderingAlloy))) { - GregTech_API.sSolderingMetalList.add(tStack); + GregTechAPI.sSolderingMetalList.add(tStack); } } } @@ -88,7 +88,7 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { */ @Override public short[] getRGBa(final ItemStack aStack) { - final Materials tMaterial = GregTech_API.sGeneratedMaterials[this.getDamage(aStack) % 1000]; + final Materials tMaterial = GregTechAPI.sGeneratedMaterials[this.getDamage(aStack) % 1000]; return tMaterial == null ? Materials._NULL.mRGBa : tMaterial.mRGBa; } @@ -146,11 +146,11 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { public ItemStack getContainerItem(final ItemStack aStack) { final int aDamage = aStack.getItemDamage(); if ((aDamage < 32000) && (aDamage >= 0)) { - final Materials aMaterial = GregTech_API.sGeneratedMaterials[aDamage % 1000]; + final Materials aMaterial = GregTechAPI.sGeneratedMaterials[aDamage % 1000]; if ((aMaterial != null) && (aMaterial != Materials.Empty) && (aMaterial != Materials._NULL)) { final OrePrefixes aPrefix = this.mGeneratedPrefixList[aDamage / 1000]; if (aPrefix != null) { - return GT_Utility.copyAmount(1, aPrefix.mContainerItem); + return GTUtility.copyAmount(1, aPrefix.mContainerItem); } } } @@ -159,8 +159,8 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { @Override public final IIconContainer getIconContainer(final int aMetaData) { - return GregTech_API.sGeneratedMaterials[aMetaData % 1000] == null ? null - : this.getIconContainer(aMetaData, GregTech_API.sGeneratedMaterials[aMetaData % 1000]); + return GregTechAPI.sGeneratedMaterials[aMetaData % 1000] == null ? null + : this.getIconContainer(aMetaData, GregTechAPI.sGeneratedMaterials[aMetaData % 1000]); } @Override @@ -169,11 +169,11 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { for (int i = 0; i < 32000; i++) { if (this.doesMaterialAllowGeneration( this.mGeneratedPrefixList[i / 1000], - GregTech_API.sGeneratedMaterials[i % 1000]) + GregTechAPI.sGeneratedMaterials[i % 1000]) && this.doesShowInCreative( this.mGeneratedPrefixList[i / 1000], - GregTech_API.sGeneratedMaterials[i % 1000], - GregTech_API.sDoShowAllItemsInCreative)) { + GregTechAPI.sGeneratedMaterials[i % 1000], + GregTechAPI.sDoShowAllItemsInCreative)) { final ItemStack tStack = new ItemStack(this, 1, i); this.isItemStackUsable(tStack); aList.add(tStack); @@ -188,7 +188,7 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { return null; } if (aMetaData < 32000) { - final Materials tMaterial = GregTech_API.sGeneratedMaterials[aMetaData % 1000]; + final Materials tMaterial = GregTechAPI.sGeneratedMaterials[aMetaData % 1000]; if (tMaterial == null) { return null; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaTool.java index fcfa5fae50..f47ef56e9a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaTool.java @@ -25,16 +25,15 @@ import net.minecraftforge.event.world.BlockEvent; import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.common.Optional; -import gregtech.api.enchants.Enchantment_Radioactivity; +import gregtech.api.enchants.EnchantmentRadioactivity; import gregtech.api.enums.Materials; import gregtech.api.enums.Mods; import gregtech.api.interfaces.IDamagableItem; -import gregtech.api.interfaces.IToolStats; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaGeneratedTool; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats; +import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IToolStats; import mods.railcraft.api.core.items.IToolCrowbar; /** @@ -47,8 +46,7 @@ import mods.railcraft.api.core.items.IToolCrowbar; @Optional.Interface(iface = "mods.railcraft.api.core.items.IToolCrowbar", modid = Mods.Names.RAILCRAFT), @Optional.Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft"), @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = Mods.Names.ENDER_I_O) }) -public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool - implements IDamagableItem, IToolCrowbar, IToolWrench { +public abstract class GTMetaTool extends MetaGeneratedTool implements IDamagableItem, IToolCrowbar, IToolWrench { /** * All instances of this Item Class are listed here. This gets used to register the Renderer to all Items of this @@ -56,33 +54,33 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool * <p/> * You can also use the unlocalized Name gotten from getUnlocalizedName() as Key if you want to get a specific Item. */ - public static final HashMap<String, Gregtech_MetaTool> sInstances = new HashMap<>(); + public static final HashMap<String, GTMetaTool> sInstances = new HashMap<>(); /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */ - public final HashMap<Short, IToolStats> mToolStats = new HashMap<>(); + public final HashMap<Short, gregtech.api.interfaces.IToolStats> mToolStats = new HashMap<>(); /** * Creates the Item using these Parameters. * * @param aUnlocalized The Unlocalized Name of this Item. */ - public Gregtech_MetaTool(final String aUnlocalized) { + public GTMetaTool(final String aUnlocalized) { super(aUnlocalized); - GT_ModHandler.registerBoxableItemToToolBox(new ItemStack(this)); + GTModHandler.registerBoxableItemToToolBox(new ItemStack(this)); this.setCreativeTab(AddToCreativeTab.tabMachines); this.setMaxStackSize(1); sInstances.put(this.getUnlocalizedName(), this); } /** - * Called by the Block Harvesting Event within the GT_Proxy + * Called by the Block Harvesting Event within the GTProxy */ @Override public void onHarvestBlockEvent(final ArrayList<ItemStack> aDrops, final ItemStack aStack, final EntityPlayer aPlayer, final Block aBlock, final int aX, final int aY, final int aZ, final byte aMetaData, final int aFortune, final boolean aSilkTouch, final BlockEvent.HarvestDropsEvent aEvent) { - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if (this.isItemStackUsable(aStack) && (this.getDigSpeed(aStack, aBlock, aMetaData) > 0.0F)) { this.doDamage( aStack, @@ -103,11 +101,11 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool @Override public boolean onLeftClickEntity(final ItemStack aStack, final EntityPlayer aPlayer, final Entity aEntity) { - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if ((tStats == null) || !this.isItemStackUsable(aStack)) { return true; } - GT_Utility.doSoundAtClient(tStats.getEntityHitSound(), 1, 1.0F); + GTUtility.doSoundAtClient(tStats.getEntityHitSound(), 1, 1.0F); if (super.onLeftClickEntity(aStack, aPlayer, aEntity)) { return true; } @@ -184,7 +182,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool @Override public ItemStack onItemRightClick(final ItemStack aStack, final World aWorld, final EntityPlayer aPlayer) { - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if ((tStats != null) && tStats.canBlock()) { aPlayer.setItemInUse(aStack, 72000); } @@ -195,7 +193,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool public void addAdditionalToolTips(final List aList, final ItemStack aStack) { final long tMaxDamage = getToolMaxDamage(aStack); final Materials tMaterial = getPrimaryMaterial(aStack); - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); final int tOffset = this.getElectricStats(aStack) != null ? 2 : 1; if (tStats != null) { final String name = aStack.getUnlocalizedName(); @@ -289,7 +287,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool public void addAdditionalToolTips(final List aList, final ItemStack aStack, final EntityPlayer aPlayer) { final long tMaxDamage = getToolMaxDamage(aStack); final Materials tMaterial = getPrimaryMaterial(aStack); - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); final int tOffset = this.getElectricStats(aStack) != null ? 2 : 1; if (tStats != null) { final String name = aStack.getUnlocalizedName(); @@ -427,7 +425,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool @Override public float getToolCombatDamage(final ItemStack aStack) { - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if (tStats == null) { return 0; } @@ -439,7 +437,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool if (!this.isItemStackUsable(aStack)) { return 0.0F; } - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if ((tStats == null) || (Math.max(0, this.getHarvestLevel(aStack, "")) < aBlock.getHarvestLevel(aMetaData))) { return 0.0F; } @@ -454,11 +452,11 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool if (!this.isItemStackUsable(aStack)) { return false; } - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if (tStats == null) { return false; } - GT_Utility.doSoundAtClient(tStats.getMiningSound(), 1, 1.0F); + GTUtility.doSoundAtClient(tStats.getMiningSound(), 1, 1.0F); this.doDamage( aStack, (int) Math.max(1, aBlock.getBlockHardness(aWorld, aX, aY, aZ) * tStats.getToolDamagePerBlockBreak())); @@ -469,8 +467,8 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool if (!this.isItemStackUsable(aStack)) { return null; } - aStack = GT_Utility.copyAmount(1, aStack); - final IToolStats tStats = this.getToolStats(aStack); + aStack = GTUtility.copyAmount(1, aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if (tStats == null) { return null; } @@ -481,13 +479,13 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool } @Override - public Interface_ToolStats getToolStats(final ItemStack aStack) { + public IToolStats getToolStats(final ItemStack aStack) { this.isItemStackUsable(aStack); return this.getToolStatsInternal(aStack); } - private Interface_ToolStats getToolStatsInternal(final ItemStack aStack) { - return (Interface_ToolStats) (aStack == null ? null : this.mToolStats.get((short) aStack.getItemDamage())); + private IToolStats getToolStatsInternal(final ItemStack aStack) { + return (IToolStats) (aStack == null ? null : this.mToolStats.get((short) aStack.getItemDamage())); } @Override @@ -496,13 +494,13 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool if (!this.isItemStackUsable(aStack)) { return false; } - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); return (tStats != null) && tStats.isCrowbar(); } @Override public void onWhack(final EntityPlayer aPlayer, final ItemStack aStack, final int aX, final int aY, final int aZ) { - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if (tStats != null) { this.doDamage(aStack, tStats.getToolDamagePerEntityAttack()); } @@ -520,7 +518,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool if (!this.isItemStackUsable(player.getCurrentEquippedItem())) { return false; } - final Interface_ToolStats tStats = this.getToolStats(player.getCurrentEquippedItem()); + final IToolStats tStats = this.getToolStats(player.getCurrentEquippedItem()); return (tStats != null) && tStats.isWrench(); } @@ -532,7 +530,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool if (player.getCurrentEquippedItem() == null) { return; } - final IToolStats tStats = this.getToolStats(player.getCurrentEquippedItem()); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(player.getCurrentEquippedItem()); if (tStats != null) { this.doDamage(player.getCurrentEquippedItem(), tStats.getToolDamagePerEntityAttack()); } @@ -543,13 +541,13 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool if (!this.isItemStackUsable(aStack)) { return false; } - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); return (tStats != null) && tStats.isCrowbar(); } @Override public void onLink(final EntityPlayer aPlayer, final ItemStack aStack, final EntityMinecart cart) { - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if (tStats != null) { this.doDamage(aStack, tStats.getToolDamagePerEntityAttack()); } @@ -560,13 +558,13 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool if (!this.isItemStackUsable(aStack)) { return false; } - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); return (tStats != null) && tStats.isCrowbar(); } @Override public void onBoost(final EntityPlayer aPlayer, final ItemStack aStack, final EntityMinecart cart) { - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if (tStats != null) { this.doDamage(aStack, tStats.getToolDamagePerEntityAttack()); } @@ -574,7 +572,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool @Override public void onCreated(final ItemStack aStack, final World aWorld, final EntityPlayer aPlayer) { - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if ((tStats != null) && (aPlayer != null)) { tStats.onToolCrafted(aStack, aPlayer); } @@ -588,7 +586,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool @Override public boolean isItemStackUsable(final ItemStack aStack) { - final IToolStats tStats = this.getToolStatsInternal(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStatsInternal(aStack); if (((aStack.getItemDamage() % 2) == 1) || (tStats == null)) { final NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { @@ -622,7 +620,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool } for (final Entry<Integer, Integer> tEntry : tMap.entrySet()) { if ((tEntry.getKey() == 33) || ((tEntry.getKey() == 20) && (tEntry.getValue() > 2)) - || (tEntry.getKey() == Enchantment_Radioactivity.INSTANCE.effectId)) { + || (tEntry.getKey() == EnchantmentRadioactivity.INSTANCE.effectId)) { tResult.put(tEntry.getKey(), tEntry.getValue()); } else { switch (Enchantment.enchantmentsList[tEntry.getKey()].type) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GTPPMTECable.java index 9b1408ba51..9025dad232 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GTPPMTECable.java @@ -10,17 +10,17 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.metatileentity.IMetaTileEntityCable; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Utility; +import gregtech.api.metatileentity.implementations.MTECable; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTUtility; -public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implements IMetaTileEntityCable { +public class GTPPMTECable extends MTECable implements IMetaTileEntityCable { private static Textures.BlockIcons INSULATION_MEDIUM_PLUS; static { try { - INSULATION_MEDIUM_PLUS = (Textures.BlockIcons) GT_Utility + INSULATION_MEDIUM_PLUS = (Textures.BlockIcons) GTUtility .getField(Textures.BlockIcons.class, "INSULATION_MEDIUM_PLUS") .get(null); } catch (IllegalAccessException | NullPointerException e) { @@ -30,9 +30,9 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem private short[] vRGB = null; - public GregtechMetaPipeEntity_Cable(final int aID, final String aName, final String aNameRegional, - final float aThickNess, final Materials aMaterial, final long aCableLossPerMeter, final long aAmperage, - final long aVoltage, final boolean aInsulated, final boolean aCanShock, final short[] aRGB) { + public GTPPMTECable(final int aID, final String aName, final String aNameRegional, final float aThickNess, + final Materials aMaterial, final long aCableLossPerMeter, final long aAmperage, final long aVoltage, + final boolean aInsulated, final boolean aCanShock, final short[] aRGB) { super( aID, aName, @@ -47,16 +47,16 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem this.vRGB = aRGB == null || aRGB.length != 4 ? Materials.Iron.mRGBa : aRGB; } - public GregtechMetaPipeEntity_Cable(final String aName, final float aThickNess, final Materials aMaterial, + public GTPPMTECable(final String aName, final float aThickNess, final Materials aMaterial, final long aCableLossPerMeter, final long aAmperage, final long aVoltage, final boolean aInsulated, final boolean aCanShock, final short[] aRGB) { super(aName, aThickNess, aMaterial, aCableLossPerMeter, aAmperage, aVoltage, aInsulated, aCanShock); this.vRGB = aRGB == null || aRGB.length != 4 ? Materials.Iron.mRGBa : aRGB; } - public GregtechMetaPipeEntity_Cable(final int aID, final String aName, final String aNameRegional, - final float aThickNess, final long aCableLossPerMeter, final long aAmperage, final long aVoltage, - final boolean aInsulated, final boolean aCanShock, final short[] aRGB) { + public GTPPMTECable(final int aID, final String aName, final String aNameRegional, final float aThickNess, + final long aCableLossPerMeter, final long aAmperage, final long aVoltage, final boolean aInsulated, + final boolean aCanShock, final short[] aRGB) { this( aID, aName, @@ -71,15 +71,14 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem aRGB); } - public GregtechMetaPipeEntity_Cable(final String aName, final float aThickNess, final long aCableLossPerMeter, - final long aAmperage, final long aVoltage, final boolean aInsulated, final boolean aCanShock, - final short[] aRGB) { + public GTPPMTECable(final String aName, final float aThickNess, final long aCableLossPerMeter, final long aAmperage, + final long aVoltage, final boolean aInsulated, final boolean aCanShock, final short[] aRGB) { this(aName, aThickNess, null, aCableLossPerMeter, aAmperage, aVoltage, aInsulated, aCanShock, aRGB); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaPipeEntity_Cable( + return new GTPPMTECable( this.mName, this.mThickNess, this.mMaterial, @@ -105,51 +104,50 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem wireMaterial = Materials.Iron; } - if (!mInsulated) return new ITexture[] { new GT_RenderedTexture( + if (!mInsulated) return new ITexture[] { new GTRenderedTexture( wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], Dyes.getModulation(aColorIndex, vRGB)) }; if (aConnected) { float tThickNess = getThickNess(); - if (tThickNess < 0.124F) return new ITexture[] { new GT_RenderedTexture( + if (tThickNess < 0.124F) return new ITexture[] { new GTRenderedTexture( Textures.BlockIcons.INSULATION_FULL, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) }; if (tThickNess < 0.374F) // 0.375 x1 return new ITexture[] { - new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB), - new GT_RenderedTexture( + new GTRenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB), + new GTRenderedTexture( Textures.BlockIcons.INSULATION_TINY, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) }; if (tThickNess < 0.499F) // 0.500 x2 return new ITexture[] { - new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB), - new GT_RenderedTexture( + new GTRenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB), + new GTRenderedTexture( Textures.BlockIcons.INSULATION_SMALL, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) }; if (tThickNess < 0.624F) // 0.625 x4 return new ITexture[] { - new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB), - new GT_RenderedTexture( + new GTRenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB), + new GTRenderedTexture( Textures.BlockIcons.INSULATION_MEDIUM, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) }; if (tThickNess < 0.749F) // 0.750 x8 return new ITexture[] { - new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB), - new GT_RenderedTexture( + new GTRenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB), + new GTRenderedTexture( INSULATION_MEDIUM_PLUS, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) }; if (tThickNess < 0.874F) // 0.825 x12 return new ITexture[] { - new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB), - new GT_RenderedTexture( + new GTRenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB), + new GTRenderedTexture( Textures.BlockIcons.INSULATION_LARGE, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) }; - return new ITexture[] { - new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB), - new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB), + new GTRenderedTexture( Textures.BlockIcons.INSULATION_HUGE, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) }; } - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( Textures.BlockIcons.INSULATION_FULL, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) }; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GTPPMTEFluid.java index e9f9a2dda4..550e5e409c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GTPPMTEFluid.java @@ -8,34 +8,34 @@ import gregtech.api.enums.SubTag; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid; +import gregtech.api.metatileentity.implementations.MTEFluid; import gregtech.api.render.TextureFactory; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; -public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid { +public class GTPPMTEFluid extends MTEFluid { public final GT_Materials mMaterial; - public GregtechMetaPipeEntityFluid(int aID, String aName, String aNameRegional, float aThickNess, - GT_Materials aMaterial, int aCapacity, int aHeatResistance, boolean aGasProof) { + public GTPPMTEFluid(int aID, String aName, String aNameRegional, float aThickNess, GT_Materials aMaterial, + int aCapacity, int aHeatResistance, boolean aGasProof) { this(aID, aName, aNameRegional, aThickNess, aMaterial, aCapacity, aHeatResistance, aGasProof, 1); } - public GregtechMetaPipeEntityFluid(final String aName, final float aThickNess, final GT_Materials aMaterial, - final int aCapacity, final int aHeatResistance, final boolean aGasProof) { + public GTPPMTEFluid(final String aName, final float aThickNess, final GT_Materials aMaterial, final int aCapacity, + final int aHeatResistance, final boolean aGasProof) { this(aName, aThickNess, aMaterial, aCapacity, aHeatResistance, aGasProof, 1); } - public GregtechMetaPipeEntityFluid(int aID, String aName, String aNameRegional, float aThickNess, - GT_Materials aMaterial, int aCapacity, int aHeatResistance, boolean aGasProof, int aFluidTypes) { + public GTPPMTEFluid(int aID, String aName, String aNameRegional, float aThickNess, GT_Materials aMaterial, + int aCapacity, int aHeatResistance, boolean aGasProof, int aFluidTypes) { super(aID, aName, aNameRegional, aThickNess, null, aCapacity, aHeatResistance, aGasProof, aFluidTypes); this.mLastReceivedFrom = 0; this.oLastReceivedFrom = 0; this.mMaterial = aMaterial; } - public GregtechMetaPipeEntityFluid(String aName, float aThickNess, GT_Materials aMaterial, int aCapacity, - int aHeatResistance, boolean aGasProof, int aFluidTypes) { + public GTPPMTEFluid(String aName, float aThickNess, GT_Materials aMaterial, int aCapacity, int aHeatResistance, + boolean aGasProof, int aFluidTypes) { super(aName, aThickNess, null, aCapacity, aHeatResistance, aGasProof, aFluidTypes); this.mLastReceivedFrom = 0; this.oLastReceivedFrom = 0; @@ -51,7 +51,7 @@ public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid { @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaPipeEntityFluid( + return new GTPPMTEFluid( this.mName, this.mThickNess, this.mMaterial, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/METHatchAirIntake.java index bab504910e..e475037c63 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/METHatchAirIntake.java @@ -7,24 +7,23 @@ import net.minecraftforge.fluids.Fluid; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; -public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_FluidGenerator { +public class METHatchAirIntake extends MTEHatchFluidGenerator { - public GT_MetaTileEntity_Hatch_AirIntake(final int aID, final String aName, final String aNameRegional, - final int aTier) { + public METHatchAirIntake(final int aID, final String aName, final String aNameRegional, final int aTier) { super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_AirIntake(final String aName, final int aTier, final String[] aDescription, + public METHatchAirIntake(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_AirIntake(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new METHatchAirIntake(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -71,30 +70,30 @@ public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_F .isServerSide()) { return; } - final float ran1 = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat(); + final float ran1 = METHatchAirIntake.floatGen.nextFloat(); float ran2 = 0.0f; float ran3 = 0.0f; - ran2 = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat(); - ran3 = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat(); + ran2 = METHatchAirIntake.floatGen.nextFloat(); + ran3 = METHatchAirIntake.floatGen.nextFloat(); final IGregTechTileEntity aMuffler = this.getBaseMetaTileEntity(); final ForgeDirection aDir = aMuffler.getFrontFacing(); final float xPos = aDir.offsetX * 0.76f + aMuffler.getXCoord() + 0.25f; float yPos = aDir.offsetY * 0.76f + aMuffler.getYCoord() + 0.65f; final float zPos = aDir.offsetZ * 0.76f + aMuffler.getZCoord() + 0.25f; - float ySpd = aDir.offsetY * 0.1f + 0.2f + 0.1f * GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat(); + float ySpd = aDir.offsetY * 0.1f + 0.2f + 0.1f * METHatchAirIntake.floatGen.nextFloat(); float xSpd; float zSpd; if (aDir.offsetY == -1) { // Logger.INFO("Y = -1"); - final float temp = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 2.0f * CORE.PI; + final float temp = METHatchAirIntake.floatGen.nextFloat() * 2.0f * GTPPCore.PI; xSpd = (float) Math.sin(temp) * 0.1f; zSpd = (float) Math.cos(temp) * 0.1f; ySpd = -ySpd; yPos = yPos - 0.8f; } else { - xSpd = aDir.offsetX * (0.1f + 0.2f * GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat()); - zSpd = aDir.offsetZ * (0.1f + 0.2f * GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat()); + xSpd = aDir.offsetX * (0.1f + 0.2f * METHatchAirIntake.floatGen.nextFloat()); + zSpd = aDir.offsetZ * (0.1f + 0.2f * METHatchAirIntake.floatGen.nextFloat()); xSpd = -xSpd; zSpd = -zSpd; @@ -103,24 +102,24 @@ public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_F aWorld.spawnParticle( name, (double) (xPos + ran1 * 0.5f), - (double) (yPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f), - (double) (zPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f), + (double) (yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f), + (double) (zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f), (double) xSpd, (double) -ySpd, (double) zSpd); aWorld.spawnParticle( name, (double) (xPos + ran2 * 0.5f), - (double) (yPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f), - (double) (zPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f), + (double) (yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f), + (double) (zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f), (double) xSpd, (double) -ySpd, (double) zSpd); aWorld.spawnParticle( name, (double) (xPos + ran3 * 0.5f), - (double) (yPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f), - (double) (zPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f), + (double) (yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f), + (double) (zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f), (double) xSpd, (double) -ySpd, (double) zSpd); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchAirIntakeExtreme.java index 007310fc06..a03f8bada1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchAirIntakeExtreme.java @@ -4,25 +4,20 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -public class GT_MetaTileEntity_Hatch_AirIntake_Extreme extends GT_MetaTileEntity_Hatch_AirIntake { +public class MTEHatchAirIntakeExtreme extends METHatchAirIntake { - public GT_MetaTileEntity_Hatch_AirIntake_Extreme(final int aID, final String aName, final String aNameRegional, - final int aTier) { + public MTEHatchAirIntakeExtreme(final int aID, final String aName, final String aNameRegional, final int aTier) { super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_AirIntake_Extreme(final String aName, final int aTier, final String[] aDescription, + public MTEHatchAirIntakeExtreme(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_AirIntake_Extreme( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures); + return new MTEHatchAirIntakeExtreme(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ChiselBus.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchChiselBus.java index 3009c80c80..e9d13f3c48 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ChiselBus.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchChiselBus.java @@ -11,15 +11,15 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.modularui.IAddUIWidgets; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; +import gregtech.api.metatileentity.implementations.MTEHatchInputBus; -public class GT_MetaTileEntity_ChiselBus extends GT_MetaTileEntity_Hatch_InputBus implements IAddUIWidgets { +public class MTEHatchChiselBus extends MTEHatchInputBus implements IAddUIWidgets { - public GT_MetaTileEntity_ChiselBus(int id, String name, String nameRegional, int tier) { + public MTEHatchChiselBus(int id, String name, String nameRegional, int tier) { super(id, name, nameRegional, tier); } - public GT_MetaTileEntity_ChiselBus(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEHatchChiselBus(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, getSlots(aTier), aDescription, aTextures); } @@ -34,7 +34,7 @@ public class GT_MetaTileEntity_ChiselBus extends GT_MetaTileEntity_Hatch_InputBu @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_ChiselBus(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTEHatchChiselBus(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchDynamoBuffer.java index f375900800..90b3648583 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchDynamoBuffer.java @@ -1,21 +1,20 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.metatileentity.implementations.MTEHatchDynamo; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatch_Dynamo { +public class MTEHatchDynamoBuffer extends MTEHatchDynamo { - public GT_MetaTileEntity_Hatch_DynamoBuffer(final int aID, final String aName, final String aNameRegional, - final int aTier) { + public MTEHatchDynamoBuffer(final int aID, final String aName, final String aNameRegional, final int aTier) { super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_DynamoBuffer(final String aName, final int aTier, final String[] aDescription, + public MTEHatchDynamoBuffer(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -37,12 +36,12 @@ public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatc @Override public long maxEUStore() { - return 512L + GT_Values.V[this.mTier + 1] * 2048L; + return 512L + GTValues.V[this.mTier + 1] * 2048L; } @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_DynamoBuffer(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTEHatchDynamoBuffer(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -50,7 +49,7 @@ public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatc String[] g; g = new String[] { "Dynamo with internal storage and additional Amp capacity", "Does not accept more than " + (this.maxEUOutput() * this.maxAmperesIn()) + "EU/t as input", - CORE.GT_Tooltip.get() }; + GTPPCore.GT_Tooltip.get() }; return g; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchElementalDataOrbHolder.java index a33994402b..0043819b23 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchElementalDataOrbHolder.java @@ -12,23 +12,22 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.SlotGroup; import gregtech.api.enums.ItemList; -import gregtech.api.gui.modularui.GT_UIInfos; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUIInfos; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.IConfigurationCircuitSupport; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.objects.GTRenderedTexture; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileEntity_Hatch - implements IConfigurationCircuitSupport { +public class MTEHatchElementalDataOrbHolder extends MTEHatch implements IConfigurationCircuitSupport { - public GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(int aID, String aName, String aNameRegional, int aTier) { + public MTEHatchElementalDataOrbHolder(int aID, String aName, String aNameRegional, int aTier) { super( aID, aName, @@ -36,27 +35,25 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE aTier, 17, new String[] { "Holds Data Orbs for the Elemental Duplicator", "Can insert/extract the circuit slot", - "A circuit must be used to select a slot (1-16)", CORE.GT_Tooltip.get() }); + "A circuit must be used to select a slot (1-16)", GTPPCore.GT_Tooltip.get() }); } - public GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(String aName, int aTier, String aDescription, - ITexture[][][] aTextures) { + public MTEHatchElementalDataOrbHolder(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, 17, aDescription, aTextures); } - public GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { + public MTEHatchElementalDataOrbHolder(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 17, aDescription, aTextures); } @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Data_Orb) }; + return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Hatch_Data_Orb) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Data_Orb) }; + return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Hatch_Data_Orb) }; } @Override @@ -81,12 +78,12 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(mName, mTier, mDescriptionArray, mTextures); + return new MTEHatchElementalDataOrbHolder(mName, mTier, mDescriptionArray, mTextures); } @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -215,7 +212,7 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE SlotGroup.ofItemHandler(inventoryHandler, 4) .startFromSlot(0) .endAtSlot(15) - .background(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_DATA_ORB) + .background(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_DATA_ORB) .applyForWidget( widget -> widget.setFilter(stack -> ItemList.Tool_DataOrb.isStackEqual(stack, false, true))) .build() diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchFluidGenerator.java index b4e213e829..638176c4b5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchFluidGenerator.java @@ -13,24 +13,23 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.objects.XSTR; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.util.GTUtility; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; -public abstract class GT_MetaTileEntity_Hatch_FluidGenerator extends GT_MetaTileEntity_Hatch_Input { +public abstract class MTEHatchFluidGenerator extends MTEHatchInput { protected static XSTR floatGen = new XSTR(); public int mProgresstime = 0, mMaxProgresstime = 0; - public GT_MetaTileEntity_Hatch_FluidGenerator(final int aID, final String aName, final String aNameRegional, - final int aTier) { + public MTEHatchFluidGenerator(final int aID, final String aName, final String aNameRegional, final int aTier) { super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_FluidGenerator(final String aName, final int aTier, final String[] aDescription, + public MTEHatchFluidGenerator(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -45,28 +44,28 @@ public abstract class GT_MetaTileEntity_Hatch_FluidGenerator extends GT_MetaTile @Override public synchronized String[] getDescription() { - mDescriptionArray[1] = "Capacity: " + GT_Utility.formatNumbers(getCapacity()) + "L"; - final String[] hatchTierString = new String[] { "Hatch Tier: " + GT_Utility.getColoredTierNameFromTier(mTier) }; + mDescriptionArray[1] = "Capacity: " + GTUtility.formatNumbers(getCapacity()) + "L"; + final String[] hatchTierString = new String[] { "Hatch Tier: " + GTUtility.getColoredTierNameFromTier(mTier) }; String[] aCustomTips = getCustomTooltip(); final String[] desc = new String[mDescriptionArray.length + aCustomTips.length + 2]; System.arraycopy(mDescriptionArray, 0, desc, 0, mDescriptionArray.length); System.arraycopy(hatchTierString, 0, desc, mDescriptionArray.length, 1); System.arraycopy(aCustomTips, 0, desc, mDescriptionArray.length + 1, aCustomTips.length); - desc[mDescriptionArray.length + aCustomTips.length] = CORE.GT_Tooltip.get(); + desc[mDescriptionArray.length + aCustomTips.length] = GTPPCore.GT_Tooltip.get(); return desc; } @Override public ITexture[] getTexturesActive(final ITexture aBaseTexture) { return new ITexture[] { aBaseTexture, - new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER) }; + new GTRenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER) }; } @Override public ITexture[] getTexturesInactive(final ITexture aBaseTexture) { return new ITexture[] { aBaseTexture, - new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER) }; + new GTRenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER) }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchInputBattery.java index 31b332e7a5..99000edc8f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchInputBattery.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; -import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GTValues.V; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -11,30 +11,29 @@ import org.apache.commons.lang3.ArrayUtils; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; -import gregtech.api.enums.GT_Values; -import gregtech.api.gui.modularui.GT_UIInfos; +import gregtech.api.enums.GTValues; +import gregtech.api.gui.modularui.GTUIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.gui.widget.ElectricSlotWidget; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatch { +public class MTEHatchInputBattery extends MTEHatch { public final RecipeMap<?> mRecipeMap = null; - public GT_MetaTileEntity_Hatch_InputBattery(int aID, String aName, String aNameRegional, int aTier) { + public MTEHatchInputBattery(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, getSlots(aTier), "Chargeable Item Bus for Multiblocks"); } - public GT_MetaTileEntity_Hatch_InputBattery(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { + public MTEHatchInputBattery(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aTier < 1 ? 1 : aTier == 1 ? 4 : aTier == 2 ? 4 : 16, aDescription, aTextures); } @@ -48,7 +47,7 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc } else { mSlots = 16; } - return ArrayUtils.addAll(this.mDescriptionArray, "Capacity: " + mSlots + " slots", CORE.GT_Tooltip.get()); + return ArrayUtils.addAll(this.mDescriptionArray, "Capacity: " + mSlots + " slots", GTPPCore.GT_Tooltip.get()); } @Override @@ -83,12 +82,12 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Charger) }; + return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Hatch_Charger) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Charger) }; + return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Hatch_Charger) }; } @Override @@ -113,12 +112,12 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_InputBattery(mName, mTier, mDescriptionArray, mTextures); + return new MTEHatchInputBattery(mName, mTier, mDescriptionArray, mTextures); } @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -135,10 +134,10 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc if (aBaseMetaTileEntity.getStoredEU() > 0 && mMetaTileEntity.mInventory[i] != null) { for (int u = 0; u < 10; u++) { aBaseMetaTileEntity.decreaseStoredEnergyUnits( - GT_ModHandler.chargeElectricItem( + GTModHandler.chargeElectricItem( mMetaTileEntity.mInventory[i], (int) Math.min(V[this.mTier] * 15, aBaseMetaTileEntity.getStoredEU()), - (int) Math.min(Integer.MAX_VALUE, GT_Values.V[u]), + (int) Math.min(Integer.MAX_VALUE, GTValues.V[u]), false, false), true); @@ -163,8 +162,8 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc protected void fillStacksIntoFirstSlots() { for (int i = 0; i < mInventory.length; i++) for (int j = i + 1; j < mInventory.length; j++) if (mInventory[j] != null - && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j]))) { - GT_Utility.moveStackFromSlotAToSlotB( + && (mInventory[i] == null || GTUtility.areStacksEqual(mInventory[i], mInventory[j]))) { + GTUtility.moveStackFromSlotAToSlotB( getBaseMetaTileEntity(), getBaseMetaTileEntity(), j, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchMufflerAdvanced.java index cc5f539a76..2cf1ed3efe 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchMufflerAdvanced.java @@ -10,24 +10,24 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.SlotWidget; -import gregtech.GT_Mod; -import gregtech.api.gui.modularui.GT_UIInfos; +import gregtech.GTMod; +import gregtech.api.gui.modularui.GTUIInfos; import gregtech.api.gui.modularui.GUITextureSet; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.modularui.IAddGregtechLogo; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.common.GT_Pollution; +import gregtech.api.metatileentity.implementations.MTEHatchMuffler; +import gregtech.api.metatileentity.implementations.MTEMultiBlockBase; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.common.Pollution; import gtPlusPlus.core.item.general.ItemAirFilter; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; -import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; +import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch_Muffler implements IAddGregtechLogo { +public class MTEHatchMufflerAdvanced extends MTEHatchMuffler implements IAddGregtechLogo { protected int SLOT_FILTER = 0; @@ -35,7 +35,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch public void onConfigLoad() { super.onConfigLoad(); try { - int a1 = GT_Mod.gregtechproxy.mPollutionSmogLimit; + int a1 = GTMod.gregtechproxy.mPollutionSmogLimit; if (a1 > 0) { mPollutionSmogLimit = a1; } @@ -46,12 +46,11 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch private int mPollutionSmogLimit = 500000; - public GT_MetaTileEntity_Hatch_Muffler_Adv(int aID, String aName, String aNameRegional, int aTier) { + public MTEHatchMufflerAdvanced(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, 1, new String[] { "" }); } - public GT_MetaTileEntity_Hatch_Muffler_Adv(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { + public MTEHatchMufflerAdvanced(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 1, aDescription, aTextures); } @@ -61,7 +60,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch : "Requires an Air Filter " + EnumChatFormatting.WHITE + "[Tier 2]" + EnumChatFormatting.GRAY, "Can take Air Filters from an input bus of the multiblock", "Reduces Pollution to " + calculatePollutionReduction(100, true) + "%", - "Recovers " + (100 - calculatePollutionReduction(100, true)) + "% of CO2/CO/SO2", CORE.GT_Tooltip.get() }; + "Recovers " + (100 - calculatePollutionReduction(100, true)) + "% of CO2/CO/SO2", GTPPCore.GT_Tooltip.get() }; @Override public String[] getDescription() { @@ -70,12 +69,12 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Muffler_Adv) }; + return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Hatch_Muffler_Adv) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Muffler_Adv) }; + return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Hatch_Muffler_Adv) }; } @Override @@ -91,12 +90,12 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_Muffler_Adv(this.mName, this.mTier, mDescriptionArray, this.mTextures); + return new MTEHatchMufflerAdvanced(this.mName, this.mTier, mDescriptionArray, this.mTextures); } @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -112,7 +111,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch // Revert to reduction of the basic muffler. emission = super.calculatePollutionReduction(emission); } - GT_Pollution.addPollution(getBaseMetaTileEntity(), emission); + Pollution.addPollution(getBaseMetaTileEntity(), emission); return true; } @@ -199,7 +198,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch if (mInventory[SLOT_FILTER] != null) return false; // Has a non-filter item in inventory. if (parentTileEntity == null) return false; // Unknown parent multiblock. - if (parentTileEntity instanceof GT_MetaTileEntity_MultiBlockBase GTMultiBase) { + if (parentTileEntity instanceof MTEMultiBlockBase GTMultiBase) { for (var inputBus : GTMultiBase.mInputBusses) { for (ItemStack stack : inputBus.mInventory) { if (isAirFilter(stack)) { @@ -266,7 +265,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch @Override public void pollutionParticles(World aWorld, String name) { - float ran1 = CORE.RANDOM.nextFloat(); + float ran1 = GTPPCore.RANDOM.nextFloat(); float ran2 = 0.0F; float ran3 = 0.0F; boolean chk1 = ran1 * 100.0F < (float) this.calculatePollutionReduction(100); @@ -274,8 +273,8 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch boolean chk3; int aPollutionAmount = PollutionUtils.getPollution(getBaseMetaTileEntity()); if (aPollutionAmount >= mPollutionSmogLimit) { - ran2 = CORE.RANDOM.nextFloat(); - ran3 = CORE.RANDOM.nextFloat(); + ran2 = GTPPCore.RANDOM.nextFloat(); + ran3 = GTPPCore.RANDOM.nextFloat(); chk2 = ran2 * 100.0F < (float) this.calculatePollutionReduction(100); chk3 = ran3 * 100.0F < (float) this.calculatePollutionReduction(100); if (!chk1 && !chk2 && !chk3) { @@ -295,24 +294,24 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch float xPos = (float) aDir.offsetX * 0.76F + (float) aMuffler.getXCoord() + 0.25F; float yPos = (float) aDir.offsetY * 0.76F + (float) aMuffler.getYCoord() + 0.25F; float zPos = (float) aDir.offsetZ * 0.76F + (float) aMuffler.getZCoord() + 0.25F; - float ySpd = (float) aDir.offsetY * 0.1F + 0.2F + 0.1F * CORE.RANDOM.nextFloat(); + float ySpd = (float) aDir.offsetY * 0.1F + 0.2F + 0.1F * GTPPCore.RANDOM.nextFloat(); float xSpd; float zSpd; if (aDir.offsetY == -1) { - float temp = CORE.RANDOM.nextFloat() * 2.0F * CORE.PI; + float temp = GTPPCore.RANDOM.nextFloat() * 2.0F * GTPPCore.PI; xSpd = (float) Math.sin((double) temp) * 0.1F; zSpd = (float) Math.cos((double) temp) * 0.1F; } else { - xSpd = (float) aDir.offsetX * (0.1F + 0.2F * CORE.RANDOM.nextFloat()); - zSpd = (float) aDir.offsetZ * (0.1F + 0.2F * CORE.RANDOM.nextFloat()); + xSpd = (float) aDir.offsetX * (0.1F + 0.2F * GTPPCore.RANDOM.nextFloat()); + zSpd = (float) aDir.offsetZ * (0.1F + 0.2F * GTPPCore.RANDOM.nextFloat()); } if (chk1) { aWorld.spawnParticle( name, (double) (xPos + ran1 * 0.5F), - (double) (yPos + CORE.RANDOM.nextFloat() * 0.5F), - (double) (zPos + CORE.RANDOM.nextFloat() * 0.5F), + (double) (yPos + GTPPCore.RANDOM.nextFloat() * 0.5F), + (double) (zPos + GTPPCore.RANDOM.nextFloat() * 0.5F), (double) xSpd, (double) ySpd, (double) zSpd); @@ -322,8 +321,8 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch aWorld.spawnParticle( name, (double) (xPos + ran2 * 0.5F), - (double) (yPos + CORE.RANDOM.nextFloat() * 0.5F), - (double) (zPos + CORE.RANDOM.nextFloat() * 0.5F), + (double) (yPos + GTPPCore.RANDOM.nextFloat() * 0.5F), + (double) (zPos + GTPPCore.RANDOM.nextFloat() * 0.5F), (double) xSpd, (double) ySpd, (double) zSpd); @@ -333,8 +332,8 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch aWorld.spawnParticle( name, (double) (xPos + ran3 * 0.5F), - (double) (yPos + CORE.RANDOM.nextFloat() * 0.5F), - (double) (zPos + CORE.RANDOM.nextFloat() * 0.5F), + (double) (yPos + GTPPCore.RANDOM.nextFloat() * 0.5F), + (double) (zPos + GTPPCore.RANDOM.nextFloat() * 0.5F), (double) xSpd, (double) ySpd, (double) zSpd); @@ -346,12 +345,12 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch @Override public GUITextureSet getGUITextureSet() { - return new GUITextureSet().setMainBackground(GTPP_UITextures.BACKGROUND_YELLOW) - .setItemSlot(GTPP_UITextures.SLOT_ITEM_YELLOW) + return new GUITextureSet().setMainBackground(GTPPUITextures.BACKGROUND_YELLOW) + .setItemSlot(GTPPUITextures.SLOT_ITEM_YELLOW) .setTitleTab( - GTPP_UITextures.TAB_TITLE_YELLOW, - GTPP_UITextures.TAB_TITLE_DARK_YELLOW, - GTPP_UITextures.TAB_TITLE_ANGULAR_YELLOW); + GTPPUITextures.TAB_TITLE_YELLOW, + GTPPUITextures.TAB_TITLE_DARK_YELLOW, + GTPPUITextures.TAB_TITLE_ANGULAR_YELLOW); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchNaquadah.java index ad94907d4c..43e43a1d4e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchNaquadah.java @@ -14,25 +14,24 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTUtility; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.reflect.ReflectionUtils; -public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_Input { +public class MTEHatchNaquadah extends MTEHatchInput { public final FluidStack[] mFluidsToUse = new FluidStack[3]; public final int mFluidCapacity; - public GT_MetaTileEntity_Hatch_Naquadah(final int aID, final String aName, final String aNameRegional) { + public MTEHatchNaquadah(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional, 6); mFluidCapacity = 32000; initHatch(); } - public GT_MetaTileEntity_Hatch_Naquadah(final String aName, final String[] aDescription, - final ITexture[][][] aTextures) { + public MTEHatchNaquadah(final String aName, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, 6, aDescription[0], aTextures); mFluidCapacity = 32000; initHatch(); @@ -53,13 +52,13 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In @Override public ITexture[] getTexturesActive(final ITexture aBaseTexture) { return new ITexture[] { aBaseTexture, - new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE) }; + new GTRenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE) }; } @Override public ITexture[] getTexturesInactive(final ITexture aBaseTexture) { return new ITexture[] { aBaseTexture, - new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE) }; + new GTRenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE) }; } public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, @@ -67,7 +66,7 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In if (side == aBaseMetaTileEntity.getFrontFacing() && aIndex == 0) { for (FluidStack f : mFluidsToUse) { if (f != null) { - if (GT_Utility.getFluidForFilledItem(aStack, true) + if (GTUtility.getFluidForFilledItem(aStack, true) .getFluid() == f.getFluid()) { return true; } @@ -96,7 +95,7 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_Naquadah(this.mName, this.mDescriptionArray, this.mTextures); + return new MTEHatchNaquadah(this.mName, this.mDescriptionArray, this.mTextures); } @Override @@ -115,7 +114,7 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In String aNaquad = aDescCache[2]; String[] s2 = new String[] { "Fluid Input for Multiblocks", "Capacity: " + getCapacity() + "L", "Accepted Fluid: " + aNaq, "Accepted Fluid: " + aEnrNaq, "Accepted Fluid: " + aNaquad, - CORE.GT_Tooltip.get() }; + GTPPCore.GT_Tooltip.get() }; return s2; } @@ -188,7 +187,7 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In : BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1]; return new ITexture[] { g, - new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_TOP_ACTIVE) }; + new GTRenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_TOP_ACTIVE) }; } return side != facing diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchOutputBattery.java index 1d6507732c..54303503c0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchOutputBattery.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; -import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GTValues.V; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -11,26 +11,25 @@ import org.apache.commons.lang3.ArrayUtils; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; -import gregtech.api.gui.modularui.GT_UIInfos; +import gregtech.api.gui.modularui.GTUIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.gui.widget.ElectricSlotWidget; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hatch { +public class MTEHatchOutputBattery extends MTEHatch { - public GT_MetaTileEntity_Hatch_OutputBattery(int aID, String aName, String aNameRegional, int aTier) { + public MTEHatchOutputBattery(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, getSlots(aTier), "Dischargeable Item Bus for Multiblocks"); } - public GT_MetaTileEntity_Hatch_OutputBattery(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { + public MTEHatchOutputBattery(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aTier < 1 ? 1 : aTier == 1 ? 4 : aTier == 2 ? 9 : 16, aDescription, aTextures); } @@ -44,7 +43,7 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat } else { mSlots = 16; } - return ArrayUtils.addAll(this.mDescriptionArray, "Capacity: " + mSlots + " slots", CORE.GT_Tooltip.get()); + return ArrayUtils.addAll(this.mDescriptionArray, "Capacity: " + mSlots + " slots", GTPPCore.GT_Tooltip.get()); } @Override @@ -74,12 +73,12 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Discharger) }; + return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Hatch_Discharger) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Discharger) }; + return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Hatch_Discharger) }; } @Override @@ -104,12 +103,12 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_OutputBattery(mName, mTier, mDescriptionArray, mTextures); + return new MTEHatchOutputBattery(mName, mTier, mDescriptionArray, mTextures); } @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -134,8 +133,8 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat protected void fillStacksIntoFirstSlots() { for (int i = 0; i < mInventory.length; i++) for (int j = i + 1; j < mInventory.length; j++) if (mInventory[j] != null - && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j]))) { - GT_Utility.moveStackFromSlotAToSlotB( + && (mInventory[i] == null || GTUtility.areStacksEqual(mInventory[i], mInventory[j]))) { + GTUtility.moveStackFromSlotAToSlotB( getBaseMetaTileEntity(), getBaseMetaTileEntity(), j, @@ -182,7 +181,7 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat if (mMetaTileEntity.mInventory[i] != null && mMetaTileEntity.getEUVar() < aBaseMetaTileEntity.getEUCapacity()) { aBaseMetaTileEntity.increaseStoredEnergyUnits( - GT_ModHandler.dischargeElectricItem( + GTModHandler.dischargeElectricItem( mMetaTileEntity.mInventory[i], (int) Math.min( V[mTier] * 15, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchReservoir.java index bfe8290240..23231cc6e9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchReservoir.java @@ -7,24 +7,23 @@ import net.minecraftforge.fluids.FluidRegistry; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.objects.GTRenderedTexture; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_FluidGenerator { +public class MTEHatchReservoir extends MTEHatchFluidGenerator { - public GT_MetaTileEntity_Hatch_Reservoir(final int aID, final String aName, final String aNameRegional, - final int aTier) { + public MTEHatchReservoir(final int aID, final String aName, final String aNameRegional, final int aTier) { super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_Reservoir(final String aName, final int aTier, final String[] aDescription, + public MTEHatchReservoir(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_Reservoir(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTEHatchReservoir(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -65,11 +64,11 @@ public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_F @Override public ITexture[] getTexturesActive(final ITexture aBaseTexture) { - return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Water) }; + return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Water) }; } @Override public ITexture[] getTexturesInactive(final ITexture aBaseTexture) { - return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Water) }; + return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Water) }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Solidifier.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSolidifier.java index 2f8c704cad..ce3337c34b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Solidifier.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSolidifier.java @@ -10,14 +10,14 @@ import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot; import com.gtnewhorizons.modularui.common.widget.SlotWidget; import gregtech.api.enums.ItemList; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.util.GT_Utility; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.util.GTUtility; -public class GT_MetaTileEntity_Hatch_Solidifier extends GT_MetaTileEntity_Hatch_Input { +public class MTEHatchSolidifier extends MTEHatchInput { static final int moldSlot = 2; static final ItemStack[] solidifierMolds = { ItemList.Shape_Mold_Bottle.get(1), ItemList.Shape_Mold_Plate.get(1), @@ -32,7 +32,7 @@ public class GT_MetaTileEntity_Hatch_Solidifier extends GT_MetaTileEntity_Hatch_ ItemList.Shape_Mold_Pipe_Large.get(1), ItemList.Shape_Mold_Pipe_Huge.get(1), ItemList.Shape_Mold_ToolHeadDrill.get(1) }; - public GT_MetaTileEntity_Hatch_Solidifier(int aID, String aName, String aNameRegional, int aTier) { + public MTEHatchSolidifier(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier); } @@ -42,7 +42,7 @@ public class GT_MetaTileEntity_Hatch_Solidifier extends GT_MetaTileEntity_Hatch_ "Fluid Input with Mold for " + EnumChatFormatting.YELLOW + "Large Processing Factory" + EnumChatFormatting.RESET, - "#22 Circuit is imprinted in Hatch", "Capacity: " + GT_Utility.formatNumbers(getCapacity()) + "L", + "#22 Circuit is imprinted in Hatch", "Capacity: " + GTUtility.formatNumbers(getCapacity()) + "L", "Added by: " + EnumChatFormatting.AQUA + "Quetz4l" + " - " @@ -51,8 +51,7 @@ public class GT_MetaTileEntity_Hatch_Solidifier extends GT_MetaTileEntity_Hatch_ + EnumChatFormatting.RESET }; } - public GT_MetaTileEntity_Hatch_Solidifier(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { + public MTEHatchSolidifier(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, getSlots(aTier), aTier, aDescription, aTextures); } @@ -73,7 +72,7 @@ public class GT_MetaTileEntity_Hatch_Solidifier extends GT_MetaTileEntity_Hatch_ public boolean isItemValidForSlot(int aIndex, ItemStack aStack) { if (aIndex == moldSlot && aStack != null) { for (final ItemStack itemStack : solidifierMolds) { - if (GT_Utility.areStacksEqual(itemStack, aStack, true)) { + if (GTUtility.areStacksEqual(itemStack, aStack, true)) { return true; } } @@ -86,7 +85,7 @@ public class GT_MetaTileEntity_Hatch_Solidifier extends GT_MetaTileEntity_Hatch_ @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_Solidifier(mName, mTier, mDescriptionArray, mTextures); + return new MTEHatchSolidifier(mName, mTier, mDescriptionArray, mTextures); } public ItemStack getMold() { @@ -98,7 +97,7 @@ public class GT_MetaTileEntity_Hatch_Solidifier extends GT_MetaTileEntity_Hatch_ super.addUIWidgets(builder, buildContext); builder.widget( new SlotWidget(new MoldSlot(inventoryHandler, moldSlot)).setPos(125, 35) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_MOLD) + .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_MOLD) .setSize(18, 18)); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSteamBusOutput.java index 5868995d49..52864b8bea 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSteamBusOutput.java @@ -10,20 +10,20 @@ import net.minecraftforge.common.util.ForgeDirection; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UIInfos; +import gregtech.api.gui.modularui.GTUIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.render.TextureFactory; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; -public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_Hatch { +public class MTEHatchSteamBusOutput extends MTEHatch { - public GT_MetaTileEntity_Hatch_Steam_BusOutput(int aID, String aName, String aNameRegional, int aTier) { + public MTEHatchSteamBusOutput(int aID, String aName, String aNameRegional, int aTier) { super( aID, aName, @@ -31,29 +31,27 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H aTier, 4, new String[] { "Item Output for Steam Multiblocks", "Does not automatically export items", - "Capacity: 4 stacks", "Does not work with non-steam multiblocks", CORE.GT_Tooltip.get() }); + "Capacity: 4 stacks", "Does not work with non-steam multiblocks", GTPPCore.GT_Tooltip.get() }); } - public GT_MetaTileEntity_Hatch_Steam_BusOutput(String aName, int aTier, String aDescription, - ITexture[][][] aTextures) { + public MTEHatchSteamBusOutput(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, 4, aDescription, aTextures); } - public GT_MetaTileEntity_Hatch_Steam_BusOutput(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { + public MTEHatchSteamBusOutput(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 4, aDescription, aTextures); } @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch + return GTMod.gregtechproxy.mRenderIndicatorsOnHatch ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT), TextureFactory.of(ITEM_OUT_SIGN) } : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch + return GTMod.gregtechproxy.mRenderIndicatorsOnHatch ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT), TextureFactory.of(ITEM_OUT_SIGN) } : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT) }; } @@ -80,12 +78,12 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_Steam_BusOutput(mName, mTier, mDescriptionArray, mTextures); + return new MTEHatchSteamBusOutput(mName, mTier, mDescriptionArray, mTextures); } @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -124,83 +122,83 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H } public ITexture[] getSideFacingActive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) }; } public ITexture[] getSideFacingInactive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) }; } public ITexture[] getFrontFacingActive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) }; } public ITexture[] getFrontFacingInactive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) }; } public ITexture[] getTopFacingActive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP) }; } public ITexture[] getTopFacingInactive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP) }; } public ITexture[] getBottomFacingActive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM) }; } public ITexture[] getBottomFacingInactive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM) }; } public ITexture[] getBottomFacingPipeActive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; } public ITexture[] getBottomFacingPipeInactive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; } public ITexture[] getTopFacingPipeActive(byte aColor) { return new ITexture[] { - new GT_RenderedTexture( + new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; } public ITexture[] getTopFacingPipeInactive(byte aColor) { return new ITexture[] { - new GT_RenderedTexture( + new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; } public ITexture[] getSideFacingPipeActive(byte aColor) { return new ITexture[] { - new GT_RenderedTexture( + new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; } public ITexture[] getSideFacingPipeInactive(byte aColor) { return new ITexture[] { - new GT_RenderedTexture( + new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSuperBusInput.java index 5794e6adf8..e95cea2762 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSuperBusInput.java @@ -8,16 +8,16 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.metatileentity.implementations.MTEHatchInputBus; +import gtPlusPlus.core.lib.GTPPCore; -public class GT_MetaTileEntity_SuperBus_Input extends GT_MetaTileEntity_Hatch_InputBus { +public class MTEHatchSuperBusInput extends MTEHatchInputBus { - public GT_MetaTileEntity_SuperBus_Input(int aID, String aName, String aNameRegional, int aTier) { + public MTEHatchSuperBusInput(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, getSlots(aTier) + 1); } - public GT_MetaTileEntity_SuperBus_Input(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEHatchSuperBusInput(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, getSlots(aTier) + 1, aDescription, aTextures); } @@ -33,13 +33,13 @@ public class GT_MetaTileEntity_SuperBus_Input extends GT_MetaTileEntity_Hatch_In @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_SuperBus_Input(this.mName, this.mTier, mDescriptionArray, this.mTextures); + return new MTEHatchSuperBusInput(this.mName, this.mTier, mDescriptionArray, this.mTextures); } @Override public String[] getDescription() { return new String[] { "Item Input for Multiblocks", "" + getSlots(this.mTier) + " Slots", - CORE.GT_Tooltip.get() }; + GTPPCore.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchTurbine.java index 6c545af332..09c3dd6efb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchTurbine.java @@ -14,43 +14,43 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.SlotWidget; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.SoundResource; -import gregtech.api.gui.modularui.GT_UIInfos; +import gregtech.api.gui.modularui.GTUIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.GT_MetaGenerated_Tool; +import gregtech.api.items.MetaGeneratedTool; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.objects.GT_ItemStack; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.objects.GTItemStack; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.BlockPos; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GregtechMetaTileEntity_LargerTurbineBase; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.MTELargerTurbineBase; @SuppressWarnings("deprecation") -public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { +public class MTEHatchTurbine extends MTEHatch { public boolean mHasController = false; public boolean mUsingAnimation = true; private String mControllerLocation; public int mEUt = 0; - public GT_MetaTileEntity_Hatch_Turbine(int aID, String aName, String aNameRegional, int aTier) { + public MTEHatchTurbine(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, 16, "Turbine Rotor holder for XL Turbines"); } - public GT_MetaTileEntity_Hatch_Turbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public MTEHatchTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, 1, aDescription, aTextures); } - public GT_MetaTileEntity_Hatch_Turbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEHatchTurbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 1, aDescription[0], aTextures); } @@ -63,7 +63,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { "Right Click with a screwdriver for technical information", "Sneak + Right Click with a wrench to rotate", "Sneak + Right Click with a screwdriver to disable animations", - CORE.GT_Tooltip.get()); + GTPPCore.GT_Tooltip.get()); } @Override @@ -106,7 +106,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { public boolean hasTurbine() { ItemStack aStack = this.mInventory[0]; - boolean aIsValid = GregtechMetaTileEntity_LargerTurbineBase.isValidTurbine(aStack); + boolean aIsValid = MTELargerTurbineBase.isValidTurbine(aStack); return aIsValid; } @@ -122,7 +122,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { } public boolean insertTurbine(ItemStack aTurbine) { - if (GregtechMetaTileEntity_LargerTurbineBase.isValidTurbine(aTurbine)) { + if (MTELargerTurbineBase.isValidTurbine(aTurbine)) { this.mInventory[0] = aTurbine; return true; } @@ -131,12 +131,12 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_Turbine(mName, mTier, mDescriptionArray, mTextures); + return new MTEHatchTurbine(mName, mTier, mDescriptionArray, mTextures); } @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -164,7 +164,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { public void damageTurbine(long aEUt, int damageFactorLow, float damageFactorHigh) { if (hasTurbine() && MathUtils.randInt(0, 1) == 0) { ItemStack aTurbine = getTurbine(); - ((GT_MetaGenerated_Tool) aTurbine.getItem()).doDamage( + ((MetaGeneratedTool) aTurbine.getItem()).doDamage( aTurbine, (long) getDamageToComponent(aTurbine) * (long) Math.min((float) aEUt / (float) damageFactorLow, Math.pow(aEUt, damageFactorHigh))); @@ -214,7 +214,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { } public boolean isControllerActive() { - GregtechMetaTileEntity_LargerTurbineBase x = getController(); + MTELargerTurbineBase x = getController(); if (x != null) { // Logger.INFO("Checking Status of Controller. Running? "+(x.mEUt > 0)); return x.lEUt > 0; @@ -223,16 +223,15 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { return false; } - public GregtechMetaTileEntity_LargerTurbineBase getController() { + public MTELargerTurbineBase getController() { if (this.mHasController && this.mControllerLocation != null && this.mControllerLocation.length() > 0) { BlockPos p = BlockPos.generateBlockPos(mControllerLocation); if (p != null) { // Logger.INFO(p.getLocationString()); IGregTechTileEntity tTileEntity = getBaseMetaTileEntity() .getIGregTechTileEntity(p.xPos, p.yPos, p.zPos); - if (tTileEntity != null - && tTileEntity.getMetaTileEntity() instanceof GregtechMetaTileEntity_LargerTurbineBase) { - return (GregtechMetaTileEntity_LargerTurbineBase) tTileEntity.getMetaTileEntity(); + if (tTileEntity != null && tTileEntity.getMetaTileEntity() instanceof MTELargerTurbineBase) { + return (MTELargerTurbineBase) tTileEntity.getMetaTileEntity(); } else { if (tTileEntity == null) { Logger.INFO("Controller MTE is null, somehow?"); @@ -275,8 +274,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { private ITexture getFrontFacingTurbineTexture() { if (!mHasController) { return this.getBaseMetaTileEntity() - .isActive() ? new GT_RenderedTexture(LARGETURBINE_ST_ACTIVE5) - : new GT_RenderedTexture(LARGETURBINE_ST5); + .isActive() ? new GTRenderedTexture(LARGETURBINE_ST_ACTIVE5) : new GTRenderedTexture(LARGETURBINE_ST5); } else { if (usingAnimations()) { if (isControllerActive()) { @@ -313,7 +311,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { } @Override - public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) { + public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) { return false; } @@ -335,9 +333,9 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { .isActive()); PlayerUtils.messagePlayer(aPlayer, "Has Turbine inserted? " + this.hasTurbine()); if (this.hasTurbine()) { - Materials aMat = GT_MetaGenerated_Tool.getPrimaryMaterial(getTurbine()); - String aSize = GregtechMetaTileEntity_LargerTurbineBase - .getTurbineSizeString(GregtechMetaTileEntity_LargerTurbineBase.getTurbineSize(getTurbine())); + Materials aMat = MetaGeneratedTool.getPrimaryMaterial(getTurbine()); + String aSize = MTELargerTurbineBase + .getTurbineSizeString(MTELargerTurbineBase.getTurbineSize(getTurbine())); PlayerUtils.messagePlayer(aPlayer, "Using: " + aMat.mLocalizedName + " " + aSize); } } else { @@ -357,7 +355,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { .isServerSide() && !aPlayer.isSneaking()) { ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem(); if (tCurrentItem != null) { - if (tCurrentItem.getItem() instanceof GT_MetaGenerated_Tool) { + if (tCurrentItem.getItem() instanceof MetaGeneratedTool) { return onToolClick(tCurrentItem, aPlayer, wrenchingSide); } } @@ -372,7 +370,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { .isServerSide()) { ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem(); if (tCurrentItem != null) { - if (tCurrentItem.getItem() instanceof GT_MetaGenerated_Tool) { + if (tCurrentItem.getItem() instanceof MetaGeneratedTool) { return onToolClick(tCurrentItem, aPlayer, wrenchingSide); } } @@ -381,30 +379,30 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { } public boolean onToolClick(ItemStack tCurrentItem, EntityPlayer aPlayer, ForgeDirection side) { - if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWrenchList)) { + if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sWrenchList)) { boolean aHasTurbine = this.hasTurbine(); if (aPlayer.inventory.getFirstEmptyStack() >= 0 && aHasTurbine) { if (PlayerUtils.isCreative(aPlayer) - || GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) { + || GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) { aPlayer.inventory.addItemStackToInventory((this.getTurbine())); this.mInventory[0] = null; - GT_Utility.sendChatToPlayer(aPlayer, "Removed turbine with wrench."); + GTUtility.sendChatToPlayer(aPlayer, "Removed turbine with wrench."); return true; } } else { - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, aHasTurbine ? "Cannot remove turbine, no free inventory space." : "No turbine to remove."); } - } else if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSolderingToolList)) { + } else if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSolderingToolList)) { if (mControllerLocation != null && mControllerLocation.length() > 0) { if (setController(BlockPos.generateBlockPos(mControllerLocation))) { if (PlayerUtils.isCreative(aPlayer) - || GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) { + || GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) { String tChat = "Trying to Reset linked Controller"; IGregTechTileEntity g = this.getBaseMetaTileEntity(); - GT_Utility.sendChatToPlayer(aPlayer, tChat); - GT_Utility.sendSoundToPlayers( + GTUtility.sendChatToPlayer(aPlayer, tChat); + GTUtility.sendSoundToPlayers( g.getWorld(), SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, @@ -423,7 +421,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( - new SlotWidget(inventoryHandler, 0).setFilter(GregtechMetaTileEntity_LargerTurbineBase::isValidTurbine) + new SlotWidget(inventoryHandler, 0).setFilter(MTELargerTurbineBase::isValidTurbine) .setAccess(false, true) .setPos(79, 34)); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchTurbineProvider.java index e9626a310c..6a501a2531 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchTurbineProvider.java @@ -14,34 +14,29 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.GT_MetaGenerated_Tool; +import gregtech.api.items.MetaGeneratedTool; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine; +import gregtech.api.metatileentity.implementations.MTEHatchInputBus; +import gregtech.common.tileentities.machines.multi.MTELargeTurbine; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.sys.KeyboardUtils; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GregtechMetaTileEntity_LargerTurbineBase; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.MTELargerTurbineBase; -public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_Hatch_InputBus { +public class MTEHatchTurbineProvider extends MTEHatchInputBus { - public GT_MetaTileEntity_Hatch_TurbineProvider(int aID, String aName, String aNameRegional, int aTier) { + public MTEHatchTurbineProvider(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_TurbineProvider(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { + public MTEHatchTurbineProvider(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_TurbineProvider( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures); + return new MTEHatchTurbineProvider(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -50,10 +45,10 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H "Will attempt once per 1200 ticks to fill the turbine slot of it's parent turbine", "You may adjust this with a screwdriver", "Hold shift to adjust in finer amounts", "Hold control to adjust direction", "Left Click with Screwdriver to reset", - "This module assumes the entire turbine is in the same Chunk", CORE.GT_Tooltip.get() }; + "This module assumes the entire turbine is in the same Chunk", GTPPCore.GT_Tooltip.get() }; } - private GT_MetaTileEntity_LargeTurbine mParent = null; + private MTELargeTurbine mParent = null; @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) { @@ -75,8 +70,8 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H if (aMetaTileEntity == null) { continue; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine aTurb) { - for (GT_MetaTileEntity_Hatch_InputBus ee : aTurb.mInputBusses) { + if (aMetaTileEntity instanceof MTELargeTurbine aTurb) { + for (MTEHatchInputBus ee : aTurb.mInputBusses) { if (ee.equals(this)) { mParent = aTurb; Logger.INFO("Found a Parent to attach to this housing."); @@ -114,7 +109,7 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H } public boolean isItemStackTurbine(ItemStack aStack) { - if (aStack.getItem() instanceof GT_MetaGenerated_Tool) { + if (aStack.getItem() instanceof MetaGeneratedTool) { if (aStack.getItemDamage() >= 170 && aStack.getItemDamage() <= 176) { return true; } @@ -123,7 +118,7 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H } public boolean isItemStackScrewdriver(ItemStack aStack) { - if (aStack.getItem() instanceof GT_MetaGenerated_Tool) { + if (aStack.getItem() instanceof MetaGeneratedTool) { if (aStack.getItemDamage() == 22 || aStack.getItemDamage() == 150) { return true; } @@ -214,7 +209,7 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( - new SlotWidget(inventoryHandler, 0).setFilter(GregtechMetaTileEntity_LargerTurbineBase::isValidTurbine) + new SlotWidget(inventoryHandler, 0).setFilter(MTELargerTurbineBase::isValidTurbine) .setAccess(false, true) .setPos(79, 34)); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTESuperBusOutput.java index f5f80bed11..686589b38a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTESuperBusOutput.java @@ -7,21 +7,21 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.Scrollable; import com.gtnewhorizons.modularui.common.widget.SlotWidget; -import gregtech.api.gui.widgets.GT_PhantomItemButton; +import gregtech.api.gui.widgets.PhantomItemButton; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.metatileentity.implementations.MTEHatchOutputBus; +import gregtech.api.util.GTUtility; +import gtPlusPlus.core.lib.GTPPCore; -public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_OutputBus { +public class MTESuperBusOutput extends MTEHatchOutputBus { - public GT_MetaTileEntity_SuperBus_Output(int id, String name, String nameRegional, int tier) { + public MTESuperBusOutput(int id, String name, String nameRegional, int tier) { super(id, name, nameRegional, tier, getSlots(tier)); } - public GT_MetaTileEntity_SuperBus_Output(String name, int tier, String[] description, ITexture[][][] textures) { + public MTESuperBusOutput(String name, int tier, String[] description, ITexture[][][] textures) { super(name, tier, getSlots(tier), description, textures); } @@ -42,7 +42,7 @@ public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_O @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_SuperBus_Output(this.mName, this.mTier, mDescriptionArray, this.mTextures); + return new MTESuperBusOutput(this.mName, this.mTier, mDescriptionArray, this.mTextures); } @Override @@ -66,8 +66,8 @@ public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_O for (int i = 0; i < this.mInventory.length; ++i) { for (int j = i + 1; j < this.mInventory.length; ++j) { if (this.mInventory[j] != null && (this.mInventory[i] == null - || GT_Utility.areStacksEqual(this.mInventory[i], this.mInventory[j]))) { - GT_Utility.moveStackFromSlotAToSlotB( + || GTUtility.areStacksEqual(this.mInventory[i], this.mInventory[j]))) { + GTUtility.moveStackFromSlotAToSlotB( (IInventory) this.getBaseMetaTileEntity(), (IInventory) this.getBaseMetaTileEntity(), j, @@ -85,7 +85,7 @@ public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_O public String[] getDescription() { String[] aDesc = new String[] { "Item Output for Multiblocks", "" + getSlots(this.mTier) + " Slots", "Left click with data stick to save filter config", "Right click with data stick to load filter config", - CORE.GT_Tooltip.get() }; + GTPPCore.GT_Tooltip.get() }; return aDesc; } @@ -106,8 +106,8 @@ public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_O if (acceptsItemLock()) { builder.widget( - new GT_PhantomItemButton(this).setPos(getGUIWidth() - 25, 40) - .setBackground(GT_PhantomItemButton.FILTER_BACKGROUND)); + new PhantomItemButton(this).setPos(getGUIWidth() - 25, 40) + .setBackground(PhantomItemButton.FILTER_BACKGROUND)); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTETreeFarmerStructural.java index 0aaaa75584..dca1cfbfa4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTETreeFarmerStructural.java @@ -6,24 +6,23 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaTreeFarmerBase; +import gregtech.api.objects.GTRenderedTexture; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines.MTETreeFarmerBase; -public class GregtechMetaTreeFarmerStructural extends GregtechMetaTreeFarmerBase { +public class MTETreeFarmerStructural extends MTETreeFarmerBase { - public GregtechMetaTreeFarmerStructural(final int aID, final String aName, final String aNameRegional, - final int aTier) { + public MTETreeFarmerStructural(final int aID, final String aName, final String aNameRegional, final int aTier) { super(aID, aName, aNameRegional, aTier, 0, "Structural Blocks for the Tree Farmer."); } - public GregtechMetaTreeFarmerStructural(final String aName, final int aTier, final int aInvSlotCount, + public MTETreeFarmerStructural(final String aName, final int aTier, final int aInvSlotCount, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aInvSlotCount, aDescription, aTextures); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTreeFarmerStructural( + return new MTETreeFarmerStructural( this.mName, this.mTier, this.mInventory.length, @@ -33,7 +32,7 @@ public class GregtechMetaTreeFarmerStructural extends GregtechMetaTreeFarmerBase @Override public ITexture getOverlayIcon() { - return new GT_RenderedTexture(Textures.BlockIcons.VOID); + return new GTRenderedTexture(Textures.BlockIcons.VOID); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MteHatchSteamBusInput.java index 457eca1dad..5de87c4a50 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MteHatchSteamBusInput.java @@ -11,25 +11,25 @@ import net.minecraftforge.common.util.ForgeDirection; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UIInfos; +import gregtech.api.gui.modularui.GTUIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.util.GTUtility; +import gtPlusPlus.core.lib.GTPPCore; -public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Hatch { +public class MteHatchSteamBusInput extends MTEHatch { public RecipeMap<?> mRecipeMap = null; public boolean disableSort; - public GT_MetaTileEntity_Hatch_Steam_BusInput(int aID, String aName, String aNameRegional, int aTier) { + public MteHatchSteamBusInput(int aID, String aName, String aNameRegional, int aTier) { super( aID, aName, @@ -38,29 +38,27 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha getSlots(aTier), new String[] { "Item Input for Steam Multiblocks", "Shift + right click with screwdriver to toggle automatic item shuffling", "Capacity: 4 stacks", - "Does not work with non-steam multiblocks", CORE.GT_Tooltip.get() }); + "Does not work with non-steam multiblocks", GTPPCore.GT_Tooltip.get() }); } - public GT_MetaTileEntity_Hatch_Steam_BusInput(String aName, int aTier, String aDescription, - ITexture[][][] aTextures) { + public MteHatchSteamBusInput(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, 4, aDescription, aTextures); } - public GT_MetaTileEntity_Hatch_Steam_BusInput(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { + public MteHatchSteamBusInput(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 4, aDescription, aTextures); } @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch + return GTMod.gregtechproxy.mRenderIndicatorsOnHatch ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(ITEM_IN_SIGN) } : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch + return GTMod.gregtechproxy.mRenderIndicatorsOnHatch ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(ITEM_IN_SIGN) } : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN) }; } @@ -87,12 +85,12 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_Steam_BusInput(mName, mTier, mDescriptionArray, mTextures); + return new MteHatchSteamBusInput(mName, mTier, mDescriptionArray, mTextures); } @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -116,8 +114,8 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha } else { for (int i = 0; i < mInventory.length; i++) for (int j = i + 1; j < mInventory.length; j++) if (mInventory[j] != null - && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j]))) - GT_Utility.moveStackFromSlotAToSlotB( + && (mInventory[i] == null || GTUtility.areStacksEqual(mInventory[i], mInventory[j]))) + GTUtility.moveStackFromSlotAToSlotB( getBaseMetaTileEntity(), getBaseMetaTileEntity(), j, @@ -145,10 +143,10 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (aPlayer.isSneaking()) { disableSort = !disableSort; - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, - GT_Utility.trans("200.1", "Automatic Item Shuffling: ") - + (disableSort ? GT_Utility.trans("087", "Disabled") : GT_Utility.trans("088", "Enabled"))); + GTUtility.trans("200.1", "Automatic Item Shuffling: ") + + (disableSort ? GTUtility.trans("087", "Disabled") : GTUtility.trans("088", "Enabled"))); } } @@ -188,83 +186,83 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha } public ITexture[] getSideFacingActive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) }; } public ITexture[] getSideFacingInactive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) }; } public ITexture[] getFrontFacingActive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) }; } public ITexture[] getFrontFacingInactive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) }; } public ITexture[] getTopFacingActive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP) }; } public ITexture[] getTopFacingInactive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP) }; } public ITexture[] getBottomFacingActive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM) }; } public ITexture[] getBottomFacingInactive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM) }; } public ITexture[] getBottomFacingPipeActive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; } public ITexture[] getBottomFacingPipeInactive(byte aColor) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; } public ITexture[] getTopFacingPipeActive(byte aColor) { return new ITexture[] { - new GT_RenderedTexture( + new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; } public ITexture[] getTopFacingPipeInactive(byte aColor) { return new ITexture[] { - new GT_RenderedTexture( + new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; } public ITexture[] getSideFacingPipeActive(byte aColor) { return new ITexture[] { - new GT_RenderedTexture( + new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; } public ITexture[] getSideFacingPipeInactive(byte aColor) { return new ITexture[] { - new GT_RenderedTexture( + new GTRenderedTexture( mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMetaTileEntity.java index e260347ca5..f8bea768da 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMetaTileEntity.java @@ -1,11 +1,11 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base; -import static gregtech.api.enums.GT_Values.GT; +import static gregtech.api.enums.GTValues.GT; import gregtech.api.interfaces.ITexture; import gregtech.api.metatileentity.MetaTileEntity; -public abstract class GregtechMetaTileEntity extends MetaTileEntity { +public abstract class GTPPMetaTileEntity extends MetaTileEntity { /** * Value between [0 - 9] to describe the Tier of this Machine. @@ -22,7 +22,7 @@ public abstract class GregtechMetaTileEntity extends MetaTileEntity { */ public final ITexture[][][] mTextures; - public GregtechMetaTileEntity(final int aID, final String aName, final String aNameRegional, final int aTier, + public GTPPMetaTileEntity(final int aID, final String aName, final String aNameRegional, final int aTier, final int aInvSlotCount, final String aDescription, final ITexture... aTextures) { super(aID, aName, aNameRegional, aInvSlotCount); this.mTier = (byte) Math.max(0, Math.min(aTier, 9)); @@ -36,8 +36,8 @@ public abstract class GregtechMetaTileEntity extends MetaTileEntity { } } - public GregtechMetaTileEntity(final String aName, final int aTier, final int aInvSlotCount, - final String aDescription, final ITexture[][][] aTextures) { + public GTPPMetaTileEntity(final String aName, final int aTier, final int aInvSlotCount, final String aDescription, + final ITexture[][][] aTextures) { super(aName, aInvSlotCount); this.mTier = (byte) aTier; this.mDescription = aDescription; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java index 1417f53c01..dad53f54f6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base; -import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.api.util.GTUtility.filterValidMTEs; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -45,36 +45,36 @@ import com.gtnewhorizons.modularui.common.widget.DynamicPositionedColumn; import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; import gregtech.api.enums.VoidingMode; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.IHatchElement; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.GT_MetaGenerated_Tool; +import gregtech.api.items.MetaGeneratedTool; import gregtech.api.logic.ProcessingLogic; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; +import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchDynamo; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchInputBus; +import gregtech.api.metatileentity.implementations.MTEHatchMaintenance; +import gregtech.api.metatileentity.implementations.MTEHatchMuffler; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; +import gregtech.api.metatileentity.implementations.MTEHatchOutputBus; import gregtech.api.recipe.RecipeMap; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; -import gregtech.api.util.IGT_HatchAdder; -import gregtech.common.items.GT_MetaGenerated_Tool_01; -import gregtech.common.items.ID_MetaTool_01; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.IGTHatchAdder; +import gregtech.common.items.IDMetaTool01; +import gregtech.common.items.MetaGeneratedTool01; import gregtech.common.tileentities.machines.IDualInputHatch; import gtPlusPlus.GTplusplus; import gtPlusPlus.GTplusplus.INIT_PHASE; @@ -83,12 +83,14 @@ import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.CORE_Preloader; +import gtPlusPlus.preloader.PreloaderCore; import gtPlusPlus.preloader.asm.AsmConfig; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_AirIntake; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBattery; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBattery; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusInput; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.METHatchAirIntake; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchInputBattery; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchOutputBattery; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MteHatchSteamBusInput; +import tectech.thing.metaTileEntity.hatch.MTEHatchDynamoMulti; +import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti; // Glee8e - 11/12/21 - 2:15pm // Yeah, now I see what's wrong. Someone inherited from GregtechMeta_MultiBlockBase instead of @@ -96,28 +98,28 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEn // so any method in GregtechMetaTileEntity_IndustrialDehydrator would see generic field declared in // GregtechMeta_MultiBlockBase without generic parameter -public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T>> - extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T> { +public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBase<T>> + extends MTEExtendedPowerMultiBlockBase<T> { public static final boolean DEBUG_DISABLE_CORES_TEMPORARILY = true; - public GT_Recipe mLastRecipe; + public GTRecipe mLastRecipe; /** * Don't use this for recipe input check, otherwise you'll get duplicated fluids */ - public ArrayList<GT_MetaTileEntity_Hatch_AirIntake> mAirIntakes = new ArrayList<>(); + public ArrayList<METHatchAirIntake> mAirIntakes = new ArrayList<>(); - public ArrayList<GT_MetaTileEntity_Hatch_InputBattery> mChargeHatches = new ArrayList<>(); - public ArrayList<GT_MetaTileEntity_Hatch_OutputBattery> mDischargeHatches = new ArrayList<>(); - public ArrayList<GT_MetaTileEntity_Hatch> mAllEnergyHatches = new ArrayList<>(); - public ArrayList<GT_MetaTileEntity_Hatch> mAllDynamoHatches = new ArrayList<>(); + public ArrayList<MTEHatchInputBattery> mChargeHatches = new ArrayList<>(); + public ArrayList<MTEHatchOutputBattery> mDischargeHatches = new ArrayList<>(); + public ArrayList<MTEHatch> mAllEnergyHatches = new ArrayList<>(); + public ArrayList<MTEHatch> mAllDynamoHatches = new ArrayList<>(); - public GregtechMeta_MultiBlockBase(final int aID, final String aName, final String aNameRegional) { + public GTPPMultiBlockBase(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMeta_MultiBlockBase(final String aName) { + public GTPPMultiBlockBase(final String aName) { super(aName); } @@ -205,7 +207,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex + StatCollector.translateToLocal("GTPP.machines.tier") + ": " + EnumChatFormatting.YELLOW - + GT_Values.VN[GT_Utility.getTier(getMaxInputVoltage())] + + GTValues.VN[GTUtility.getTier(getMaxInputVoltage())] + EnumChatFormatting.RESET));; } if (!this.mAllDynamoHatches.isEmpty()) { @@ -300,7 +302,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex public int getPollutionReductionForAllMufflers() { int mPollutionReduction = 0; - for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) { + for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) { mPollutionReduction = Math.max(calculatePollutionReductionForHatch(tHatch, 100), mPollutionReduction); } return mPollutionReduction; @@ -308,7 +310,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex public long getStoredEnergyInAllEnergyHatches() { long storedEnergy = 0; - for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(mAllEnergyHatches)) { + for (MTEHatch tHatch : filterValidMTEs(mAllEnergyHatches)) { storedEnergy += tHatch.getBaseMetaTileEntity() .getStoredEU(); } @@ -317,7 +319,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex public long getMaxEnergyStorageOfAllEnergyHatches() { long maxEnergy = 0; - for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(mAllEnergyHatches)) { + for (MTEHatch tHatch : filterValidMTEs(mAllEnergyHatches)) { maxEnergy += tHatch.getBaseMetaTileEntity() .getEUCapacity(); } @@ -326,7 +328,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex public long getStoredEnergyInAllDynamoHatches() { long storedEnergy = 0; - for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(mAllDynamoHatches)) { + for (MTEHatch tHatch : filterValidMTEs(mAllDynamoHatches)) { storedEnergy += tHatch.getBaseMetaTileEntity() .getStoredEU(); } @@ -335,7 +337,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex public long getMaxEnergyStorageOfAllDynamoHatches() { long maxEnergy = 0; - for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(mAllDynamoHatches)) { + for (MTEHatch tHatch : filterValidMTEs(mAllDynamoHatches)) { maxEnergy += tHatch.getBaseMetaTileEntity() .getEUCapacity(); } @@ -383,7 +385,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex public void log(String s) { if (!AsmConfig.disableAllLogging) { - if (CORE_Preloader.DEBUG_MODE) { + if (PreloaderCore.DEBUG_MODE) { Logger.INFO(s); } else { Logger.MACHINE_INFO(s); @@ -393,7 +395,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex @Override protected void setProcessingLogicPower(ProcessingLogic logic) { - logic.setAvailableVoltage(GT_Utility.roundUpVoltage(this.getMaxInputVoltage())); + logic.setAvailableVoltage(GTUtility.roundUpVoltage(this.getMaxInputVoltage())); logic.setAvailableAmperage(1L); } @@ -404,11 +406,10 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex return mEnergyHatches.get(0) .getBaseMetaTileEntity() .getInputVoltage(); - for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) - rEnergy += tHatch.getBaseMetaTileEntity() - .getInputVoltage() - * tHatch.getBaseMetaTileEntity() - .getInputAmperage(); + for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) rEnergy += tHatch.getBaseMetaTileEntity() + .getInputVoltage() + * tHatch.getBaseMetaTileEntity() + .getInputAmperage(); return rEnergy; } @@ -422,27 +423,27 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex @Override public void explodeMultiblock() { MetaTileEntity tTileEntity; - for (final Iterator<GT_MetaTileEntity_Hatch_InputBattery> localIterator = this.mChargeHatches - .iterator(); localIterator.hasNext(); tTileEntity.getBaseMetaTileEntity() - .doExplosion(gregtech.api.enums.GT_Values.V[8])) { + for (final Iterator<MTEHatchInputBattery> localIterator = this.mChargeHatches.iterator(); localIterator + .hasNext(); tTileEntity.getBaseMetaTileEntity() + .doExplosion(GTValues.V[8])) { tTileEntity = localIterator.next(); } tTileEntity = null; - for (final Iterator<GT_MetaTileEntity_Hatch_OutputBattery> localIterator = this.mDischargeHatches - .iterator(); localIterator.hasNext(); tTileEntity.getBaseMetaTileEntity() - .doExplosion(gregtech.api.enums.GT_Values.V[8])) { + for (final Iterator<MTEHatchOutputBattery> localIterator = this.mDischargeHatches.iterator(); localIterator + .hasNext(); tTileEntity.getBaseMetaTileEntity() + .doExplosion(GTValues.V[8])) { tTileEntity = localIterator.next(); } tTileEntity = null; - for (final Iterator<GT_MetaTileEntity_Hatch> localIterator = this.mTecTechDynamoHatches - .iterator(); localIterator.hasNext(); tTileEntity.getBaseMetaTileEntity() - .doExplosion(gregtech.api.enums.GT_Values.V[8])) { + for (final Iterator<MTEHatch> localIterator = this.mTecTechDynamoHatches.iterator(); localIterator + .hasNext(); tTileEntity.getBaseMetaTileEntity() + .doExplosion(GTValues.V[8])) { tTileEntity = localIterator.next(); } tTileEntity = null; - for (final Iterator<GT_MetaTileEntity_Hatch> localIterator = this.mTecTechEnergyHatches - .iterator(); localIterator.hasNext(); tTileEntity.getBaseMetaTileEntity() - .doExplosion(gregtech.api.enums.GT_Values.V[8])) { + for (final Iterator<MTEHatch> localIterator = this.mTecTechEnergyHatches.iterator(); localIterator + .hasNext(); tTileEntity.getBaseMetaTileEntity() + .doExplosion(GTValues.V[8])) { tTileEntity = localIterator.next(); } @@ -470,7 +471,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex public ItemStack findItemInInventory(ItemStack aSearchStack) { if (aSearchStack != null && this.mInputBusses.size() > 0) { - for (GT_MetaTileEntity_Hatch_InputBus bus : this.mInputBusses) { + for (MTEHatchInputBus bus : this.mInputBusses) { if (bus != null) { for (ItemStack uStack : bus.mInventory) { if (uStack != null) { @@ -490,9 +491,8 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex * Deplete fluid input from a set of restricted hatches. This assumes these hatches can store nothing else but your * expected fluid */ - protected boolean depleteInputFromRestrictedHatches(Collection<GT_MetaTileEntity_Hatch_CustomFluidBase> aHatches, - int aAmount) { - for (final GT_MetaTileEntity_Hatch_CustomFluidBase tHatch : filterValidMTEs(aHatches)) { + protected boolean depleteInputFromRestrictedHatches(Collection<MTEHatchCustomFluidBase> aHatches, int aAmount) { + for (final MTEHatchCustomFluidBase tHatch : filterValidMTEs(aHatches)) { FluidStack tLiquid = tHatch.getFluid(); if (tLiquid == null || tLiquid.amount < aAmount) { continue; @@ -508,10 +508,10 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex @Override public void updateSlots() { - for (final GT_MetaTileEntity_Hatch_InputBattery tHatch : filterValidMTEs(this.mChargeHatches)) { + for (final MTEHatchInputBattery tHatch : filterValidMTEs(this.mChargeHatches)) { tHatch.updateSlots(); } - for (final GT_MetaTileEntity_Hatch_OutputBattery tHatch : filterValidMTEs(this.mDischargeHatches)) { + for (final MTEHatchOutputBattery tHatch : filterValidMTEs(this.mDischargeHatches)) { tHatch.updateSlots(); } super.updateSlots(); @@ -554,18 +554,18 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex // Try setRecipeMap try { - if (aTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - resetRecipeMapForHatch((GT_MetaTileEntity_Hatch) aTileEntity, getRecipeMap()); + if (aTileEntity instanceof MTEHatchInput) { + resetRecipeMapForHatch((MTEHatch) aTileEntity, getRecipeMap()); } - if (aTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) { - resetRecipeMapForHatch((GT_MetaTileEntity_Hatch) aTileEntity, getRecipeMap()); + if (aTileEntity instanceof MTEHatchInputBus) { + resetRecipeMapForHatch((MTEHatch) aTileEntity, getRecipeMap()); } } catch (Throwable t) { t.printStackTrace(); } if (aList.isEmpty()) { - if (aTileEntity instanceof GT_MetaTileEntity_Hatch) { + if (aTileEntity instanceof MTEHatch) { if (GTplusplus.CURRENT_LOAD_PHASE == INIT_PHASE.STARTED) { log( "Adding " + aTileEntity.getInventoryName() @@ -600,7 +600,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex } } } - if (aTileEntity instanceof GT_MetaTileEntity_Hatch) { + if (aTileEntity instanceof MTEHatch) { if (GTplusplus.CURRENT_LOAD_PHASE == INIT_PHASE.STARTED) { log("Adding " + aCur.getInventoryName() + " at " + aCurPos.getLocationString()); } @@ -633,13 +633,13 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex boolean aDidAdd = false; // Handle Custom Hatches - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBattery) { + if (aMetaTileEntity instanceof MTEHatchInputBattery) { log("Found GT_MetaTileEntity_Hatch_InputBattery"); aDidAdd = addToMachineListInternal(mChargeHatches, aMetaTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBattery) { + } else if (aMetaTileEntity instanceof MTEHatchOutputBattery) { log("Found GT_MetaTileEntity_Hatch_OutputBattery"); aDidAdd = addToMachineListInternal(mDischargeHatches, aMetaTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_AirIntake) { + } else if (aMetaTileEntity instanceof METHatchAirIntake) { aDidAdd = addToMachineListInternal(mAirIntakes, aMetaTileEntity, aBaseCasingIndex) && addToMachineListInternal(mInputHatches, aMetaTileEntity, aBaseCasingIndex); } @@ -659,28 +659,28 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex } // Handle Fluid Hatches using seperate logic - else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) + else if (aMetaTileEntity instanceof MTEHatchInput) aDidAdd = addToMachineListInternal(mInputHatches, aMetaTileEntity, aBaseCasingIndex); - else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) + else if (aMetaTileEntity instanceof MTEHatchOutput) aDidAdd = addToMachineListInternal(mOutputHatches, aMetaTileEntity, aBaseCasingIndex); // Process Remaining hatches using Vanilla GT Logic else if (aMetaTileEntity instanceof IDualInputHatch hatch) { hatch.updateCraftingIcon(this.getMachineCraftingIcon()); aDidAdd = addToMachineListInternal(mDualInputHatches, aMetaTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) + } else if (aMetaTileEntity instanceof MTEHatchInputBus) aDidAdd = addToMachineListInternal(mInputBusses, aMetaTileEntity, aBaseCasingIndex); - else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) + else if (aMetaTileEntity instanceof MTEHatchOutputBus) aDidAdd = addToMachineListInternal(mOutputBusses, aMetaTileEntity, aBaseCasingIndex); - else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) { + else if (aMetaTileEntity instanceof MTEHatchEnergy) { aDidAdd = addToMachineListInternal(mEnergyHatches, aMetaTileEntity, aBaseCasingIndex); updateMasterEnergyHatchList(aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) { + } else if (aMetaTileEntity instanceof MTEHatchDynamo) { aDidAdd = addToMachineListInternal(mDynamoHatches, aMetaTileEntity, aBaseCasingIndex); updateMasterDynamoHatchList(aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) + } else if (aMetaTileEntity instanceof MTEHatchMaintenance) aDidAdd = addToMachineListInternal(mMaintenanceHatches, aMetaTileEntity, aBaseCasingIndex); - else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) + else if (aMetaTileEntity instanceof MTEHatchMuffler) aDidAdd = addToMachineListInternal(mMufflerHatches, aMetaTileEntity, aBaseCasingIndex); // return super.addToMachineList(aTileEntity, aBaseCasingIndex); @@ -690,7 +690,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex @Override public boolean addMaintenanceToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { + if (aMetaTileEntity instanceof MTEHatchMaintenance) { return addToMachineList(aMetaTileEntity, aBaseCasingIndex); } return false; @@ -699,7 +699,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex @Override public boolean addMufflerToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { + if (aMetaTileEntity instanceof MTEHatchMuffler) { return addToMachineList(aMetaTileEntity, aBaseCasingIndex); } return false; @@ -708,8 +708,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex @Override public boolean addInputToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input - || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) { + if (aMetaTileEntity instanceof MTEHatchInput || aMetaTileEntity instanceof MTEHatchInputBus) { return addToMachineList(aMetaTileEntity, aBaseCasingIndex); } return false; @@ -718,8 +717,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex @Override public boolean addOutputToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output - || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { + if (aMetaTileEntity instanceof MTEHatchOutput || aMetaTileEntity instanceof MTEHatchOutputBus) { return addToMachineList(aMetaTileEntity, aBaseCasingIndex); } return false; @@ -727,7 +725,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex public boolean addAirIntakeToMachineList(final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex) { IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_AirIntake) { + if (aMetaTileEntity instanceof METHatchAirIntake) { return addToMachineList(aMetaTileEntity, aBaseCasingIndex); } return false; @@ -738,7 +736,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex } public boolean addFluidInputToMachineList(final IMetaTileEntity aMetaTileEntity, final int aBaseCasingIndex) { - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { + if (aMetaTileEntity instanceof MTEHatchInput) { return addToMachineList(aMetaTileEntity, aBaseCasingIndex); } return false; @@ -754,12 +752,12 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex public boolean resetRecipeMapForAllInputHatches(RecipeMap<?> aMap) { int cleared = 0; - for (GT_MetaTileEntity_Hatch_Input g : this.mInputHatches) { + for (MTEHatchInput g : this.mInputHatches) { if (resetRecipeMapForHatch(g, aMap)) { cleared++; } } - for (GT_MetaTileEntity_Hatch_InputBus g : this.mInputBusses) { + for (MTEHatchInputBus g : this.mInputBusses) { if (resetRecipeMapForHatch(g, aMap)) { cleared++; } @@ -773,10 +771,9 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex if (aMetaTileEntity == null) { return false; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input - || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus - || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Steam_BusInput) { - return resetRecipeMapForHatch((GT_MetaTileEntity_Hatch) aMetaTileEntity, aMap); + if (aMetaTileEntity instanceof MTEHatchInput || aMetaTileEntity instanceof MTEHatchInputBus + || aMetaTileEntity instanceof MteHatchSteamBusInput) { + return resetRecipeMapForHatch((MTEHatch) aMetaTileEntity, aMap); } else { return false; } @@ -786,33 +783,32 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex } } - public boolean resetRecipeMapForHatch(GT_MetaTileEntity_Hatch aTileEntity, RecipeMap<?> aMap) { + public boolean resetRecipeMapForHatch(MTEHatch aTileEntity, RecipeMap<?> aMap) { if (aTileEntity == null) { return false; } final IMetaTileEntity aMetaTileEntity = aTileEntity; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input - || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus - || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Steam_BusInput) { - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mRecipeMap = null; - ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mRecipeMap = aMap; + if (aMetaTileEntity instanceof MTEHatchInput || aMetaTileEntity instanceof MTEHatchInputBus + || aMetaTileEntity instanceof MteHatchSteamBusInput) { + if (aMetaTileEntity instanceof MTEHatchInput) { + ((MTEHatchInput) aMetaTileEntity).mRecipeMap = null; + ((MTEHatchInput) aMetaTileEntity).mRecipeMap = aMap; if (aMap != null) { log("Remapped Input Hatch to " + aMap.unlocalizedName + "."); } else { log("Cleared Input Hatch."); } - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) { - ((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity).mRecipeMap = null; - ((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity).mRecipeMap = aMap; + } else if (aMetaTileEntity instanceof MTEHatchInputBus) { + ((MTEHatchInputBus) aMetaTileEntity).mRecipeMap = null; + ((MTEHatchInputBus) aMetaTileEntity).mRecipeMap = aMap; if (aMap != null) { log("Remapped Input Bus to " + aMap.unlocalizedName + "."); } else { log("Cleared Input Bus."); } } else { - ((GT_MetaTileEntity_Hatch_Steam_BusInput) aMetaTileEntity).mRecipeMap = null; - ((GT_MetaTileEntity_Hatch_Steam_BusInput) aMetaTileEntity).mRecipeMap = aMap; + ((MteHatchSteamBusInput) aMetaTileEntity).mRecipeMap = null; + ((MteHatchSteamBusInput) aMetaTileEntity).mRecipeMap = aMap; if (aMap != null) { log("Remapped Input Bus to " + aMap.unlocalizedName + "."); } else { @@ -853,9 +849,9 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex if (aMetaTileEntity == null) { return false; } - Method mProper = ReflectionUtils.getMethod(GT_MetaTileEntity_Hatch.class, "updateTexture", int.class); + Method mProper = ReflectionUtils.getMethod(MTEHatch.class, "updateTexture", int.class); if (mProper != null) { - if (GT_MetaTileEntity_Hatch.class.isInstance(aMetaTileEntity)) { + if (MTEHatch.class.isInstance(aMetaTileEntity)) { mProper.setAccessible(true); mProper.invoke(aMetaTileEntity, aCasingID); // log("Good Method Call for updateTexture."); @@ -863,9 +859,9 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex } } else { log("Bad Method Call for updateTexture."); - if (GT_MetaTileEntity_Hatch.class.isInstance(aMetaTileEntity)) { + if (MTEHatch.class.isInstance(aMetaTileEntity)) { if (aCasingID <= Byte.MAX_VALUE) { - ((GT_MetaTileEntity_Hatch) aTileEntity).updateTexture(aCasingID); + ((MTEHatch) aTileEntity).updateTexture(aCasingID); log( "Good Method Call for updateTexture. Used fallback method of setting mMachineBlock as casing id was <= 128."); return true; @@ -893,12 +889,12 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex /** * This is the array Used to Store the Tectech Multi-Amp Dynamo hatches. */ - public ArrayList<GT_MetaTileEntity_Hatch> mTecTechDynamoHatches = new ArrayList<>(); + public ArrayList<MTEHatch> mTecTechDynamoHatches = new ArrayList<>(); /** * This is the array Used to Store the Tectech Multi-Amp Energy hatches. */ - public ArrayList<GT_MetaTileEntity_Hatch> mTecTechEnergyHatches = new ArrayList<>(); + public ArrayList<MTEHatch> mTecTechEnergyHatches = new ArrayList<>(); /** * TecTech Multi-Amp Dynamo Support @@ -923,21 +919,13 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex } public boolean isThisHatchMultiDynamo(IMetaTileEntity aMetaTileEntity) { - Class<?> mDynamoClass; - mDynamoClass = ReflectionUtils - .getClass("com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti"); - if (mDynamoClass != null) { - if (mDynamoClass.isInstance(aMetaTileEntity)) { - return true; - } - } - return false; + return aMetaTileEntity instanceof MTEHatchDynamoMulti; } @Override public boolean addDynamoToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo || isThisHatchMultiDynamo(aMetaTileEntity)) { + if (aMetaTileEntity instanceof MTEHatchDynamo || isThisHatchMultiDynamo(aMetaTileEntity)) { return addToMachineList(aMetaTileEntity, aBaseCasingIndex); } return false; @@ -947,7 +935,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex if (aMetaTileEntity == null) { return false; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch aHatch) { + if (aMetaTileEntity instanceof MTEHatch aHatch) { return mAllDynamoHatches.add(aHatch); } return false; @@ -976,21 +964,13 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex } public boolean isThisHatchMultiEnergy(IMetaTileEntity aMetaTileEntity) { - Class<?> mDynamoClass; - mDynamoClass = ReflectionUtils - .getClass("com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti"); - if (mDynamoClass != null) { - if (mDynamoClass.isInstance(aMetaTileEntity)) { - return true; - } - } - return false; + return aMetaTileEntity instanceof MTEHatchEnergyMulti; } @Override public boolean addEnergyInputToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy || isThisHatchMultiEnergy(aMetaTileEntity)) { + if (aMetaTileEntity instanceof MTEHatchEnergy || isThisHatchMultiEnergy(aMetaTileEntity)) { return addToMachineList(aMetaTileEntity, aBaseCasingIndex); } return false; @@ -1000,7 +980,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex if (aMetaTileEntity == null) { return false; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch aHatch) { + if (aMetaTileEntity instanceof MTEHatch aHatch) { return mAllEnergyHatches.add(aHatch); } return false; @@ -1009,7 +989,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex /** * Pollution Management */ - public int calculatePollutionReductionForHatch(GT_MetaTileEntity_Hatch_Muffler hatch, int poll) { + public int calculatePollutionReductionForHatch(MTEHatchMuffler hatch, int poll) { return hatch.calculatePollutionReduction(poll); } @@ -1039,7 +1019,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem(); if (tCurrentItem != null) { // Logger.INFO("Holding Item."); - if (tCurrentItem.getItem() instanceof GT_MetaGenerated_Tool) { + if (tCurrentItem.getItem() instanceof MetaGeneratedTool) { // Logger.INFO("Is GT_MetaGenerated_Tool."); int[] aOreID = OreDictionary.getOreIDs(tCurrentItem); for (int id : aOreID) { @@ -1061,7 +1041,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex public boolean onPlungerRightClick(EntityPlayer aPlayer, ForgeDirection side, float aX, float aY, float aZ) { int aHatchIndex = 0; PlayerUtils.messagePlayer(aPlayer, "Trying to clear " + mOutputHatches.size() + " output hatches."); - for (GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) { + for (MTEHatchOutput hatch : this.mOutputHatches) { if (hatch.mFluid != null) { PlayerUtils.messagePlayer( aPlayer, @@ -1084,9 +1064,9 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex if (aPlayer.isSneaking()) { batchMode = !batchMode; if (batchMode) { - GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOn")); + GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOn")); } else { - GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOff")); + GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOff")); } return true; } @@ -1099,7 +1079,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex if (supportsVoidProtection() && wrenchingSide == getBaseMetaTileEntity().getFrontFacing()) { Set<VoidingMode> allowed = getAllowedVoidingModes(); setVoidingMode(getVoidingMode().nextInCollection(allowed)); - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, StatCollector.translateToLocal("GT5U.gui.button.voiding_mode") + " " + StatCollector.translateToLocal(getVoidingMode().getTransKey())); @@ -1266,12 +1246,12 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex protected void addNoPlayerInventoryUI(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) + new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK) .setPos(3, 4) .setSize(152, 159)); for (int i = 0; i < 9; i++) { builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.BUTTON_STANDARD) + new DrawableWidget().setDrawable(GTUITextures.BUTTON_STANDARD) .setPos(155, 3 + i * 18) .setSize(18, 18)); } @@ -1333,7 +1313,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex screenElements .widget( - new TextWidget(GT_Utility.trans("138", "Incomplete Structure.")).setDefaultColor(COLOR_TEXT_WHITE.get()) + new TextWidget(GTUtility.trans("138", "Incomplete Structure.")).setDefaultColor(COLOR_TEXT_WHITE.get()) .setEnabled(widget -> !mMachine)) .widget(new FakeSyncWidget.BooleanSyncer(() -> mMachine, val -> mMachine = val)) .widget( @@ -1343,7 +1323,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex + StatCollector.translateToLocal("GTPP.machines.tier") + ": " + EnumChatFormatting.GREEN - + GT_Values.VOLTAGE_NAMES[(int) getInputTier()]) + + GTValues.VOLTAGE_NAMES[(int) getInputTier()]) .setDefaultColor(COLOR_TEXT_WHITE.get()) .setEnabled(widget -> mMachine && getInputTier() > 0)) .widget( @@ -1353,7 +1333,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex + StatCollector.translateToLocal("GTPP.machines.tier") + ": " + EnumChatFormatting.GREEN - + GT_Values.VOLTAGE_NAMES[(int) getOutputTier()]) + + GTValues.VOLTAGE_NAMES[(int) getOutputTier()]) .setDefaultColor(COLOR_TEXT_WHITE.get()) .setEnabled(widget -> mMachine && getOutputTier() > 0)) .widget( @@ -1450,7 +1430,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex + StatCollector.translateToLocal("GTPP.machines.tier") + ": " + EnumChatFormatting.YELLOW - + GT_Values.VN[GT_Utility.getTier(getMaxInputVoltage())] + + GTValues.VN[GTUtility.getTier(getMaxInputVoltage())] + EnumChatFormatting.RESET)) .setDefaultColor(COLOR_TEXT_WHITE.get()) .setEnabled(widget -> mMachine)) @@ -1572,53 +1552,49 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex mToolStacks.put( true + "WRENCH", - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.WRENCH.ID, 1, GOOD, Materials.Tungsten, null)); + MetaGeneratedTool01.INSTANCE.getToolWithStats(IDMetaTool01.WRENCH.ID, 1, GOOD, Materials.Tungsten, null)); mToolStacks.put( true + "CROWBAR", - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.CROWBAR.ID, 1, GOOD, Materials.Tungsten, null)); + MetaGeneratedTool01.INSTANCE.getToolWithStats(IDMetaTool01.CROWBAR.ID, 1, GOOD, Materials.Tungsten, null)); mToolStacks.put( true + "HARDHAMMER", - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.HARDHAMMER.ID, 1, GOOD, Materials.Tungsten, null)); + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.HARDHAMMER.ID, 1, GOOD, Materials.Tungsten, null)); mToolStacks.put( true + "SOFTHAMMER", - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.SOFTMALLET.ID, 1, GOOD, Materials.Tungsten, null)); + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.SOFTMALLET.ID, 1, GOOD, Materials.Tungsten, null)); mToolStacks.put( true + "SCREWDRIVER", - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.SCREWDRIVER.ID, 1, GOOD, Materials.Tungsten, null)); + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.SCREWDRIVER.ID, 1, GOOD, Materials.Tungsten, null)); mToolStacks.put( true + "SOLDERING_IRON_LV", - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.SOLDERING_IRON_LV.ID, 1, GOOD, Materials.Tungsten, null)); + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.SOLDERING_IRON_LV.ID, 1, GOOD, Materials.Tungsten, null)); mToolStacks.put( false + "WRENCH", - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.WRENCH.ID, 1, BAD, Materials.Tungsten, null)); + MetaGeneratedTool01.INSTANCE.getToolWithStats(IDMetaTool01.WRENCH.ID, 1, BAD, Materials.Tungsten, null)); mToolStacks.put( false + "CROWBAR", - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.CROWBAR.ID, 1, BAD, Materials.Tungsten, null)); + MetaGeneratedTool01.INSTANCE.getToolWithStats(IDMetaTool01.CROWBAR.ID, 1, BAD, Materials.Tungsten, null)); mToolStacks.put( false + "HARDHAMMER", - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.HARDHAMMER.ID, 1, BAD, Materials.Tungsten, null)); + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.HARDHAMMER.ID, 1, BAD, Materials.Tungsten, null)); mToolStacks.put( false + "SOFTHAMMER", - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.SOFTMALLET.ID, 1, BAD, Materials.Tungsten, null)); + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.SOFTMALLET.ID, 1, BAD, Materials.Tungsten, null)); mToolStacks.put( false + "SCREWDRIVER", - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.SCREWDRIVER.ID, 1, BAD, Materials.Tungsten, null)); + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.SCREWDRIVER.ID, 1, BAD, Materials.Tungsten, null)); mToolStacks.put( false + "SOLDERING_IRON_LV", - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.SOLDERING_IRON_LV.ID, 1, BAD, Materials.Tungsten, null)); + MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.SOLDERING_IRON_LV.ID, 1, BAD, Materials.Tungsten, null)); ItemStack aGlassPane1 = ItemUtils.getItemStackOfAmountFromOreDict("paneGlassRed", 1); ItemStack aGlassPane2 = ItemUtils.getItemStackOfAmountFromOreDict("paneGlassLime", 1); @@ -1626,28 +1602,26 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex mToolStacks.put("trueGLASS", aGlassPane2); } - public enum GTPPHatchElement implements IHatchElement<GregtechMeta_MultiBlockBase<?>> { + public enum GTPPHatchElement implements IHatchElement<GTPPMultiBlockBase<?>> { - AirIntake(GregtechMeta_MultiBlockBase::addAirIntakeToMachineList, GT_MetaTileEntity_Hatch_AirIntake.class) { + AirIntake(GTPPMultiBlockBase::addAirIntakeToMachineList, METHatchAirIntake.class) { @Override - public long count(GregtechMeta_MultiBlockBase<?> t) { + public long count(GTPPMultiBlockBase<?> t) { return t.mAirIntakes.size(); } }, - TTDynamo(GregtechMeta_MultiBlockBase::addMultiAmpDynamoToMachineList, - "com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti") { + TTDynamo(GTPPMultiBlockBase::addMultiAmpDynamoToMachineList, MTEHatchDynamoMulti.class) { @Override - public long count(GregtechMeta_MultiBlockBase<?> t) { + public long count(GTPPMultiBlockBase<?> t) { return t.mTecTechDynamoHatches.size(); } }, - TTEnergy(GregtechMeta_MultiBlockBase::addMultiAmpEnergyToMachineList, - "com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti") { + TTEnergy(GTPPMultiBlockBase::addMultiAmpEnergyToMachineList, MTEHatchEnergyMulti.class) { @Override - public long count(GregtechMeta_MultiBlockBase<?> t) { + public long count(GTPPMultiBlockBase<?> t) { return t.mTecTechEnergyHatches.size(); } },; @@ -1658,16 +1632,16 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex } private final List<? extends Class<? extends IMetaTileEntity>> mMteClasses; - private final IGT_HatchAdder<? super GregtechMeta_MultiBlockBase<?>> mAdder; + private final IGTHatchAdder<? super GTPPMultiBlockBase<?>> mAdder; @SafeVarargs - GTPPHatchElement(IGT_HatchAdder<? super GregtechMeta_MultiBlockBase<?>> aAdder, + GTPPHatchElement(IGTHatchAdder<? super GTPPMultiBlockBase<?>> aAdder, Class<? extends IMetaTileEntity>... aMteClasses) { this.mMteClasses = Arrays.asList(aMteClasses); this.mAdder = aAdder; } - GTPPHatchElement(IGT_HatchAdder<? super GregtechMeta_MultiBlockBase<?>> aAdder, String... aClassNames) { + GTPPHatchElement(IGTHatchAdder<? super GTPPMultiBlockBase<?>> aAdder, String... aClassNames) { this.mMteClasses = Arrays.stream(aClassNames) .map(ReflectionUtils::getClass) .filter(Objects::nonNull) @@ -1682,7 +1656,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex } @Override - public IGT_HatchAdder<? super GregtechMeta_MultiBlockBase<?>> adder() { + public IGTHatchAdder<? super GTPPMultiBlockBase<?>> adder() { return mAdder; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/MTEHatchCustomFluidBase.java index fd92983af4..b084651177 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/MTEHatchCustomFluidBase.java @@ -12,25 +12,25 @@ import net.minecraftforge.fluids.FluidStack; import com.gtnewhorizons.modularui.common.widget.FluidSlotWidget; -import gregtech.GT_Mod; -import gregtech.api.gui.modularui.GT_UIInfos; +import gregtech.GTMod; +import gregtech.api.gui.modularui.GTUIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.MTEHatch; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.util.GTUtility; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; -public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_Hatch { +public class MTEHatchCustomFluidBase extends MTEHatch { public final Fluid mLockedFluid; public final int mFluidCapacity; protected FluidStack mLockedStack = null; protected String mTempMod = null; - public GT_MetaTileEntity_Hatch_CustomFluidBase(Fluid aFluid, int aAmount, final int aID, final String aName, + public MTEHatchCustomFluidBase(Fluid aFluid, int aAmount, final int aID, final String aName, final String aNameRegional, int aTier) { super( aID, @@ -38,12 +38,12 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H aNameRegional, aTier, 3, - new String[] { "Fluid Input for Multiblocks", "Capacity: " + GT_Utility.formatNumbers(aAmount) + "L" }); + new String[] { "Fluid Input for Multiblocks", "Capacity: " + GTUtility.formatNumbers(aAmount) + "L" }); this.mLockedFluid = aFluid; this.mFluidCapacity = aAmount; } - public GT_MetaTileEntity_Hatch_CustomFluidBase(Fluid aFluid, int aAmount, final String aName, final int aTier, + public MTEHatchCustomFluidBase(Fluid aFluid, int aAmount, final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription[0], aTextures); this.mLockedFluid = aFluid; @@ -53,7 +53,7 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final ForgeDirection side, final ItemStack aStack) { if (side == aBaseMetaTileEntity.getFrontFacing() && aIndex == 0) { - FluidStack fs = GT_Utility.getFluidForFilledItem(aStack, true); + FluidStack fs = GTUtility.getFluidForFilledItem(aStack, true); return fs != null && fs.getFluid() == this.mLockedFluid; } return false; @@ -67,14 +67,14 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch + return GTMod.gregtechproxy.mRenderIndicatorsOnHatch ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(FLUID_IN_SIGN) } : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch + return GTMod.gregtechproxy.mRenderIndicatorsOnHatch ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(FLUID_IN_SIGN) } : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN) }; } @@ -96,7 +96,7 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -181,7 +181,7 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H + (mLockedStack != null ? mLockedStack.getLocalizedName() : "Empty") + EnumChatFormatting.RESET; return new String[] { "Fluid Input for " + (isSteam ? "Steam " : "") + "Multiblocks", - "Capacity: " + getCapacity() + "L", aFluidName, CORE.GT_Tooltip.get() }; + "Capacity: " + getCapacity() + "L", aFluidName, GTPPCore.GT_Tooltip.get() }; } @Override @@ -194,7 +194,7 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_CustomFluidBase( + return new MTEHatchCustomFluidBase( this.mLockedFluid, this.mFluidCapacity, this.mName, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/MTESteamMultiBase.java index 689bdf52ba..9730b551d8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/MTESteamMultiBase.java @@ -1,9 +1,9 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base; -import static gregtech.api.enums.GT_Values.V; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_Utility.filterValidMTEs; -import static gregtech.api.util.GT_Utility.formatNumbers; +import static gregtech.api.enums.GTValues.V; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTUtility.filterValidMTEs; +import static gregtech.api.util.GTUtility.formatNumbers; import static mcp.mobius.waila.api.SpecialChars.GREEN; import static mcp.mobius.waila.api.SpecialChars.RED; import static mcp.mobius.waila.api.SpecialChars.RESET; @@ -19,45 +19,44 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IHatchElement; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; -import gregtech.api.util.GT_HatchElementBuilder; -import gregtech.api.util.GT_Utility; -import gregtech.api.util.GT_Waila; -import gregtech.api.util.IGT_HatchAdder; +import gregtech.api.util.GTUtility; +import gregtech.api.util.GTWaila; +import gregtech.api.util.HatchElementBuilder; +import gregtech.api.util.IGTHatchAdder; import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusInput; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusOutput; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchSteamBusOutput; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MteHatchSteamBusInput; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMultiBase<T>> - extends GregtechMeta_MultiBlockBase<T> { +public abstract class MTESteamMultiBase<T extends MTESteamMultiBase<T>> extends GTPPMultiBlockBase<T> { - public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusInput> mSteamInputs = new ArrayList<>(); - public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusOutput> mSteamOutputs = new ArrayList<>(); - public ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase> mSteamInputFluids = new ArrayList<>(); + public ArrayList<MteHatchSteamBusInput> mSteamInputs = new ArrayList<>(); + public ArrayList<MTEHatchSteamBusOutput> mSteamOutputs = new ArrayList<>(); + public ArrayList<MTEHatchCustomFluidBase> mSteamInputFluids = new ArrayList<>(); protected static final String TT_steaminputbus = StatCollector.translateToLocal("GTPP.MBTT.SteamInputBus"); protected static final String TT_steamoutputbus = StatCollector.translateToLocal("GTPP.MBTT.SteamOutputBus"); protected static final String TT_steamhatch = StatCollector.translateToLocal("GTPP.MBTT.SteamHatch"); - public GregtechMeta_SteamMultiBase(String aName) { + public MTESteamMultiBase(String aName) { super(aName); } - public GregtechMeta_SteamMultiBase(int aID, String aName, String aNameRegional) { + public MTESteamMultiBase(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } @@ -71,9 +70,9 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(getCasingTextureIndex()) }; } - protected abstract GT_RenderedTexture getFrontOverlay(); + protected abstract GTRenderedTexture getFrontOverlay(); - protected abstract GT_RenderedTexture getFrontOverlayActive(); + protected abstract GTRenderedTexture getFrontOverlayActive(); public abstract int getTierRecipes(); @@ -170,22 +169,22 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu // Use this to determine the correct value, then update the hatch texture after. boolean aDidAdd = false; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_CustomFluidBase) { + if (aMetaTileEntity instanceof MTEHatchCustomFluidBase) { log("Adding Steam Input Hatch"); aDidAdd = addToMachineListInternal(mSteamInputFluids, aMetaTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Steam_BusInput) { + } else if (aMetaTileEntity instanceof MteHatchSteamBusInput) { log( "Trying to set recipe map. Type: " + (getRecipeMap() != null ? getRecipeMap().unlocalizedName : "Null")); this.resetRecipeMapForHatch(aTileEntity, getRecipeMap()); log("Adding Steam Input Bus"); aDidAdd = addToMachineListInternal(mSteamInputs, aMetaTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Steam_BusOutput) { + } else if (aMetaTileEntity instanceof MTEHatchSteamBusOutput) { log("Adding Steam Output Bus"); aDidAdd = addToMachineListInternal(mSteamOutputs, aMetaTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) + } else if (aMetaTileEntity instanceof MTEHatchInput) aDidAdd = addToMachineListInternal(mInputHatches, aMetaTileEntity, aBaseCasingIndex); - else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output); + else if (aMetaTileEntity instanceof MTEHatchOutput); return aDidAdd; } @@ -197,7 +196,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu @Override public boolean depleteInput(FluidStack aLiquid) { if (aLiquid == null) return false; - for (GT_MetaTileEntity_Hatch_CustomFluidBase tHatch : filterValidMTEs(mSteamInputFluids)) { + for (MTEHatchCustomFluidBase tHatch : filterValidMTEs(mSteamInputFluids)) { FluidStack tLiquid = tHatch.getFluid(); if (tLiquid != null && tLiquid.isFluidEqual(aLiquid)) { tLiquid = tHatch.drain(aLiquid.amount, false); @@ -212,11 +211,11 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu @Override public boolean depleteInput(ItemStack aStack) { - if (GT_Utility.isStackInvalid(aStack)) return false; - FluidStack aLiquid = GT_Utility.getFluidForFilledItem(aStack, true); + if (GTUtility.isStackInvalid(aStack)) return false; + FluidStack aLiquid = GTUtility.getFluidForFilledItem(aStack, true); if (aLiquid != null) return depleteInput(aLiquid); - for (GT_MetaTileEntity_Hatch_CustomFluidBase tHatch : filterValidMTEs(mSteamInputFluids)) { - if (GT_Utility.areStacksEqual( + for (MTEHatchCustomFluidBase tHatch : filterValidMTEs(mSteamInputFluids)) { + if (GTUtility.areStacksEqual( aStack, tHatch.getBaseMetaTileEntity() .getStackInSlot(0))) { @@ -228,11 +227,11 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu } } } - for (GT_MetaTileEntity_Hatch_Steam_BusInput tHatch : filterValidMTEs(mSteamInputs)) { + for (MteHatchSteamBusInput tHatch : filterValidMTEs(mSteamInputs)) { tHatch.mRecipeMap = getRecipeMap(); for (int i = tHatch.getBaseMetaTileEntity() .getSizeInventory() - 1; i >= 0; i--) { - if (GT_Utility.areStacksEqual( + if (GTUtility.areStacksEqual( aStack, tHatch.getBaseMetaTileEntity() .getStackInSlot(i))) { @@ -251,12 +250,12 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu @Override public ArrayList<FluidStack> getStoredFluids() { ArrayList<FluidStack> rList = new ArrayList<>(); - for (GT_MetaTileEntity_Hatch_CustomFluidBase tHatch : filterValidMTEs(mSteamInputFluids)) { + for (MTEHatchCustomFluidBase tHatch : filterValidMTEs(mSteamInputFluids)) { if (tHatch.getFillableStack() != null) { rList.add(tHatch.getFillableStack()); } } - for (GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) if (hatch.getFillableStack() != null) { + for (MTEHatchInput hatch : this.mInputHatches) if (hatch.getFillableStack() != null) { rList.add(hatch.getFillableStack()); } return rList; @@ -265,7 +264,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu @Override public ArrayList<ItemStack> getStoredInputs() { ArrayList<ItemStack> rList = new ArrayList<>(); - for (GT_MetaTileEntity_Hatch_Steam_BusInput tHatch : filterValidMTEs(mSteamInputs)) { + for (MteHatchSteamBusInput tHatch : filterValidMTEs(mSteamInputs)) { tHatch.mRecipeMap = getRecipeMap(); for (int i = tHatch.getBaseMetaTileEntity() .getSizeInventory() - 1; i >= 0; i--) { @@ -282,13 +281,13 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu @Override public boolean addOutput(ItemStack aStack) { - if (GT_Utility.isStackInvalid(aStack)) return false; - aStack = GT_Utility.copy(aStack); + if (GTUtility.isStackInvalid(aStack)) return false; + aStack = GTUtility.copy(aStack); boolean outputSuccess = true; while (outputSuccess && aStack.stackSize > 0) { outputSuccess = false; ItemStack single = aStack.splitStack(1); - for (GT_MetaTileEntity_Hatch_Steam_BusOutput tHatch : filterValidMTEs(mSteamOutputs)) { + for (MTEHatchSteamBusOutput tHatch : filterValidMTEs(mSteamOutputs)) { if (!outputSuccess) { for (int i = tHatch.getSizeInventory() - 1; i >= 0 && !outputSuccess; i--) { if (tHatch.getBaseMetaTileEntity() @@ -296,7 +295,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu } } } - for (GT_MetaTileEntity_Hatch_Output tHatch : filterValidMTEs(mOutputHatches)) { + for (MTEHatchOutput tHatch : filterValidMTEs(mOutputHatches)) { if (!outputSuccess && tHatch.outputsItems()) { if (tHatch.getBaseMetaTileEntity() .addStackToSlot(1, single)) outputSuccess = true; @@ -309,7 +308,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu @Override public ArrayList<ItemStack> getStoredOutputs() { ArrayList<ItemStack> rList = new ArrayList<>(); - for (GT_MetaTileEntity_Hatch_Steam_BusOutput tHatch : filterValidMTEs(mSteamOutputs)) { + for (MTEHatchSteamBusOutput tHatch : filterValidMTEs(mSteamOutputs)) { for (int i = tHatch.getBaseMetaTileEntity() .getSizeInventory() - 1; i >= 0; i--) { rList.add( @@ -323,7 +322,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu @Override public List<ItemStack> getItemOutputSlots(ItemStack[] toOutput) { List<ItemStack> ret = new ArrayList<>(); - for (final GT_MetaTileEntity_Hatch tBus : filterValidMTEs(mSteamOutputs)) { + for (final MTEHatch tBus : filterValidMTEs(mSteamOutputs)) { final IInventory tBusInv = tBus.getBaseMetaTileEntity(); for (int i = 0; i < tBusInv.getSizeInventory(); i++) { ret.add(tBus.getStackInSlot(i)); @@ -334,8 +333,8 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu @Override public void updateSlots() { - for (GT_MetaTileEntity_Hatch_CustomFluidBase tHatch : filterValidMTEs(mSteamInputFluids)) tHatch.updateSlots(); - for (GT_MetaTileEntity_Hatch_Steam_BusInput tHatch : filterValidMTEs(mSteamInputs)) tHatch.updateSlots(); + for (MTEHatchCustomFluidBase tHatch : filterValidMTEs(mSteamInputFluids)) tHatch.updateSlots(); + for (MteHatchSteamBusInput tHatch : filterValidMTEs(mSteamInputs)) tHatch.updateSlots(); } @Override @@ -355,12 +354,12 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu @Override public boolean resetRecipeMapForAllInputHatches(RecipeMap<?> aMap) { boolean ret = super.resetRecipeMapForAllInputHatches(aMap); - for (GT_MetaTileEntity_Hatch_Steam_BusInput hatch : mSteamInputs) { + for (MteHatchSteamBusInput hatch : mSteamInputs) { if (resetRecipeMapForHatch(hatch, aMap)) { ret = true; } } - for (GT_MetaTileEntity_Hatch_Input g : this.mInputHatches) { + for (MTEHatchInput g : this.mInputHatches) { if (resetRecipeMapForHatch(g, aMap)) { ret = true; } @@ -392,34 +391,33 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu StatCollector.translateToLocalFormatted("GTPP.waila.steam.use", formatNumbers(actualEnergyUsage))); } } - currentTip.add( - GT_Waila.getMachineProgressString(isActive, tag.getInteger("maxProgress"), tag.getInteger("progress"))); + currentTip + .add(GTWaila.getMachineProgressString(isActive, tag.getInteger("maxProgress"), tag.getInteger("progress"))); // Show ns on the tooltip - if (GT_Mod.gregtechproxy.wailaAverageNS && tag.hasKey("averageNS")) { + if (GTMod.gregtechproxy.wailaAverageNS && tag.hasKey("averageNS")) { int tAverageTime = tag.getInteger("averageNS"); currentTip.add("Average CPU load of ~" + formatNumbers(tAverageTime) + " ns"); } super.getMTEWailaBody(itemStack, currentTip, accessor, config); } - protected static <T extends GregtechMeta_SteamMultiBase<T>> GT_HatchElementBuilder<T> buildSteamInput( - Class<T> typeToken) { - return buildHatchAdder(typeToken).adder(GregtechMeta_SteamMultiBase::addToMachineList) + protected static <T extends MTESteamMultiBase<T>> HatchElementBuilder<T> buildSteamInput(Class<T> typeToken) { + return buildHatchAdder(typeToken).adder(MTESteamMultiBase::addToMachineList) .hatchIds(31040) .shouldReject(t -> !t.mSteamInputFluids.isEmpty()); } - protected enum SteamHatchElement implements IHatchElement<GregtechMeta_SteamMultiBase<?>> { + protected enum SteamHatchElement implements IHatchElement<MTESteamMultiBase<?>> { InputBus_Steam { @Override public List<? extends Class<? extends IMetaTileEntity>> mteClasses() { - return Collections.singletonList(GT_MetaTileEntity_Hatch_Steam_BusInput.class); + return Collections.singletonList(MteHatchSteamBusInput.class); } @Override - public long count(GregtechMeta_SteamMultiBase<?> t) { + public long count(MTESteamMultiBase<?> t) { return t.mSteamInputs.size(); } }, @@ -427,18 +425,18 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu @Override public List<? extends Class<? extends IMetaTileEntity>> mteClasses() { - return Collections.singletonList(GT_MetaTileEntity_Hatch_Steam_BusOutput.class); + return Collections.singletonList(MTEHatchSteamBusOutput.class); } @Override - public long count(GregtechMeta_SteamMultiBase<?> t) { + public long count(MTESteamMultiBase<?> t) { return t.mSteamOutputs.size(); } },; @Override - public IGT_HatchAdder<? super GregtechMeta_SteamMultiBase<?>> adder() { - return GregtechMeta_SteamMultiBase::addToMachineList; + public IGTHatchAdder<? super MTESteamMultiBase<?>> adder() { + return MTESteamMultiBase::addToMachineList; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/MTETransformerHiAmp.java index c6a088fb1c..d2a6468f28 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/MTETransformerHiAmp.java @@ -6,29 +6,30 @@ import net.minecraftforge.common.util.ForgeDirection; import org.apache.commons.lang3.ArrayUtils; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.metatileentity.implementations.MTETransformer; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; -public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer { +public class MTETransformerHiAmp extends MTETransformer { private boolean mHalfMode = false; - public GregtechMetaTransformerHiAmp(int aID, String aName, String aNameRegional, int aTier, String aDescription) { + public MTETransformerHiAmp(int aID, String aName, String aNameRegional, int aTier, String aDescription) { super(aID, aName, aNameRegional, aTier, aDescription); } - public GregtechMetaTransformerHiAmp(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTETransformerHiAmp(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public long maxEUStore() { - return ((512L + gregtech.api.enums.GT_Values.V[(this.mTier + 1)] * 2L) * 8); + return ((512L + GTValues.V[(this.mTier + 1)] * 2L) * 8); } @Override @@ -81,7 +82,7 @@ public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTransformerHiAmp(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTETransformerHiAmp(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -90,7 +91,7 @@ public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer this.mDescriptionArray, "Accepts 4A and outputs 16A", "Toggle 2A/8A half-mode with Screwdriver", - CORE.GT_Tooltip.get()); + GTPPCore.GT_Tooltip.get()); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTEBoilerBase.java index 3f0d8d1ec1..6387624a1c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTEBoilerBase.java @@ -9,21 +9,21 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SoundResource; -import gregtech.api.gui.modularui.GT_UIInfos; +import gregtech.api.gui.modularui.GTUIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; -import gregtech.api.objects.GT_ItemStack; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.metatileentity.implementations.MTEBasicTank; +import gregtech.api.objects.GTItemStack; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.util.math.MathUtils; -public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank { +public abstract class MTEBoilerBase extends MTEBasicTank { public int mTemperature = 20; public int mProcessingEnergy = 0; @@ -32,12 +32,12 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank public boolean mHadNoWater = false; public long RI = MathUtils.randLong(5L, 30L); - public GregtechMetaBoilerBase(final int aID, final String aName, final String aNameRegional, - final String aDescription, final ITexture... aTextures) { + public MTEBoilerBase(final int aID, final String aName, final String aNameRegional, final String aDescription, + final ITexture... aTextures) { super(aID, aName, aNameRegional, 0, 4, aDescription, aTextures); } - public GregtechMetaBoilerBase(final String aName, final int aTier, final String[] aDescription, + public MTEBoilerBase(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 4, aDescription, aTextures); } @@ -104,12 +104,12 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank return true; } if (aPlayer != null) { - if (GT_Utility.areStacksEqual(aPlayer.getCurrentEquippedItem(), new ItemStack(Items.water_bucket, 1))) { + if (GTUtility.areStacksEqual(aPlayer.getCurrentEquippedItem(), new ItemStack(Items.water_bucket, 1))) { this.fill(Materials.Water.getFluid(1000 * aPlayer.getCurrentEquippedItem().stackSize), true); aPlayer.getCurrentEquippedItem() .func_150996_a(Items.bucket); } else { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); } } return true; @@ -147,7 +147,7 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank @Override public boolean isFluidInputAllowed(final FluidStack aFluid) { - return GT_ModHandler.isWater(aFluid); + return GTModHandler.isWater(aFluid); } @Override @@ -167,8 +167,8 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank } @Override - public boolean allowCoverOnSide(final ForgeDirection side, final GT_ItemStack aCover) { - return GregTech_API.getCoverBehaviorNew(aCover.toStack()) + public boolean allowCoverOnSide(final ForgeDirection side, final GTItemStack aCover) { + return GregTechAPI.getCoverBehaviorNew(aCover.toStack()) .isSimpleCover(); } @@ -225,7 +225,7 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank } if ((aTick % 10L) == 0L) { if (this.mTemperature > 100) { - if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) { + if ((this.mFluid == null) || (!GTModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) { this.mHadNoWater = true; } else { if (this.mHadNoWater) { @@ -234,11 +234,11 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank } this.mFluid.amount -= 1; if (this.mSteam == null) { - this.mSteam = GT_ModHandler.getSteam(150L); - } else if (GT_ModHandler.isSteam(this.mSteam)) { + this.mSteam = GTModHandler.getSteam(150L); + } else if (GTModHandler.isSteam(this.mSteam)) { this.mSteam.amount += 150; } else { - this.mSteam = GT_ModHandler.getSteam(150L); + this.mSteam = GTModHandler.getSteam(150L); } } } else { @@ -251,49 +251,48 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank } if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && (this.mInventory[2] != null)) { - if ((GT_OreDictUnificator - .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Coal))) - || (GT_OreDictUnificator + if ((GTOreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Coal))) + || (GTOreDictUnificator .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Coal))) - || (GT_OreDictUnificator + || (GTOreDictUnificator .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Coal))) - || (GT_OreDictUnificator + || (GTOreDictUnificator .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Coal)))) { this.mProcessingEnergy += 160; aBaseMetaTileEntity.decrStackSize(2, 1); if (aBaseMetaTileEntity.getRandomNumber(3) == 0) { aBaseMetaTileEntity - .addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)); + .addStackToSlot(3, GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)); } - } else if (GT_OreDictUnificator + } else if (GTOreDictUnificator .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Charcoal))) { this.mProcessingEnergy += 160; aBaseMetaTileEntity.decrStackSize(2, 1); if (aBaseMetaTileEntity.getRandomNumber(3) == 0) { aBaseMetaTileEntity - .addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L)); + .addStackToSlot(3, GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L)); } - } else if (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCoke")) { + } else if (GTOreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCoke")) { this.mProcessingEnergy += 640; aBaseMetaTileEntity.decrStackSize(2, 1); if (aBaseMetaTileEntity.getRandomNumber(2) == 0) { aBaseMetaTileEntity - .addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L)); + .addStackToSlot(3, GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L)); } - } else if ((GT_OreDictUnificator + } else if ((GTOreDictUnificator .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Lignite))) - || (GT_OreDictUnificator + || (GTOreDictUnificator .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Lignite))) - || (GT_OreDictUnificator + || (GTOreDictUnificator .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Lignite))) - || (GT_OreDictUnificator + || (GTOreDictUnificator .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Lignite)))) { this.mProcessingEnergy += 40; aBaseMetaTileEntity.decrStackSize(2, 1); if (aBaseMetaTileEntity.getRandomNumber(8) == 0) { aBaseMetaTileEntity.addStackToSlot( 3, - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)); + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)); } } } @@ -328,7 +327,7 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank @Override public void doSound(final byte aIndex, final double aX, final double aY, final double aZ) { if (aIndex == 1) { - GT_Utility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 2, 1.0F, aX, aY, aZ); + GTUtility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 2, 1.0F, aX, aY, aZ); for (int l = 0; l < 8; l++) { this.getBaseMetaTileEntity() .getWorld() diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java index 43ead231b3..386c5634f8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators; -import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GTValues.V; import java.util.Collection; @@ -13,38 +13,38 @@ import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.ArrayUtils; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UIInfos; +import gregtech.api.gui.modularui.GTUIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.RecipeMapWorkable; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; +import gregtech.api.metatileentity.implementations.MTEBasicTank; import gregtech.api.recipe.RecipeMap; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; -public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_BasicTank implements RecipeMapWorkable { +public abstract class MTERocketFuelGeneratorBase extends MTEBasicTank implements RecipeMapWorkable { protected int pollMin, pollMax; - public GregtechRocketFuelGeneratorBase(final int aID, final String aName, final String aNameRegional, - final int aTier, final String aDescription, final ITexture... aTextures) { + public MTERocketFuelGeneratorBase(final int aID, final String aName, final String aNameRegional, final int aTier, + final String aDescription, final ITexture... aTextures) { super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures); - pollMin = (int) (CORE.ConfigSwitches.baseMinPollutionPerSecondRocketFuelGenerator - * CORE.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]); - pollMax = (int) (CORE.ConfigSwitches.baseMaxPollutionPerSecondRocketFuelGenerator - * CORE.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]); + pollMin = (int) (GTPPCore.ConfigSwitches.baseMinPollutionPerSecondRocketFuelGenerator + * GTPPCore.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]); + pollMax = (int) (GTPPCore.ConfigSwitches.baseMaxPollutionPerSecondRocketFuelGenerator + * GTPPCore.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]); } - public GregtechRocketFuelGeneratorBase(final String aName, final int aTier, final String[] aDescription, + public MTERocketFuelGeneratorBase(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); - pollMin = (int) (CORE.ConfigSwitches.baseMinPollutionPerSecondRocketFuelGenerator - * CORE.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]); - pollMax = (int) (CORE.ConfigSwitches.baseMaxPollutionPerSecondRocketFuelGenerator - * CORE.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]); + pollMin = (int) (GTPPCore.ConfigSwitches.baseMinPollutionPerSecondRocketFuelGenerator + * GTPPCore.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]); + pollMax = (int) (GTPPCore.ConfigSwitches.baseMaxPollutionPerSecondRocketFuelGenerator + * GTPPCore.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]); } @Override @@ -80,12 +80,12 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_ this.mDescriptionArray, "Fuel Efficiency: " + this.getEfficiency() + "%", aPollution, - CORE.GT_Tooltip.get()); + GTPPCore.GT_Tooltip.get()); } @Override public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -239,7 +239,7 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_ if ((this.mInventory[this.getInputSlot()] != null) && (aBaseMetaTileEntity.getUniversalEnergyStored() < ((this.maxEUOutput() * 20) + this.getMinimumStoredEU())) - && (GT_Utility.getFluidForFilledItem(this.mInventory[this.getInputSlot()], true) == null)) { + && (GTUtility.getFluidForFilledItem(this.mInventory[this.getInputSlot()], true) == null)) { final int tFuelValue = this.getFuelValue(this.mInventory[this.getInputSlot()]); if (tFuelValue > 0) { final ItemStack tEmptyContainer = this.getEmptyContainer(this.mInventory[this.getInputSlot()]); @@ -277,9 +277,9 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_ return 0; } FluidStack tLiquid; - final Collection<GT_Recipe> tRecipeList = this.getRecipeMap() + final Collection<GTRecipe> tRecipeList = this.getRecipeMap() .getAllRecipes(); - for (final GT_Recipe tFuel : tRecipeList) { + for (final GTRecipe tFuel : tRecipeList) { if ((tLiquid = tFuel.mFluidInputs[0]) != null) { if (aLiquid.isFluidEqual(tLiquid)) { int aperOp = this.consumedFluidPerOperation(tLiquid); @@ -291,10 +291,10 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_ } public int getFuelValue(final ItemStack aStack) { - if (GT_Utility.isStackInvalid(aStack) || (this.getRecipeMap() == null)) { + if (GTUtility.isStackInvalid(aStack) || (this.getRecipeMap() == null)) { return 0; } - final GT_Recipe tFuel = this.getRecipeMap() + final GTRecipe tFuel = this.getRecipeMap() .findRecipe(this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack); if (tFuel != null) { return (int) ((tFuel.mSpecialValue * 1000L * this.getEfficiency()) / 100); @@ -303,22 +303,22 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_ } public ItemStack getEmptyContainer(final ItemStack aStack) { - if (GT_Utility.isStackInvalid(aStack) || (this.getRecipeMap() == null)) { + if (GTUtility.isStackInvalid(aStack) || (this.getRecipeMap() == null)) { return null; } - final GT_Recipe tFuel = this.getRecipeMap() + final GTRecipe tFuel = this.getRecipeMap() .findRecipe(this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack); if (tFuel != null) { - return GT_Utility.copy(tFuel.getOutput(0)); + return GTUtility.copy(tFuel.getOutput(0)); } - return GT_Utility.getContainerItem(aStack, true); + return GTUtility.getContainerItem(aStack, true); } @Override public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final ForgeDirection side, final ItemStack aStack) { return super.allowPutStack(aBaseMetaTileEntity, aIndex, side, aStack) && ((this.getFuelValue(aStack) > 0) - || (this.getFuelValue(GT_Utility.getFluidForFilledItem(aStack, true)) > 0)); + || (this.getFuelValue(GTUtility.getFluidForFilledItem(aStack, true)) > 0)); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTESolarGenerator.java index 5e0588acfd..0d0cb67916 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTESolarGenerator.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators; -import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GTValues.V; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.util.ForgeDirection; @@ -8,12 +8,12 @@ import net.minecraftforge.common.util.ForgeDirection; import org.apache.commons.lang3.ArrayUtils; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UIInfos; +import gregtech.api.gui.modularui.GTUIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; +import gregtech.api.metatileentity.implementations.MTEBasicTank; -public abstract class GregtechMetaSolarGenerator extends GT_MetaTileEntity_BasicTank { +public abstract class MTESolarGenerator extends MTEBasicTank { public int mEfficiency; public int mProcessingEnergy = 0; @@ -21,12 +21,12 @@ public abstract class GregtechMetaSolarGenerator extends GT_MetaTileEntity_Basic public int mLossTimer = 0; public static int sEnergyPerTick = 16; - public GregtechMetaSolarGenerator(final int aID, final String aName, final String aNameRegional, final int aTier, + public MTESolarGenerator(final int aID, final String aName, final String aNameRegional, final int aTier, final String aDescription, final ITexture... aTextures) { super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures); } - public GregtechMetaSolarGenerator(final String aName, final int aTier, final String[] aDescription, + public MTESolarGenerator(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); } @@ -67,7 +67,7 @@ public abstract class GregtechMetaSolarGenerator extends GT_MetaTileEntity_Basic if (aBaseMetaTileEntity.isClientSide()) { return true; } - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/MTETreeFarmerBase.java index fe3253244a..dc0b4a5dd6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/MTETreeFarmerBase.java @@ -6,19 +6,19 @@ import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTETieredMachineBlock; +import gregtech.api.objects.GTRenderedTexture; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public abstract class GregtechMetaTreeFarmerBase extends GT_MetaTileEntity_TieredMachineBlock { +public abstract class MTETreeFarmerBase extends MTETieredMachineBlock { - public GregtechMetaTreeFarmerBase(final int aID, final String aName, final String aNameRegional, final int aTier, + public MTETreeFarmerBase(final int aID, final String aName, final String aNameRegional, final int aTier, final int aInvSlotCount, final String aDescription) { super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription); } - public GregtechMetaTreeFarmerBase(final String aName, final int aTier, final int aInvSlotCount, - final String[] aDescription, final ITexture[][][] aTextures) { + public MTETreeFarmerBase(final String aName, final int aTier, final int aInvSlotCount, final String[] aDescription, + final ITexture[][][] aTextures) { super(aName, aTier, aInvSlotCount, aDescription, aTextures); } @@ -139,23 +139,23 @@ public abstract class GregtechMetaTreeFarmerBase extends GT_MetaTileEntity_Tiere } public ITexture[] getFront(final byte aColor) { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager) }; + return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager) }; } public ITexture[] getBack(final byte aColor) { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager) }; + return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager) }; } public ITexture[] getBottom(final byte aColor) { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Acacia_Log) }; + return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Acacia_Log) }; } public ITexture[] getTop(final byte aColor) { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Podzol) }; + return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Podzol) }; } public ITexture[] getSides(final byte aColor) { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager) }; + return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager) }; } public ITexture[] getFrontActive(final byte aColor) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchCatalysts.java index b53e540044..13bb4b44f1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchCatalysts.java @@ -8,35 +8,35 @@ import org.apache.commons.lang3.ArrayUtils; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.objects.GTRenderedTexture; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GT_MetaTileEntity_Hatch_Catalysts extends GT_MetaTileEntity_Hatch_NbtConsumable { +public class MTEHatchCatalysts extends MTEHatchNbtConsumable { - public GT_MetaTileEntity_Hatch_Catalysts(int aID, String aName, String aNameRegional) { + public MTEHatchCatalysts(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, 0, 16, "Dedicated Catalyst Storage", false); } - public GT_MetaTileEntity_Hatch_Catalysts(String aName, String[] aDescription, ITexture[][][] aTextures) { + public MTEHatchCatalysts(String aName, String[] aDescription, ITexture[][][] aTextures) { super(aName, 0, 16, aDescription, false, aTextures); } @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Catalyst) }; + return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Bus_Catalyst) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Catalyst) }; + return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Bus_Catalyst) }; } @Override public String[] getDescription() { - return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get()); + return ArrayUtils.add(this.mDescriptionArray, GTPPCore.GT_Tooltip.get()); } @Override @@ -46,7 +46,7 @@ public class GT_MetaTileEntity_Hatch_Catalysts extends GT_MetaTileEntity_Hatch_N @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_Catalysts(mName, mDescriptionArray, mTextures); + return new MTEHatchCatalysts(mName, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchMillingBalls.java index e3134f5812..a40ea08ec1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchMillingBalls.java @@ -8,35 +8,35 @@ import org.apache.commons.lang3.ArrayUtils; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.objects.GTRenderedTexture; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GT_MetaTileEntity_Hatch_MillingBalls extends GT_MetaTileEntity_Hatch_NbtConsumable { +public class MTEHatchMillingBalls extends MTEHatchNbtConsumable { - public GT_MetaTileEntity_Hatch_MillingBalls(int aID, String aName, String aNameRegional) { + public MTEHatchMillingBalls(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, 6, 4, "Dedicated Milling Ball Storage", false); } - public GT_MetaTileEntity_Hatch_MillingBalls(String aName, String[] aDescription, ITexture[][][] aTextures) { + public MTEHatchMillingBalls(String aName, String[] aDescription, ITexture[][][] aTextures) { super(aName, 6, 4, aDescription, false, aTextures); } @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Milling_Balls) }; + return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Bus_Milling_Balls) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Milling_Balls) }; + return new ITexture[] { aBaseTexture, new GTRenderedTexture(TexturesGtBlock.Overlay_Bus_Milling_Balls) }; } @Override public String[] getDescription() { - return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get()); + return ArrayUtils.add(this.mDescriptionArray, GTPPCore.GT_Tooltip.get()); } @Override @@ -46,7 +46,7 @@ public class GT_MetaTileEntity_Hatch_MillingBalls extends GT_MetaTileEntity_Hatc @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_MillingBalls(mName, mDescriptionArray, mTextures); + return new MTEHatchMillingBalls(mName, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchNbtConsumable.java index e18fc489b0..dbcef2d9e7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchNbtConsumable.java @@ -10,33 +10,32 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget; import com.gtnewhorizons.modularui.common.widget.SlotGroup; import com.gtnewhorizons.modularui.common.widget.TextWidget; -import gregtech.api.gui.modularui.GT_UIInfos; +import gregtech.api.gui.modularui.GTUIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.modularui.IAddGregtechLogo; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.util.GT_Utility; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.util.minecraft.ItemUtils; -public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileEntity_Hatch - implements IAddGregtechLogo { +public abstract class MTEHatchNbtConsumable extends MTEHatch implements IAddGregtechLogo { private final int mInputslotCount; private final int mTotalSlotCount; private final boolean mAllowDuplicateUsageTypes; - public GT_MetaTileEntity_Hatch_NbtConsumable(int aID, String aName, String aNameRegional, int aTier, - int aInputSlots, String aDescription, boolean aAllowDuplicateTypes) { + public MTEHatchNbtConsumable(int aID, String aName, String aNameRegional, int aTier, int aInputSlots, + String aDescription, boolean aAllowDuplicateTypes) { super(aID, aName, aNameRegional, aTier, aInputSlots * 2, aDescription); mInputslotCount = getInputSlotCount(); mTotalSlotCount = getInputSlotCount() * 2; mAllowDuplicateUsageTypes = aAllowDuplicateTypes; } - public GT_MetaTileEntity_Hatch_NbtConsumable(String aName, int aTier, int aInputSlots, String[] aDescription, + public MTEHatchNbtConsumable(String aName, int aTier, int aInputSlots, String[] aDescription, boolean aAllowDuplicateTypes, ITexture[][][] aTextures) { super(aName, aTier, aInputSlots * 2, aDescription, aTextures); mInputslotCount = getInputSlotCount(); @@ -77,7 +76,7 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE @Override public final boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -118,8 +117,8 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE for (int i = 0; i <= getSlotID_LastInput(); i++) { for (int j = i + 1; j <= getSlotID_LastInput(); j++) { if (mInventory[j] != null - && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j]))) { - GT_Utility.moveStackFromSlotAToSlotB( + && (mInventory[i] == null || GTUtility.areStacksEqual(mInventory[i], mInventory[j]))) { + GTUtility.moveStackFromSlotAToSlotB( getBaseMetaTileEntity(), getBaseMetaTileEntity(), j, @@ -201,7 +200,7 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE // First check for duplicates for (int i = getSlotID_FirstUsage(); i <= getSlotID_LastUsage(); i++) { if (mInventory[i] != null) { - if (GT_Utility.areStacksEqual(aStackToMove, mInventory[i], true)) { + if (GTUtility.areStacksEqual(aStackToMove, mInventory[i], true)) { Logger.INFO("Found matching stack in slot " + i + "."); aFoundMatching = true; break; @@ -261,7 +260,7 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE public boolean isItemValidForUsageSlot(ItemStack aStack) { if (aStack != null) { for (ItemStack aValid : getItemsValidForUsageSlots()) { - if (GT_Utility.areStacksEqual(aStack, aValid, true)) { + if (GTUtility.areStacksEqual(aStack, aValid, true)) { return true; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPPCopiedBlockTexture.java index 6a780d227c..117104b4f2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPPCopiedBlockTexture.java @@ -3,26 +3,26 @@ package gtPlusPlus.xmod.gregtech.api.objects; import net.minecraft.block.Block; import gregtech.api.enums.Dyes; -import gregtech.api.objects.GT_CopiedBlockTexture; +import gregtech.api.objects.GTCopiedBlockTexture; /** * Made this to get rid of deprecation warnings <i>everywhere</i>. - * + * * @author Alkalus * */ @SuppressWarnings("deprecation") -public class GTPP_CopiedBlockTexture extends GT_CopiedBlockTexture { +public class GTPPCopiedBlockTexture extends GTCopiedBlockTexture { - public GTPP_CopiedBlockTexture(Block aBlock, int aSide, int aMeta, short[] aRGBa, boolean aAllowAlpha) { + public GTPPCopiedBlockTexture(Block aBlock, int aSide, int aMeta, short[] aRGBa, boolean aAllowAlpha) { super(aBlock, aMeta, aMeta, aRGBa, aAllowAlpha); } - public GTPP_CopiedBlockTexture(Block aBlock, int aSide, int aMeta, short[] aRGBa) { + public GTPPCopiedBlockTexture(Block aBlock, int aSide, int aMeta, short[] aRGBa) { this(aBlock, aSide, aMeta, aRGBa, true); } - public GTPP_CopiedBlockTexture(Block aBlock, int aSide, int aMeta) { + public GTPPCopiedBlockTexture(Block aBlock, int aSide, int aMeta) { this(aBlock, aSide, aMeta, Dyes._NULL.mRGBa); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPPRenderedTexture.java index 0da0136193..fda498d1f6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPPRenderedTexture.java @@ -2,26 +2,26 @@ package gtPlusPlus.xmod.gregtech.api.objects; import gregtech.api.enums.Dyes; import gregtech.api.interfaces.IIconContainer; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.objects.GTRenderedTexture; /** * Made this to get rid of deprecation warnings <i>everywhere</i>. - * + * * @author Alkalus * */ @SuppressWarnings("deprecation") -public class GTPP_RenderedTexture extends GT_RenderedTexture { +public class GTPPRenderedTexture extends GTRenderedTexture { - public GTPP_RenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean aAllowAlpha) { + public GTPPRenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean aAllowAlpha) { super(aIcon, aRGBa, aAllowAlpha); } - public GTPP_RenderedTexture(IIconContainer aIcon, short[] aRGBa) { + public GTPPRenderedTexture(IIconContainer aIcon, short[] aRGBa) { this(aIcon, aRGBa, true); } - public GTPP_RenderedTexture(IIconContainer aIcon) { + public GTPPRenderedTexture(IIconContainer aIcon) { this(aIcon, Dyes._NULL.mRGBa); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java index 967d3ae916..2cafd18a39 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java @@ -6,7 +6,7 @@ import java.util.List; import net.minecraft.item.ItemStack; -import gregtech.api.objects.GT_ArrayList; +import gregtech.api.objects.GTArrayList; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; @@ -14,7 +14,7 @@ public class GregtechItemData { private static final GregtechMaterialStack[] EMPTY_GT_MaterialStack_ARRAY = new GregtechMaterialStack[0]; - public final List<Object> mExtraData = new GT_ArrayList<>(false, 1); + public final List<Object> mExtraData = new GTArrayList<>(false, 1); public final GregtechOrePrefixes mPrefix; public final GregtechMaterialStack mMaterial; public final GregtechMaterialStack[] mByProducts; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPPConfig.java index 65beea207a..1a32b75bb8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPPConfig.java @@ -1,46 +1,46 @@ package gtPlusPlus.xmod.gregtech.api.util; -import static gregtech.api.enums.GT_Values.E; +import static gregtech.api.enums.GTValues.E; import net.minecraft.item.ItemStack; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; -import gregtech.api.GregTech_API; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.GregTechAPI; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; -public class GTPP_Config implements Runnable { +public class GTPPConfig implements Runnable { public static boolean troll = false; public static Configuration sConfigFileIDs; public final Configuration mConfig; - public GTPP_Config(Configuration aConfig) { + public GTPPConfig(Configuration aConfig) { mConfig = aConfig; mConfig.load(); mConfig.save(); } public static int addIDConfig(Object aCategory, String aName, int aDefault) { - if (GT_Utility.isStringInvalid(aName)) return aDefault; + if (GTUtility.isStringInvalid(aName)) return aDefault; Property tProperty = sConfigFileIDs.get( aCategory.toString() .replaceAll("\\|", "."), aName.replaceAll("\\|", "."), aDefault); int rResult = tProperty.getInt(aDefault); - if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) sConfigFileIDs.save(); + if (!tProperty.wasRead() && GregTechAPI.sPostloadFinished) sConfigFileIDs.save(); return rResult; } public static String getStackConfigName(ItemStack aStack) { - if (GT_Utility.isStackInvalid(aStack)) return E; - Object rName = GT_OreDictUnificator.getAssociation(aStack); + if (GTUtility.isStackInvalid(aStack)) return E; + Object rName = GTOreDictUnificator.getAssociation(aStack); if (rName != null) return rName.toString(); try { - if (GT_Utility.isStringValid(rName = aStack.getUnlocalizedName())) return rName.toString(); + if (GTUtility.isStringValid(rName = aStack.getUnlocalizedName())) return rName.toString(); } catch (Throwable e) { /* Do nothing */ } @@ -57,14 +57,14 @@ public class GTPP_Config implements Runnable { } public boolean get(Object aCategory, String aName, boolean aDefault) { - if (GT_Utility.isStringInvalid(aName)) return aDefault; + if (GTUtility.isStringInvalid(aName)) return aDefault; Property tProperty = mConfig.get( aCategory.toString() .replaceAll("\\|", "_"), (aName + "_" + aDefault).replaceAll("\\|", "_"), aDefault); boolean rResult = tProperty.getBoolean(aDefault); - if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) mConfig.save(); + if (!tProperty.wasRead() && GregTechAPI.sPostloadFinished) mConfig.save(); return rResult; } @@ -73,14 +73,14 @@ public class GTPP_Config implements Runnable { } public int get(Object aCategory, String aName, int aDefault) { - if (GT_Utility.isStringInvalid(aName)) return aDefault; + if (GTUtility.isStringInvalid(aName)) return aDefault; Property tProperty = mConfig.get( aCategory.toString() .replaceAll("\\|", "_"), (aName + "_" + aDefault).replaceAll("\\|", "_"), aDefault); int rResult = tProperty.getInt(aDefault); - if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) mConfig.save(); + if (!tProperty.wasRead() && GregTechAPI.sPostloadFinished) mConfig.save(); return rResult; } @@ -89,14 +89,14 @@ public class GTPP_Config implements Runnable { } public double get(Object aCategory, String aName, double aDefault) { - if (GT_Utility.isStringInvalid(aName)) return aDefault; + if (GTUtility.isStringInvalid(aName)) return aDefault; Property tProperty = mConfig.get( aCategory.toString() .replaceAll("\\|", "_"), (aName + "_" + aDefault).replaceAll("\\|", "_"), aDefault); double rResult = tProperty.getDouble(aDefault); - if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) mConfig.save(); + if (!tProperty.wasRead() && GregTechAPI.sPostloadFinished) mConfig.save(); return rResult; } @@ -105,14 +105,14 @@ public class GTPP_Config implements Runnable { } public String get(Object aCategory, String aName, String aDefault) { - if (GT_Utility.isStringInvalid(aName)) return aDefault; + if (GTUtility.isStringInvalid(aName)) return aDefault; Property tProperty = mConfig.get( aCategory.toString() .replaceAll("\\|", "_"), (aName + "_" + aDefault).replaceAll("\\|", "_"), aDefault); String rResult = tProperty.getString(); - if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) mConfig.save(); + if (!tProperty.wasRead() && GregTechAPI.sPostloadFinished) mConfig.save(); return rResult; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java index df95b7de2b..da6db942aa 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java @@ -7,7 +7,7 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; public class SpecialBehaviourTooltipHandler { @@ -22,7 +22,7 @@ public class SpecialBehaviourTooltipHandler { if (event != null) { if (event.itemStack != null) { for (ItemStack aKey : mTooltipCache.keySet()) { - if (GT_Utility.areStacksEqual(aKey, event.itemStack, false)) { + if (GTUtility.areStacksEqual(aKey, event.itemStack, false)) { String s = mTooltipCache.get(aKey); if (s != null && s.length() > 0) { event.toolTip.add(EnumChatFormatting.RED + s); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/MetaGTProxy.java index c53e217560..fbef4832e5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/MetaGTProxy.java @@ -8,7 +8,7 @@ import net.minecraftforge.fluids.FluidRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; import gregtech.api.enums.ItemList; import gregtech.api.enums.TAE; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.handler.AchievementHandler; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -18,11 +18,11 @@ import gtPlusPlus.xmod.gregtech.common.covers.CoverManager; import ic2.core.init.BlocksItems; import ic2.core.init.InternalName; -public class Meta_GT_Proxy { +public class MetaGTProxy { public static AchievementHandler mAssemblyAchievements; - public Meta_GT_Proxy() {} + public MetaGTProxy() {} public static void preInit() { fixIC2FluidNames(); @@ -54,21 +54,21 @@ public class Meta_GT_Proxy { .addStringLocalization("fluidHotWater", aNewHeatedWaterName); LanguageRegistry.instance() .addStringLocalization("ic2.fluidHotWater", aNewHeatedWaterName); - GT_LanguageManager.addStringLocalization("fluidHotWater", aNewHeatedWaterName); - GT_LanguageManager.addStringLocalization("ic2.fluidHotWater", aNewHeatedWaterName); + GTLanguageManager.addStringLocalization("fluidHotWater", aNewHeatedWaterName); + GTLanguageManager.addStringLocalization("ic2.fluidHotWater", aNewHeatedWaterName); Block b = BlocksItems.getFluidBlock(InternalName.fluidHotWater); if (b != null) { LanguageRegistry.addName(ItemUtils.getSimpleStack(b), aNewHeatedWaterName); LanguageRegistry.instance() .addStringLocalization(b.getUnlocalizedName(), aNewHeatedWaterName); - GT_LanguageManager.addStringLocalization(b.getUnlocalizedName(), aNewHeatedWaterName); + GTLanguageManager.addStringLocalization(b.getUnlocalizedName(), aNewHeatedWaterName); } Fluid f = BlocksItems.getFluid(InternalName.fluidHotWater); if (f != null) { LanguageRegistry.instance() .addStringLocalization(f.getUnlocalizedName(), aNewHeatedWaterName); - GT_LanguageManager.addStringLocalization(f.getUnlocalizedName(), aNewHeatedWaterName); + GTLanguageManager.addStringLocalization(f.getUnlocalizedName(), aNewHeatedWaterName); int aDam = FluidRegistry.getFluidID(f); ItemStack s = ItemList.Display_Fluid.getWithDamage(1, aDam); if (s != null) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java index ee0d040394..ef9274af1d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java @@ -8,10 +8,10 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.TAE; -import gregtech.api.util.GT_LanguageManager; -import gregtech.common.blocks.GT_Material_Casings; +import gregtech.api.util.GTLanguageManager; +import gregtech.common.blocks.MaterialCasings; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture; +import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture; import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler; public class GregtechMetaCasingBlocks extends GregtechMetaCasingBlocksAbstract { @@ -19,32 +19,31 @@ public class GregtechMetaCasingBlocks extends GregtechMetaCasingBlocksAbstract { CasingTextureHandler TextureHandler = new CasingTextureHandler(); public GregtechMetaCasingBlocks() { - super(GregtechMetaCasingItems.class, "miscutils.blockcasings", GT_Material_Casings.INSTANCE); + super(GregtechMetaCasingItems.class, "miscutils.blockcasings", MaterialCasings.INSTANCE); for (byte i = 0; i < 16; i = (byte) (i + 1)) { if (i == 2 || i == 3 || i == 4) { continue; } - TAE.registerTexture(0, i, new GTPP_CopiedBlockTexture(this, 6, i)); + TAE.registerTexture(0, i, new GTPPCopiedBlockTexture(this, 6, i)); } - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Centrifuge Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Structural Coke Oven Casing"); - GT_LanguageManager + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Centrifuge Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Structural Coke Oven Casing"); + GTLanguageManager .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Heat Resistant Coke Oven Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Heat Proof Coke Oven Casing"); // 60 - GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Material Press Machine Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Electrolyzer Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Wire Factory Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Maceration Stack Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Matter Generation Coil"); // 65 - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Matter Fabricator Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Iron Plated Bricks"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Multitank Exterior Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Hastelloy-N Reactor Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Zeron-100 Reactor Shielding"); - GT_LanguageManager + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Heat Proof Coke Oven Casing"); // 60 + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Material Press Machine Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Electrolyzer Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Wire Factory Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Maceration Stack Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Matter Generation Coil"); // 65 + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Matter Fabricator Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Iron Plated Bricks"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Multitank Exterior Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Hastelloy-N Reactor Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Zeron-100 Reactor Shielding"); + GTLanguageManager .addStringLocalization(this.getUnlocalizedName() + ".14.name", "Blast Smelter Heat Containment Coil "); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Blast Smelter Casing Block"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Blast Smelter Casing Block"); GregtechItemList.Casing_Centrifuge1.set(new ItemStack(this, 1, 0)); GregtechItemList.Casing_CokeOven.set(new ItemStack(this, 1, 1)); GregtechItemList.Casing_CokeOven_Coil1.set(new ItemStack(this, 1, 2)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java index 9d53c281a2..eefc983e21 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java @@ -10,11 +10,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import gregtech.api.enums.TAE; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; -import gregtech.common.blocks.GT_Material_Casings; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; +import gregtech.common.blocks.MaterialCasings; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture; +import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture; import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler2; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage.GregtechMetaTileEntity_PowerSubStationController; @@ -53,38 +53,38 @@ public class GregtechMetaCasingBlocks2 extends GregtechMetaCasingBlocksAbstract int tier = GregtechMetaTileEntity_PowerSubStationController.getCellTier(field_150939_a, meta); if (meta == 7 && tier > 0) { long capacity = GregtechMetaTileEntity_PowerSubStationController.getCapacityFromCellTier(tier); - aList.add("Energy Storage: " + GT_Utility.formatNumbers(capacity)); + aList.add("Energy Storage: " + GTUtility.formatNumbers(capacity)); } super.addInformation(aStack, aPlayer, aList, aF3_H); } } public GregtechMetaCasingBlocks2() { - super(GregtechMetaCasingItemBlocks2.class, "gtplusplus.blockcasings.2", GT_Material_Casings.INSTANCE); + super(GregtechMetaCasingItemBlocks2.class, "gtplusplus.blockcasings.2", MaterialCasings.INSTANCE); for (byte i = 0; i < 16; i = (byte) (i + 1)) { if (i == 4 || i == 10 || i == 11 || i == 12 || i == 14) { continue; } - TAE.registerTexture(1, i, new GTPP_CopiedBlockTexture(this, 6, i)); + TAE.registerTexture(1, i, new GTPPCopiedBlockTexture(this, 6, i)); } - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Thermal Processing Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Hastelloy-N Sealant Block"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Hastelloy-X Structural Block"); - GT_LanguageManager + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Thermal Processing Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Hastelloy-N Sealant Block"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Hastelloy-X Structural Block"); + GTLanguageManager .addStringLocalization(this.getUnlocalizedName() + ".3.name", "Incoloy-DS Fluid Containment Block"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Wash Plant Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Industrial Sieve Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Large Sieve Grate"); - GT_LanguageManager + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Wash Plant Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Industrial Sieve Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Large Sieve Grate"); + GTLanguageManager .addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (EV)"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Sub-Station External Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Cyclotron Coil"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Cyclotron Outer Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Thermal Containment Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Bulk Production Frame"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Cutting Factory Frame"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Sub-Station External Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Cyclotron Coil"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Cyclotron Outer Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Thermal Containment Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Bulk Production Frame"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Cutting Factory Frame"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Sterile Farm Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Sterile Farm Casing"); GregtechItemList.Casing_ThermalCentrifuge.set(new ItemStack(this, 1, 0)); GregtechItemList.Casing_Refinery_External.set(new ItemStack(this, 1, 1)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java index 76fb077de1..0a5399efdc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java @@ -11,11 +11,11 @@ import net.minecraft.world.IBlockAccess; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.TAE; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; -import gregtech.common.blocks.GT_Material_Casings; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; +import gregtech.common.blocks.MaterialCasings; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture; +import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture; import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler3; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage.GregtechMetaTileEntity_PowerSubStationController; @@ -37,46 +37,45 @@ public class GregtechMetaCasingBlocks3 extends GregtechMetaCasingBlocksAbstract int tier = GregtechMetaTileEntity_PowerSubStationController.getCellTier(field_150939_a, meta); if (tier > 0) { long capacity = GregtechMetaTileEntity_PowerSubStationController.getCapacityFromCellTier(tier); - aList.add("Energy Storage: " + GT_Utility.formatNumbers(capacity)); + aList.add("Energy Storage: " + GTUtility.formatNumbers(capacity)); } super.addInformation(aStack, aPlayer, aList, aF3_H); } } public GregtechMetaCasingBlocks3() { - super(GregtechMetaCasingItemBlocks3.class, "gtplusplus.blockcasings.3", GT_Material_Casings.INSTANCE); + super(GregtechMetaCasingItemBlocks3.class, "gtplusplus.blockcasings.3", MaterialCasings.INSTANCE); for (byte i = 0; i < 16; i = (byte) (i + 1)) { // Free up Redox casing in TAE if (i >= 4 && i <= 8) { continue; } - TAE.registerTexture(2, i, new GTPP_CopiedBlockTexture(this, 6, i)); + TAE.registerTexture(2, i, new GTPPCopiedBlockTexture(this, 6, i)); } - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Aquatic Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Inconel Reinforced Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Multi-Use Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Trinium Plated Casing"); - GT_LanguageManager + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Aquatic Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Inconel Reinforced Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Multi-Use Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Trinium Plated Casing"); + GTLanguageManager .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Vanadium Redox Power Cell (IV)"); - GT_LanguageManager + GTLanguageManager .addStringLocalization(this.getUnlocalizedName() + ".5.name", "Vanadium Redox Power Cell (LuV)"); - GT_LanguageManager + GTLanguageManager .addStringLocalization(this.getUnlocalizedName() + ".6.name", "Vanadium Redox Power Cell (ZPM)"); - GT_LanguageManager + GTLanguageManager .addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (UV)"); - GT_LanguageManager + GTLanguageManager .addStringLocalization(this.getUnlocalizedName() + ".8.name", "Vanadium Redox Power Cell (UHV)"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Supply Depot Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Advanced Cryogenic Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Volcanus Casing"); - GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".12.name", "Fusion Machine Casing MK III"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Advanced Fusion Coil"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "Unnamed"); // Can Use, don't - // change texture - // (Used for Fusion - // MK4) - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Containment Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Supply Depot Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Advanced Cryogenic Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Volcanus Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Fusion Machine Casing MK III"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Advanced Fusion Coil"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "Unnamed"); // Can Use, don't + // change texture + // (Used for Fusion + // MK4) + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Containment Casing"); GregtechItemList.Casing_FishPond.set(new ItemStack(this, 1, 0)); GregtechItemList.Casing_Extruder.set(new ItemStack(this, 1, 1)); GregtechItemList.Casing_Multi_Use.set(new ItemStack(this, 1, 2)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java index a150d7e828..d68653e73a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java @@ -9,30 +9,30 @@ import net.minecraft.util.IIcon; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; -import gregtech.api.util.GT_LanguageManager; -import gregtech.common.blocks.GT_Material_Casings; +import gregtech.api.util.GTLanguageManager; +import gregtech.common.blocks.MaterialCasings; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture; +import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public class GregtechMetaCasingBlocks4 extends GregtechMetaCasingBlocksAbstract { public GregtechMetaCasingBlocks4() { - super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.4", GT_Material_Casings.INSTANCE); + super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.4", MaterialCasings.INSTANCE); for (byte i = 0; i < 16; i = (byte) (i + 1)) { if (i == 2 || i == 4 || i == 5 || i == 6 || i == 7 || i == 8 || i == 12 || i == 13 || i == 14 || i == 15) { continue; } - TAE.registerTexture(3, i, new GTPP_CopiedBlockTexture(this, 6, i)); + TAE.registerTexture(3, i, new GTPPCopiedBlockTexture(this, 6, i)); } - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Naquadah Reactor Base"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Reactor Piping"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Naquadah Containment Chamber"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Tempered Arc Furnace Casing"); - GT_LanguageManager + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Naquadah Reactor Base"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Reactor Piping"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Naquadah Containment Chamber"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Tempered Arc Furnace Casing"); + GTLanguageManager .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Quantum Force Transformer Coil Casings"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Vacuum Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Turbodyne Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Vacuum Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Turbodyne Casing"); GregtechItemList.Casing_Naq_Reactor_A.set(new ItemStack(this, 1, 0)); GregtechItemList.Casing_Naq_Reactor_B.set(new ItemStack(this, 1, 1)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java index cc573cd188..afe195d7aa 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java @@ -8,10 +8,10 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; -import gregtech.api.util.GT_LanguageManager; -import gregtech.common.blocks.GT_Material_Casings; +import gregtech.api.util.GTLanguageManager; +import gregtech.common.blocks.MaterialCasings; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture; +import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGrinderMultiblock; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -23,37 +23,36 @@ public class GregtechMetaCasingBlocks5 extends GregtechMetaCasingBlocksAbstract private static final TexturesGrinderMultiblock mGrinderOverlayHandler = new TexturesGrinderMultiblock(); public GregtechMetaCasingBlocks5() { - super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.5", GT_Material_Casings.INSTANCE); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "IsaMill Exterior Casing"); // IsaMill - // Casing - TAE.registerTexture(0, 2, new GTPP_CopiedBlockTexture(this, 6, 0)); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "IsaMill Piping"); // IsaMill - // Pipe - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "IsaMill Gearbox"); // IsaMill - // Gearbox - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Elemental Confinement Shell"); // Duplicator + super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.5", MaterialCasings.INSTANCE); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "IsaMill Exterior Casing"); // IsaMill + // Casing + TAE.registerTexture(0, 2, new GTPPCopiedBlockTexture(this, 6, 0)); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "IsaMill Piping"); // IsaMill + // Pipe + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "IsaMill Gearbox"); // IsaMill + // Gearbox + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Elemental Confinement Shell"); // Duplicator + // Casing + TAE.registerTexture(0, 3, new GTPPCopiedBlockTexture(this, 6, 3)); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Sparge Tower Exterior Casing"); // Sparge + // Tower // Casing - TAE.registerTexture(0, 3, new GTPP_CopiedBlockTexture(this, 6, 3)); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Sparge Tower Exterior Casing"); // Sparge - // Tower - // Casing - TAE.registerTexture(0, 4, new GTPP_CopiedBlockTexture(this, 6, 4)); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Sturdy Printer Casing"); // Unused - TAE.registerTexture(1, 10, new GTPP_CopiedBlockTexture(this, 6, 5)); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Forge Casing"); // Forge Hammer - // Casing - TAE.registerTexture(1, 11, new GTPP_CopiedBlockTexture(this, 6, 6)); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Neutron Pulse Manipulator"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Cosmic Fabric Manipulator"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Infinity Infused Manipulator"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "SpaceTime Continuum Ripper"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Neutron Shielding Core"); - GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".12.name", "Cosmic Fabric Shielding Core"); - GT_LanguageManager + TAE.registerTexture(0, 4, new GTPPCopiedBlockTexture(this, 6, 4)); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Sturdy Printer Casing"); // Unused + TAE.registerTexture(1, 10, new GTPPCopiedBlockTexture(this, 6, 5)); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Forge Casing"); // Forge Hammer + // Casing + TAE.registerTexture(1, 11, new GTPPCopiedBlockTexture(this, 6, 6)); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Neutron Pulse Manipulator"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Cosmic Fabric Manipulator"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Infinity Infused Manipulator"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "SpaceTime Continuum Ripper"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Neutron Shielding Core"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Cosmic Fabric Shielding Core"); + GTLanguageManager .addStringLocalization(this.getUnlocalizedName() + ".13.name", "Infinity Infused Shielding Core"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "SpaceTime Bending Core"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Force Field Glass"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "SpaceTime Bending Core"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Force Field Glass"); GregtechItemList.Casing_IsaMill_Casing.set(new ItemStack(this, 1, 0)); GregtechItemList.Casing_IsaMill_Pipe.set(new ItemStack(this, 1, 1)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks6.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks6.java index d257078461..c51d6e6afd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks6.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks6.java @@ -13,10 +13,10 @@ import net.minecraft.world.IBlockAccess; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.TAE; -import gregtech.api.util.GT_LanguageManager; -import gregtech.common.blocks.GT_Material_Casings; +import gregtech.api.util.GTLanguageManager; +import gregtech.common.blocks.MaterialCasings; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture; +import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture; import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler6; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -45,13 +45,13 @@ public class GregtechMetaCasingBlocks6 extends GregtechMetaCasingBlocksAbstract } public GregtechMetaCasingBlocks6() { - super(GregtechMetaCasingItemBlocks3.class, "gtplusplus.blockcasings.6", GT_Material_Casings.INSTANCE); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Fusion Machine Casing MK IV"); - TAE.registerTexture(3, 4, new GTPP_CopiedBlockTexture(this, 6, 0)); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Advanced Fusion Coil II"); - TAE.registerTexture(3, 5, new GTPP_CopiedBlockTexture(this, 6, 1)); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Unnamed"); - TAE.registerTexture(3, 6, new GTPP_CopiedBlockTexture(this, 6, 2)); + super(GregtechMetaCasingItemBlocks3.class, "gtplusplus.blockcasings.6", MaterialCasings.INSTANCE); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Fusion Machine Casing MK IV"); + TAE.registerTexture(3, 4, new GTPPCopiedBlockTexture(this, 6, 0)); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Advanced Fusion Coil II"); + TAE.registerTexture(3, 5, new GTPPCopiedBlockTexture(this, 6, 1)); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Unnamed"); + TAE.registerTexture(3, 6, new GTPPCopiedBlockTexture(this, 6, 2)); GregtechItemList.Casing_Fusion_External2.set(new ItemStack(this, 1, 0)); GregtechItemList.Casing_Fusion_Internal2.set(new ItemStack(this, 1, 1)); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java index 79d9e2c458..f286b4d628 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java @@ -19,20 +19,20 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; -import gregtech.api.util.GT_LanguageManager; -import gregtech.common.blocks.GT_Block_Casings_Abstract; +import gregtech.api.GregTechAPI; +import gregtech.api.util.GTLanguageManager; +import gregtech.common.blocks.BlockCasingsAbstract; import gtPlusPlus.core.creative.AddToCreativeTab; -public abstract class GregtechMetaCasingBlocksAbstract extends GT_Block_Casings_Abstract { +public abstract class GregtechMetaCasingBlocksAbstract extends BlockCasingsAbstract { public GregtechMetaCasingBlocksAbstract(final Class<? extends ItemBlock> aItemClass, final String aName, final Material aMaterial) { super(aItemClass, aName, aMaterial); this.setStepSound(soundTypeMetal); this.setCreativeTab(AddToCreativeTab.tabMachines); - GregTech_API.registerMachineBlock(this, -1); - GT_LanguageManager + GregTechAPI.registerMachineBlock(this, -1); + GTLanguageManager .addStringLocalization(this.getUnlocalizedName() + "." + 32767 + ".name", "Any Sub Block of this"); } @@ -63,8 +63,8 @@ public abstract class GregtechMetaCasingBlocksAbstract extends GT_Block_Casings_ @Override public void onBlockAdded(final World aWorld, final int aX, final int aY, final int aZ) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { - GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + if (GregTechAPI.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ); } } @@ -106,8 +106,8 @@ public abstract class GregtechMetaCasingBlocksAbstract extends GT_Block_Casings_ @Override public void breakBlock(final World aWorld, final int aX, final int aY, final int aZ, final Block aBlock, final int aMetaData) { - if (GregTech_API.isMachineBlock(this, aMetaData)) { - GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + if (GregTechAPI.isMachineBlock(this, aMetaData)) { + GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java index ad2b11f924..32f1f127d0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java @@ -8,9 +8,9 @@ import net.minecraft.world.IBlockAccess; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; -import gregtech.api.util.GT_LanguageManager; -import gregtech.common.blocks.GT_Material_Casings; -import gtPlusPlus.core.material.ALLOY; +import gregtech.api.util.GTLanguageManager; +import gregtech.common.blocks.MaterialCasings; +import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public class GregtechMetaCasingBlocksPipeGearbox extends GregtechMetaCasingBlocksAbstract { @@ -18,42 +18,41 @@ public class GregtechMetaCasingBlocksPipeGearbox extends GregtechMetaCasingBlock private static HashMap<Integer, Integer> sMaterialMapping = new HashMap<>(); public GregtechMetaCasingBlocksPipeGearbox() { - super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.pipesgears", GT_Material_Casings.INSTANCE); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Eglin Steel Gear Box Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Inconel-792 Gear Box Casing"); - GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Incoloy MA956 Gear Box Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Nitinol-60 Gear Box Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Zeron-100 Gear Box Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Pikyonium Gear Box Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Titansteel Gear Box Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Abyssal Gear Box Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Babbit Alloy Pipe Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Inconel-690 Pipe Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Stellite Pipe Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Nitinol-60 Pipe Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Lafium Pipe Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Cinobite Pipe Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "Titansteel Pipe Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Abyssal Pipe Casing"); + super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.pipesgears", MaterialCasings.INSTANCE); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Eglin Steel Gear Box Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Inconel-792 Gear Box Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Incoloy MA956 Gear Box Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Nitinol-60 Gear Box Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Zeron-100 Gear Box Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Pikyonium Gear Box Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Titansteel Gear Box Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Abyssal Gear Box Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Babbit Alloy Pipe Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Inconel-690 Pipe Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Stellite Pipe Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Nitinol-60 Pipe Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Lafium Pipe Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Cinobite Pipe Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "Titansteel Pipe Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Abyssal Pipe Casing"); int aMappingID = 0; - sMaterialMapping.put(aMappingID++, ALLOY.EGLIN_STEEL.getRgbAsHex()); - sMaterialMapping.put(aMappingID++, ALLOY.INCONEL_792.getRgbAsHex()); - sMaterialMapping.put(aMappingID++, ALLOY.INCOLOY_MA956.getRgbAsHex()); - sMaterialMapping.put(aMappingID++, ALLOY.NITINOL_60.getRgbAsHex()); - sMaterialMapping.put(aMappingID++, ALLOY.ZERON_100.getRgbAsHex()); - sMaterialMapping.put(aMappingID++, ALLOY.PIKYONIUM.getRgbAsHex()); - sMaterialMapping.put(aMappingID++, ALLOY.TITANSTEEL.getRgbAsHex()); - sMaterialMapping.put(aMappingID++, ALLOY.ABYSSAL.getRgbAsHex()); - sMaterialMapping.put(aMappingID++, ALLOY.BABBIT_ALLOY.getRgbAsHex()); - sMaterialMapping.put(aMappingID++, ALLOY.INCONEL_690.getRgbAsHex()); - sMaterialMapping.put(aMappingID++, ALLOY.STELLITE.getRgbAsHex()); - sMaterialMapping.put(aMappingID++, ALLOY.NITINOL_60.getRgbAsHex()); - sMaterialMapping.put(aMappingID++, ALLOY.LAFIUM.getRgbAsHex()); - sMaterialMapping.put(aMappingID++, ALLOY.CINOBITE.getRgbAsHex()); - sMaterialMapping.put(aMappingID++, ALLOY.TITANSTEEL.getRgbAsHex()); - sMaterialMapping.put(aMappingID++, ALLOY.ABYSSAL.getRgbAsHex()); + sMaterialMapping.put(aMappingID++, MaterialsAlloy.EGLIN_STEEL.getRgbAsHex()); + sMaterialMapping.put(aMappingID++, MaterialsAlloy.INCONEL_792.getRgbAsHex()); + sMaterialMapping.put(aMappingID++, MaterialsAlloy.INCOLOY_MA956.getRgbAsHex()); + sMaterialMapping.put(aMappingID++, MaterialsAlloy.NITINOL_60.getRgbAsHex()); + sMaterialMapping.put(aMappingID++, MaterialsAlloy.ZERON_100.getRgbAsHex()); + sMaterialMapping.put(aMappingID++, MaterialsAlloy.PIKYONIUM.getRgbAsHex()); + sMaterialMapping.put(aMappingID++, MaterialsAlloy.TITANSTEEL.getRgbAsHex()); + sMaterialMapping.put(aMappingID++, MaterialsAlloy.ABYSSAL.getRgbAsHex()); + sMaterialMapping.put(aMappingID++, MaterialsAlloy.BABBIT_ALLOY.getRgbAsHex()); + sMaterialMapping.put(aMappingID++, MaterialsAlloy.INCONEL_690.getRgbAsHex()); + sMaterialMapping.put(aMappingID++, MaterialsAlloy.STELLITE.getRgbAsHex()); + sMaterialMapping.put(aMappingID++, MaterialsAlloy.NITINOL_60.getRgbAsHex()); + sMaterialMapping.put(aMappingID++, MaterialsAlloy.LAFIUM.getRgbAsHex()); + sMaterialMapping.put(aMappingID++, MaterialsAlloy.CINOBITE.getRgbAsHex()); + sMaterialMapping.put(aMappingID++, MaterialsAlloy.TITANSTEEL.getRgbAsHex()); + sMaterialMapping.put(aMappingID++, MaterialsAlloy.ABYSSAL.getRgbAsHex()); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java index 23d9ab5007..a432212670 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java @@ -7,21 +7,21 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; public abstract class GregtechMetaItemCasingsAbstract extends ItemBlock { - protected final String mCasing_Centrifuge = GT_LanguageManager + protected final String mCasing_Centrifuge = GTLanguageManager .addStringLocalization("mu.centrifugecasing", "Warning! Standing in the Centrifuge not recommended"); - protected final String mCasing_CokeOven = GT_LanguageManager + protected final String mCasing_CokeOven = GTLanguageManager .addStringLocalization("mu.cokeoven", "Sturdy and Strong"); - protected final String mCasing_CokeCoil1 = GT_LanguageManager + protected final String mCasing_CokeCoil1 = GTLanguageManager .addStringLocalization("mu.coil01tooltip", "Base Heating Capacity = 1350 Kelvin"); - protected final String mCasing_CokeCoil2 = GT_LanguageManager + protected final String mCasing_CokeCoil2 = GTLanguageManager .addStringLocalization("mu.coil02tooltip", "Base Heating Capacity = 2275 Kelvin"); - protected final String mNoMobsToolTip = GT_LanguageManager + protected final String mNoMobsToolTip = GTLanguageManager .addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block"); - protected final String mNoTileEntityToolTip = GT_LanguageManager + protected final String mNoTileEntityToolTip = GTLanguageManager .addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!"); public GregtechMetaItemCasingsAbstract(final Block par1) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java index 473c13f3da..7c65de73bd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java @@ -11,10 +11,10 @@ import net.minecraft.util.IIcon; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; -import gregtech.api.util.GT_LanguageManager; -import gregtech.common.blocks.GT_Material_Casings; +import gregtech.api.util.GTLanguageManager; +import gregtech.common.blocks.MaterialCasings; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture; +import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public class GregtechMetaSpecialMachineCasings extends GregtechMetaCasingBlocksAbstract { @@ -43,19 +43,18 @@ public class GregtechMetaSpecialMachineCasings extends GregtechMetaCasingBlocksA } public GregtechMetaSpecialMachineCasings() { - super(SpecialCasingItemBlock.class, "gtplusplus.blockspecialcasings.2", GT_Material_Casings.INSTANCE); + super(SpecialCasingItemBlock.class, "gtplusplus.blockspecialcasings.2", MaterialCasings.INSTANCE); for (byte i = 0; i < 16; i = (byte) (i + 1)) { // TAE.registerTextures(new GT_CopiedBlockTexture(this, 6, i)); // Don't register these Textures, They already exist within vanilla GT. (May not exist in 5.08) } - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Strong Bronze Machine Casing"); - GT_LanguageManager + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Strong Bronze Machine Casing"); + GTLanguageManager .addStringLocalization(this.getUnlocalizedName() + ".1.name", "Sturdy Aluminium Machine Casing"); - GT_LanguageManager + GTLanguageManager .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Vigorous Laurenium Machine Casing"); - TAE.registerTexture(84, new GTPP_CopiedBlockTexture(this, 6, 2)); - GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".3.name", "Rugged Botmium Machine Casing"); + TAE.registerTexture(84, new GTPPCopiedBlockTexture(this, 6, 2)); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Rugged Botmium Machine Casing"); GregtechItemList.Casing_Machine_Custom_1.set(new ItemStack(this, 1, 0)); GregtechItemList.Casing_Machine_Custom_2.set(new ItemStack(this, 1, 1)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java index 1d7c853e71..dba95455c8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java @@ -13,10 +13,10 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; -import gregtech.api.util.GT_LanguageManager; -import gregtech.common.blocks.GT_Material_Casings; +import gregtech.api.util.GTLanguageManager; +import gregtech.common.blocks.MaterialCasings; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture; +import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.blocks.textures.turbine.LargeTurbineTextureHandler; @@ -39,32 +39,29 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs } public GregtechMetaSpecialMultiCasings() { - super(SpecialCasingItemBlock.class, "gtplusplus.blockspecialcasings.1", GT_Material_Casings.INSTANCE); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Turbine Shaft"); - GT_LanguageManager + super(SpecialCasingItemBlock.class, "gtplusplus.blockspecialcasings.1", MaterialCasings.INSTANCE); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Turbine Shaft"); + GTLanguageManager .addStringLocalization(this.getUnlocalizedName() + ".1.name", "Reinforced Steam Turbine Casing"); - GT_LanguageManager + GTLanguageManager .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Reinforced HP Steam Turbine Casing"); - GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".3.name", "Reinforced Gas Turbine Casing"); - GT_LanguageManager + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Reinforced Gas Turbine Casing"); + GTLanguageManager .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Reinforced Plasma Turbine Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Tesla Containment Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Structural Solar Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Salt Containment Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Thermally Insulated Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Flotation Cell Casings"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Reinforced Engine Casing"); - GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".11.name", "Molecular Containment Casing"); - GT_LanguageManager + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Tesla Containment Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Structural Solar Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Salt Containment Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Thermally Insulated Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Flotation Cell Casings"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Reinforced Engine Casing"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Molecular Containment Casing"); + GTLanguageManager .addStringLocalization(this.getUnlocalizedName() + ".12.name", "High Voltage Current Capacitor"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Particle Containment Casing"); - GT_LanguageManager + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Particle Containment Casing"); + GTLanguageManager .addStringLocalization(this.getUnlocalizedName() + ".14.name", "Reinforced Heat Exchanger Casing"); - GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".15.name", "Reinforced SC Turbine Casing"); - TAE.registerTexture(1, 12, new GTPP_CopiedBlockTexture(this, 6, 14)); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Reinforced SC Turbine Casing"); + TAE.registerTexture(1, 12, new GTPPCopiedBlockTexture(this, 6, 14)); GregtechItemList.Casing_Turbine_Shaft.set(new ItemStack(this, 1, 0)); GregtechItemList.Casing_Turbine_LP.set(new ItemStack(this, 1, 1)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java index 9a2912c2c5..4f34811289 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java @@ -13,8 +13,8 @@ import net.minecraft.world.IBlockAccess; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; -import gregtech.api.util.GT_LanguageManager; -import gregtech.common.blocks.GT_Material_Casings; +import gregtech.api.util.GTLanguageManager; +import gregtech.common.blocks.MaterialCasings; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -47,19 +47,19 @@ public class GregtechMetaSpecialMultiCasings2 extends GregtechMetaCasingBlocksAb } public GregtechMetaSpecialMultiCasings2() { - super(SpecialCasingItemBlock.class, "gtplusplus.blockspecialcasings.3", GT_Material_Casings.INSTANCE); + super(SpecialCasingItemBlock.class, "gtplusplus.blockspecialcasings.3", MaterialCasings.INSTANCE); for (byte i = 0; i < 16; i = (byte) (i + 1)) { // TAE.registerTextures(new GT_CopiedBlockTexture(this, 6, i)); // Don't register these Textures, They already exist within vanilla GT. (May not exist in 5.08) } - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Resonance Chamber I"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Resonance Chamber II"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Resonance Chamber III"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Resonance Chamber IV"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Modulator I"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Modulator II"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Modulator III"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Modulator IV"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Resonance Chamber I"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Resonance Chamber II"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Resonance Chamber III"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Resonance Chamber IV"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Modulator I"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Modulator II"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Modulator III"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Modulator IV"); GregtechItemList.ResonanceChamber_I.set(new ItemStack(this, 1, 0)); GregtechItemList.ResonanceChamber_II.set(new ItemStack(this, 1, 1)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java index 7ddab1c471..50780c5809 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java @@ -9,10 +9,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Textures; -import gregtech.api.util.GT_LanguageManager; -import gregtech.common.blocks.GT_Material_Casings; +import gregtech.api.util.GTLanguageManager; +import gregtech.common.blocks.MaterialCasings; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -35,24 +35,24 @@ public class GregtechMetaTieredCasingBlocks1 extends GregtechMetaCasingBlocksAbs public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { int aMeta = aStack.getItemDamage(); if (aMeta < 10) { - aList.add("Tier: " + GT_Values.VN[aMeta]); + aList.add("Tier: " + GTValues.VN[aMeta]); } super.addInformation(aStack, aPlayer, aList, aF3_H); } } public GregtechMetaTieredCasingBlocks1() { - super(TieredCasingItemBlock.class, "gtplusplus.blocktieredcasings.1", GT_Material_Casings.INSTANCE); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Integral Encasement I"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Integral Encasement II"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Integral Encasement III"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Integral Encasement IV"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Integral Encasement V"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Integral Framework I"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Integral Framework II"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Integral Framework III"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Integral Framework IV"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Integral Framework V"); + super(TieredCasingItemBlock.class, "gtplusplus.blocktieredcasings.1", MaterialCasings.INSTANCE); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Integral Encasement I"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Integral Encasement II"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Integral Encasement III"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Integral Encasement IV"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Integral Encasement V"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Integral Framework I"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Integral Framework II"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Integral Framework III"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Integral Framework IV"); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Integral Framework V"); GregtechItemList.GTPP_Casing_ULV.set(new ItemStack(this, 1, 0)); GregtechItemList.GTPP_Casing_LV.set(new ItemStack(this, 1, 1)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java index 30658ab6ef..0f1c39d28e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java @@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -28,7 +28,7 @@ public class GregtechFluidHandler { GT_Materials.Cryotheum, 4, 5, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Cryotheum, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, GT_Materials.Cryotheum, 1L), ItemUtils.getEmptyCell(), 1000); } @@ -39,7 +39,7 @@ public class GregtechFluidHandler { GT_Materials.Pyrotheum, 4, 4000, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Pyrotheum, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, GT_Materials.Pyrotheum, 1L), ItemUtils.getEmptyCell(), 1000); } @@ -50,7 +50,7 @@ public class GregtechFluidHandler { GT_Materials.Ender, 4, 4000, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Ender, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, GT_Materials.Ender, 1L), ItemUtils.getEmptyCell(), 1000); } @@ -62,7 +62,7 @@ public class GregtechFluidHandler { GT_Materials.HydrofluoricAcid, 1, 120, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrofluoricAcid, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrofluoricAcid, 1L), ItemUtils.getEmptyCell(), 1000, false); @@ -80,7 +80,7 @@ public class GregtechFluidHandler { GT_Materials.SulfurousAcid, 4, 75, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfurousAcid, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfurousAcid, 1L), ItemUtils.getEmptyCell(), 1000, false); @@ -92,7 +92,7 @@ public class GregtechFluidHandler { GT_Materials.SulfuricApatite, 4, 500, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricApatite, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricApatite, 1L), ItemUtils.getEmptyCell(), 1000, false); @@ -106,7 +106,7 @@ public class GregtechFluidHandler { GT_Materials.HydrogenChloride, 4, 75, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrogenChloride, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrogenChloride, 1L), ItemUtils.getEmptyCell(), 1000, false); @@ -119,7 +119,7 @@ public class GregtechFluidHandler { GT_Materials.SulfuricLithium, 4, 280, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricLithium, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricLithium, 1L), ItemUtils.getEmptyCell(), 1000, false); @@ -131,7 +131,7 @@ public class GregtechFluidHandler { GT_Materials.LithiumHydroxide, 4, 500, - GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.LithiumHydroxide, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, GT_Materials.LithiumHydroxide, 1L), ItemUtils.getEmptyCell(), 1000, false); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java index 058d2a7f1e..f4d3d22aba 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java @@ -9,7 +9,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialCentrifuge; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialCentrifuge; public class TexturesCentrifugeMultiblock { @@ -67,8 +67,8 @@ public class TexturesCentrifugeMultiblock { ForgeDirection side) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (!(tTileEntity instanceof IGregTechTileEntity tTile)) return 0; - if (tTile.getMetaTileEntity() instanceof GregtechMetaTileEntity_IndustrialCentrifuge - && tTile.getFrontFacing() == side) return tTile.isActive() ? 1 : 2; + if (tTile.getMetaTileEntity() instanceof MTEIndustrialCentrifuge && tTile.getFrontFacing() == side) + return tTile.isActive() ? 1 : 2; return 0; } @@ -133,8 +133,8 @@ public class TexturesCentrifugeMultiblock { public boolean isUsingAnimatedTexture(IMetaTileEntity aMetaTileEntity) { if (aMetaTileEntity != null) { - if (aMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge) { - return ((GregtechMetaTileEntity_IndustrialCentrifuge) aMetaTileEntity).usingAnimations(); + if (aMetaTileEntity instanceof MTEIndustrialCentrifuge) { + return ((MTEIndustrialCentrifuge) aMetaTileEntity).usingAnimations(); } } return false; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java index e7d09bd308..128e9c95d7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java @@ -9,7 +9,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks5; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IsaMill; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIsaMill; public class TexturesGrinderMultiblock { @@ -61,7 +61,7 @@ public class TexturesGrinderMultiblock { private static int isIsaControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection side) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (!(tTileEntity instanceof IGregTechTileEntity tTile)) return 0; - if (tTile.getMetaTileEntity() instanceof GregtechMetaTileEntity_IsaMill && tTile.getFrontFacing() == side) + if (tTile.getMetaTileEntity() instanceof MTEIsaMill && tTile.getFrontFacing() == side) return tTile.isActive() ? 1 : 2; return 0; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java index 7b58e35a68..57d01bcc5f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java @@ -6,17 +6,17 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.objects.GTRenderedTexture; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; public class TexturesGtBlock { - private static final boolean mAnimated = CORE.ConfigSwitches.enableAnimatedTextures; + private static final boolean mAnimated = GTPPCore.ConfigSwitches.enableAnimatedTextures; private static final AutoMap<Runnable> mCustomiconMap = new AutoMap<>(); /* @@ -38,7 +38,7 @@ public class TexturesGtBlock { this.mModID = aModID; mCustomiconMap.put(this); Logger.WARNING("Constructing a Custom Texture. " + this.mIconName); - GregTech_API.sGTBlockIconload.add(this); + GregTechAPI.sGTBlockIconload.add(this); } @Override @@ -53,7 +53,7 @@ public class TexturesGtBlock { @Override public void run() { - this.mIcon = GregTech_API.sBlockIcons.registerIcon(this.mModID + ":" + this.mIconName); + this.mIcon = GregTechAPI.sBlockIcons.registerIcon(this.mModID + ":" + this.mIconName); Logger.WARNING( "FIND ME _ Processing texture: " + this.getTextureFile() .getResourcePath()); @@ -565,16 +565,16 @@ public class TexturesGtBlock { public static final CustomIcon TEXTURE_TECH_PANEL_H = new CustomIcon("metro/TEXTURE_TECH_PANEL_H"); public static ITexture[] OVERLAYS_ENERGY_OUT_MULTI_BUFFER = new ITexture[] { - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 255, 100, 0, 0 }), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 255, 255, 30, 0 }), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 128, 128, 128, 0 }), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }) }; + new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }), + new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }), + new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 255, 100, 0, 0 }), + new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 255, 255, 30, 0 }), + new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 128, 128, 128, 0 }), + new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), + new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), + new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), + new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }), + new GTRenderedTexture(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }) }; public static IIconContainer[] CONNECTED_FUSION_HULLS = new IIconContainer[] { TEXTURE_CASING_FUSION_COIL_II_1, TEXTURE_CASING_FUSION_COIL_II_2, TEXTURE_CASING_FUSION_COIL_II_3, TEXTURE_CASING_FUSION_COIL_II_4, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java index a9f74cd75d..bf16555e4f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java @@ -6,7 +6,7 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.interfaces.IIconContainer; import gtPlusPlus.api.objects.Logger; @@ -23,7 +23,7 @@ public final class TexturesGtTools { public CustomIcon(final String aIconName) { this.mIconName = aIconName; Logger.INFO("Constructing a Custom Texture. " + this.mIconName); - GregTech_API.sGTItemIconload.add(this); + GregTechAPI.sGTItemIconload.add(this); } @Override @@ -38,9 +38,9 @@ public final class TexturesGtTools { @Override public void run() { - this.mIcon = GregTech_API.sItemIcons.registerIcon(GTPlusPlus.ID + ":" + this.mIconName); + this.mIcon = GregTechAPI.sItemIcons.registerIcon(GTPlusPlus.ID + ":" + this.mIconName); // Utils.LOG_INFO("Registering a Custom Texture. "+mIcon.g); - this.mOverlay = GregTech_API.sItemIcons.registerIcon(GTPlusPlus.ID + ":" + this.mIconName + "_OVERLAY"); + this.mOverlay = GregTechAPI.sItemIcons.registerIcon(GTPlusPlus.ID + ":" + this.mIconName + "_OVERLAY"); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java index c983044319..dea287fde6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java @@ -98,7 +98,7 @@ import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Turbine; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchTurbine; import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaSpecialMultiCasings; public class LargeTurbineTextureHandler { @@ -206,7 +206,7 @@ public class LargeTurbineTextureHandler { && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { + && ((tMetaTileEntity instanceof MTEHatchTurbine))) { if (isUsingAnimatedTexture(tTileEntity)) { return mGetCurrentTextureSet_ACTIVE[0]; } @@ -217,7 +217,7 @@ public class LargeTurbineTextureHandler { && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { + && ((tMetaTileEntity instanceof MTEHatchTurbine))) { if (isUsingAnimatedTexture(tTileEntity)) { return mGetCurrentTextureSet_ACTIVE[3]; } @@ -228,7 +228,7 @@ public class LargeTurbineTextureHandler { && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { + && ((tMetaTileEntity instanceof MTEHatchTurbine))) { if (isUsingAnimatedTexture(tTileEntity)) { return mGetCurrentTextureSet_ACTIVE[6]; } @@ -238,7 +238,7 @@ public class LargeTurbineTextureHandler { && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { + && ((tMetaTileEntity instanceof MTEHatchTurbine))) { if (isUsingAnimatedTexture(tTileEntity)) { return mGetCurrentTextureSet_ACTIVE[1]; } @@ -248,7 +248,7 @@ public class LargeTurbineTextureHandler { && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { + && ((tMetaTileEntity instanceof MTEHatchTurbine))) { if (isUsingAnimatedTexture(tTileEntity)) { return mGetCurrentTextureSet_ACTIVE[7]; } @@ -259,7 +259,7 @@ public class LargeTurbineTextureHandler { && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { + && ((tMetaTileEntity instanceof MTEHatchTurbine))) { if (isUsingAnimatedTexture(tTileEntity)) { return mGetCurrentTextureSet_ACTIVE[8]; } @@ -270,7 +270,7 @@ public class LargeTurbineTextureHandler { && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { + && ((tMetaTileEntity instanceof MTEHatchTurbine))) { if (isUsingAnimatedTexture(tTileEntity)) { return mGetCurrentTextureSet_ACTIVE[5]; } @@ -281,7 +281,7 @@ public class LargeTurbineTextureHandler { && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { + && ((tMetaTileEntity instanceof MTEHatchTurbine))) { if (isUsingAnimatedTexture(tTileEntity)) { return mGetCurrentTextureSet_ACTIVE[2]; } @@ -295,7 +295,7 @@ public class LargeTurbineTextureHandler { && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { + && ((tMetaTileEntity instanceof MTEHatchTurbine))) { if (isUsingAnimatedTexture(tTileEntity)) { return mGetCurrentTextureSet_ACTIVE[0]; } @@ -306,7 +306,7 @@ public class LargeTurbineTextureHandler { && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { + && ((tMetaTileEntity instanceof MTEHatchTurbine))) { if (isUsingAnimatedTexture(tTileEntity)) { return mGetCurrentTextureSet_ACTIVE[3]; } @@ -317,7 +317,7 @@ public class LargeTurbineTextureHandler { && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { + && ((tMetaTileEntity instanceof MTEHatchTurbine))) { if (isUsingAnimatedTexture(tTileEntity)) { return mGetCurrentTextureSet_ACTIVE[6]; } @@ -327,7 +327,7 @@ public class LargeTurbineTextureHandler { && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { + && ((tMetaTileEntity instanceof MTEHatchTurbine))) { if (isUsingAnimatedTexture(tTileEntity)) { return mGetCurrentTextureSet_ACTIVE[1]; } @@ -337,7 +337,7 @@ public class LargeTurbineTextureHandler { && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { + && ((tMetaTileEntity instanceof MTEHatchTurbine))) { if (isUsingAnimatedTexture(tTileEntity)) { return mGetCurrentTextureSet_ACTIVE[7]; } @@ -348,7 +348,7 @@ public class LargeTurbineTextureHandler { && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { + && ((tMetaTileEntity instanceof MTEHatchTurbine))) { if (isUsingAnimatedTexture(tTileEntity)) { return mGetCurrentTextureSet_ACTIVE[8]; } @@ -359,7 +359,7 @@ public class LargeTurbineTextureHandler { && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { + && ((tMetaTileEntity instanceof MTEHatchTurbine))) { if (isUsingAnimatedTexture(tTileEntity)) { return mGetCurrentTextureSet_ACTIVE[5]; } @@ -370,7 +370,7 @@ public class LargeTurbineTextureHandler { && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == side) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) - && ((tMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine))) { + && ((tMetaTileEntity instanceof MTEHatchTurbine))) { if (isUsingAnimatedTexture(tTileEntity)) { return mGetCurrentTextureSet_ACTIVE[2]; } @@ -388,8 +388,8 @@ public class LargeTurbineTextureHandler { aTile = (IGregTechTileEntity) tTileEntity; if (aTile != null) { final IMetaTileEntity aMetaTileEntity = aTile.getMetaTileEntity(); - if (aMetaTileEntity != null && aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine) { - aVal = ((GT_MetaTileEntity_Hatch_Turbine) aMetaTileEntity).getBaseMetaTileEntity() + if (aMetaTileEntity != null && aMetaTileEntity instanceof MTEHatchTurbine) { + aVal = ((MTEHatchTurbine) aMetaTileEntity).getBaseMetaTileEntity() .isActive(); // Logger.INFO("Returning "+aVal+" as Rotor Assembly controller status"); } @@ -398,11 +398,11 @@ public class LargeTurbineTextureHandler { return aVal; } - public static GT_MetaTileEntity_Hatch_Turbine isTurbineHatch(final IGregTechTileEntity aTileEntity) { + public static MTEHatchTurbine isTurbineHatch(final IGregTechTileEntity aTileEntity) { if (aTileEntity != null) { final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity != null && aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine) { - return (GT_MetaTileEntity_Hatch_Turbine) aMetaTileEntity; + if (aMetaTileEntity != null && aMetaTileEntity instanceof MTEHatchTurbine) { + return (MTEHatchTurbine) aMetaTileEntity; } } return null; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverOverflow.java index a3341ea077..f93b371aa3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverOverflow.java @@ -11,21 +11,21 @@ import net.minecraftforge.fluids.IFluidHandler; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.common.widget.TextWidget; -import gregtech.api.gui.modularui.GT_CoverUIBuildContext; +import gregtech.api.gui.modularui.CoverUIBuildContext; import gregtech.api.interfaces.tileentity.ICoverable; -import gregtech.api.util.GT_CoverBehavior; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.CoverBehavior; +import gregtech.api.util.GTUtility; import gregtech.api.util.ISerializableObject; import gregtech.common.gui.modularui.widget.CoverDataControllerWidget; -import gregtech.common.gui.modularui.widget.CoverDataFollower_NumericWidget; +import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget; -public class GTPP_Cover_Overflow extends GT_CoverBehavior { +public class CoverOverflow extends CoverBehavior { public final int mTransferRate; public final int mInitialTransferRate; public final int mMaxTransferRate; - public GTPP_Cover_Overflow(int aTransferRate) { + public CoverOverflow(int aTransferRate) { this.mTransferRate = aTransferRate * 1000 / 10; this.mInitialTransferRate = aTransferRate; this.mMaxTransferRate = aTransferRate * 1000; @@ -67,7 +67,7 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior { public int onCoverScrewdriverclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { - if (GT_Utility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) { + if (GTUtility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) { aCoverVariable += (mMaxTransferRate * (aPlayer.isSneaking() ? 0.1f : 0.01f)); } else { aCoverVariable -= (mMaxTransferRate * (aPlayer.isSneaking() ? 0.1f : 0.01f)); @@ -78,9 +78,9 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior { if (aCoverVariable <= 0) { aCoverVariable = mMaxTransferRate; } - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, - GT_Utility.trans("322", "Overflow point: ") + aCoverVariable + GT_Utility.trans("323", "L")); + GTUtility.trans("322", "Overflow point: ") + aCoverVariable + GTUtility.trans("323", "L")); return aCoverVariable; } @@ -88,7 +88,7 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior { EntityPlayer aPlayer, float aX, float aY, float aZ) { boolean aShift = aPlayer.isSneaking(); int aAmount = aShift ? 128 : 8; - if (GT_Utility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) { + if (GTUtility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) { aCoverVariable += aAmount; } else { aCoverVariable -= aAmount; @@ -99,9 +99,9 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior { if (aCoverVariable <= 0) { aCoverVariable = mMaxTransferRate; } - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, - GT_Utility.trans("322", "Overflow point: ") + aCoverVariable + GT_Utility.trans("323", "L")); + GTUtility.trans("322", "Overflow point: ") + aCoverVariable + GTUtility.trans("323", "L")); aTileEntity.setCoverDataAtSide(side, new ISerializableObject.LegacyCoverData(aCoverVariable)); return true; } @@ -158,7 +158,7 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior { } @Override - public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) { + public ModularWindow createWindow(CoverUIBuildContext buildContext) { return new OverflowUIFactory(buildContext).createWindow(); } @@ -169,7 +169,7 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior { private static final int spaceX = 18; private static final int spaceY = 18; - public OverflowUIFactory(GT_CoverUIBuildContext buildContext) { + public OverflowUIFactory(CoverUIBuildContext buildContext) { super(buildContext); } @@ -180,9 +180,9 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior { builder .widget( - new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GTPP_Cover_Overflow.this) + new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverOverflow.this) .addFollower( - new CoverDataFollower_NumericWidget<>(), + new CoverDataFollowerNumericWidget<>(), coverData -> (double) convert(coverData), (coverData, state) -> new ISerializableObject.LegacyCoverData(state.intValue()), widget -> widget.setBounds(0, mMaxTransferRate) @@ -191,7 +191,7 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior { .setPos(startX + spaceX * 0, startY + spaceY * 1 + 8) .setSize(spaceX * 4 - 3, 12))) .widget( - new TextWidget(GT_Utility.trans("322", "Overflow point: ")).setDefaultColor(COLOR_TEXT_GRAY.get()) + new TextWidget(GTUtility.trans("322", "Overflow point: ")).setDefaultColor(COLOR_TEXT_GRAY.get()) .setPos(startX, 4 + startY + spaceY * 0 + 8)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverToggleVisual.java index 42ab793c9c..2ba532d11f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverToggleVisual.java @@ -12,14 +12,14 @@ import net.minecraftforge.fluids.Fluid; import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.XSTR; -import gregtech.api.util.GT_CoverBehavior; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.CoverBehavior; +import gregtech.api.util.GTUtility; import gregtech.api.util.ISerializableObject; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.util.minecraft.PlayerUtils; -public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior { +public class CoverToggleVisual extends CoverBehavior { private static final Map<String, Integer> sConnectionStateForEntityMap = new ConcurrentHashMap<>(); private static final Map<String, String> sPrefixMap = new ConcurrentHashMap<>(); @@ -41,7 +41,7 @@ public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior { public boolean onCoverRightclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { PlayerUtils - .messagePlayer(aPlayer, GT_Utility.trans("756", "Connectable: ") + getConnectionState(aCoverVariable)); + .messagePlayer(aPlayer, GTUtility.trans("756", "Connectable: ") + getConnectionState(aCoverVariable)); return super.onCoverRightclick(side, aCoverID, aCoverVariable, aTileEntity, aPlayer, aX, aY, aZ); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java index 924484e098..e11f4fae02 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.common.helpers; -import static gregtech.api.GregTech_API.mEUtoRF; +import static gregtech.api.GregTechAPI.mEUtoRF; import static gregtech.api.enums.Mods.Baubles; import static gregtech.api.enums.Mods.COFHCore; @@ -20,26 +20,26 @@ import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent; -import gregtech.api.enums.GT_Values; -import gregtech.api.util.GT_ModHandler; -import gregtech.common.items.GT_MetaGenerated_Item_01; -import gregtech.common.items.GT_MetaGenerated_Item_02; -import gregtech.common.items.GT_MetaGenerated_Item_03; -import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.api.enums.GTValues; +import gregtech.api.util.GTModHandler; +import gregtech.common.items.MetaGeneratedItem01; +import gregtech.common.items.MetaGeneratedItem02; +import gregtech.common.items.MetaGeneratedItem03; +import gregtech.common.items.MetaGeneratedTool01; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.NBTUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaWirelessCharger; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEWirelessCharger; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; public class ChargingHelper { - private static final Map<String, Pair<GregtechMetaWirelessCharger, Byte>> mValidPlayers = new HashMap<>(); - protected static Map<BlockPos, GregtechMetaWirelessCharger> mChargerMap = new HashMap<>(); + private static final Map<String, Pair<MTEWirelessCharger, Byte>> mValidPlayers = new HashMap<>(); + protected static Map<BlockPos, MTEWirelessCharger> mChargerMap = new HashMap<>(); private int mTickTimer = 0; private static final int mTickMultiplier = 20; @@ -75,7 +75,7 @@ public class ChargingHelper { } } - for (GregtechMetaWirelessCharger mEntityTemp : mChargerMap.values()) { + for (MTEWirelessCharger mEntityTemp : mChargerMap.values()) { if (mEntityTemp != null) { if (mEntityTemp.getBaseMetaTileEntity() == null || !mEntityTemp.getBaseMetaTileEntity() .isAllowedToWork()) continue; @@ -96,11 +96,11 @@ public class ChargingHelper { if (mStartingEu - mEntityTemp.getEUVar() <= 0) { long mMaxDistance; if (mEntityTemp.getMode() == 0) { - mMaxDistance = (4 * GT_Values.V[mEntityTemp.getTier()]); + mMaxDistance = (4 * GTValues.V[mEntityTemp.getTier()]); } else if (mEntityTemp.getMode() == 1) { mMaxDistance = (mEntityTemp.getTier() * 10L); } else { - mMaxDistance = (4 * GT_Values.V[mEntityTemp.getTier()] / 2); + mMaxDistance = (4 * GTValues.V[mEntityTemp.getTier()] / 2); } double mDistance = calculateDistance(mEntityTemp, mPlayerMan); long mVoltageCost = MathUtils.findPercentageOfInt(mMaxDistance, (float) mDistance); @@ -121,7 +121,7 @@ public class ChargingHelper { } catch (Throwable t) { if (!mChargerMap.isEmpty()) { for (BlockPos aPos : mChargerMap.keySet()) { - GregtechMetaWirelessCharger r = mChargerMap.get(aPos); + MTEWirelessCharger r = mChargerMap.get(aPos); if (r == null || r.getBaseMetaTileEntity() .isInvalidTileEntity()) { mChargerMap.remove(aPos); @@ -131,11 +131,11 @@ public class ChargingHelper { } } - public static GregtechMetaWirelessCharger getEntry(BlockPos mPos) { + public static MTEWirelessCharger getEntry(BlockPos mPos) { return mChargerMap.get(mPos); } - public static boolean addEntry(BlockPos mPos, GregtechMetaWirelessCharger mEntity) { + public static boolean addEntry(BlockPos mPos, MTEWirelessCharger mEntity) { if (mEntity == null) { return false; } @@ -143,7 +143,7 @@ public class ChargingHelper { return true; } - public static boolean removeEntry(BlockPos mPos, GregtechMetaWirelessCharger mEntity) { + public static boolean removeEntry(BlockPos mPos, MTEWirelessCharger mEntity) { if (mEntity == null) { return false; } @@ -154,31 +154,31 @@ public class ChargingHelper { } } - public static boolean addValidPlayer(EntityPlayer mPlayer, GregtechMetaWirelessCharger mEntity) { + public static boolean addValidPlayer(EntityPlayer mPlayer, MTEWirelessCharger mEntity) { if (mEntity == null) { return false; } if (mValidPlayers.containsKey(mPlayer.getDisplayName())) { return false; } else { - Pair<GregtechMetaWirelessCharger, Byte> mEntry = new Pair<>(mEntity, (byte) mEntity.getMode()); + Pair<MTEWirelessCharger, Byte> mEntry = new Pair<>(mEntity, (byte) mEntity.getMode()); return mValidPlayers.put(mPlayer.getDisplayName(), mEntry) == null; } } - public static boolean removeValidPlayer(EntityPlayer mPlayer, GregtechMetaWirelessCharger mEntity) { + public static boolean removeValidPlayer(EntityPlayer mPlayer, MTEWirelessCharger mEntity) { if (mEntity == null) { return false; } if (mValidPlayers.containsKey(mPlayer.getDisplayName())) { - Pair<GregtechMetaWirelessCharger, Byte> mEntry = new Pair<>(mEntity, (byte) mEntity.getMode()); + Pair<MTEWirelessCharger, Byte> mEntry = new Pair<>(mEntity, (byte) mEntity.getMode()); return mValidPlayers.remove(mPlayer.getDisplayName(), mEntry); } else { return false; } } - private boolean canCharge(GregtechMetaWirelessCharger charger, EntityPlayer chargeablePlayer, + private boolean canCharge(MTEWirelessCharger charger, EntityPlayer chargeablePlayer, Map<String, UUID> longRangeChargers, Map<String, UUID> shortRangeChargers) { if (charger.getMode() == 0) { return !longRangeChargers.isEmpty() && longRangeChargers.containsKey(chargeablePlayer.getDisplayName()); @@ -192,7 +192,7 @@ public class ChargingHelper { } } - private double calculateDistance(GregtechMetaWirelessCharger mEntityTemp, EntityPlayer mPlayerMan) { + private double calculateDistance(MTEWirelessCharger mEntityTemp, EntityPlayer mPlayerMan) { if (mEntityTemp == null || mPlayerMan == null) { return 0; } @@ -201,14 +201,14 @@ public class ChargingHelper { mEntityTemp.getPositionOfEntity(mPlayerMan)); } - private void chargeItems(@Nonnull GregtechMetaWirelessCharger mEntity, ItemStack[] mItems) { + private void chargeItems(@Nonnull MTEWirelessCharger mEntity, ItemStack[] mItems) { if (mItems == null || mItems.length == 0) { return; } chargeItemsEx(mEntity, mItems); } - private void chargeItemsEx(@Nonnull GregtechMetaWirelessCharger mEntity, ItemStack[] mItems) { + private void chargeItemsEx(@Nonnull MTEWirelessCharger mEntity, ItemStack[] mItems) { // Bad Inventory if (mItems == null || mItems.length == 0) { return; @@ -234,19 +234,18 @@ public class ChargingHelper { } // Try to get charge direct from NBT for GT and IC2 stacks - if (mTemp.getItem() instanceof GT_MetaGenerated_Tool_01 - || mTemp.getItem() instanceof GT_MetaGenerated_Item_01 - || mTemp.getItem() instanceof GT_MetaGenerated_Item_02 - || mTemp.getItem() instanceof GT_MetaGenerated_Item_03 + if (mTemp.getItem() instanceof MetaGeneratedTool01 || mTemp.getItem() instanceof MetaGeneratedItem01 + || mTemp.getItem() instanceof MetaGeneratedItem02 + || mTemp.getItem() instanceof MetaGeneratedItem03 || mTemp.getItem() .getClass() .getName() - .equalsIgnoreCase(GT_MetaGenerated_Tool_01.class.getName())) { + .equalsIgnoreCase(MetaGeneratedTool01.class.getName())) { if (!NBTUtils.hasKey(mTemp, "GT.ItemCharge")) { if (!mTemp.getDisplayName() .toLowerCase() .contains("battery")) { - if (!GT_ModHandler.isElectricItem(mTemp)) { + if (!GTModHandler.isElectricItem(mTemp)) { continue; } } else { @@ -284,8 +283,7 @@ public class ChargingHelper { int mMultiVoltage = (int) (mMulti * mVoltageIncrease); if ((mitemCurrentCharge + mMultiVoltage) <= mItemMaxCharge) { - if (GT_ModHandler.chargeElectricItem(mTemp, mMultiVoltage, Integer.MAX_VALUE, true, false) - > 0) { + if (GTModHandler.chargeElectricItem(mTemp, mMultiVoltage, Integer.MAX_VALUE, true, false) > 0) { for (int i = 0; i < mMulti; i++) { ElectricItem.manager.charge(mTemp, mVoltageIncrease, Integer.MAX_VALUE, false, false); } @@ -300,7 +298,7 @@ public class ChargingHelper { mitemCurrentCharge = ElectricItem.manager.getCharge(mTemp); if (mitemCurrentCharge < mItemMaxCharge && mitemCurrentCharge >= (mItemMaxCharge - mVoltage)) { int xDif = (int) (mItemMaxCharge - mitemCurrentCharge); - if (GT_ModHandler.chargeElectricItem(mTemp, xDif, Integer.MAX_VALUE, true, false) >= 0) { + if (GTModHandler.chargeElectricItem(mTemp, xDif, Integer.MAX_VALUE, true, false) >= 0) { if (ElectricItem.manager.getCharge(mTemp) >= mItemMaxCharge) { mEntity.setEUVar(mEntity.getEUVar() - (xDif)); mEuStored = mEntity.getEUVar(); @@ -334,7 +332,7 @@ public class ChargingHelper { if (itemstack == null) { return false; } - if (GT_ModHandler.isElectricItem(itemstack)) { + if (GTModHandler.isElectricItem(itemstack)) { return true; } return itemstack.getItem() instanceof IElectricItem; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java index 8cbb473a42..773bf0127e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java @@ -6,8 +6,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.material.Material; @@ -31,14 +31,14 @@ public class FlotationRecipeHandler { public static Material getMaterialOfMilledProduct(ItemStack aMilled) { for (String aKey : sMilledMap.keySet()) { ItemStack aTempMilledStack = sMilledMap.get(aKey); - if (GT_Utility.areStacksEqual(aTempMilledStack, aMilled, true)) { + if (GTUtility.areStacksEqual(aTempMilledStack, aMilled, true)) { return sMaterialMap.get(aKey); } } return null; } - public static ItemStack findMilledStack(GT_Recipe aRecipe) { + public static ItemStack findMilledStack(GTRecipe aRecipe) { if (aRecipe == null || aRecipe.mInputs == null || aRecipe.mInputs.length <= 0) { return null; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GTMethodHelper.java index ced9b46c3e..357764c820 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GTMethodHelper.java @@ -8,7 +8,7 @@ import gregtech.api.enums.Textures.BlockIcons; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ITexturedTileEntity; -public class GT_MethodHelper { +public class GTMethodHelper { public static ITexture[] getTexture(TileEntity tTileEntity, Block aBlock, ForgeDirection side) { if (tTileEntity instanceof ITexturedTileEntity) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java index 2b0e2a7a4d..57a985f3f3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java @@ -6,7 +6,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.ItemList; -import gregtech.common.items.GT_VolumetricFlask; +import gregtech.common.items.ItemVolumetricFlask; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class VolumetricFlaskHelper { @@ -42,8 +42,8 @@ public class VolumetricFlaskHelper { public static int getMaxFlaskCapacity(ItemStack aStack) { if (aStack != null) { Item aItem = aStack.getItem(); - if (aItem instanceof GT_VolumetricFlask) { - return ((GT_VolumetricFlask) aItem).getMaxCapacity(); + if (aItem instanceof ItemVolumetricFlask) { + return ((ItemVolumetricFlask) aItem).getMaxCapacity(); } } return 0; @@ -120,6 +120,6 @@ public class VolumetricFlaskHelper { } public static Item generateNewFlask(String unlocalized, String english, int maxCapacity) { - return new GT_VolumetricFlask(unlocalized, english, maxCapacity); + return new ItemVolumetricFlask(unlocalized, english, maxCapacity); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java index 3717f17554..03a4ace32f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.helpers.tesseract; -import static gtPlusPlus.core.lib.CORE.sTesseractGeneratorOwnershipMap; -import static gtPlusPlus.core.lib.CORE.sTesseractTerminalOwnershipMap; +import static gtPlusPlus.core.lib.GTPPCore.sTesseractGeneratorOwnershipMap; +import static gtPlusPlus.core.lib.GTPPCore.sTesseractTerminalOwnershipMap; import java.util.HashMap; import java.util.Map; @@ -12,8 +12,8 @@ import java.util.UUID; import net.minecraft.entity.player.EntityPlayer; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator; -import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal; +import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractGenerator; +import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractTerminal; public class TesseractHelper { @@ -25,8 +25,7 @@ public class TesseractHelper { */ // Checks if a Generator is owned by a player. - public static final boolean isGeneratorOwnedByPlayer(EntityPlayer player, - GT_MetaTileEntity_TesseractGenerator generator) { + public static final boolean isGeneratorOwnedByPlayer(EntityPlayer player, MTETesseractGenerator generator) { if (player == null) { Logger.WARNING("Failed. [isGeneratorOwnedByPlayer]"); return false; @@ -35,9 +34,9 @@ public class TesseractHelper { UUID playerIdentifier = player.getUniqueID(); if (!sTesseractGeneratorOwnershipMap.isEmpty() && playerIdentifier != null) { // Utils.LOG_WARNING("Success. [isGeneratorOwnedByPlayer] 2"); - Map<Integer, GT_MetaTileEntity_TesseractGenerator> generators = getGeneratorOwnershipByPlayer(player); - Set<Entry<Integer, GT_MetaTileEntity_TesseractGenerator>> players = generators.entrySet(); - for (Entry<Integer, GT_MetaTileEntity_TesseractGenerator> current : players) { + Map<Integer, MTETesseractGenerator> generators = getGeneratorOwnershipByPlayer(player); + Set<Entry<Integer, MTETesseractGenerator>> players = generators.entrySet(); + for (Entry<Integer, MTETesseractGenerator> current : players) { // Utils.LOG_WARNING("Success. [isGeneratorOwnedByPlayer] 3"); if (current.getValue() .equals(generator)) { @@ -52,23 +51,22 @@ public class TesseractHelper { // Saves A Generator to the Players UUID map along with the Freq. public static final boolean setGeneratorOwnershipByPlayer(EntityPlayer player, int freq, - GT_MetaTileEntity_TesseractGenerator generator) { + MTETesseractGenerator generator) { if (player == null) { return false; } UUID playerIdentifier = player.getUniqueID(); Logger.WARNING("Setting Generator on " + freq + " for " + player.getDisplayName() + "."); if (playerIdentifier != null) { - Map<Integer, GT_MetaTileEntity_TesseractGenerator> playerOwned = sTesseractGeneratorOwnershipMap - .get(playerIdentifier); + Map<Integer, MTETesseractGenerator> playerOwned = sTesseractGeneratorOwnershipMap.get(playerIdentifier); if (playerOwned == null || playerOwned.isEmpty()) { - Map<Integer, GT_MetaTileEntity_TesseractGenerator> newOwnershipMap = new HashMap<>(); + Map<Integer, MTETesseractGenerator> newOwnershipMap = new HashMap<>(); newOwnershipMap.put(freq, generator); sTesseractGeneratorOwnershipMap.put(playerIdentifier, newOwnershipMap); Logger.WARNING("Success! [Empty Map]"); return true; } else if (sTesseractGeneratorOwnershipMap.containsKey(playerIdentifier)) { - Map<Integer, GT_MetaTileEntity_TesseractGenerator> ownershipMap = sTesseractGeneratorOwnershipMap + Map<Integer, MTETesseractGenerator> ownershipMap = sTesseractGeneratorOwnershipMap .get(playerIdentifier); if (!ownershipMap.containsKey(freq)) { ownershipMap.put(freq, generator); @@ -84,7 +82,7 @@ public class TesseractHelper { } // Gets Generator based on Frequency. - public static final GT_MetaTileEntity_TesseractGenerator getGeneratorByFrequency(EntityPlayer player, int freq) { + public static final MTETesseractGenerator getGeneratorByFrequency(EntityPlayer player, int freq) { if (player == null) { return null; } @@ -92,9 +90,9 @@ public class TesseractHelper { Logger.WARNING("Getting Generator on " + freq + " for " + player.getDisplayName() + "."); if (!sTesseractGeneratorOwnershipMap.isEmpty() && playerIdentifier != null) { // Utils.LOG_WARNING("Success. [getGeneratorByFrequency] 1"); - Map<Integer, GT_MetaTileEntity_TesseractGenerator> generators = getGeneratorOwnershipByPlayer(player); - Set<Entry<Integer, GT_MetaTileEntity_TesseractGenerator>> players = generators.entrySet(); - for (Entry<Integer, GT_MetaTileEntity_TesseractGenerator> current : players) { + Map<Integer, MTETesseractGenerator> generators = getGeneratorOwnershipByPlayer(player); + Set<Entry<Integer, MTETesseractGenerator>> players = generators.entrySet(); + for (Entry<Integer, MTETesseractGenerator> current : players) { // Utils.LOG_WARNING("Success. [getGeneratorByFrequency] 2"); if (current.getKey() .equals(freq)) { @@ -131,16 +129,15 @@ public class TesseractHelper { */ // Checks if a Terminal is owned by a player. - public static final boolean isTerminalOwnedByPlayer(EntityPlayer player, - GT_MetaTileEntity_TesseractTerminal generator) { + public static final boolean isTerminalOwnedByPlayer(EntityPlayer player, MTETesseractTerminal generator) { if (player == null) { return false; } UUID playerIdentifier = player.getUniqueID(); if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) { - Map<Integer, GT_MetaTileEntity_TesseractTerminal> generators = getTerminalOwnershipByPlayer(player); - Set<Entry<Integer, GT_MetaTileEntity_TesseractTerminal>> players = generators.entrySet(); - for (Entry<Integer, GT_MetaTileEntity_TesseractTerminal> current : players) { + Map<Integer, MTETesseractTerminal> generators = getTerminalOwnershipByPlayer(player); + Set<Entry<Integer, MTETesseractTerminal>> players = generators.entrySet(); + for (Entry<Integer, MTETesseractTerminal> current : players) { if (current.getValue() .equals(generator)) { return true; @@ -152,24 +149,22 @@ public class TesseractHelper { // Saves A Terminal to the Players UUID map along with the Freq. public static final boolean setTerminalOwnershipByPlayer(EntityPlayer player, int freq, - GT_MetaTileEntity_TesseractTerminal generator) { + MTETesseractTerminal generator) { if (player == null) { return false; } UUID playerIdentifier = player.getUniqueID(); if (playerIdentifier != null) { Logger.WARNING("Setting Terminal on " + freq + " for " + player.getDisplayName() + "."); - Map<Integer, GT_MetaTileEntity_TesseractTerminal> playerOwned = sTesseractTerminalOwnershipMap - .get(playerIdentifier); + Map<Integer, MTETesseractTerminal> playerOwned = sTesseractTerminalOwnershipMap.get(playerIdentifier); if (playerOwned == null || playerOwned.isEmpty()) { - Map<Integer, GT_MetaTileEntity_TesseractTerminal> newOwnershipMap = new HashMap<>(); + Map<Integer, MTETesseractTerminal> newOwnershipMap = new HashMap<>(); newOwnershipMap.put(freq, generator); sTesseractTerminalOwnershipMap.put(playerIdentifier, newOwnershipMap); Logger.WARNING("Success! [Empty Map]"); return true; } else if (sTesseractTerminalOwnershipMap.containsKey(playerIdentifier)) { - Map<Integer, GT_MetaTileEntity_TesseractTerminal> ownershipMap = sTesseractTerminalOwnershipMap - .get(playerIdentifier); + Map<Integer, MTETesseractTerminal> ownershipMap = sTesseractTerminalOwnershipMap.get(playerIdentifier); if (!ownershipMap.containsKey(freq)) { ownershipMap.put(freq, generator); } @@ -183,16 +178,16 @@ public class TesseractHelper { } // Gets Terminal based on Frequency. - public static final GT_MetaTileEntity_TesseractTerminal getTerminalByFrequency(EntityPlayer player, int freq) { + public static final MTETesseractTerminal getTerminalByFrequency(EntityPlayer player, int freq) { if (player == null) { return null; } UUID playerIdentifier = player.getUniqueID(); Logger.WARNING("Getting Terminal on " + freq + " for " + player.getDisplayName() + "."); if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) { - Map<Integer, GT_MetaTileEntity_TesseractTerminal> generators = getTerminalOwnershipByPlayer(player); - Set<Entry<Integer, GT_MetaTileEntity_TesseractTerminal>> players = generators.entrySet(); - for (Entry<Integer, GT_MetaTileEntity_TesseractTerminal> current : players) { + Map<Integer, MTETesseractTerminal> generators = getTerminalOwnershipByPlayer(player); + Set<Entry<Integer, MTETesseractTerminal>> players = generators.entrySet(); + for (Entry<Integer, MTETesseractTerminal> current : players) { if (current.getKey() .equals(freq)) { Logger.WARNING("Success!"); @@ -223,13 +218,11 @@ public class TesseractHelper { * Internal Methods * */ - private static Map<Integer, GT_MetaTileEntity_TesseractGenerator> getGeneratorOwnershipByPlayer( - EntityPlayer player) { + private static Map<Integer, MTETesseractGenerator> getGeneratorOwnershipByPlayer(EntityPlayer player) { UUID playerIdentifier = player.getUniqueID(); if (!sTesseractGeneratorOwnershipMap.isEmpty() && playerIdentifier != null) { - Set<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>>> players = sTesseractGeneratorOwnershipMap - .entrySet(); - for (Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> current : players) { + Set<Entry<UUID, Map<Integer, MTETesseractGenerator>>> players = sTesseractGeneratorOwnershipMap.entrySet(); + for (Entry<UUID, Map<Integer, MTETesseractGenerator>> current : players) { if (current.getKey() .compareTo(playerIdentifier) == 0) { return current.getValue(); @@ -239,12 +232,11 @@ public class TesseractHelper { return null; } - private static Map<Integer, GT_MetaTileEntity_TesseractTerminal> getTerminalOwnershipByPlayer(EntityPlayer player) { + private static Map<Integer, MTETesseractTerminal> getTerminalOwnershipByPlayer(EntityPlayer player) { UUID playerIdentifier = player.getUniqueID(); if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) { - Set<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>>> players = sTesseractTerminalOwnershipMap - .entrySet(); - for (Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> current : players) { + Set<Entry<UUID, Map<Integer, MTETesseractTerminal>>> players = sTesseractTerminalOwnershipMap.entrySet(); + for (Entry<UUID, Map<Integer, MTETesseractTerminal>> current : players) { if (current.getKey() .compareTo(playerIdentifier) == 0) { return current.getValue(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java index 8edb8c2cf9..a6cd63ca19 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java @@ -16,17 +16,17 @@ import net.minecraft.world.World; import org.apache.commons.lang3.StringUtils; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; -import gregtech.api.objects.GT_MultiTexture; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.objects.GTMultiTexture; +import gregtech.api.objects.GTRenderedTexture; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.sys.KeyboardUtils; -import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_ToggleVisual; +import gtPlusPlus.xmod.gregtech.common.covers.CoverToggleVisual; public class MetaCustomCoverItem extends Item { @@ -72,10 +72,10 @@ public class MetaCustomCoverItem extends Item { if (i > 0 && hide()) { ItemUtils.hideItemFromNEI(thisStack); } - GregTech_API.registerCover( + GregTechAPI.registerCover( thisStack, - new GT_MultiTexture(new ITexture[] { new GT_RenderedTexture(mTextures[i]) }), - new GTPP_Cover_ToggleVisual()); + new GTMultiTexture(new ITexture[] { new GTRenderedTexture(mTextures[i]) }), + new CoverToggleVisual()); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index ec9416be02..a787e4c4ce 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -1,64 +1,64 @@ package gtPlusPlus.xmod.gregtech.common.items; -import static gregtech.api.util.GT_RecipeConstants.RTG_DURATION_IN_DAYS; -import static gregtech.client.GT_TooltipHandler.Tier.EV; -import static gregtech.client.GT_TooltipHandler.registerTieredTooltip; +import static gregtech.api.util.GTRecipeConstants.RTG_DURATION_IN_DAYS; +import static gregtech.client.GTTooltipHandler.Tier.EV; +import static gregtech.client.GTTooltipHandler.registerTieredTooltip; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.rtgFuels; import static gtPlusPlus.core.util.Utils.getTcAspectStack; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Casing_Gem_1; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Casing_Gem_2; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Casing_Gem_3; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Casing_Gem_4; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Gem_1; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Gem_2; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Gem_3; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Gem_4; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_RE_EV_Cadmium; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_RE_EV_Lithium; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_RE_EV_Sodium; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Compressed_Fusion_Reactor; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_EV; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_HV; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_IV; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_LV; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Cover_Overflow_MV; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Distillus_Upgrade_Chip; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Gregtech_Computer_Cube; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Laser_Lens_Special; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Laser_Lens_WoodsGlass; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Maceration_Upgrade_Chip; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Pellet_RTG_AM241; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Pellet_RTG_PO210; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Pellet_RTG_PU238; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Pellet_RTG_SR90; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Shape_Extruder_WindmillShaft; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_EV; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_HV; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_IV; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_LV; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_LuV; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_MV; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_UHV; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_UV; -import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.TransmissionComponent_ZPM; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Casing_Gem_1; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Casing_Gem_2; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Casing_Gem_3; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Casing_Gem_4; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Gem_1; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Gem_2; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Gem_3; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_Gem_4; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_RE_EV_Cadmium; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_RE_EV_Lithium; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_RE_EV_Sodium; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Compressed_Fusion_Reactor; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_EV; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_HV; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_IV; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_LV; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_MV; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Distillus_Upgrade_Chip; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Gregtech_Computer_Cube; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Laser_Lens_Special; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Laser_Lens_WoodsGlass; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Maceration_Upgrade_Chip; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Pellet_RTG_AM241; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Pellet_RTG_PO210; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Pellet_RTG_PU238; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Pellet_RTG_SR90; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Shape_Extruder_WindmillShaft; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_EV; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_HV; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_IV; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_LV; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_LuV; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_MV; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_UHV; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_UV; +import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.TransmissionComponent_ZPM; + +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.TC_Aspects; +import gregtech.api.enums.TCAspects; import gregtech.api.enums.Textures; import gregtech.api.enums.TierEU; -import gregtech.api.objects.GT_MultiTexture; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; +import gregtech.api.objects.GTMultiTexture; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTModHandler; import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_X32; +import gtPlusPlus.xmod.gregtech.api.items.GTMetaItemX32; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_Overflow; +import gtPlusPlus.xmod.gregtech.common.covers.CoverOverflow; -public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { +public class MetaGeneratedGregtechItems extends GTMetaItemX32 { public static final MetaGeneratedGregtechItems INSTANCE; @@ -85,27 +85,27 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { Battery_RE_EV_Sodium.ID, "Quad Cell Sodium Battery", "Reusable", - getTcAspectStack(TC_Aspects.ELECTRUM, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L))); + getTcAspectStack(TCAspects.ELECTRUM, 2L), + getTcAspectStack(TCAspects.METALLUM, 2L), + getTcAspectStack(TCAspects.POTENTIA, 2L))); GregtechItemList.Battery_RE_EV_Cadmium.set( this.addItem( Battery_RE_EV_Cadmium.ID, "Quad Cell Cadmium Battery", "Reusable", - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.METALLUM, 1L), - getTcAspectStack(TC_Aspects.POTENTIA, 1L))); + getTcAspectStack(TCAspects.ELECTRUM, 1L), + getTcAspectStack(TCAspects.METALLUM, 1L), + getTcAspectStack(TCAspects.POTENTIA, 1L))); GregtechItemList.Battery_RE_EV_Lithium.set( this.addItem( Battery_RE_EV_Lithium.ID, "Quad Cell Lithium Battery", "Reusable", - getTcAspectStack(TC_Aspects.ELECTRUM, 3L), - getTcAspectStack(TC_Aspects.METALLUM, 3L), - getTcAspectStack(TC_Aspects.POTENTIA, 3L))); + getTcAspectStack(TCAspects.ELECTRUM, 3L), + getTcAspectStack(TCAspects.METALLUM, 3L), + getTcAspectStack(TCAspects.POTENTIA, 3L))); /** * Power Gems @@ -115,27 +115,27 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { Battery_Gem_1.ID, "Proton Cell", "Reusable", - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.METALLUM, 24L), - getTcAspectStack(TC_Aspects.POTENTIA, 16L))); + getTcAspectStack(TCAspects.ELECTRUM, 8L), + getTcAspectStack(TCAspects.METALLUM, 24L), + getTcAspectStack(TCAspects.POTENTIA, 16L))); GregtechItemList.Battery_Gem_2.set( this.addItem( Battery_Gem_2.ID, "Electron Cell", "Reusable", - getTcAspectStack(TC_Aspects.ELECTRUM, 16L), - getTcAspectStack(TC_Aspects.METALLUM, 32L), - getTcAspectStack(TC_Aspects.POTENTIA, 32L))); + getTcAspectStack(TCAspects.ELECTRUM, 16L), + getTcAspectStack(TCAspects.METALLUM, 32L), + getTcAspectStack(TCAspects.POTENTIA, 32L))); GregtechItemList.Battery_Gem_3.set( this.addItem( Battery_Gem_3.ID, "Quark Entanglement", "Reusable", - getTcAspectStack(TC_Aspects.ELECTRUM, 32L), - getTcAspectStack(TC_Aspects.METALLUM, 48L), - getTcAspectStack(TC_Aspects.POTENTIA, 64L))); + getTcAspectStack(TCAspects.ELECTRUM, 32L), + getTcAspectStack(TCAspects.METALLUM, 48L), + getTcAspectStack(TCAspects.POTENTIA, 64L))); // RTG Pellet GregtechItemList.Pellet_RTG_PU238.set( @@ -143,36 +143,36 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { Pellet_RTG_PU238.ID, StringUtils.superscript("238") + "Pu Pellet", "", - getTcAspectStack(TC_Aspects.RADIO, 4L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L))); + getTcAspectStack(TCAspects.RADIO, 4L), + getTcAspectStack(TCAspects.POTENTIA, 2L), + getTcAspectStack(TCAspects.METALLUM, 2L))); GregtechItemList.Pellet_RTG_SR90.set( this.addItem( Pellet_RTG_SR90.ID, StringUtils.superscript("90") + "Sr Pellet", "", - getTcAspectStack(TC_Aspects.RADIO, 4L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L))); + getTcAspectStack(TCAspects.RADIO, 4L), + getTcAspectStack(TCAspects.POTENTIA, 2L), + getTcAspectStack(TCAspects.METALLUM, 2L))); GregtechItemList.Pellet_RTG_PO210.set( this.addItem( Pellet_RTG_PO210.ID, StringUtils.superscript("210") + "Po Pellet", "", - getTcAspectStack(TC_Aspects.RADIO, 4L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L))); + getTcAspectStack(TCAspects.RADIO, 4L), + getTcAspectStack(TCAspects.POTENTIA, 2L), + getTcAspectStack(TCAspects.METALLUM, 2L))); GregtechItemList.Pellet_RTG_AM241.set( this.addItem( Pellet_RTG_AM241.ID, StringUtils.superscript("241") + "Am Pellet", "", - getTcAspectStack(TC_Aspects.RADIO, 4L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L))); + getTcAspectStack(TCAspects.RADIO, 4L), + getTcAspectStack(TCAspects.POTENTIA, 2L), + getTcAspectStack(TCAspects.METALLUM, 2L))); // Computer Cube GregtechItemList.Gregtech_Computer_Cube.set( @@ -180,59 +180,59 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { Gregtech_Computer_Cube.ID, "Gregtech Computer Cube", "Reusable", - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.METALLUM, 8L), - getTcAspectStack(TC_Aspects.POTENTIA, 8L))); + getTcAspectStack(TCAspects.ELECTRUM, 8L), + getTcAspectStack(TCAspects.METALLUM, 8L), + getTcAspectStack(TCAspects.POTENTIA, 8L))); GregtechItemList.Cover_Overflow_LV.set( this.addItem( Cover_Overflow_LV.ID, "Overflow Valve (LV)", "Maximum void amount: 64,000", - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L))); + getTcAspectStack(TCAspects.ELECTRUM, 1L), + getTcAspectStack(TCAspects.MACHINA, 1L), + getTcAspectStack(TCAspects.ITER, 1L), + getTcAspectStack(TCAspects.AQUA, 1L))); GregtechItemList.Cover_Overflow_MV.set( this.addItem( Cover_Overflow_MV.ID, "Overflow Valve (MV)", "Maximum void amount: 512,000", - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L))); + getTcAspectStack(TCAspects.ELECTRUM, 1L), + getTcAspectStack(TCAspects.MACHINA, 1L), + getTcAspectStack(TCAspects.ITER, 1L), + getTcAspectStack(TCAspects.AQUA, 1L))); GregtechItemList.Cover_Overflow_HV.set( this.addItem( Cover_Overflow_HV.ID, "Overflow Valve (HV)", "Maximum void amount: 4,096,000", - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L))); + getTcAspectStack(TCAspects.ELECTRUM, 1L), + getTcAspectStack(TCAspects.MACHINA, 1L), + getTcAspectStack(TCAspects.ITER, 1L), + getTcAspectStack(TCAspects.AQUA, 1L))); GregtechItemList.Cover_Overflow_EV.set( this.addItem( Cover_Overflow_EV.ID, "Overflow Valve (EV)", "Maximum void amount: 32,768,000", - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L))); + getTcAspectStack(TCAspects.ELECTRUM, 1L), + getTcAspectStack(TCAspects.MACHINA, 1L), + getTcAspectStack(TCAspects.ITER, 1L), + getTcAspectStack(TCAspects.AQUA, 1L))); GregtechItemList.Cover_Overflow_IV.set( this.addItem( Cover_Overflow_IV.ID, "Overflow Valve (IV)", "Maximum void amount: 262,144,000", - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L))); + getTcAspectStack(TCAspects.ELECTRUM, 1L), + getTcAspectStack(TCAspects.MACHINA, 1L), + getTcAspectStack(TCAspects.ITER, 1L), + getTcAspectStack(TCAspects.AQUA, 1L))); // Fusion Reactor MK4 Singularity GregtechItemList.Compressed_Fusion_Reactor.set( @@ -258,9 +258,9 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { Battery_Gem_4.ID, "Graviton Anomaly", "Reusable", - getTcAspectStack(TC_Aspects.ELECTRUM, 64L), - getTcAspectStack(TC_Aspects.METALLUM, 64L), - getTcAspectStack(TC_Aspects.POTENTIA, 64L))); + getTcAspectStack(TCAspects.ELECTRUM, 64L), + getTcAspectStack(TCAspects.METALLUM, 64L), + getTcAspectStack(TCAspects.POTENTIA, 64L))); /* * High Tier 'Saws' for the tree Farm @@ -285,11 +285,11 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { aTransParts[tier - 1].set( this.addItem( IDs[tier - 1], - "Transmission Component (" + GT_Values.VN[tier] + ")", + "Transmission Component (" + GTValues.VN[tier] + ")", "", - getTcAspectStack(TC_Aspects.ELECTRUM, tier), - getTcAspectStack(TC_Aspects.MACHINA, tier), - getTcAspectStack(TC_Aspects.MAGNETO, tier))); + getTcAspectStack(TCAspects.ELECTRUM, tier), + getTcAspectStack(TCAspects.MACHINA, tier), + getTcAspectStack(TCAspects.MAGNETO, tier))); } // Distillus Chip @@ -308,17 +308,17 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { } private void setAllElectricStats() { - this.setElectricStats(32000 + Battery_RE_EV_Cadmium.ID, 4800000L, GT_Values.V[4], 4L, -3L, true); - this.setElectricStats(32000 + Battery_RE_EV_Sodium.ID, 3200000L, GT_Values.V[4], 4L, -3L, true); - this.setElectricStats(32000 + Battery_RE_EV_Lithium.ID, 6400000L, GT_Values.V[4], 4L, -3L, true); - this.setElectricStats(32000 + Battery_Gem_1.ID, GT_Values.V[6] * 20 * 300 / 4, GT_Values.V[6], 6L, -3L, false); - this.setElectricStats(32000 + Battery_Gem_2.ID, GT_Values.V[7] * 20 * 300 / 4, GT_Values.V[7], 7L, -3L, false); - this.setElectricStats(32000 + Battery_Gem_3.ID, GT_Values.V[8] * 20 * 300 / 4, GT_Values.V[8], 8L, -3L, false); - this.setElectricStats(32000 + Battery_Casing_Gem_4.ID, (64000000000L * 16), GT_Values.V[9], 9L, -3L, false); + this.setElectricStats(32000 + Battery_RE_EV_Cadmium.ID, 4800000L, GTValues.V[4], 4L, -3L, true); + this.setElectricStats(32000 + Battery_RE_EV_Sodium.ID, 3200000L, GTValues.V[4], 4L, -3L, true); + this.setElectricStats(32000 + Battery_RE_EV_Lithium.ID, 6400000L, GTValues.V[4], 4L, -3L, true); + this.setElectricStats(32000 + Battery_Gem_1.ID, GTValues.V[6] * 20 * 300 / 4, GTValues.V[6], 6L, -3L, false); + this.setElectricStats(32000 + Battery_Gem_2.ID, GTValues.V[7] * 20 * 300 / 4, GTValues.V[7], 7L, -3L, false); + this.setElectricStats(32000 + Battery_Gem_3.ID, GTValues.V[8] * 20 * 300 / 4, GTValues.V[8], 8L, -3L, false); + this.setElectricStats(32000 + Battery_Casing_Gem_4.ID, (64000000000L * 16), GTValues.V[9], 9L, -3L, false); this.setElectricStats( 32000 + Gregtech_Computer_Cube.ID, - GT_Values.V[6] * 10 * 60 * 20, - GT_Values.V[5], + GTValues.V[6] * 10 * 60 * 20, + GTValues.V[5], 5L, -3L, false); @@ -331,36 +331,36 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { } private void registerFuelRTGRecipes() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(GregtechItemList.Pellet_RTG_PU238.get(1)) .duration(0) .eut(64) .metadata(RTG_DURATION_IN_DAYS, MathUtils.roundToClosestInt(87.7f)) .addTo(rtgFuels); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(GregtechItemList.Pellet_RTG_SR90.get(1)) .duration(0) .eut(TierEU.RECIPE_LV) .metadata(RTG_DURATION_IN_DAYS, MathUtils.roundToClosestInt(28.8f)) .addTo(rtgFuels); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(GregtechItemList.Pellet_RTG_PO210.get(1)) .duration(0) .eut(TierEU.RECIPE_HV) .metadata(RTG_DURATION_IN_DAYS, 1) .addTo(rtgFuels); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(GregtechItemList.Pellet_RTG_AM241.get(1)) .duration(0) .eut(16) .metadata(RTG_DURATION_IN_DAYS, 216) .addTo(rtgFuels); - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getIC2Item("RTGPellets", 1)) + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getIC2Item("RTGPellets", 1)) .duration(0) .eut(8) .metadata(RTG_DURATION_IN_DAYS, MathUtils.roundToClosestInt(2.6f)) @@ -368,36 +368,36 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { } private void registerCovers() { - GregTech_API.registerCover( + GregTechAPI.registerCover( GregtechItemList.Cover_Overflow_LV.get(1L), - new GT_MultiTexture( + new GTMultiTexture( Textures.BlockIcons.MACHINE_CASINGS[4][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), - new GTPP_Cover_Overflow(64)); - GregTech_API.registerCover( + new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), + new CoverOverflow(64)); + GregTechAPI.registerCover( GregtechItemList.Cover_Overflow_MV.get(1L), - new GT_MultiTexture( + new GTMultiTexture( Textures.BlockIcons.MACHINE_CASINGS[5][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), - new GTPP_Cover_Overflow(512)); - GregTech_API.registerCover( + new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), + new CoverOverflow(512)); + GregTechAPI.registerCover( GregtechItemList.Cover_Overflow_HV.get(1L), - new GT_MultiTexture( + new GTMultiTexture( Textures.BlockIcons.MACHINE_CASINGS[5][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), - new GTPP_Cover_Overflow(4096)); - GregTech_API.registerCover( + new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), + new CoverOverflow(4096)); + GregTechAPI.registerCover( GregtechItemList.Cover_Overflow_EV.get(1L), - new GT_MultiTexture( + new GTMultiTexture( Textures.BlockIcons.MACHINE_CASINGS[8][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), - new GTPP_Cover_Overflow(32768)); - GregTech_API.registerCover( + new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), + new CoverOverflow(32768)); + GregTechAPI.registerCover( GregtechItemList.Cover_Overflow_IV.get(1L), - new GT_MultiTexture( + new GTMultiTexture( Textures.BlockIcons.MACHINE_CASINGS[8][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), - new GTPP_Cover_Overflow(262144)); + new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), + new CoverOverflow(262144)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java index 30250a46f3..ddc90a0183 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java @@ -1,24 +1,24 @@ package gtPlusPlus.xmod.gregtech.common.items; -import gregtech.api.GregTech_API; -import gregtech.api.enums.TC_Aspects; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.TCAspects; import gregtech.api.enums.ToolDictNames; -import gregtech.api.items.GT_MetaGenerated_Tool; +import gregtech.api.items.MetaGeneratedTool; import gtPlusPlus.xmod.gregtech.api.enums.GregtechToolDictNames; -import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_AngleGrinder; -import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricSnips; +import gtPlusPlus.xmod.gregtech.common.tools.ToolAngleGrinder; +import gtPlusPlus.xmod.gregtech.common.tools.ToolElectricSnips; -public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool { +public class MetaGeneratedGregtechTools extends MetaGeneratedTool { public static final short ANGLE_GRINDER = 7834; public static final short ELECTRIC_SNIPS = 7934; - public static GT_MetaGenerated_Tool INSTANCE; + public static MetaGeneratedTool INSTANCE; static { INSTANCE = new MetaGeneratedGregtechTools(); } - public static GT_MetaGenerated_Tool getInstance() { + public static MetaGeneratedTool getInstance() { return INSTANCE; } @@ -30,25 +30,25 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool { ANGLE_GRINDER, "Angle Grinder", "Hand-held electric filing device", - new TOOL_Gregtech_AngleGrinder(), + new ToolAngleGrinder(), GregtechToolDictNames.craftingToolAngleGrinder, ToolDictNames.craftingToolFile, - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)); + new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 2L), + new TCAspects.TC_AspectStack(TCAspects.FABRICO, 2L), + new TCAspects.TC_AspectStack(TCAspects.ORDO, 2L)); // Electric Wire Cutter - GregTech_API.registerWireCutter( + GregTechAPI.registerWireCutter( this.addTool( ELECTRIC_SNIPS, "Automatic Snips", "Hand-held electric wire cutter", - new TOOL_Gregtech_ElectricSnips(), + new ToolElectricSnips(), GregtechToolDictNames.craftingToolElectricSnips, ToolDictNames.craftingToolWireCutter, - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 4L), - new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 4L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 4L))); + new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 4L), + new TCAspects.TC_AspectStack(TCAspects.FABRICO, 4L), + new TCAspects.TC_AspectStack(TCAspects.ORDO, 4L))); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/Ids_MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedItemIDs.java index 5a9e9db772..72f5c66c58 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/Ids_MetaGeneratedGregtechItems.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedItemIDs.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.common.items; -public enum Ids_MetaGeneratedGregtechItems { +public enum MetaGeneratedItemIDs { Shape_Extruder_WindmillShaft(40), Pellet_RTG_PU238(41), @@ -41,7 +41,7 @@ public enum Ids_MetaGeneratedGregtechItems { public final int ID; - Ids_MetaGeneratedGregtechItems(int ID) { + MetaGeneratedItemIDs(int ID) { this.ID = ID; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java index f85822750d..be7a0f1c99 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java @@ -7,31 +7,31 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.util.GT_LanguageManager; -import gregtech.common.items.behaviors.Behaviour_None; -import gregtech.common.items.behaviors.Behaviour_Wrench; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.util.GTLanguageManager; +import gregtech.common.items.behaviors.BehaviourNone; +import gregtech.common.items.behaviors.BehaviourWrench; import gtPlusPlus.core.util.minecraft.NBTUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; -public class Behaviour_Choocher extends Behaviour_None { +public class Behaviour_Choocher extends BehaviourNone { private boolean isWrench = true; - private final Behaviour_Wrench wrench = new Behaviour_Wrench(150); + private final BehaviourWrench wrench = new BehaviourWrench(150); private final Behaviour_Prospecting_Ex prospecting = new Behaviour_Prospecting_Ex(10, 1250); - private final String mTooltip1 = GT_LanguageManager + private final String mTooltip1 = GTLanguageManager .addStringLocalization("gt.behaviour.choochering1", "Current tool mode: "); - private final String mTooltip2 = GT_LanguageManager + private final String mTooltip2 = GTLanguageManager .addStringLocalization("gt.behaviour.choochering2", "Change tool mode using Shift+Rightclick."); - private final String mTooltipH = GT_LanguageManager + private final String mTooltipH = GTLanguageManager .addStringLocalization("gt.behaviour.prospectingEx", "Usable for Prospecting large areas."); - private final String mTooltipW = GT_LanguageManager + private final String mTooltipW = GTLanguageManager .addStringLocalization("gt.behaviour.wrench", "Rotates Blocks on Rightclick."); public Behaviour_Choocher() {} @Override - public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer, + public boolean onItemUseFirst(final MetaBaseItem aItem, final ItemStack aStack, final EntityPlayer aPlayer, final World aWorld, final int aX, final int aY, final int aZ, final ForgeDirection side, final float hitX, final float hitY, final float hitZ) { if (aWorld.isRemote) { @@ -64,7 +64,7 @@ public class Behaviour_Choocher extends Behaviour_None { } @Override - public List<String> getAdditionalToolTips(final GT_MetaBase_Item aItem, final List<String> aList, + public List<String> getAdditionalToolTips(final MetaBaseItem aItem, final List<String> aList, final ItemStack aStack) { boolean inWrenchMode; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java index f3d7f87a86..c458d237bd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java @@ -13,37 +13,37 @@ import net.minecraftforge.common.util.ForgeDirection; import codechicken.lib.math.MathHelper; import gregtech.api.enums.SoundResource; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; -import gregtech.common.items.behaviors.Behaviour_None; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; +import gregtech.common.items.behaviors.BehaviourNone; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.entity.projectile.EntityLightningAttack; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.NBTUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; import ic2.api.item.IElectricItemManager; -public class Behaviour_Electric_Lighter extends Behaviour_None { +public class Behaviour_Electric_Lighter extends BehaviourNone { - private final String mTooltip = GT_LanguageManager + private final String mTooltip = GTLanguageManager .addStringLocalization("gt.behaviour.lighter.tooltip", "Can light things on Fire"); - private final String mTooltipUses = GT_LanguageManager + private final String mTooltipUses = GTLanguageManager .addStringLocalization("gt.behaviour.lighter.uses", "Remaining Uses:"); - private final String mTooltipUnstackable = GT_LanguageManager + private final String mTooltipUnstackable = GTLanguageManager .addStringLocalization("gt.behaviour.unstackable", "Not usable when stacked!"); public Behaviour_Electric_Lighter() {} @Override - public boolean onLeftClickEntity(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) { + public boolean onLeftClickEntity(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) { if (!aPlayer.worldObj.isRemote && aStack != null && aStack.stackSize == 1) { boolean rOutput = false; if (aEntity instanceof EntityCreeper) { if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) { - GT_Utility.sendSoundToPlayers( + GTUtility.sendSoundToPlayers( aPlayer.worldObj, SoundResource.FIRE_IGNITE, 1.0F, @@ -62,8 +62,8 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { } @Override - public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, - int aY, int aZ, int ordinalSide, float hitX, float hitY, float hitZ) { + public boolean onItemUse(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, + int aZ, int ordinalSide, float hitX, float hitY, float hitZ) { if (!aWorld.isRemote && aStack != null && aStack.stackSize == 1) { if (aPlayer.isSneaking()) { Logger.INFO("Changing Mode"); @@ -81,8 +81,11 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMode"); if (aCurrentMode) { // Shoot Lightning Attack - aWorld - .playSoundAtEntity(aPlayer, "random.bow", 0.5F, 0.4F / (CORE.RANDOM.nextFloat() * 0.4F + 0.8F)); + aWorld.playSoundAtEntity( + aPlayer, + "random.bow", + 0.5F, + 0.4F / (GTPPCore.RANDOM.nextFloat() * 0.4F + 0.8F)); if (!aWorld.isRemote) { aWorld.spawnEntityInWorld(new EntityLightningAttack(aWorld, aPlayer, hitX, hitY, hitZ)); } @@ -94,12 +97,12 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { aX += tDirection.offsetX; aY += tDirection.offsetY; aZ += tDirection.offsetZ; - if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ) + if (GTUtility.isBlockAir(aWorld, aX, aY, aZ) && aPlayer.canPlayerEdit(aX, aY, aZ, ordinalSide, aStack)) { Logger.WARNING("Preparing Lighter b"); if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) { Logger.WARNING("Preparing Lighter c"); - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ); + GTUtility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ); aWorld.setBlock(aX, aY, aZ, Blocks.fire); rOutput = true; // ItemNBT.setLighterFuel(aStack, tFuelAmount); @@ -113,7 +116,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { return false; } - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int ordinalSide, float hitX, float hitY, float hitZ) { if (!aWorld.isRemote && aStack != null && aStack.stackSize == 1) { if (aPlayer.isSneaking()) { @@ -132,8 +135,11 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMode"); if (aCurrentMode) { // Shoot Lightning Attack - aWorld - .playSoundAtEntity(aPlayer, "random.bow", 0.5F, 0.4F / (CORE.RANDOM.nextFloat() * 0.4F + 0.8F)); + aWorld.playSoundAtEntity( + aPlayer, + "random.bow", + 0.5F, + 0.4F / (GTPPCore.RANDOM.nextFloat() * 0.4F + 0.8F)); if (!aWorld.isRemote) { aWorld.spawnEntityInWorld(new EntityLightningAttack(aWorld, aPlayer, hitX, hitY, hitZ)); } @@ -145,12 +151,12 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { aX += tDirection.offsetX; aY += tDirection.offsetY; aZ += tDirection.offsetZ; - if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ) + if (GTUtility.isBlockAir(aWorld, aX, aY, aZ) && aPlayer.canPlayerEdit(aX, aY, aZ, ordinalSide, aStack)) { Logger.WARNING("Preparing Lighter b"); if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) { Logger.WARNING("Preparing Lighter c"); - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ); + GTUtility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ); aWorld.setBlock(aX, aY, aZ, Blocks.fire); rOutput = true; // ItemNBT.setLighterFuel(aStack, tFuelAmount); @@ -191,7 +197,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { private void useUp(ItemStack aStack) {} @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { aList.add(this.mTooltip); int aUses = 0; if (aStack != null) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java index 5749204296..f63da57f1c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java @@ -11,20 +11,20 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidBlock; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.SoundResource; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.items.GT_MetaGenerated_Tool; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.items.MetaGeneratedTool; import gregtech.api.objects.ItemData; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gregtech.common.blocks.GT_Block_Ores; -import gregtech.common.blocks.GT_TileEntity_Ores; -import gregtech.common.items.behaviors.Behaviour_Prospecting; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gregtech.common.blocks.BlockOres; +import gregtech.common.blocks.TileEntityOres; +import gregtech.common.items.behaviors.BehaviourProspecting; -public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting { +public class Behaviour_Prospecting_Ex extends BehaviourProspecting { private final int mVanillaCosts; private final int mEUCosts; @@ -36,7 +36,7 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting { } @Override - public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer, + public boolean onItemUseFirst(final MetaBaseItem aItem, final ItemStack aStack, final EntityPlayer aPlayer, final World aWorld, final int aX, final int aY, final int aZ, final ForgeDirection side, final float hitX, final float hitY, final float hitZ) { if (aWorld.isRemote) { @@ -48,28 +48,28 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting { } final byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ); - ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(aBlock, 1, aMeta)); + ItemData tAssotiation = GTOreDictUnificator.getAssociation(new ItemStack(aBlock, 1, aMeta)); if ((tAssotiation != null) && (tAssotiation.mPrefix.toString() .startsWith("ore"))) { - GT_Utility + GTUtility .sendChatToPlayer(aPlayer, "This is " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore."); - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ); + GTUtility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ); return true; } if ((aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone)) - || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockGranites)) + || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTechAPI.sBlockGranites)) || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.netherrack)) || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.end_stone)) || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.dirt)) || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.grass))) { - if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ); + if (GTModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) { + GTUtility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ); int tX = aX; int tY = aY; int tZ = aZ; int tMetaID = 0; - final int tQuality = ((aItem instanceof GT_MetaGenerated_Tool) - ? ((GT_MetaGenerated_Tool) aItem).getHarvestLevel(aStack, "") + final int tQuality = ((aItem instanceof MetaGeneratedTool) + ? ((MetaGeneratedTool) aItem).getHarvestLevel(aStack, "") : 0) * 3; int i = 0; @@ -80,23 +80,23 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting { final Block tBlock = aWorld.getBlock(tX, tY, tZ); if ((tBlock == Blocks.lava) || (tBlock == Blocks.flowing_lava)) { - GT_Utility.sendChatToPlayer(aPlayer, "There is Lava behind this Block."); + GTUtility.sendChatToPlayer(aPlayer, "There is Lava behind this Block."); break; } if ((tBlock == Blocks.water) || (tBlock == Blocks.flowing_water) || ((tBlock instanceof IFluidBlock))) { - GT_Utility.sendChatToPlayer(aPlayer, "There is a Liquid behind this Block."); + GTUtility.sendChatToPlayer(aPlayer, "There is a Liquid behind this Block."); break; } - if ((tBlock == Blocks.monster_egg) || (!GT_Utility.hasBlockHitBox(aWorld, tX, tY, tZ))) { - GT_Utility.sendChatToPlayer(aPlayer, "There is an Air Pocket behind this Block."); + if ((tBlock == Blocks.monster_egg) || (!GTUtility.hasBlockHitBox(aWorld, tX, tY, tZ))) { + GTUtility.sendChatToPlayer(aPlayer, "There is an Air Pocket behind this Block."); break; } if (tBlock != aBlock) { if (i >= 4) { break; } - GT_Utility.sendChatToPlayer(aPlayer, "Material is changing behind this Block."); + GTUtility.sendChatToPlayer(aPlayer, "Material is changing behind this Block."); break; } } @@ -107,13 +107,13 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting { tY = (aY - 4 - tQuality) + tRandom.nextInt(j); tZ = (aZ - 4 - tQuality) + tRandom.nextInt(j); final Block tBlock = aWorld.getBlock(tX, tY, tZ); - if ((tBlock instanceof GT_Block_Ores)) { + if ((tBlock instanceof BlockOres)) { final TileEntity tTileEntity = aWorld.getTileEntity(tX, tY, tZ); - if ((tTileEntity instanceof GT_TileEntity_Ores)) { - final Materials tMaterial = GregTech_API.sGeneratedMaterials[(((GT_TileEntity_Ores) tTileEntity).mMetaData + if ((tTileEntity instanceof TileEntityOres)) { + final Materials tMaterial = GregTechAPI.sGeneratedMaterials[(((TileEntityOres) tTileEntity).mMetaData % 1000)]; if ((tMaterial != null) && (tMaterial != Materials._NULL)) { - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, "Found traces of " + tMaterial.mDefaultLocalName + " Ore."); return true; @@ -121,17 +121,17 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting { } } else { tMetaID = aWorld.getBlockMetadata(tX, tY, tZ); - tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); + tAssotiation = GTOreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); if ((tAssotiation != null) && (tAssotiation.mPrefix.toString() .startsWith("ore"))) { - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, "Found traces of " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore."); return true; } } } - GT_Utility.sendChatToPlayer(aPlayer, "No Ores found."); + GTUtility.sendChatToPlayer(aPlayer, "No Ores found."); } return true; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java index 987924952a..399554d306 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java @@ -8,7 +8,7 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Textures; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.xmod.gregtech.common.items.MetaCustomCoverItem; @@ -45,6 +45,6 @@ public class MetaItemCoverCasings extends MetaCustomCoverItem { public String getItemStackDisplayName(final ItemStack tItem) { return EnumChatFormatting.LIGHT_PURPLE + StatCollector.translateToLocalFormatted( "item.itemCustomMetaCover.miscutils.GtMachineCasings", - GT_Values.VOLTAGE_NAMES[MathUtils.balance(tItem.getItemDamage(), 0, GT_Values.VOLTAGE_NAMES.length - 1)]); // super.getItemStackDisplayName(tItem); + GTValues.VOLTAGE_NAMES[MathUtils.balance(tItem.getItemDamage(), 0, GTValues.VOLTAGE_NAMES.length - 1)]); // super.getItemStackDisplayName(tItem); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/CapeRenderer.java index a281a205d2..f9ec4b9433 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/CapeRenderer.java @@ -21,18 +21,18 @@ import net.minecraftforge.client.event.RenderPlayerEvent; import org.apache.commons.io.IOUtils; import org.lwjgl.opengl.GL11; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.CORE.ConfigSwitches; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.lib.GTPPCore.ConfigSwitches; import gtPlusPlus.core.proxy.ClientProxy; import gtPlusPlus.core.util.data.AES; import gtPlusPlus.core.util.data.FileUtils; import gtPlusPlus.core.util.math.MathUtils; -public class GTPP_CapeRenderer extends RenderPlayer { +public class CapeRenderer extends RenderPlayer { private static final ResourceLocation[] mCapes = { new ResourceLocation("miscutils:textures/OrangeHD.png"), new ResourceLocation("miscutils:textures/FancyCapeHD.png"), @@ -42,7 +42,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { private final boolean mInit; - public GTPP_CapeRenderer() { + public CapeRenderer() { mInit = init(); } @@ -91,7 +91,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { // We have already checked if this player has a cape, but since they do not, we best not render. if (hasResourceChecked) { - if (!hasCape && !CORE.DEVENV) { + if (!hasCape && !GTPPCore.DEVENV) { return; } } @@ -113,7 +113,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { } // Automatically allocate a Dev cape while in Dev mode. - if (tResource == null && CORE.DEVENV) { + if (tResource == null && GTPPCore.DEVENV) { tResource = mCapes[4]; hasCape = true; } @@ -184,13 +184,13 @@ public class GTPP_CapeRenderer extends RenderPlayer { private boolean renderCapeOnPlayer(RenderPlayerEvent.Specials.Pre aEvent, AbstractClientPlayer aPlayer) { float aPartialTicks = aEvent.partialRenderTick; try { - if (tResource == null && CORE.DEVENV) { + if (tResource == null && GTPPCore.DEVENV) { tResource = mCapes[3]; } // If player is invisible, don't render. - if (GT_Utility.getFullInvisibility(aPlayer) || aPlayer.isInvisible() - || GT_Utility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id))) { + if (GTUtility.getFullInvisibility(aPlayer) || aPlayer.isInvisible() + || GTUtility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id))) { aEvent.setCanceled(true); return false; } @@ -207,8 +207,8 @@ public class GTPP_CapeRenderer extends RenderPlayer { - (aPlayer.prevPosZ + (aPlayer.posZ - aPlayer.prevPosZ) * aPartialTicks); float f6 = aPlayer.prevRenderYawOffset + (aPlayer.renderYawOffset - aPlayer.prevRenderYawOffset) * aPartialTicks; - double d3 = MathHelper.sin(f6 * CORE.PI / 180.0F); - double d4 = -MathHelper.cos(f6 * CORE.PI / 180.0F); + double d3 = MathHelper.sin(f6 * GTPPCore.PI / 180.0F); + double d4 = -MathHelper.cos(f6 * GTPPCore.PI / 180.0F); float f7 = (float) d1 * 10.0F; float f8 = (float) (d0 * d3 + d2 * d4) * 100.0F; float f9 = (float) (d0 * d4 - d2 * d3) * 100.0F; @@ -260,7 +260,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { private static boolean init() { CapeUtils.handleOldCapeCache(); - if (CORE.DEVENV) { + if (GTPPCore.DEVENV) { return true; } ForkJoinPool.commonPool() diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_FlaskRenderer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/FlaskRenderer.java index 0c9e59e2f2..20d904ae80 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_FlaskRenderer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/FlaskRenderer.java @@ -13,14 +13,14 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.common.items.GT_VolumetricFlask; +import gregtech.common.items.ItemVolumetricFlask; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import ic2.core.util.DrawUtil; @SideOnly(cpw.mods.fml.relauncher.Side.CLIENT) -public final class GTPP_FlaskRenderer implements net.minecraftforge.client.IItemRenderer { +public final class FlaskRenderer implements net.minecraftforge.client.IItemRenderer { - public GTPP_FlaskRenderer() { + public FlaskRenderer() { MinecraftForgeClient.registerItemRenderer(GregtechItemList.VOLUMETRIC_FLASK_8k.getItem(), this); MinecraftForgeClient.registerItemRenderer(GregtechItemList.VOLUMETRIC_FLASK_32k.getItem(), this); } @@ -37,7 +37,7 @@ public final class GTPP_FlaskRenderer implements net.minecraftforge.client.IItem @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - GT_VolumetricFlask cell = (GT_VolumetricFlask) item.getItem(); + ItemVolumetricFlask cell = (ItemVolumetricFlask) item.getItem(); int aType = cell.getMaxCapacity() == 8000 ? 0 : 1; IIcon icon = item.getIconIndex(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/MachineBlockRenderer.java index bfd16b4cc5..7ce7002738 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/MachineBlockRenderer.java @@ -28,23 +28,23 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.registry.RenderingRegistry; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IPipeRenderedTileEntity; import gregtech.api.interfaces.tileentity.ITexturedTileEntity; import gregtech.api.metatileentity.MetaPipeEntity; -import gregtech.common.blocks.GT_Block_Machines; -import gregtech.common.render.GT_Renderer_Block; -import gtPlusPlus.xmod.gregtech.common.helpers.GT_MethodHelper; +import gregtech.common.blocks.BlockMachines; +import gregtech.common.render.GTRendererBlock; +import gtPlusPlus.xmod.gregtech.common.helpers.GTMethodHelper; -public class GTPP_Render_MachineBlock extends GT_Renderer_Block { +public class MachineBlockRenderer extends GTRendererBlock { - public static GTPP_Render_MachineBlock INSTANCE; + public static MachineBlockRenderer INSTANCE; public final int mRenderID = RenderingRegistry.getNextAvailableRenderId(); - public GTPP_Render_MachineBlock() { + public MachineBlockRenderer() { INSTANCE = this; RenderingRegistry.registerBlockHandler(this); } @@ -62,8 +62,8 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { } private static void renderNormalInventoryMetaTileEntity(Block aBlock, int aMeta, RenderBlocks aRenderer) { - if (aMeta > 0 && aMeta < GregTech_API.METATILEENTITIES.length) { - IMetaTileEntity tMetaTileEntity = GregTech_API.METATILEENTITIES[aMeta]; + if (aMeta > 0 && aMeta < GregTechAPI.METATILEENTITIES.length) { + IMetaTileEntity tMetaTileEntity = GregTechAPI.METATILEENTITIES[aMeta]; if (tMetaTileEntity != null) { aBlock.setBlockBoundsForItemRender(); aRenderer.setRenderBoundsFromBlock(aBlock); @@ -240,12 +240,12 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { aZ, aBlock, aRenderer, - new ITexture[][] { GT_MethodHelper.getTexture(tTileEntity, aBlock, DOWN), - GT_MethodHelper.getTexture(tTileEntity, aBlock, UP), - GT_MethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.NORTH), - GT_MethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.SOUTH), - GT_MethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.WEST), - GT_MethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.EAST) }) + new ITexture[][] { GTMethodHelper.getTexture(tTileEntity, aBlock, DOWN), + GTMethodHelper.getTexture(tTileEntity, aBlock, UP), + GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.NORTH), + GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.SOUTH), + GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.WEST), + GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.EAST) }) : false; } @@ -294,7 +294,7 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { final EnumMap<ForgeDirection, ITexture[]> textureUncovered = new EnumMap<>(ForgeDirection.class); for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - texture.put(side, GT_MethodHelper.getTexture((TileEntity) aTileEntity, aBlock, side)); + texture.put(side, GTMethodHelper.getTexture((TileEntity) aTileEntity, aBlock, side)); textureUncovered.put(side, aTileEntity.getTextureUncovered(side)); } @@ -1204,10 +1204,10 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { @Override public void renderInventoryBlock(Block aBlock, int aMeta, int aModelID, RenderBlocks aRenderer) { aMeta += 30400; - if (aBlock instanceof GT_Block_Machines) { - if (aMeta > 0 && aMeta < GregTech_API.METATILEENTITIES.length - && GregTech_API.METATILEENTITIES[aMeta] != null - && !GregTech_API.METATILEENTITIES[aMeta].renderInInventory(aBlock, aMeta, aRenderer)) { + if (aBlock instanceof BlockMachines) { + if (aMeta > 0 && aMeta < GregTechAPI.METATILEENTITIES.length + && GregTechAPI.METATILEENTITIES[aMeta] != null + && !GregTechAPI.METATILEENTITIES[aMeta].renderInInventory(aBlock, aMeta, aRenderer)) { renderNormalInventoryMetaTileEntity(aBlock, aMeta, aRenderer); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTEElectricAutoWorkbench.java index c1ba23c3c7..05150c8478 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTEElectricAutoWorkbench.java @@ -15,27 +15,27 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget; import com.gtnewhorizons.modularui.common.widget.SlotGroup; import com.gtnewhorizons.modularui.common.widget.SlotWidget; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.Textures; import gregtech.api.enums.Textures.BlockIcons; -import gregtech.api.gui.modularui.GT_UIInfos; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUIInfos; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.modularui.IAddGregtechLogo; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; -import gregtech.api.objects.GT_ItemStack; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; +import gregtech.api.metatileentity.implementations.MTEBasicTank; +import gregtech.api.objects.GTItemStack; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_BasicTank implements IAddGregtechLogo { +public class MTEElectricAutoWorkbench extends MTEBasicTank implements IAddGregtechLogo { public int mMode = 0, mCurrentSlot = 0, mThroughPut = 0, mTicksUntilNextUpdate = 20; public boolean mLastCraftSuccessful = false; @@ -44,18 +44,18 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B private static final int MAX_MODES = 10; private static final int MAX_THROUGHPUT = 4; - public GT_MetaTileEntity_ElectricAutoWorkbench(final int aID, final int aTier, final String aDescription) { + public MTEElectricAutoWorkbench(final int aID, final int aTier, final String aDescription) { super( aID, "basicmachine.automation.autoworkbench.0" + aTier, - "Auto Workbench (" + GT_Values.VN[aTier] + ")", + "Auto Workbench (" + GTValues.VN[aTier] + ")", aTier, 30, aDescription); - mLocalName = "Auto Workbench (" + GT_Values.VN[aTier] + ")"; + mLocalName = "Auto Workbench (" + GTValues.VN[aTier] + ")"; } - public GT_MetaTileEntity_ElectricAutoWorkbench(final String aName, final int aTier, final String[] aDescription, + public MTEElectricAutoWorkbench(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 30, aDescription, aTextures); } @@ -112,22 +112,22 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B @Override public long maxEUInput() { - return GT_Values.V[mTier]; + return GTValues.V[mTier]; } @Override public long maxEUOutput() { - return mThroughPut % 2 == 0 ? GT_Values.V[mTier] : 0; + return mThroughPut % 2 == 0 ? GTValues.V[mTier] : 0; } @Override public long getMinimumStoredEU() { - return GT_Values.V[this.mTier]; + return GTValues.V[this.mTier]; } @Override public long maxEUStore() { - return Math.max(2048L, GT_Values.V[this.mTier] * (this.mTier * GT_Values.V[this.mTier])); + return Math.max(2048L, GTValues.V[this.mTier] * (this.mTier * GTValues.V[this.mTier])); } @Override @@ -142,17 +142,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B @Override public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_ElectricAutoWorkbench( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures); + return new MTEElectricAutoWorkbench(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -200,7 +196,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } @Override - public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) { + public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) { return side != getBaseMetaTileEntity().getFrontFacing() && side != getBaseMetaTileEntity().getBackFacing(); } @@ -226,12 +222,12 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B if (mInventory[18] == null) { for (byte i = 0; i < 18 && mFluid != null; i++) { - ItemStack tOutput = GT_Utility.fillFluidContainer(mFluid, mInventory[i], false, true); + ItemStack tOutput = GTUtility.fillFluidContainer(mFluid, mInventory[i], false, true); if (tOutput != null) { for (byte j = 0; j < 9; j++) { - if (mInventory[j] == null || (GT_Utility.areStacksEqual(tOutput, mInventory[j]) + if (mInventory[j] == null || (GTUtility.areStacksEqual(tOutput, mInventory[j]) && mInventory[j].stackSize + tOutput.stackSize <= tOutput.getMaxStackSize())) { - mFluid.amount -= GT_Utility.getFluidForFilledItem(tOutput, true).amount + mFluid.amount -= GTUtility.getFluidForFilledItem(tOutput, true).amount * tOutput.stackSize; getBaseMetaTileEntity().decrStackSize(i, 1); if (mInventory[j] == null) { @@ -274,7 +270,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B for (int i = 0; i < 9; i++) { tRecipe[i] = mInventory[i + 19]; if (tRecipe[i] != null) { - tRecipe[i] = GT_Utility.copy(tRecipe[i]); + tRecipe[i] = GTUtility.copy(tRecipe[i]); tRecipe[i].stackSize = 1; } } @@ -288,22 +284,22 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } break; } - tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]); + tTempStack = GTUtility.copy(mInventory[mCurrentSlot]); tTempStack.stackSize = 1; tRecipe[0] = tTempStack; - if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { + if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { tRecipe[1] = tTempStack; tRecipe[3] = tTempStack; tRecipe[4] = tTempStack; } else break; - if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { + if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { tRecipe[2] = tTempStack; tRecipe[5] = tTempStack; tRecipe[6] = tTempStack; tRecipe[7] = tTempStack; tRecipe[8] = tTempStack; } else break; - if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { + if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { if (mInventory[18] == null) { mInventory[18] = mInventory[mCurrentSlot]; mInventory[mCurrentSlot] = null; @@ -320,10 +316,10 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } break; } - tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]); + tTempStack = GTUtility.copy(mInventory[mCurrentSlot]); tTempStack.stackSize = 1; tRecipe[0] = tTempStack; - if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { + if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { if (mInventory[18] == null) { mInventory[18] = mInventory[mCurrentSlot]; mInventory[mCurrentSlot] = null; @@ -340,13 +336,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } break; } - tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]); + tTempStack = GTUtility.copy(mInventory[mCurrentSlot]); tTempStack.stackSize = 1; tRecipe[0] = tTempStack; tRecipe[1] = tTempStack; tRecipe[3] = tTempStack; tRecipe[4] = tTempStack; - if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { + if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { if (mInventory[18] == null) { mInventory[18] = mInventory[mCurrentSlot]; mInventory[mCurrentSlot] = null; @@ -363,7 +359,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } break; } - tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]); + tTempStack = GTUtility.copy(mInventory[mCurrentSlot]); tTempStack.stackSize = 1; tRecipe[0] = tTempStack; tRecipe[1] = tTempStack; @@ -374,7 +370,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B tRecipe[6] = tTempStack; tRecipe[7] = tTempStack; tRecipe[8] = tTempStack; - if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { + if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { if (mInventory[18] == null) { mInventory[18] = mInventory[mCurrentSlot]; mInventory[mCurrentSlot] = null; @@ -391,11 +387,11 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } break; } - tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]); + tTempStack = GTUtility.copy(mInventory[mCurrentSlot]); tTempStack.stackSize = 1; tRecipe[0] = tTempStack; - tOutput = GT_OreDictUnificator.get(true, tTempStack); - if (tOutput != null && GT_Utility.areStacksEqual(tOutput, tTempStack)) tOutput = null; + tOutput = GTOreDictUnificator.get(true, tTempStack); + if (tOutput != null && GTUtility.areStacksEqual(tOutput, tTempStack)) tOutput = null; if (tOutput == null) { tRecipe[0] = null; if (mInventory[18] == null) { @@ -413,13 +409,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mTicksUntilNextUpdate = 1; } } else if (OrePrefixes.dustSmall.contains(mInventory[mCurrentSlot])) { - tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]); + tTempStack = GTUtility.copy(mInventory[mCurrentSlot]); tTempStack.stackSize = 1; tRecipe[0] = tTempStack; tRecipe[1] = tTempStack; tRecipe[3] = tTempStack; tRecipe[4] = tTempStack; - if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) + if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { if (mInventory[18] == null) { mInventory[18] = mInventory[mCurrentSlot]; @@ -428,7 +424,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } } } else if (OrePrefixes.dustTiny.contains(mInventory[mCurrentSlot])) { - tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]); + tTempStack = GTUtility.copy(mInventory[mCurrentSlot]); tTempStack.stackSize = 1; tRecipe[0] = tTempStack; tRecipe[1] = tTempStack; @@ -439,7 +435,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B tRecipe[6] = tTempStack; tRecipe[7] = tTempStack; tRecipe[8] = tTempStack; - if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) + if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { if (mInventory[18] == null) { mInventory[18] = mInventory[mCurrentSlot]; @@ -465,7 +461,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } break; } - tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]); + tTempStack = GTUtility.copy(mInventory[mCurrentSlot]); tTempStack.stackSize = 1; tRecipe[0] = tTempStack; tRecipe[1] = tTempStack; @@ -476,7 +472,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B tRecipe[6] = tTempStack; tRecipe[7] = tTempStack; tRecipe[8] = tTempStack; - if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { + if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { if (mInventory[18] == null) { mInventory[18] = mInventory[mCurrentSlot]; mInventory[mCurrentSlot] = null; @@ -496,15 +492,15 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } break; } - tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]); + tTempStack = GTUtility.copy(mInventory[mCurrentSlot]); tTempStack.stackSize = 1; for (int i = mCurrentSlot + 1; i < 18; i++) { if (mInventory[i] != null && mInventory[i].getItem() == tTempStack.getItem() && mInventory[mCurrentSlot].getItemDamage() + mInventory[i].getItemDamage() > tTempStack.getMaxDamage()) { tRecipe[0] = tTempStack; - tRecipe[1] = GT_Utility.copy(mInventory[i]); - if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) + tRecipe[1] = GTUtility.copy(mInventory[i]); + if (GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { if (mInventory[18] == null) { mInventory[18] = mInventory[mCurrentSlot]; @@ -527,11 +523,11 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } for (byte i = 0, j = 0; i < 18 && j < 9 && (j < 2 - || GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) + || GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null); i++) { tRecipe[j] = mInventory[(mCurrentSlot + i) % 18]; if (tRecipe[j] != null) { - tRecipe[j] = GT_Utility.copy(tRecipe[j]); + tRecipe[j] = GTUtility.copy(tRecipe[j]); tRecipe[j].stackSize = 1; j++; } @@ -542,19 +538,19 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } if (tOutput == null) - tOutput = GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe); + tOutput = GTModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe); if (tOutput != null || mMode == 0) mInventory[28] = tOutput; if (tOutput == null) { mLastCraftSuccessful = false; } else { - if ((tTempStack = GT_OreDictUnificator.get(true, tOutput)) != null) { + if ((tTempStack = GTOreDictUnificator.get(true, tOutput)) != null) { tTempStack.stackSize = tOutput.stackSize; tOutput = tTempStack; } - mInventory[28] = GT_Utility.copy(tOutput); + mInventory[28] = GTUtility.copy(tOutput); ArrayList<ItemStack> tList = recipeContent(tRecipe), tContent = benchContent(); if (tList.size() > 0 && tContent.size() > 0) { @@ -562,7 +558,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B for (byte i = 0; i < tList.size() && success; i++) { success = false; for (byte j = 0; j < tContent.size() && !success; j++) { - if (GT_Utility.areStacksEqual(tList.get(i), tContent.get(j))) { + if (GTUtility.areStacksEqual(tList.get(i), tContent.get(j))) { if (tList.get(i).stackSize <= tContent.get(j).stackSize) { success = true; } @@ -576,17 +572,17 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B for (byte i = 8; i > -1; i--) { for (byte j = 17; j > -1; j--) { if (tRecipe[i] != null && mInventory[j] != null) { - if (GT_Utility.areStacksEqual(tRecipe[i], mInventory[j])) { - ItemStack tStack = GT_Utility.getContainerItem(mInventory[j], true); + if (GTUtility.areStacksEqual(tRecipe[i], mInventory[j])) { + ItemStack tStack = GTUtility.getContainerItem(mInventory[j], true); if (tStack != null) { getBaseMetaTileEntity().decrStackSize(j, 1); if (!tStack.isItemStackDamageable() || tStack.getItemDamage() < tStack.getMaxDamage()) { for (byte k = 9; k < 18; k++) { if (mInventory[k] == null) { - mInventory[k] = GT_Utility.copy(tStack); + mInventory[k] = GTUtility.copy(tStack); break; - } else if (GT_Utility.areStacksEqual(mInventory[k], tStack) + } else if (GTUtility.areStacksEqual(mInventory[k], tStack) && mInventory[k].stackSize + tStack.stackSize <= tStack.getMaxStackSize()) { mInventory[k].stackSize += tStack.stackSize; @@ -603,7 +599,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } } - mInventory[18] = GT_Utility.copy(tOutput); + mInventory[18] = GTUtility.copy(tOutput); getBaseMetaTileEntity() .decreaseStoredEnergyUnits(mMode == 5 || mMode == 6 || mMode == 7 ? 128 : 2048, true); mTicksUntilNextUpdate = 1; @@ -620,7 +616,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B if (mInventory[18] == null && mThroughPut < 2) { for (byte i = 0; i < 8; i++) { for (byte j = i; ++j < 9;) { - if (GT_Utility.areStacksEqual(mInventory[i], mInventory[j]) + if (GTUtility.areStacksEqual(mInventory[i], mInventory[j]) && mInventory[i].getMaxStackSize() > 8) { mInventory[18] = mInventory[j]; mInventory[j] = null; @@ -635,7 +631,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B if (mThroughPut < 2) { getBaseMetaTileEntity().decreaseStoredEnergyUnits( - GT_Utility.moveOneItemStack( + GTUtility.moveOneItemStack( getBaseMetaTileEntity(), getBaseMetaTileEntity().getIInventoryAtSide(getBaseMetaTileEntity().getBackFacing()), getBaseMetaTileEntity().getBackFacing(), @@ -655,8 +651,8 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B if (aStack == null) return true; for (byte i = 19; i < 28; i++) { if (mInventory[i] != null) { - if (GT_Utility.areStacksEqual(mInventory[i], aStack)) return true; - if (GT_Utility.areStacksEqual(GT_Utility.getContainerForFilledItem(mInventory[i], true), aStack)) + if (GTUtility.areStacksEqual(mInventory[i], aStack)) return true; + if (GTUtility.areStacksEqual(GTUtility.getContainerForFilledItem(mInventory[i], true), aStack)) return true; } } @@ -669,13 +665,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B if (tRecipe[i] != null) { boolean temp = false; for (ItemStack itemStack : tList) { - if (GT_Utility.areStacksEqual(tRecipe[i], itemStack)) { + if (GTUtility.areStacksEqual(tRecipe[i], itemStack)) { itemStack.stackSize++; temp = true; break; } } - if (!temp) tList.add(GT_Utility.copy(1, tRecipe[i])); + if (!temp) tList.add(GTUtility.copy(1, tRecipe[i])); } } return tList; @@ -687,13 +683,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B if (mInventory[i] != null) { boolean temp = false; for (byte j = 0; j < tList.size(); j++) { - if (GT_Utility.areStacksEqual(mInventory[i], mInventory[j])) { + if (GTUtility.areStacksEqual(mInventory[i], mInventory[j])) { tList.get(j).stackSize += mInventory[i].stackSize; temp = true; break; } } - if (!temp) tList.add(GT_Utility.copy(mInventory[i])); + if (!temp) tList.add(GTUtility.copy(mInventory[i])); } } return tList; @@ -730,7 +726,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B public String[] getDescription() { return new String[] { "Automatic Crafting Table Mk III", // this.mDescription, - CORE.GT_Tooltip.get() }; + GTPPCore.GT_Tooltip.get() }; } @Override @@ -765,12 +761,12 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B public ITexture[] getFront(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) }; } public ITexture[] getBack(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(BlockIcons.OVERLAY_PIPE) }; + new GTRenderedTexture(BlockIcons.OVERLAY_PIPE) }; } public ITexture[] getBottom(final byte aColor) { @@ -779,12 +775,12 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B public ITexture[] getTop(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) }; } public ITexture[] getSides(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) }; } @Override @@ -807,16 +803,16 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B .startFromSlot(9) .endAtSlot(17) .canInsert(false) - .background(GT_UITextures.SLOT_DARK_GRAY) + .background(GTUITextures.SLOT_DARK_GRAY) .applyForWidget(SlotWidget::disableShiftInsert) .build() .setPos(7, 59)) .widget( new SlotWidget(inventoryHandler, 18).setAccess(true, false) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT) + .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_OUT) .setPos(151, 40)) .widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SLOTS_HOLO_3BY3) + new DrawableWidget().setDrawable(GTUITextures.PICTURE_SLOTS_HOLO_3BY3) .setPos(62, 4) .setSize(54, 54)) .widget( @@ -824,20 +820,20 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B .startFromSlot(19) .endAtSlot(27) .phantom(true) - .background(GT_UITextures.TRANSPARENT) + .background(GTUITextures.TRANSPARENT) .build() .setPos(62, 4)) .widget( SlotWidget.phantom(inventoryHandler, 28) .disableInteraction() - .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_ARROW_4) + .setBackground(getGUITextureSet().getItemSlot(), GTPPUITextures.OVERLAY_SLOT_ARROW_4) .setPos(151, 4)); builder.widget( new CycleButtonWidget().setGetter(() -> mThroughPut) .setSetter(val -> mThroughPut = val) .setLength(MAX_THROUGHPUT) - .setTextureGetter(i -> GTPP_UITextures.OVERLAY_BUTTON_THROUGHPUT[i]) - .setBackground(GT_UITextures.BUTTON_STANDARD) + .setTextureGetter(i -> GTPPUITextures.OVERLAY_BUTTON_THROUGHPUT[i]) + .setBackground(GTUITextures.BUTTON_STANDARD) .setPos(120, 4) .setSize(18, 18)); String[] mModeText = new String[] { "Normal Crafting Table", "???", "1x1", "2x2", "3x3", "Unifier", "Dust", @@ -848,20 +844,20 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B switchMode(); }) .setLength(MAX_MODES) - .setTextureGetter(i -> GTPP_UITextures.OVERLAY_BUTTON_MODE[i]); + .setTextureGetter(i -> GTPPUITextures.OVERLAY_BUTTON_MODE[i]); for (int i = 0; i < MAX_MODES; i++) { modeButton.addTooltip(i, "Mode: " + mModeText[i]); } builder.widget( - modeButton.setBackground(GT_UITextures.BUTTON_STANDARD) + modeButton.setBackground(GTUITextures.BUTTON_STANDARD) .setPos(120, 40) .setSize(18, 18)); builder.widget( - new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_WORKBENCH_CIRCLE) + new DrawableWidget().setDrawable(GTPPUITextures.PICTURE_WORKBENCH_CIRCLE) .setPos(136, 23) .setSize(16, 16)) .widget( - new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_ARROW_WHITE_DOWN) + new DrawableWidget().setDrawable(GTPPUITextures.PICTURE_ARROW_WHITE_DOWN) .setPos(155, 23) .setSize(10, 16)); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTETesseractGenerator.java index 33dbfee6d4..08db4e19be 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTETesseractGenerator.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.automation; -import static gtPlusPlus.core.lib.CORE.sTesseractGeneratorOwnershipMap; -import static gtPlusPlus.core.lib.CORE.sTesseractTerminalOwnershipMap; +import static gtPlusPlus.core.lib.GTPPCore.sTesseractGeneratorOwnershipMap; +import static gtPlusPlus.core.lib.GTPPCore.sTesseractTerminalOwnershipMap; import java.util.UUID; @@ -27,16 +27,16 @@ import gregtech.api.interfaces.tileentity.IDigitalChest; import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Utility; +import gregtech.api.metatileentity.implementations.MTEBasicTank; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.helpers.tesseract.TesseractHelper; -public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_BasicTank { +public class MTETesseractGenerator extends MTEBasicTank { public static int TESSERACT_ENERGY_COST_DIMENSIONAL = 512; public static int TESSERACT_ENERGY_COST = 128; @@ -46,19 +46,18 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi public int mFrequency = 0; public UUID mOwner; - public GT_MetaTileEntity_TesseractGenerator(final int aID, final String aName, final String aNameRegional, - final int aTier) { + public MTETesseractGenerator(final int aID, final String aName, final String aNameRegional, final int aTier) { super(aID, aName, aNameRegional, aTier, 3, ""); } - public GT_MetaTileEntity_TesseractGenerator(final String aName, final int aTier, final String[] aDescription, + public MTETesseractGenerator(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_TesseractGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTETesseractGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -215,12 +214,12 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi .getFrontFacing()) { if (aPlayer.getUniqueID() .compareTo(this.mOwner) == 0) { - final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ); + final float[] tCoords = GTUtility.getClickedFacingCoords(side, aX, aY, aZ); switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) { case 0: Logger.WARNING("Freq. -1 | " + this.mFrequency); try { - CORE.sTesseractGeneratorOwnershipMap.get(mOwner) + GTPPCore.sTesseractGeneratorOwnershipMap.get(mOwner) .remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency -= 1; @@ -229,7 +228,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi case 1: Logger.WARNING("Freq. +1 | " + this.mFrequency); try { - CORE.sTesseractGeneratorOwnershipMap.get(mOwner) + GTPPCore.sTesseractGeneratorOwnershipMap.get(mOwner) .remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency += 1; @@ -238,15 +237,15 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi break; } if (getGeneratorEntity(this.mFrequency) != null && getGeneratorEntity(this.mFrequency) != this) { - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, "Frequency: " + this.mFrequency + EnumChatFormatting.RED + " (Occupied)"); } else { - GT_Utility.sendChatToPlayer(aPlayer, "Frequency: " + this.mFrequency); + GTUtility.sendChatToPlayer(aPlayer, "Frequency: " + this.mFrequency); } } else if (aPlayer.getUniqueID() .compareTo(this.mOwner) != 0) { - GT_Utility.sendChatToPlayer(aPlayer, "This is not your Tesseract Generator to configure."); + GTUtility.sendChatToPlayer(aPlayer, "This is not your Tesseract Generator to configure."); } } @@ -260,47 +259,47 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi .compareTo(this.mOwner) == 0) { if (side == this.getBaseMetaTileEntity() .getFrontFacing()) { - final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ); + final float[] tCoords = GTUtility.getClickedFacingCoords(side, aX, aY, aZ); switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) { case 0 -> { try { - CORE.sTesseractGeneratorOwnershipMap.get(mOwner) + GTPPCore.sTesseractGeneratorOwnershipMap.get(mOwner) .remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency -= 64; } case 1 -> { try { - CORE.sTesseractGeneratorOwnershipMap.get(mOwner) + GTPPCore.sTesseractGeneratorOwnershipMap.get(mOwner) .remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency += 64; } case 2 -> { try { - CORE.sTesseractGeneratorOwnershipMap.get(mOwner) + GTPPCore.sTesseractGeneratorOwnershipMap.get(mOwner) .remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency -= 512; } case 3 -> { try { - CORE.sTesseractGeneratorOwnershipMap.get(mOwner) + GTPPCore.sTesseractGeneratorOwnershipMap.get(mOwner) .remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency += 512; } } if (getGeneratorEntity(this.mFrequency) != null && getGeneratorEntity(this.mFrequency) != this) { - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, "Frequency: " + this.mFrequency + EnumChatFormatting.RED + " (Occupied)"); } else { - GT_Utility.sendChatToPlayer(aPlayer, "Frequency: " + this.mFrequency); + GTUtility.sendChatToPlayer(aPlayer, "Frequency: " + this.mFrequency); } } } else { - GT_Utility.sendChatToPlayer(aPlayer, "This is not your Tesseract Generator to configure."); + GTUtility.sendChatToPlayer(aPlayer, "This is not your Tesseract Generator to configure."); } } @@ -614,7 +613,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi return tTileEntity.drain(aSide, aFluid, doDrain); } - public boolean addEnergyConsumption(final GT_MetaTileEntity_TesseractTerminal aTerminal) { + public boolean addEnergyConsumption(final MTETesseractTerminal aTerminal) { if (!this.getBaseMetaTileEntity() .isAllowedToWork()) { return false; @@ -728,7 +727,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi "Connect with pipes to insert items", "Consumes " + TESSERACT_ENERGY_COST + "EU/t for same dimension transfers", "Consumes " + TESSERACT_ENERGY_COST_DIMENSIONAL + "EU/t for cross dimensional transfers", - CORE.GT_Tooltip.get()); + GTPPCore.GT_Tooltip.get()); } @Override @@ -752,10 +751,10 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { return side == facing - ? new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional), - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency) } - : new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional), - new GT_RenderedTexture(Textures.BlockIcons.VOID) }; + ? new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional), + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency) } + : new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional), + new GTRenderedTexture(Textures.BlockIcons.VOID) }; } // To-Do? @@ -789,8 +788,8 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi return false; } - private GT_MetaTileEntity_TesseractGenerator getGeneratorEntity() { - GT_MetaTileEntity_TesseractGenerator thisGenerator = TesseractHelper + private MTETesseractGenerator getGeneratorEntity() { + MTETesseractGenerator thisGenerator = TesseractHelper .getGeneratorByFrequency(PlayerUtils.getPlayerOnServerFromUUID(mOwner), this.mFrequency); if (thisGenerator != null) { return thisGenerator; @@ -798,8 +797,8 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi return null; } - private GT_MetaTileEntity_TesseractGenerator getGeneratorEntity(int frequency) { - GT_MetaTileEntity_TesseractGenerator thisGenerator = TesseractHelper + private MTETesseractGenerator getGeneratorEntity(int frequency) { + MTETesseractGenerator thisGenerator = TesseractHelper .getGeneratorByFrequency(PlayerUtils.getPlayerOnServerFromUUID(mOwner), frequency); if (thisGenerator != null) { return thisGenerator; @@ -825,7 +824,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi @Override public void onRemoval() { try { - CORE.sTesseractGeneratorOwnershipMap.get(mOwner) + GTPPCore.sTesseractGeneratorOwnershipMap.get(mOwner) .remove(this.mFrequency); } catch (Throwable t) {} super.onRemoval(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTETesseractTerminal.java index 28b567e06c..c34a2ca41b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTETesseractTerminal.java @@ -18,15 +18,15 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.metatileentity.implementations.MTEBasicTank; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTUtility; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.helpers.tesseract.TesseractHelper; -public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_BasicTank { +public class MTETesseractTerminal extends MTEBasicTank { public int mFrequency = 0; public UUID mOwner; @@ -35,19 +35,18 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic private static int TESSERACT_ENERGY_COST = 128; private static int TESSERACT_ENERGY_COST_DIMENSIONAL = 512; - public GT_MetaTileEntity_TesseractTerminal(final int aID, final String aName, final String aNameRegional, - final int aTier) { + public MTETesseractTerminal(final int aID, final String aName, final String aNameRegional, final int aTier) { super(aID, aName, aNameRegional, aTier, 3, ""); } - public GT_MetaTileEntity_TesseractTerminal(final String aName, final int aTier, final String[] aDescription, + public MTETesseractTerminal(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_TesseractTerminal(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTETesseractTerminal(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -168,12 +167,12 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic .compareTo(this.mOwner) == 0) { if (side == this.getBaseMetaTileEntity() .getFrontFacing()) { - final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ); + final float[] tCoords = GTUtility.getClickedFacingCoords(side, aX, aY, aZ); switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) { case 0: // Utils.LOG_WARNING("Freq. -1 | " + this.mFrequency); try { - CORE.sTesseractTerminalOwnershipMap.get(mOwner) + GTPPCore.sTesseractTerminalOwnershipMap.get(mOwner) .remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency -= 1; @@ -181,14 +180,14 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic case 1: // Utils.LOG_WARNING("Freq. +1 | " + this.mFrequency); try { - CORE.sTesseractTerminalOwnershipMap.get(mOwner) + GTPPCore.sTesseractTerminalOwnershipMap.get(mOwner) .remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency += 1; default: // Utils.LOG_WARNING("Did not click the correct place."); try { - CORE.sTesseractTerminalOwnershipMap.get(mOwner) + GTPPCore.sTesseractTerminalOwnershipMap.get(mOwner) .remove(this.mFrequency); } catch (Throwable t) {} break; @@ -204,7 +203,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic } } else if (aPlayer.getUniqueID() .compareTo(this.mOwner) != 0) { - GT_Utility.sendChatToPlayer(aPlayer, "This is not your Tesseract Terminal to configure."); + GTUtility.sendChatToPlayer(aPlayer, "This is not your Tesseract Terminal to configure."); } return true; } @@ -216,38 +215,38 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic .compareTo(this.mOwner) == 0) { if (side == this.getBaseMetaTileEntity() .getFrontFacing()) { - final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ); + final float[] tCoords = GTUtility.getClickedFacingCoords(side, aX, aY, aZ); switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) { case 0 -> { try { - CORE.sTesseractTerminalOwnershipMap.get(mOwner) + GTPPCore.sTesseractTerminalOwnershipMap.get(mOwner) .remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency -= 64; } case 1 -> { try { - CORE.sTesseractTerminalOwnershipMap.get(mOwner) + GTPPCore.sTesseractTerminalOwnershipMap.get(mOwner) .remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency += 64; } case 2 -> { try { - CORE.sTesseractTerminalOwnershipMap.get(mOwner) + GTPPCore.sTesseractTerminalOwnershipMap.get(mOwner) .remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency -= 512; } case 3 -> { try { - CORE.sTesseractTerminalOwnershipMap.get(mOwner) + GTPPCore.sTesseractTerminalOwnershipMap.get(mOwner) .remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency += 512; } } - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, "Frequency: " + this.mFrequency + (this.getTesseract(this.mFrequency, false) == null ? "" @@ -257,7 +256,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic } } else if (aPlayer.getUniqueID() .compareTo(this.mOwner) != 0) { - GT_Utility.sendChatToPlayer(aPlayer, "This is not your Tesseract Terminal to configure."); + GTUtility.sendChatToPlayer(aPlayer, "This is not your Tesseract Terminal to configure."); } } @@ -266,8 +265,8 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic .getFrontFacing(); } - public GT_MetaTileEntity_TesseractGenerator getTesseract(final int aFrequency, final boolean aWorkIrrelevant) { - final GT_MetaTileEntity_TesseractGenerator rTesseract = TesseractHelper + public MTETesseractGenerator getTesseract(final int aFrequency, final boolean aWorkIrrelevant) { + final MTETesseractGenerator rTesseract = TesseractHelper .getGeneratorByFrequency(PlayerUtils.getPlayerOnServerFromUUID(mOwner), aFrequency); if (rTesseract == null) { return null; @@ -299,7 +298,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public String[] getInfoData() { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity != null) && (this.getBaseMetaTileEntity() .isAllowedToWork()) && (tTileEntity.isSendingInformation())) { return tTileEntity.getInfoData(); @@ -315,7 +314,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public boolean isDigitalChest() { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return false; @@ -325,7 +324,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public ItemStack[] getStoredItemData() { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return null; @@ -335,7 +334,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public void setItemCount(final int aCount) { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return; @@ -345,7 +344,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public int getMaxItemCount() { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return 0; @@ -355,7 +354,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public boolean isItemValidForSlot(final int aIndex, final ItemStack aStack) { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return false; @@ -365,7 +364,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public int[] getAccessibleSlotsFromSide(final int ordinalSide) { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return new int[0]; @@ -375,7 +374,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public boolean canInsertItem(final int aIndex, final ItemStack aStack, final int ordinalSide) { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return false; @@ -385,7 +384,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public boolean canExtractItem(final int aIndex, final ItemStack aStack, final int ordinalSide) { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return false; @@ -395,7 +394,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public int getSizeInventory() { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return 0; @@ -405,7 +404,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public ItemStack getStackInSlot(final int aIndex) { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return null; @@ -415,7 +414,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public void setInventorySlotContents(final int aIndex, final ItemStack aStack) { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return; @@ -425,7 +424,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public ItemStack decrStackSize(final int aIndex, final int aAmount) { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return null; @@ -435,7 +434,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public String getInventoryName() { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return ""; @@ -445,7 +444,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public int getInventoryStackLimit() { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return 0; @@ -455,7 +454,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public boolean canFill(final ForgeDirection aSide, final Fluid aFluid) { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return false; @@ -465,7 +464,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public boolean canDrain(final ForgeDirection aSide, final Fluid aFluid) { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return false; @@ -475,7 +474,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public FluidTankInfo[] getTankInfo(final ForgeDirection aSide) { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return new FluidTankInfo[0]; @@ -485,7 +484,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public int fill_default(final ForgeDirection aDirection, final FluidStack aFluid, final boolean doFill) { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return 0; @@ -495,7 +494,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public FluidStack drain(final ForgeDirection aDirection, final int maxDrain, final boolean doDrain) { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return null; @@ -505,7 +504,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public FluidStack drain(final ForgeDirection aSide, final FluidStack aFluid, final boolean doDrain) { - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity() .isAllowedToWork())) { return null; @@ -530,7 +529,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic .getOwnerName()); } } - final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, true); + final MTETesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, true); if (tTileEntity != null) { tTileEntity.addEnergyConsumption(this); if ((!this.mDidWork) && (this.getTesseract(this.mFrequency, false) != null)) { @@ -557,7 +556,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic "Outputs from the back face", "Consumes " + TESSERACT_ENERGY_COST + "EU/t for same dimension transfers", "Consumes " + TESSERACT_ENERGY_COST_DIMENSIONAL + "EU/t for cross dimensional transfers", - CORE.GT_Tooltip.get()); + GTPPCore.GT_Tooltip.get()); } @Override @@ -581,10 +580,10 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { return side == facing - ? new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional), - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency) } - : new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional), - new GT_RenderedTexture(Textures.BlockIcons.VOID) }; + ? new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional), + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency) } + : new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional), + new GTRenderedTexture(Textures.BlockIcons.VOID) }; } // To-Do? @@ -635,7 +634,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public void onRemoval() { try { - CORE.sTesseractTerminalOwnershipMap.get(mOwner) + GTPPCore.sTesseractTerminalOwnershipMap.get(mOwner) .remove(this.mFrequency); } catch (Throwable t) {} super.onRemoval(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerBase.java index 6200a37872..b3a367bcaf 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerBase.java @@ -15,36 +15,36 @@ import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.gui.modularui.GUITextureSet; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_ItemStack; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; +import gregtech.api.objects.GTItemStack; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.common.tileentities.boilers.MTEBoiler; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures; -public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { +public class MTEBoilerBase extends MTEBoiler { private final int steamPerSecond; private final int tier; - public GT_MetaTileEntity_Boiler_Base(int aID, String aNameRegional, int tier) { + public MTEBoilerBase(int aID, String aNameRegional, int tier) { super( aID, "electricboiler." + tier + ".tier.single", aNameRegional, - "Produces " + (CORE.ConfigSwitches.boilerSteamPerSecond * tier) + "L of Steam per second"); - this.steamPerSecond = (CORE.ConfigSwitches.boilerSteamPerSecond * tier); + "Produces " + (GTPPCore.ConfigSwitches.boilerSteamPerSecond * tier) + "L of Steam per second"); + this.steamPerSecond = (GTPPCore.ConfigSwitches.boilerSteamPerSecond * tier); this.tier = tier; } - public GT_MetaTileEntity_Boiler_Base(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEBoilerBase(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); - this.steamPerSecond = (CORE.ConfigSwitches.boilerSteamPerSecond * aTier); + this.steamPerSecond = (GTPPCore.ConfigSwitches.boilerSteamPerSecond * aTier); this.tier = aTier; } @@ -56,11 +56,11 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { "Consumes fuel only when temperature is less than 100C", "Fuel with burn time greater than 500 is more efficient.", "Doesn't explode if there's no water", - CORE.GT_Tooltip.get()); + GTPPCore.GT_Tooltip.get()); } public ITexture getOverlayIcon() { - return new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT); + return new GTRenderedTexture(Textures.BlockIcons.BOILER_FRONT); } @Override @@ -81,13 +81,13 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { return rTextures; } - protected GT_RenderedTexture getCasingTexture() { + protected GTRenderedTexture getCasingTexture() { if (this.tier == 1) { - return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_LV_SIDE); + return new GTRenderedTexture(Textures.BlockIcons.MACHINE_LV_SIDE); } else if (this.tier == 2) { - return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_MV_SIDE); + return new GTRenderedTexture(Textures.BlockIcons.MACHINE_MV_SIDE); } else { - return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_HV_SIDE); + return new GTRenderedTexture(Textures.BlockIcons.MACHINE_HV_SIDE); } } @@ -231,13 +231,13 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { @Override protected int getPollution() { - return (int) (CORE.ConfigSwitches.basePollutionPerSecondBoiler - * CORE.ConfigSwitches.pollutionReleasedByTierBoiler[this.tier]); + return (int) (GTPPCore.ConfigSwitches.basePollutionPerSecondBoiler + * GTPPCore.ConfigSwitches.pollutionReleasedByTierBoiler[this.tier]); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Boiler_Base(this.mName, tier, this.mDescriptionArray, this.mTextures); + return new MTEBoilerBase(this.mName, tier, this.mDescriptionArray, this.mTextures); } @Override @@ -269,15 +269,15 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { || fuel.getDisplayName() .toLowerCase() .contains("coke")) { - tile.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L)); + tile.addStackToSlot(3, GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L)); } else { - tile.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)); + tile.addStackToSlot(3, GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)); } } } @Override - public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCover) { + public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCover) { if (side != this.getBaseMetaTileEntity() .getFrontFacing()) { return true; @@ -292,12 +292,12 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { @Override protected IDrawable[] getFuelSlotBackground() { - return new IDrawable[] { getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_COAL }; + return new IDrawable[] { getGUITextureSet().getItemSlot(), GTPPUITextures.OVERLAY_SLOT_COAL }; } @Override protected IDrawable[] getAshSlotBackground() { - return new IDrawable[] { getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_DUST }; + return new IDrawable[] { getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_DUST }; } @Override @@ -307,26 +307,26 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { @Override protected IDrawable getOverlaySlotIn() { - return GT_UITextures.OVERLAY_SLOT_IN; + return GTUITextures.OVERLAY_SLOT_IN; } @Override protected IDrawable getOverlaySlotOut() { - return GT_UITextures.OVERLAY_SLOT_OUT; + return GTUITextures.OVERLAY_SLOT_OUT; } @Override protected IDrawable getOverlaySlotCanister() { - return GTPP_UITextures.OVERLAY_SLOT_CANISTER_DARK; + return GTPPUITextures.OVERLAY_SLOT_CANISTER_DARK; } @Override protected UITexture getProgressbarEmpty() { - return GTPP_UITextures.PROGRESSBAR_BOILER_EMPTY; + return GTPPUITextures.PROGRESSBAR_BOILER_EMPTY; } @Override protected UITexture getProgressbarFuel() { - return GTPP_UITextures.PROGRESSBAR_FUEL; + return GTPPUITextures.PROGRESSBAR_FUEL; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerHV.java index dce70d4ccf..6bb0c658bd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerHV.java @@ -4,44 +4,44 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.objects.GTRenderedTexture; -public class GT_MetaTileEntity_Boiler_MV extends GT_MetaTileEntity_Boiler_Base { +public class MTEBoilerHV extends MTEBoilerBase { - public GT_MetaTileEntity_Boiler_MV(int aID, String aNameRegional, int aBoilerTier) { + public MTEBoilerHV(int aID, String aNameRegional, int aBoilerTier) { super(aID, aNameRegional, aBoilerTier); } - public GT_MetaTileEntity_Boiler_MV(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEBoilerHV(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Boiler_MV(this.mName, 2, this.mDescriptionArray, this.mTextures); + return new MTEBoilerHV(this.mName, 3, this.mDescriptionArray, this.mTextures); } @Override - protected GT_RenderedTexture getCasingTexture() { - return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_MV_SIDE); + protected GTRenderedTexture getCasingTexture() { + return new GTRenderedTexture(Textures.BlockIcons.MACHINE_HV_SIDE); } @Override public ITexture[] getFront(final byte aColor) { return new ITexture[] { super.getFront(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) }; + new GTRenderedTexture(Textures.BlockIcons.BOILER_FRONT) }; } @Override public ITexture[] getTop(final byte aColor) { return new ITexture[] { super.getTop(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_MV_TOP) }; + new GTRenderedTexture(Textures.BlockIcons.MACHINE_HV_TOP) }; } @Override public ITexture[] getFrontActive(final byte aColor) { return new ITexture[] { super.getFrontActive(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) }; + new GTRenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerLV.java index e24698812f..0d8c03e448 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerLV.java @@ -4,44 +4,44 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.objects.GTRenderedTexture; -public class GT_MetaTileEntity_Boiler_HV extends GT_MetaTileEntity_Boiler_Base { +public class MTEBoilerLV extends MTEBoilerBase { - public GT_MetaTileEntity_Boiler_HV(int aID, String aNameRegional, int aBoilerTier) { + public MTEBoilerLV(int aID, String aNameRegional, int aBoilerTier) { super(aID, aNameRegional, aBoilerTier); } - public GT_MetaTileEntity_Boiler_HV(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEBoilerLV(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Boiler_HV(this.mName, 3, this.mDescriptionArray, this.mTextures); + return new MTEBoilerLV(this.mName, 1, this.mDescriptionArray, this.mTextures); } @Override - protected GT_RenderedTexture getCasingTexture() { - return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_HV_SIDE); + protected GTRenderedTexture getCasingTexture() { + return new GTRenderedTexture(Textures.BlockIcons.MACHINE_LV_SIDE); } @Override public ITexture[] getFront(final byte aColor) { return new ITexture[] { super.getFront(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) }; + new GTRenderedTexture(Textures.BlockIcons.BOILER_FRONT) }; } @Override public ITexture[] getTop(final byte aColor) { return new ITexture[] { super.getTop(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_HV_TOP) }; + new GTRenderedTexture(Textures.BlockIcons.MACHINE_LV_TOP) }; } @Override public ITexture[] getFrontActive(final byte aColor) { return new ITexture[] { super.getFrontActive(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) }; + new GTRenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerMV.java index adaec8a51e..32bda689c2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerMV.java @@ -4,44 +4,44 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.objects.GTRenderedTexture; -public class GT_MetaTileEntity_Boiler_LV extends GT_MetaTileEntity_Boiler_Base { +public class MTEBoilerMV extends MTEBoilerBase { - public GT_MetaTileEntity_Boiler_LV(int aID, String aNameRegional, int aBoilerTier) { + public MTEBoilerMV(int aID, String aNameRegional, int aBoilerTier) { super(aID, aNameRegional, aBoilerTier); } - public GT_MetaTileEntity_Boiler_LV(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEBoilerMV(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Boiler_LV(this.mName, 1, this.mDescriptionArray, this.mTextures); + return new MTEBoilerMV(this.mName, 2, this.mDescriptionArray, this.mTextures); } @Override - protected GT_RenderedTexture getCasingTexture() { - return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_LV_SIDE); + protected GTRenderedTexture getCasingTexture() { + return new GTRenderedTexture(Textures.BlockIcons.MACHINE_MV_SIDE); } @Override public ITexture[] getFront(final byte aColor) { return new ITexture[] { super.getFront(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) }; + new GTRenderedTexture(Textures.BlockIcons.BOILER_FRONT) }; } @Override public ITexture[] getTop(final byte aColor) { return new ITexture[] { super.getTop(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_LV_TOP) }; + new GTRenderedTexture(Textures.BlockIcons.MACHINE_MV_TOP) }; } @Override public ITexture[] getFrontActive(final byte aColor) { return new ITexture[] { super.getFrontActive(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) }; + new GTRenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEGeothermalGenerator.java index af235556c8..4fac228f4f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEGeothermalGenerator.java @@ -9,29 +9,28 @@ import org.apache.commons.lang3.ArrayUtils; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.ItemList; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UIInfos; +import gregtech.api.gui.modularui.GTUIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEBasicGenerator; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_ModHandler; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.util.GTModHandler; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity_BasicGenerator { +public class MTEGeothermalGenerator extends MTEBasicGenerator { public int mEfficiency; - public GregtechMetaTileEntityGeothermalGenerator(final int aID, final String aName, final String aNameRegional, - final int aTier) { + public MTEGeothermalGenerator(final int aID, final String aName, final String aNameRegional, final int aTier) { super(aID, aName, aNameRegional, aTier, "Requires Pahoehoe Lava or Normal Lava as Fuel", new ITexture[0]); this.setEfficiency(); } - public GregtechMetaTileEntityGeothermalGenerator(final String aName, final int aTier, final String[] aDescription, + public MTEGeothermalGenerator(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); this.setEfficiency(); @@ -44,12 +43,12 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity this.mDescriptionArray, "Generates power at " + this.getEfficiency() + "% Efficiency per tick", aPollution, - CORE.GT_Tooltip.get()); + GTPPCore.GT_Tooltip.get()); } @Override public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -70,7 +69,7 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity @Override public int getFuelValue(final ItemStack aStack) { - int rValue = Math.max((GT_ModHandler.getFuelValue(aStack) * 6) / 5, super.getFuelValue(aStack)); + int rValue = Math.max((GTModHandler.getFuelValue(aStack) * 6) / 5, super.getFuelValue(aStack)); if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) { rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3); } @@ -85,77 +84,73 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntityGeothermalGenerator( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures); + return new MTEGeothermalGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override public ITexture[] getFront(final byte aColor) { return new ITexture[] { super.getFront(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE), + new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE), Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; } @Override public ITexture[] getBack(final byte aColor) { return new ITexture[] { super.getBack(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK), - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical) }; + new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK), + new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical) }; } @Override public ITexture[] getBottom(final byte aColor) { return new ITexture[] { super.getBottom(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM) }; + new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM) }; } @Override public ITexture[] getTop(final byte aColor) { return new ITexture[] { super.getTop(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER) }; + new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE), + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER) }; } @Override public ITexture[] getSides(final byte aColor) { return new ITexture[] { super.getSides(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT) }; + new GTRenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT) }; } @Override public ITexture[] getFrontActive(final byte aColor) { return new ITexture[] { super.getFrontActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE), + new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE), Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; } @Override public ITexture[] getBackActive(final byte aColor) { return new ITexture[] { super.getBackActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK_ACTIVE), - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical_Active) }; + new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK_ACTIVE), + new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical_Active) }; } @Override public ITexture[] getBottomActive(final byte aColor) { return new ITexture[] { super.getBottomActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE) }; + new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE) }; } @Override public ITexture[] getTopActive(final byte aColor) { return new ITexture[] { super.getTopActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE) }; + new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE), + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE) }; } @Override public ITexture[] getSidesActive(final byte aColor) { return new ITexture[] { super.getSidesActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT_ACTIVE) }; + new GTRenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT_ACTIVE) }; } @Override @@ -165,7 +160,7 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity @Override public int getPollution() { - return (int) (CORE.ConfigSwitches.basePollutionPerSecondGeothermalGenerator - * CORE.ConfigSwitches.pollutionReleasedByTierGeothermalGenerator[mTier]); + return (int) (GTPPCore.ConfigSwitches.basePollutionPerSecondGeothermalGenerator + * GTPPCore.ConfigSwitches.pollutionReleasedByTierGeothermalGenerator[mTier]); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java index 32cf3a92cc..00a915b89c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java @@ -13,25 +13,25 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEBasicGenerator; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator { +public class MTERTGenerator extends MTEBasicGenerator { public int mEfficiency; private long mTicksToBurnFor; private int mVoltage = 0; - private GT_Recipe mCurrentRecipe; + private GTRecipe mCurrentRecipe; private int mDaysRemaining = 0; private int mDayTick = 0; private byte mNewTier = 0; @@ -130,7 +130,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator this.mInventory[getStackDisplaySlot()] = new ItemStack(Blocks.fire, 1); this.mInventory[getStackDisplaySlot()].setStackDisplayName( "Generating: " - + GT_Utility.formatNumbers( + + GTUtility.formatNumbers( aBaseMetaTileEntity.getUniversalEnergyStored() - getMinimumStoredEU()) + " EU"); } @@ -151,7 +151,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator } if ((this.mInventory[getInputSlot()] != null) && (aBaseMetaTileEntity.getUniversalEnergyStored() < maxEUOutput() * 20L + getMinimumStoredEU()) - && (GT_Utility.getFluidForFilledItem(this.mInventory[getInputSlot()], true) == null)) { + && (GTUtility.getFluidForFilledItem(this.mInventory[getInputSlot()], true) == null)) { int tFuelValue = getFuelValue(this.mInventory[getInputSlot()]); if (tFuelValue > 0) { ItemStack tEmptyContainer = getEmptyContainer(this.mInventory[getInputSlot()]); @@ -179,12 +179,12 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator this.mDescriptionArray, "Fuel is measured in minecraft days (Check with Scanner)", "RTG changes output voltage depending on fuel", - "Generates power at " + GT_Utility.formatNumbers(this.getEfficiency()) + "% Efficiency per tick", - "Output Voltage: " + GT_Utility.formatNumbers(this.getOutputTier()) + " EU/t", - CORE.GT_Tooltip.get()); + "Generates power at " + GTUtility.formatNumbers(this.getEfficiency()) + "% Efficiency per tick", + "Output Voltage: " + GTUtility.formatNumbers(this.getOutputTier()) + " EU/t", + GTPPCore.GT_Tooltip.get()); } - public GregtechMetaTileEntity_RTG(int aID, String aName, String aNameRegional, int aTier) { + public MTERTGenerator(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, "Requires RTG Pellets", new ITexture[0]); } @@ -202,7 +202,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator return 0; } - public GregtechMetaTileEntity_RTG(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTERTGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -214,7 +214,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_RTG(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTERTGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -235,66 +235,66 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator @Override public ITexture[] getFront(byte aColor) { return new ITexture[] { super.getFront(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB) }; + new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP), + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB) }; } @Override public ITexture[] getBack(byte aColor) { return new ITexture[] { super.getBack(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP) }; + new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP) }; } @Override public ITexture[] getBottom(byte aColor) { return new ITexture[] { super.getBottom(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP) }; + new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP) }; } @Override public ITexture[] getTop(byte aColor) { return new ITexture[] { super.getTop(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP), - new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE) }; + new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP), + new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE) }; } @Override public ITexture[] getSides(byte aColor) { return new ITexture[] { gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(0)], - new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), + new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()] }; } @Override public ITexture[] getFrontActive(byte aColor) { return new ITexture[] { super.getFrontActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE) }; + new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE) }; } @Override public ITexture[] getBackActive(byte aColor) { return new ITexture[] { super.getBackActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE) }; + new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE) }; } @Override public ITexture[] getBottomActive(byte aColor) { return new ITexture[] { super.getBottomActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE) }; + new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE) }; } @Override public ITexture[] getTopActive(byte aColor) { return new ITexture[] { super.getTopActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), - new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE) }; + new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), + new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE) }; } @Override public ITexture[] getSidesActive(byte aColor) { return new ITexture[] { gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(0)], - new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), + new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()] }; } @@ -305,8 +305,8 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator @Override public int getFuelValue(ItemStack aStack) { - if ((GT_Utility.isStackInvalid(aStack)) || (getRecipeMap() == null)) return 0; - GT_Recipe tFuel = getRecipeMap() + if ((GTUtility.isStackInvalid(aStack)) || (getRecipeMap() == null)) return 0; + GTRecipe tFuel = getRecipeMap() .findRecipe(getBaseMetaTileEntity(), false, 9223372036854775807L, null, new ItemStack[] { aStack }); if (tFuel != null) { this.mCurrentRecipe = tFuel; @@ -370,9 +370,9 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator @Override public String[] getInfoData() { return new String[] { "RTG - Running at tier " + this.mTier, "Active: " + this.getBaseMetaTileEntity() - .isActive(), "Current Output: " + GT_Utility.formatNumbers(mVoltage) + " EU/t", - "Days of Fuel remaining: " + GT_Utility.formatNumbers(mTicksToBurnFor / 20 / 60 / 20), - "Hours of Fuel remaining: " + GT_Utility.formatNumbers(mTicksToBurnFor / 20 / 60 / 60), + .isActive(), "Current Output: " + GTUtility.formatNumbers(mVoltage) + " EU/t", + "Days of Fuel remaining: " + GTUtility.formatNumbers(mTicksToBurnFor / 20 / 60 / 20), + "Hours of Fuel remaining: " + GTUtility.formatNumbers(mTicksToBurnFor / 20 / 60 / 60), "Ticks of " + this.mVoltage + "v remaining: " + mTicksToBurnFor, this.mCurrentRecipe.mInputs[0].getDisplayName() + " x1" }; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERocketFuelGenerator.java index 5b1a45e16f..48c3a63007 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERocketFuelGenerator.java @@ -9,23 +9,22 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; -import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GTModHandler; import gtPlusPlus.api.recipe.GTPPRecipeMaps; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechRocketFuelGeneratorBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.MTERocketFuelGeneratorBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFuelGeneratorBase { +public class MTERocketFuelGenerator extends MTERocketFuelGeneratorBase { public int mEfficiency; - public GregtechMetaTileEntityRocketFuelGenerator(final int aID, final String aName, final String aNameRegional, - final int aTier) { + public MTERocketFuelGenerator(final int aID, final String aName, final String aNameRegional, final int aTier) { super(aID, aName, aNameRegional, aTier, "Requires GT++ Rocket Fuels", new ITexture[0]); } - public GregtechMetaTileEntityRocketFuelGenerator(final String aName, final int aTier, final String[] aDescription, + public MTERocketFuelGenerator(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); this.mEfficiency = getEfficiency(); @@ -39,11 +38,7 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntityRocketFuelGenerator( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures); + return new MTERocketFuelGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -63,22 +58,22 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue @Override public int getFuelValue(final ItemStack aStack) { - int rValue = Math.max((GT_ModHandler.getFuelValue(aStack) * 6) / 5, super.getFuelValue(aStack)); + int rValue = Math.max((GTModHandler.getFuelValue(aStack) * 6) / 5, super.getFuelValue(aStack)); if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) { rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3); } return rValue; } - private GT_RenderedTexture getCasingTexture() { + private GTRenderedTexture getCasingTexture() { if (this.mTier <= 4) { - return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top); + return new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top); } else if (this.mTier == 5) { - return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Advanced); + return new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Advanced); } else { - return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Ultra); + return new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Ultra); } // return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top); } @@ -92,25 +87,25 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue @Override public ITexture[] getBack(final byte aColor) { return new ITexture[] { super.getBack(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent) }; + new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Vent) }; } @Override public ITexture[] getBottom(final byte aColor) { return new ITexture[] { super.getBottom(aColor)[0], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } @Override public ITexture[] getTop(final byte aColor) { return new ITexture[] { super.getTop(aColor)[0], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off) }; } @Override public ITexture[] getSides(final byte aColor) { return new ITexture[] { super.getSides(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal) }; + new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal) }; } @Override @@ -122,24 +117,24 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue @Override public ITexture[] getBackActive(final byte aColor) { return new ITexture[] { super.getBackActive(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast) }; + new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast) }; } @Override public ITexture[] getBottomActive(final byte aColor) { return new ITexture[] { super.getBottomActive(aColor)[0], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } @Override public ITexture[] getTopActive(final byte aColor) { return new ITexture[] { super.getTopActive(aColor)[0], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On) }; } @Override public ITexture[] getSidesActive(final byte aColor) { return new ITexture[] { super.getSidesActive(aColor)[0], this.getCasingTexture(), - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active) }; + new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active) }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTESemiFluidGenerator.java index bbb5ae9da4..4c893eb92d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTESemiFluidGenerator.java @@ -11,33 +11,32 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator; -import gregtech.api.objects.GT_ItemStack; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEBasicGenerator; +import gregtech.api.objects.GTItemStack; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; -public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_BasicGenerator { +public class MTESemiFluidGenerator extends MTEBasicGenerator { public int mEfficiency; - public GT_MetaTileEntity_SemiFluidGenerator(int aID, String aName, String aNameRegional, int aTier) { + public MTESemiFluidGenerator(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, "Requires semi-fluid Fuel", new ITexture[0]); } - public GT_MetaTileEntity_SemiFluidGenerator(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { + public MTESemiFluidGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public int getPollution() { - return (int) (CORE.ConfigSwitches.basePollutionPerSecondSemiFluidGenerator - * CORE.ConfigSwitches.pollutionReleasedByTierSemiFluidGenerator[this.mTier]); + return (int) (GTPPCore.ConfigSwitches.basePollutionPerSecondSemiFluidGenerator + * GTPPCore.ConfigSwitches.pollutionReleasedByTierSemiFluidGenerator[this.mTier]); } @Override @@ -47,7 +46,7 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_SemiFluidGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTESemiFluidGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -62,7 +61,7 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi this.mDescriptionArray, "Produces " + (this.getPollution()) + " pollution/sec", "Fuel Efficiency: " + this.getEfficiency() + "%", - CORE.GT_Tooltip.get()); + GTPPCore.GT_Tooltip.get()); } @Override @@ -76,7 +75,7 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi } @Override - public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCover) { + public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCover) { if (side != this.getBaseMetaTileEntity() .getFrontFacing()) { return true; @@ -86,11 +85,11 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi @Override public int getFuelValue(ItemStack aStack) { - if ((GT_Utility.isStackInvalid(aStack)) || (getRecipeMap() == null)) { + if ((GTUtility.isStackInvalid(aStack)) || (getRecipeMap() == null)) { Logger.WARNING("Bad Fuel?"); return 0; } - int rValue = Math.max(GT_ModHandler.getFuelValue(aStack) * 6 / 5, super.getFuelValue(aStack)); + int rValue = Math.max(GTModHandler.getFuelValue(aStack) * 6 / 5, super.getFuelValue(aStack)); if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) { rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3); } @@ -101,62 +100,62 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi @Override public ITexture[] getFront(byte aColor) { return new ITexture[] { super.getFront(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT), + new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] }; } @Override public ITexture[] getBack(byte aColor) { return new ITexture[] { super.getBack(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP) }; + new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP) }; } @Override public ITexture[] getBottom(byte aColor) { return new ITexture[] { super.getBottom(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM) }; + new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM) }; } @Override public ITexture[] getTop(byte aColor) { return new ITexture[] { super.getTop(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE) }; + new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE) }; } @Override public ITexture[] getSides(byte aColor) { return new ITexture[] { super.getSides(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP) }; + new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP) }; } @Override public ITexture[] getFrontActive(byte aColor) { return new ITexture[] { super.getFrontActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT_ACTIVE), + new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT_ACTIVE), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] }; } @Override public ITexture[] getBackActive(byte aColor) { return new ITexture[] { super.getBackActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE) }; + new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE) }; } @Override public ITexture[] getBottomActive(byte aColor) { return new ITexture[] { super.getBottomActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE) }; + new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE) }; } @Override public ITexture[] getTopActive(byte aColor) { return new ITexture[] { super.getTopActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE) }; + new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE) }; } @Override public ITexture[] getSidesActive(byte aColor) { return new ITexture[] { super.getSidesActive(aColor)[0], - new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE) }; + new GTRenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE) }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java index 4bc9004944..3a85e0aae3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; -import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GTValues.V; import java.util.Collections; @@ -22,18 +22,18 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget; import gregtech.api.enums.Materials; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.GT_MetaGenerated_Tool; +import gregtech.api.items.MetaGeneratedTool; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; -import gregtech.api.objects.GT_ItemStack; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; -import gregtech.common.items.GT_MetaGenerated_Tool_01; -import gregtech.common.items.ID_MetaTool_01; +import gregtech.api.metatileentity.implementations.MTEBasicMachine; +import gregtech.api.objects.GTItemStack; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; +import gregtech.common.items.IDMetaTool01; +import gregtech.common.items.MetaGeneratedTool01; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.general.ItemAirFilter; @@ -41,10 +41,10 @@ import gtPlusPlus.core.item.general.ItemBasicScrubberTurbine; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; -import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; +import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_BasicMachine { +public class MTEAtmosphericReconditioner extends MTEBasicMachine { public int mPollutionReduction = 0; protected int mBaseEff = 2500; @@ -56,7 +56,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi protected boolean mSaveRotor = false; - public GregtechMetaAtmosphericReconditioner(int aID, String aName, String aNameRegional, int aTier) { + public MTEAtmosphericReconditioner(int aID, String aName, String aNameRegional, int aTier) { super( aID, aName, @@ -66,26 +66,25 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi "Making sure you don't live in Gwalior - Uses 2A", 3, 0, - new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB), - new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active), - new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab), - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast), - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB) }); + new ITexture[] { new GTRenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE), + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB), + new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active), + new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab), + new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast), + new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Vent), + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE), + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB) }); mPollutionEnabled = PollutionUtils.isPollutionEnabled(); } - public GregtechMetaAtmosphericReconditioner(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { + public MTEAtmosphericReconditioner(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 2, aDescription, aTextures, 2, 0); mPollutionEnabled = PollutionUtils.isPollutionEnabled(); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaAtmosphericReconditioner(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTEAtmosphericReconditioner(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -264,7 +263,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi // Calculate The Voltage we are running long tVoltage = drainEU; - byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); + byte tTier = (byte) Math.max(1, GTUtility.getTier(tVoltage)); // Check Sides for Air, // More air means more pollution processing. @@ -413,7 +412,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi if (rotorStack.getItem() instanceof ItemBasicScrubberTurbine) { // Logger.INFO("Found Basic Turbine Rotor."); return true; - } else if (rotorStack.getItem() instanceof GT_MetaGenerated_Tool && rotorStack.getItemDamage() >= 170 + } else if (rotorStack.getItem() instanceof MetaGeneratedTool && rotorStack.getItemDamage() >= 170 && rotorStack.getItemDamage() <= 179) { // Logger.INFO("Found Turbine Rotor."); return true; @@ -454,9 +453,9 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi Logger.INFO("Rotor Damage: " + currentUse); return true; } - } else if (rotorStack.getItem() instanceof GT_MetaGenerated_Tool_01) { - Materials t1 = GT_MetaGenerated_Tool.getPrimaryMaterial(rotorStack); - Materials t2 = GT_MetaGenerated_Tool.getSecondaryMaterial(rotorStack); + } else if (rotorStack.getItem() instanceof MetaGeneratedTool01) { + Materials t1 = MetaGeneratedTool.getPrimaryMaterial(rotorStack); + Materials t2 = MetaGeneratedTool.getSecondaryMaterial(rotorStack); if (t1 == Materials._NULL && t2 == Materials._NULL) { Logger.INFO("Found creative rotor."); creativeRotor = true; @@ -466,10 +465,10 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi return false; } - if (mInventory[SLOT_ROTOR].getItem() instanceof GT_MetaGenerated_Tool_01 - && ((GT_MetaGenerated_Tool) mInventory[SLOT_ROTOR].getItem()).getToolStats(mInventory[SLOT_ROTOR]) + if (mInventory[SLOT_ROTOR].getItem() instanceof MetaGeneratedTool01 + && ((MetaGeneratedTool) mInventory[SLOT_ROTOR].getItem()).getToolStats(mInventory[SLOT_ROTOR]) .getSpeedMultiplier() > 0 - && GT_MetaGenerated_Tool.getPrimaryMaterial(mInventory[SLOT_ROTOR]).mToolSpeed > 0) { + && MetaGeneratedTool.getPrimaryMaterial(mInventory[SLOT_ROTOR]).mToolSpeed > 0) { long damageValue = (long) Math .floor(Math.abs(MathUtils.randFloat(1, 2) - MathUtils.randFloat(1, 3)) * (1 + 3 - 1) + 1); @@ -487,9 +486,9 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi // Damage Rotor // int rotorDurability = this.mInventory[this.SLOT_ROTOR].getItemDamage(); long rotorDamage = creativeRotor ? 0 - : GT_MetaGenerated_Tool.getToolDamage(this.mInventory[this.SLOT_ROTOR]); + : MetaGeneratedTool.getToolDamage(this.mInventory[this.SLOT_ROTOR]); long rotorDurabilityMax = creativeRotor ? Integer.MAX_VALUE - : GT_MetaGenerated_Tool.getToolMaxDamage(this.mInventory[this.SLOT_ROTOR]); + : MetaGeneratedTool.getToolMaxDamage(this.mInventory[this.SLOT_ROTOR]); long rotorDurability = (rotorDurabilityMax - rotorDamage); Logger.INFO( "Rotor Damage: " + rotorDamage @@ -503,10 +502,10 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi if (!mSaveRotor) { Logger.INFO("Damaging Rotor."); - if (!creativeRotor) GT_ModHandler + if (!creativeRotor) GTModHandler .damageOrDechargeItem(this.mInventory[this.SLOT_ROTOR], (int) damageValue, 0, null); - long tempDur = GT_MetaGenerated_Tool.getToolDamage(this.mInventory[this.SLOT_ROTOR]); + long tempDur = MetaGeneratedTool.getToolDamage(this.mInventory[this.SLOT_ROTOR]); if (tempDur < rotorDurabilityMax) { return true; } else { @@ -515,9 +514,9 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi } else { Logger.INFO("Damaging Rotor."); if (rotorDurability > 1000) { - if (!creativeRotor) GT_ModHandler + if (!creativeRotor) GTModHandler .damageOrDechargeItem(this.mInventory[this.SLOT_ROTOR], (int) damageValue / 2, 0, null); - long tempDur = GT_MetaGenerated_Tool.getToolDamage(this.mInventory[this.SLOT_ROTOR]); + long tempDur = MetaGeneratedTool.getToolDamage(this.mInventory[this.SLOT_ROTOR]); if (tempDur < rotorDurabilityMax) { return true; } else { @@ -691,9 +690,9 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi boolean creativeRotor = false; ItemStack rotorStack = this.mInventory[SLOT_ROTOR]; if (rotorStack != null) { - if (rotorStack.getItem() instanceof GT_MetaGenerated_Tool_01) { - Materials t1 = GT_MetaGenerated_Tool.getPrimaryMaterial(rotorStack); - Materials t2 = GT_MetaGenerated_Tool.getSecondaryMaterial(rotorStack); + if (rotorStack.getItem() instanceof MetaGeneratedTool01) { + Materials t1 = MetaGeneratedTool.getPrimaryMaterial(rotorStack); + Materials t2 = MetaGeneratedTool.getSecondaryMaterial(rotorStack); if (t1 == Materials._NULL && t2 == Materials._NULL) { creativeRotor = true; } @@ -739,7 +738,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi if (aStack.getItem() instanceof ItemBasicScrubberTurbine) { return true; } - if (aStack.getItem() instanceof GT_MetaGenerated_Tool && aStack.getItemDamage() >= 170 + if (aStack.getItem() instanceof MetaGeneratedTool && aStack.getItemDamage() >= 170 && aStack.getItemDamage() <= 179) { return true; } @@ -756,8 +755,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi @Override public void doSound(byte aIndex, double aX, double aY, double aZ) { if (aIndex == -120) { - GT_Utility - .doSoundAtClient(SoundResource.IC2_TOOLS_BATTERY_USE, MathUtils.randInt(5, 50), 0.05F, aX, aY, aZ); + GTUtility.doSoundAtClient(SoundResource.IC2_TOOLS_BATTERY_USE, MathUtils.randInt(5, 50), 0.05F, aX, aY, aZ); } else { super.doSound((byte) 0, aX, aY, aZ); } @@ -774,7 +772,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi try { long tVoltage = maxEUInput(); - byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); + byte tTier = (byte) Math.max(1, GTUtility.getTier(tVoltage)); reduction += (((Math.max((tTier - 2), 1) * 2) * 50) * mAirSides); reduction = (MathUtils.safeInt((long) reduction * this.mBaseEff) / 100000) * mAirSides * Math.max((tTier - 2), 1); @@ -801,7 +799,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi } @Override - public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCoverID) { + public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCoverID) { if (side.offsetY != 0) { return false; } @@ -825,12 +823,12 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi public static ItemStack getTieredTurbine(int aTier) { if (sGregTurbines == null) { sGregTurbines = new ItemStack[3]; - sGregTurbines[0] = GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01") - .getToolWithStats(ID_MetaTool_01.TURBINE_SMALL.ID, 1, Materials.Iron, Materials.Iron, null); - sGregTurbines[1] = GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01") - .getToolWithStats(ID_MetaTool_01.TURBINE_SMALL.ID, 1, Materials.Bronze, Materials.Bronze, null); - sGregTurbines[2] = GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01") - .getToolWithStats(ID_MetaTool_01.TURBINE_SMALL.ID, 1, Materials.Steel, Materials.Steel, null); + sGregTurbines[0] = MetaGeneratedTool.sInstances.get("gt.metatool.01") + .getToolWithStats(IDMetaTool01.TURBINE_SMALL.ID, 1, Materials.Iron, Materials.Iron, null); + sGregTurbines[1] = MetaGeneratedTool.sInstances.get("gt.metatool.01") + .getToolWithStats(IDMetaTool01.TURBINE_SMALL.ID, 1, Materials.Bronze, Materials.Bronze, null); + sGregTurbines[2] = MetaGeneratedTool.sInstances.get("gt.metatool.01") + .getToolWithStats(IDMetaTool01.TURBINE_SMALL.ID, 1, Materials.Steel, Materials.Steel, null); } else { return sGregTurbines[aTier]; } @@ -842,8 +840,8 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi if (aStackRotor.getItem() instanceof ItemBasicScrubberTurbine) { return getBaseEfficiency(getTieredTurbine(aStackRotor.getItemDamage())); } - return (int) ((50.0F - + (10.0F * ((GT_MetaGenerated_Tool) aStackRotor.getItem()).getToolCombatDamage(aStackRotor))) * 100); + return (int) ((50.0F + (10.0F * ((MetaGeneratedTool) aStackRotor.getItem()).getToolCombatDamage(aStackRotor))) + * 100); } public int getOptimalAirFlow(ItemStack aStackRotor) { @@ -852,8 +850,8 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi } return (int) Math.max( Float.MIN_NORMAL, - ((GT_MetaGenerated_Tool) aStackRotor.getItem()).getToolStats(aStackRotor) - .getSpeedMultiplier() * GT_MetaGenerated_Tool.getPrimaryMaterial(aStackRotor).mToolSpeed * 50); + ((MetaGeneratedTool) aStackRotor.getItem()).getToolStats(aStackRotor) + .getSpeedMultiplier() * MetaGeneratedTool.getPrimaryMaterial(aStackRotor).mToolSpeed * 50); } @Override @@ -862,22 +860,22 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi if (stack.getItem() instanceof ItemBasicScrubberTurbine) { return true; } - return stack.getItem() instanceof GT_MetaGenerated_Tool && stack.getItemDamage() >= 170 + return stack.getItem() instanceof MetaGeneratedTool && stack.getItemDamage() >= 170 && stack.getItemDamage() <= 179; }) - .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_TURBINE) + .setBackground(getGUITextureSet().getItemSlot(), GTPPUITextures.OVERLAY_SLOT_TURBINE) .setPos(52, 24)) .widget( new SlotWidget(inventoryHandler, SLOT_FILTER) .setFilter(stack -> stack.getItem() instanceof ItemAirFilter) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_RECYCLE) + .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_RECYCLE) .setPos(106, 24)) .widget( new SlotWidget(inventoryHandler, 7) - .setFilter(stack -> GT_Utility.areStacksEqual(stack, CI.getConveyor(mTier, 1), true)) + .setFilter(stack -> GTUtility.areStacksEqual(stack, CI.getConveyor(mTier, 1), true)) .setPos(124, 62)); builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_INFORMATION) + new DrawableWidget().setDrawable(GTUITextures.PICTURE_INFORMATION) .dynamicTooltip(() -> Collections.singletonList("Reduction: " + mPollutionReduction + "/s")) .attachSyncer( new FakeSyncWidget.IntegerSyncer(() -> mPollutionReduction, val -> mPollutionReduction = val), diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAutoChisel.java index a845982e8b..6cdc97130b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAutoChisel.java @@ -13,24 +13,24 @@ import com.gtnewhorizons.modularui.api.math.Pos2d; import com.gtnewhorizons.modularui.common.widget.SlotWidget; import gregtech.api.enums.Textures.BlockIcons; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEBasicMachine; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.BasicUIProperties; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import team.chisel.carving.Carving; -public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMachine { +public class MTEAutoChisel extends MTEBasicMachine { private ItemStack mInputCache; private ItemStack mOutputCache; - public GregtechMetaTileEntity_AutoChisel(int aID, String aName, String aNameRegional, int aTier) { + public MTEAutoChisel(int aID, String aName, String aNameRegional, int aTier) { super( aID, aName, @@ -40,23 +40,23 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa "Chisels things, Gregtech style", 1, 1, - new ITexture[] { new GT_RenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE), - new GT_RenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB), - new GT_RenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE), - new GT_RenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER), - new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active), - new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab), - new GT_RenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE), - new GT_RenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB) }); + new ITexture[] { new GTRenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE), + new GTRenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB), + new GTRenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE), + new GTRenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER), + new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active), + new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab), + new GTRenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE), + new GTRenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB) }); } - public GregtechMetaTileEntity_AutoChisel(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEAutoChisel(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 1, aDescription, aTextures, 1, 1); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_AutoChisel(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTEAutoChisel(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -70,8 +70,7 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa private boolean hasValidCache(ItemStack aStack, ItemStack aSpecialSlot, boolean aClearOnFailure) { if (mInputCache != null && mOutputCache != null) { - if (GT_Utility.areStacksEqual(aStack, mInputCache) - && GT_Utility.areStacksEqual(aSpecialSlot, mOutputCache)) { + if (GTUtility.areStacksEqual(aStack, mInputCache) && GTUtility.areStacksEqual(aSpecialSlot, mOutputCache)) { return true; } } @@ -161,8 +160,8 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa return DID_NOT_FIND_RECIPE; } - private static final FallbackableUITexture progressBarTexture = GT_UITextures - .fallbackableProgressbar("auto_chisel", GT_UITextures.PROGRESSBAR_COMPRESS); + private static final FallbackableUITexture progressBarTexture = GTUITextures + .fallbackableProgressbar("auto_chisel", GTUITextures.PROGRESSBAR_COMPRESS); @Override protected BasicUIProperties getUIProperties() { @@ -174,7 +173,7 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa @Override protected SlotWidget createItemInputSlot(int index, IDrawable[] backgrounds, Pos2d pos) { return (SlotWidget) super.createItemInputSlot(index, backgrounds, pos) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_COMPRESSOR); + .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_COMPRESSOR); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTECropHarvestor.java index b93a3cbfd0..07884ed745 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTECropHarvestor.java @@ -21,28 +21,28 @@ import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; import com.gtnewhorizons.modularui.common.widget.ProgressBar; import com.gtnewhorizons.modularui.common.widget.SlotGroup; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UIInfos; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUIInfos; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; -import gregtech.api.objects.GT_ItemStack; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Utility; +import gregtech.api.metatileentity.implementations.MTEBasicTank; +import gregtech.api.objects.GTItemStack; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; +import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import ic2.api.crops.CropCard; import ic2.api.crops.ICropTile; import ic2.core.item.DamageHandler; -public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank { +public class MTECropHarvestor extends MTEBasicTank { private static final int SLOT_WEEDEX_1 = 1; private static final int SLOT_WEEDEX_2 = 2; @@ -53,17 +53,17 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank public boolean mModeAlternative = false; public boolean mHarvestEnabled = true; - public GT_MetaTileEntity_CropHarvestor(final int aID, final int aTier, final String aDescription) { + public MTECropHarvestor(final int aID, final int aTier, final String aDescription) { super( aID, "basicmachine.cropharvester.0" + aTier, - "Crop Manager (" + GT_Values.VN[aTier] + ")", + "Crop Manager (" + GTValues.VN[aTier] + ")", aTier, 21, aDescription); } - public GT_MetaTileEntity_CropHarvestor(final String aName, final int aTier, final String[] aDescription, + public MTECropHarvestor(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 21, aDescription, aTextures); } @@ -110,17 +110,17 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank @Override public long getMinimumStoredEU() { - return GT_Values.V[this.mTier]; + return GTValues.V[this.mTier]; } @Override public long maxEUStore() { - return GT_Values.V[this.mTier] * (this.mTier * GT_Values.V[this.mTier]); + return GTValues.V[this.mTier] * (this.mTier * GTValues.V[this.mTier]); } @Override public long maxEUInput() { - return GT_Values.V[this.mTier]; + return GTValues.V[this.mTier]; } @Override @@ -135,13 +135,13 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank @Override public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_CropHarvestor(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTECropHarvestor(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -268,11 +268,11 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank // If the slot is empty, create a new stack for the drop item, else check if it is the same as the drop // and merge if possible - if (invStack == null || GT_Utility.isStackInvalid(invStack) || invStack.stackSize == 0) { + if (invStack == null || GTUtility.isStackInvalid(invStack) || invStack.stackSize == 0) { int stackSize = Math.min(dropAmount, dropItem.getMaxStackSize()); - getBaseMetaTileEntity().setInventorySlotContents(i, GT_Utility.copyAmount(stackSize, dropItem)); + getBaseMetaTileEntity().setInventorySlotContents(i, GTUtility.copyAmount(stackSize, dropItem)); dropAmount -= stackSize; - } else if (GT_Utility.areStacksEqual(invStack, dropItem)) { + } else if (GTUtility.areStacksEqual(invStack, dropItem)) { int space = Math.min(invStack.getMaxStackSize(), getInventoryStackLimit()) - invStack.stackSize; if (dropAmount <= space) { // if the drop amount fits @@ -518,11 +518,11 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank "Radius: " + aSide + " blocks each side (" + aRadius + "x3x" + aRadius + ")", "Has " + (this.mTier * 5) + "% chance for extra drops", "Holds " + this.getCapacity() + "L of Water", - CORE.GT_Tooltip.get()); + GTPPCore.GT_Tooltip.get()); } @Override - public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) { + public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) { return true; } @@ -572,27 +572,27 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank public ITexture[] getFront(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter) }; + new GTRenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter) }; } public ITexture[] getBack(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter) }; + new GTRenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter) }; } public ITexture[] getBottom(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Boxes) }; + new GTRenderedTexture(TexturesGtBlock.Casing_CropHarvester_Boxes) }; } public ITexture[] getTop(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Boxes) }; + new GTRenderedTexture(TexturesGtBlock.Casing_CropHarvester_Boxes) }; } public ITexture[] getSides(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter) }; + new GTRenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter) }; } @Override @@ -645,18 +645,18 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( new CycleButtonWidget().setToggle(() -> mModeAlternative, val -> mModeAlternative = val) - .setTexture(GTPP_UITextures.OVERLAY_BUTTON_HARVESTER_MODE) + .setTexture(GTPPUITextures.OVERLAY_BUTTON_HARVESTER_MODE) .addTooltip(0, "Enable Hydration/Fertilizing/Weed-EX") .addTooltip(1, "Disable Hydration/Fertilizing/Weed-EX") - .setBackground(GT_UITextures.BUTTON_STANDARD) + .setBackground(GTUITextures.BUTTON_STANDARD) .setPos(47, 63) .setSize(18, 18)); builder.widget( new CycleButtonWidget().setToggle(() -> mHarvestEnabled, val -> mHarvestEnabled = val) - .setTexture(GTPP_UITextures.OVERLAY_BUTTON_HARVESTER_TOGGLE) + .setTexture(GTPPUITextures.OVERLAY_BUTTON_HARVESTER_TOGGLE) .addTooltip(0, "Enable Harvest") .addTooltip(1, "Disable Harvest") - .setBackground(GT_UITextures.BUTTON_STANDARD) + .setBackground(GTUITextures.BUTTON_STANDARD) .setPos(67, 63) .setSize(18, 18)); builder.widget( @@ -668,7 +668,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank stack -> stack != null && stack.getItem() .getUnlocalizedName() .equals("ic2.itemWeedEx")) - .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_WEED_EX)) + .setBackground(getGUITextureSet().getItemSlot(), GTPPUITextures.OVERLAY_SLOT_WEED_EX)) .build() .setPos(7, 13)) .widget( @@ -680,7 +680,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank stack -> stack != null && stack.getItem() .getUnlocalizedName() .equals("ic2.itemFertilizer")) - .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_FERTILIZER)) + .setBackground(getGUITextureSet().getItemSlot(), GTPPUITextures.OVERLAY_SLOT_FERTILIZER)) .build() .setPos(7, 31)) .widget( @@ -693,7 +693,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank builder .widget( new ProgressBar() - .setTexture(GTPP_UITextures.PROGRESSBAR_BOILER_EMPTY, GT_UITextures.PROGRESSBAR_BOILER_WATER, 54) + .setTexture(GTPPUITextures.PROGRESSBAR_BOILER_EMPTY, GTUITextures.PROGRESSBAR_BOILER_WATER, 54) .setDirection(ProgressBar.Direction.UP) .setProgress(() -> (float) getFluidAmount() / getCapacity()) .setSynced(false, false) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java index d7b6b8fffd..b87403d17e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java @@ -10,14 +10,14 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.objects.GTRenderedTexture; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMetaTileEntity; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity { +public class MTEPollutionCreator extends GTPPMetaTileEntity { int mCurrentPollution; int mAveragePollution; @@ -26,19 +26,20 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity { private int mTickTimer = 0; private int mSecondTimer = 0; - public GregtechMetaPollutionCreator(final int aID, final String aName, final String aNameRegional, final int aTier, + public MTEPollutionCreator(final int aID, final String aName, final String aNameRegional, final int aTier, final String aDescription, final int aSlotCount) { super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription); } - public GregtechMetaPollutionCreator(final String aName, final int aTier, final String aDescription, + public MTEPollutionCreator(final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures, final int aSlotCount) { super(aName, aTier, aSlotCount, aDescription, aTextures); } @Override public String[] getDescription() { - return new String[] { this.mDescription, "A useful debug machine to create pollution.", CORE.GT_Tooltip.get() }; + return new String[] { this.mDescription, "A useful debug machine to create pollution.", + GTPPCore.GT_Tooltip.get() }; } @Override @@ -69,52 +70,52 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity { public ITexture[] getFront(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) }; } public ITexture[] getBack(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getBottom(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getTop(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getSides(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getFrontActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) }; } public ITexture[] getBackActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getBottomActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getTopActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getSidesActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } @Override @@ -130,7 +131,7 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity { @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaPollutionCreator( + return new MTEPollutionCreator( this.mName, this.mTier, this.mDescription, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java index 92443d2658..6d599b60b9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java @@ -10,16 +10,16 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTUtility; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMetaTileEntity; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { +public class MTEPollutionDetector extends GTPPMetaTileEntity { int mCurrentPollution; int mAveragePollution; @@ -29,12 +29,12 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { private int mSecondTimer = 0; private long mRedstoneLevel = 0; - public GregtechMetaPollutionDetector(final int aID, final String aName, final String aNameRegional, final int aTier, + public MTEPollutionDetector(final int aID, final String aName, final String aNameRegional, final int aTier, final String aDescription, final int aSlotCount) { super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription); } - public GregtechMetaPollutionDetector(final String aName, final int aTier, final String aDescription, + public MTEPollutionDetector(final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures, final int aSlotCount) { super(aName, aTier, aSlotCount, aDescription, aTextures); } @@ -42,17 +42,18 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { @Override public String[] getDescription() { return new String[] { this.mDescription, "Right click to check pollution levels.", - "Configure with screwdriver to set redstone output amount.", "Does not use power.", CORE.GT_Tooltip.get() }; + "Configure with screwdriver to set redstone output amount.", "Does not use power.", + GTPPCore.GT_Tooltip.get() }; } @Override public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { return side == facing - ? new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional), - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency) } - : new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional), - new GT_RenderedTexture(Textures.BlockIcons.VOID) }; + ? new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional), + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency) } + : new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional), + new GTRenderedTexture(Textures.BlockIcons.VOID) }; } @Override @@ -82,57 +83,57 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { public ITexture[] getFront(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) }; } public ITexture[] getBack(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getBottom(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getTop(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getSides(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getFrontActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) }; } public ITexture[] getBackActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getBottomActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getTopActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getSidesActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaPollutionDetector( + return new MTEPollutionDetector( this.mName, this.mTier, this.mDescription, @@ -457,7 +458,7 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { if (side == this.getBaseMetaTileEntity() .getFrontFacing()) { - final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ); + final float[] tCoords = GTUtility.getClickedFacingCoords(side, aX, aY, aZ); switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) { case 0 -> this.mRedstoneLevel -= 5000; case 1 -> this.mRedstoneLevel += 5000; @@ -465,7 +466,7 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { case 3 -> this.mRedstoneLevel += 50000; } this.markDirty(); - GT_Utility.sendChatToPlayer(aPlayer, "Emit Redstone at Pollution Level: " + this.mRedstoneLevel); + GTUtility.sendChatToPlayer(aPlayer, "Emit Redstone at Pollution Level: " + this.mRedstoneLevel); } super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEWirelessCharger.java index b1289958a9..1535140115 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEWirelessCharger.java @@ -11,33 +11,33 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.BaseMetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.objects.GTRenderedTexture; import gtPlusPlus.api.objects.minecraft.BlockPos; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMetaTileEntity; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper; -public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity { +public class MTEWirelessCharger extends GTPPMetaTileEntity { private int mCurrentDimension = 0; public int mMode = 0; public boolean mLocked = true; - public GregtechMetaWirelessCharger(final int aID, final String aName, final String aNameRegional, final int aTier, + public MTEWirelessCharger(final int aID, final String aName, final String aNameRegional, final int aTier, final String aDescription, final int aSlotCount) { super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription); } - public GregtechMetaWirelessCharger(final String aName, final int aTier, final String aDescription, + public MTEWirelessCharger(final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures, final int aSlotCount) { super(aName, aTier, aSlotCount, aDescription, aTextures); } @@ -46,11 +46,11 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity { public String[] getDescription() { return new String[] { this.mDescription, "Can be locked to the owner by sneaking with a screwdriver", "Can also be locked with a lock upgrade", "", "3 Modes, Long-Range, Local and Mixed.", - "Long-Range: Can supply 2A of power to a single player up to " + (GT_Values.V[this.mTier] * 4) + "m away.", + "Long-Range: Can supply 2A of power to a single player up to " + (GTValues.V[this.mTier] * 4) + "m away.", "Local: Can supply several Amps to each player within " + this.mTier * 20 + "m.", "Mixed: Provides both 2A of long range and 1A per player locally.", "Mixed mode is more conservative of power and as a result only", - "Gets half the distances each singular mode gets.", CORE.GT_Tooltip.get() }; + "Gets half the distances each singular mode gets.", GTPPCore.GT_Tooltip.get() }; } public int getTier() { @@ -101,52 +101,52 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity { public ITexture[] getFront(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) }; } public ITexture[] getBack(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getBottom(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getTop(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getSides(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getFrontActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) }; } public ITexture[] getBackActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getBottomActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getTopActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getSidesActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } @Override @@ -188,7 +188,7 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity { @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaWirelessCharger( + return new MTEWirelessCharger( this.mName, this.mTier, this.mDescription, @@ -250,17 +250,17 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity { @Override public long maxEUStore() { - return GT_Values.V[this.mTier] * 128; + return GTValues.V[this.mTier] * 128; } @Override public int getCapacity() { - return (int) (GT_Values.V[this.mTier] * 32); + return (int) (GTValues.V[this.mTier] * 32); } @Override public long maxEUInput() { - return GT_Values.V[this.mTier]; + return GTValues.V[this.mTier]; } @Override @@ -508,8 +508,8 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity { } } if (this.mMode == 0 || this.mMode == 2) { - int tempRange = (int) (this.mMode == 0 ? 4 * GT_Values.V[this.mTier] - : 2 * GT_Values.V[this.mTier]); + int tempRange = (int) (this.mMode == 0 ? 4 * GTValues.V[this.mTier] + : 2 * GTValues.V[this.mTier]); if (getDistanceBetweenTwoPositions(getTileEntityPosition(), getPositionOfEntity(mTemp)) <= tempRange) { if (!mWirelessChargingMap.containsKey(mTemp.getDisplayName())) { @@ -614,7 +614,7 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity { int tempRange; if (this.mMode == 0 || this.mMode == 2) { - tempRange = (int) (this.mMode == 0 ? 4 * GT_Values.V[this.mTier] : 2 * GT_Values.V[this.mTier]); + tempRange = (int) (this.mMode == 0 ? 4 * GTValues.V[this.mTier] : 2 * GTValues.V[this.mTier]); } else { tempRange = this.mMode == 1 ? this.mTier * 20 : this.mTier * 10; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java index 52804f9ad2..9f0b6d6be9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java @@ -3,12 +3,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.misc; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.Arrays; import java.util.Collection; @@ -32,43 +32,42 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import gregtech.api.enums.TAE; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_AmazonPackager> - implements ISurvivalConstructable { +public class MTEAmazonPackager extends GTPPMultiBlockBase<MTEAmazonPackager> implements ISurvivalConstructable { private int mCasing; private static final int MACHINEMODE_PACKAGER = 0; private static final int MACHINEMODE_UNPACKAGER = 1; - private static IStructureDefinition<GMTE_AmazonPackager> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEAmazonPackager> STRUCTURE_DEFINITION = null; @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GMTE_AmazonPackager(mName); + return new MTEAmazonPackager(mName); } - public GMTE_AmazonPackager(int aID, String aName, String aNameRegional) { + public MTEAmazonPackager(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GMTE_AmazonPackager(String aName) { + public MTEAmazonPackager(String aName) { super(aName); } @@ -78,17 +77,16 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon } @Override - public IStructureDefinition<GMTE_AmazonPackager> getStructureDefinition() { + public IStructureDefinition<MTEAmazonPackager> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GMTE_AmazonPackager>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEAmazonPackager>builder() .addShape( mName, transpose( new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" }, { "CCC", "CCC", "CCC" }, })) .addElement( 'C', - buildHatchAdder(GMTE_AmazonPackager.class) - .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler) + buildHatchAdder(MTEAmazonPackager.class).atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler) .casingIndex(TAE.getIndexFromPage(2, 9)) .dot(1) .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings3Misc, 9)))) @@ -98,8 +96,8 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Amazon Warehouse") .addInfo("This Multiblock is used for EXTREME packaging requirements") @@ -170,12 +168,12 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon @Override public int getPollutionPerSecond(ItemStack arg0) { - return CORE.ConfigSwitches.pollutionPerSecondMultiPackager; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiPackager; } @Override public int getMaxParallelRecipes() { - return (16 * GT_Utility.getTier(this.getMaxInputVoltage())); + return (16 * GTUtility.getTier(this.getMaxInputVoltage())); } @Override @@ -242,7 +240,7 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon @Override public void setMachineModeIcons() { machineModeIcons.clear(); - machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_PACKAGER); - machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_UNPACKAGER); + machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_PACKAGER); + machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_UNPACKAGER); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java index e5d138dfda..ed14343fa3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java @@ -3,13 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_StructureUtility.ofCoil; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.ofCoil; import net.minecraft.item.ItemStack; @@ -29,36 +29,36 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; -public class GregtechMetaTileEntity_IndustrialAlloySmelter extends - GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialAlloySmelter> implements ISurvivalConstructable { +public class MTEIndustrialAlloySmelter extends GTPPMultiBlockBase<MTEIndustrialAlloySmelter> + implements ISurvivalConstructable { public static int CASING_TEXTURE_ID; private HeatingCoilLevel mHeatingCapacity; private int mLevel = 0; private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialAlloySmelter> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialAlloySmelter> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_IndustrialAlloySmelter(int aID, String aName, String aNameRegional) { + public MTEIndustrialAlloySmelter(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 1); } - public GregtechMetaTileEntity_IndustrialAlloySmelter(String aName) { + public MTEIndustrialAlloySmelter(String aName) { super(aName); CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 1); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialAlloySmelter(this.mName); + return new MTEIndustrialAlloySmelter(this.mName); } @Override @@ -93,7 +93,7 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends @Override public int getPollutionPerSecond(ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialAlloySmelter; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialAlloySmelter; } @Override @@ -112,8 +112,8 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Industrial Alloy Smelter") .addInfo("Gains one parallel per voltage tier") @@ -132,14 +132,14 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends .addEnergyHatch("Any Inconel Reinforced Casing", 1) .addMaintenanceHatch("Any Inconel Reinforced Casing", 1) .addMufflerHatch("Any Inconel Reinforced Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialAlloySmelter> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialAlloySmelter> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialAlloySmelter>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialAlloySmelter>builder() .addShape( mName, transpose( @@ -147,16 +147,14 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends { "HHH", "H-H", "HHH" }, { "C~C", "CCC", "CCC" }, })) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_IndustrialAlloySmelter.class) + buildHatchAdder(MTEIndustrialAlloySmelter.class) .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler) .casingIndex(CASING_TEXTURE_ID) .dot(1) .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings3Misc, 1)))) .addElement( 'H', - ofCoil( - GregtechMetaTileEntity_IndustrialAlloySmelter::setCoilLevel, - GregtechMetaTileEntity_IndustrialAlloySmelter::getCoilLevel)) + ofCoil(MTEIndustrialAlloySmelter::setCoilLevel, MTEIndustrialAlloySmelter::getCoilLevel)) .addElement('V', ofBlock(ModBlocks.blockCasingsTieredGTPP, 4)) .build(); } @@ -187,7 +185,7 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends @Override public int getMaxParallelRecipes() { - return (this.mLevel * GT_Utility.getTier(this.getMaxInputVoltage())); + return (this.mLevel * GTUtility.getTier(this.getMaxInputVoltage())); } @Override @@ -196,7 +194,7 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends @NotNull @Override - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { + protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { return super.createOverclockCalculator(recipe).setSpeedBoost(100F / (100F + 5F * mLevel)) .setHeatOC(true) .setRecipeHeat(0) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java index cc182cf6d2..256e1219aa 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java @@ -2,14 +2,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.Arrays; import java.util.Collection; @@ -41,18 +41,18 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public class GregtechMetaTileEntity_IndustrialArcFurnace - extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialArcFurnace> implements ISurvivalConstructable { +public class MTEIndustrialArcFurnace extends GTPPMultiBlockBase<MTEIndustrialArcFurnace> + implements ISurvivalConstructable { // 862 private static final int mCasingTextureID = TAE.getIndexFromPage(3, 3); @@ -61,19 +61,19 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace private int mSize = 0; private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialArcFurnace> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialArcFurnace> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_IndustrialArcFurnace(final int aID, final String aName, final String aNameRegional) { + public MTEIndustrialArcFurnace(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_IndustrialArcFurnace(final String aName) { + public MTEIndustrialArcFurnace(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialArcFurnace(this.mName); + return new MTEIndustrialArcFurnace(this.mName); } @Override @@ -82,8 +82,8 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for Industrial Arc Furnace") .addInfo("250% faster than using single block machines of the same voltage") @@ -103,7 +103,7 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -118,9 +118,9 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace private static final int MAX_TIER = 3; @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialArcFurnace> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialArcFurnace> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialArcFurnace>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialArcFurnace>builder() .addShape(STRUCTURE_PIECE_FRONT + 1, new String[][] { { "CCC", "C~C", "CCC" } }) .addShape(STRUCTURE_PIECE_FRONT + 2, new String[][] { { "CCCCC", "C C", "C C", "C C", "CCCCC" } }) .addShape( @@ -137,7 +137,7 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace { "CCCCCCC", "CCCCCCC", "CCCCCCC", "CCCCCCC", "CCCCCCC", "CCCCCCC", "CCCCCCC" }, }) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_IndustrialArcFurnace.class) + buildHatchAdder(MTEIndustrialArcFurnace.class) .atLeast(InputBus, InputHatch, OutputBus, OutputHatch, Maintenance, Energy, Muffler) .casingIndex(getCasingTextureIndex()) .dot(1) @@ -255,7 +255,7 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace @Override public int getMaxParallelRecipes() { - return (this.mSize * 8 * GT_Utility.getTier(this.getMaxInputVoltage())); + return (this.mSize * 8 * GTUtility.getTier(this.getMaxInputVoltage())); } @Override @@ -265,7 +265,7 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialArcFurnace; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialArcFurnace; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java index c04620d4b4..86a971cb5c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java @@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -29,39 +29,39 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon; -public class GregtechMetaTileEntity_IndustrialCentrifuge - extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialCentrifuge> implements ISurvivalConstructable { +public class MTEIndustrialCentrifuge extends GTPPMultiBlockBase<MTEIndustrialCentrifuge> + implements ISurvivalConstructable { private boolean mIsAnimated; private static final CustomIcon frontFaceActive = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE5"); private static final CustomIcon frontFace = new CustomIcon("iconsets/LARGECENTRIFUGE5"); private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialCentrifuge> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialCentrifuge> STRUCTURE_DEFINITION = null; // public static double recipesComplete = 0; - public GregtechMetaTileEntity_IndustrialCentrifuge(final int aID, final String aName, final String aNameRegional) { + public MTEIndustrialCentrifuge(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); mIsAnimated = true; } - public GregtechMetaTileEntity_IndustrialCentrifuge(final String aName) { + public MTEIndustrialCentrifuge(final String aName) { super(aName); mIsAnimated = true; } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialCentrifuge(this.mName); + return new MTEIndustrialCentrifuge(this.mName); } @Override @@ -70,8 +70,8 @@ public class GregtechMetaTileEntity_IndustrialCentrifuge } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Industrial Centrifuge") .addInfo("125% faster than using single block machines of the same voltage") @@ -90,21 +90,21 @@ public class GregtechMetaTileEntity_IndustrialCentrifuge .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialCentrifuge> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialCentrifuge> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialCentrifuge>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialCentrifuge>builder() .addShape( mName, transpose( new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" }, { "CCC", "CCC", "CCC" }, })) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_IndustrialCentrifuge.class) + buildHatchAdder(MTEIndustrialCentrifuge.class) .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch) .casingIndex(getCasingTextureIndex()) .dot(1) @@ -164,7 +164,7 @@ public class GregtechMetaTileEntity_IndustrialCentrifuge @Override public int getMaxParallelRecipes() { - return (6 * GT_Utility.getTier(this.getMaxInputVoltage())); + return (6 * GTUtility.getTier(this.getMaxInputVoltage())); } public Block getCasingBlock() { @@ -186,7 +186,7 @@ public class GregtechMetaTileEntity_IndustrialCentrifuge @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialCentrifuge; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialCentrifuge; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java index 82d18a9347..1dc694e584 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java @@ -3,12 +3,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.List; import java.util.stream.Stream; @@ -31,42 +31,41 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; +import gregtech.api.metatileentity.implementations.MTEHatchInputBus; import gregtech.api.recipe.RecipeMap; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_StreamUtil; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTStreamUtil; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ChiselBus; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchChiselBus; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import team.chisel.carving.Carving; -public class GregtechMetaTileEntity_IndustrialChisel - extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialChisel> implements ISurvivalConstructable { +public class MTEIndustrialChisel extends GTPPMultiBlockBase<MTEIndustrialChisel> implements ISurvivalConstructable { private int mCasing; private ItemStack target; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialChisel> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialChisel> STRUCTURE_DEFINITION = null; private ItemStack mInputCache; private ItemStack mOutputCache; - private GT_Recipe mCachedRecipe; + private GTRecipe mCachedRecipe; - public GregtechMetaTileEntity_IndustrialChisel(int aID, String aName, String aNameRegional) { + public MTEIndustrialChisel(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_IndustrialChisel(String aName) { + public MTEIndustrialChisel(String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialChisel(this.mName); + return new MTEIndustrialChisel(this.mName); } @Override @@ -75,8 +74,8 @@ public class GregtechMetaTileEntity_IndustrialChisel } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Factory Grade Auto Chisel") .addInfo("Target block goes in Controller slot for common Input Buses") @@ -93,14 +92,14 @@ public class GregtechMetaTileEntity_IndustrialChisel .addEnergyHatch("Any casing", 1) .addMaintenanceHatch("Any casing", 1) .addMufflerHatch("Any casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialChisel> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialChisel> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialChisel>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialChisel>builder() .addShape( mName, transpose( @@ -113,7 +112,7 @@ public class GregtechMetaTileEntity_IndustrialChisel // spotless:on .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_IndustrialChisel.class) + buildHatchAdder(MTEIndustrialChisel.class) .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler) .casingIndex(90) .dot(1) @@ -162,8 +161,7 @@ public class GregtechMetaTileEntity_IndustrialChisel private boolean hasValidCache(ItemStack aStack, ItemStack aSpecialSlot, boolean aClearOnFailure) { if (mInputCache != null && mOutputCache != null && mCachedRecipe != null) { - if (GT_Utility.areStacksEqual(aStack, mInputCache) - && GT_Utility.areStacksEqual(aSpecialSlot, mOutputCache)) { + if (GTUtility.areStacksEqual(aStack, mInputCache) && GTUtility.areStacksEqual(aSpecialSlot, mOutputCache)) { return true; } } @@ -176,7 +174,7 @@ public class GregtechMetaTileEntity_IndustrialChisel return false; } - private void cacheItem(ItemStack aInputItem, ItemStack aOutputItem, GT_Recipe aRecipe) { + private void cacheItem(ItemStack aInputItem, ItemStack aOutputItem, GTRecipe aRecipe) { mInputCache = aInputItem.copy(); mOutputCache = aOutputItem.copy(); mCachedRecipe = aRecipe; @@ -215,17 +213,17 @@ public class GregtechMetaTileEntity_IndustrialChisel return tOutput; } - private GT_Recipe generateChiselRecipe(ItemStack aInput) { + private GTRecipe generateChiselRecipe(ItemStack aInput) { boolean tIsCached = hasValidCache(aInput, this.target, true); if (tIsCached || aInput != null && hasChiselResults(aInput)) { ItemStack tOutput = tIsCached ? mOutputCache.copy() : getChiselOutput(aInput, this.target); if (tOutput != null) { - if (mCachedRecipe != null && GT_Utility.areStacksEqual(aInput, mInputCache) - && GT_Utility.areStacksEqual(tOutput, mOutputCache)) { + if (mCachedRecipe != null && GTUtility.areStacksEqual(aInput, mInputCache) + && GTUtility.areStacksEqual(tOutput, mOutputCache)) { return mCachedRecipe; } // We can chisel this - GT_Recipe aRecipe = new GT_Recipe( + GTRecipe aRecipe = new GTRecipe( false, new ItemStack[] { ItemUtils.getSimpleStack(aInput, 1) }, new ItemStack[] { ItemUtils.getSimpleStack(tOutput, 1) }, @@ -245,16 +243,16 @@ public class GregtechMetaTileEntity_IndustrialChisel return null; } - private GT_Recipe getRecipe() { - for (GT_MetaTileEntity_Hatch_InputBus bus : this.mInputBusses) { - if (bus instanceof GT_MetaTileEntity_ChiselBus) { // Chisel buses + private GTRecipe getRecipe() { + for (MTEHatchInputBus bus : this.mInputBusses) { + if (bus instanceof MTEHatchChiselBus) { // Chisel buses if (bus.mInventory[bus.getSizeInventory() - 1] == null) continue; this.target = bus.mInventory[bus.getSizeInventory() - 1]; for (int i = bus.getSizeInventory() - 2; i >= 0; i--) { ItemStack itemsInSlot = bus.mInventory[i]; if (itemsInSlot != null) { - GT_Recipe tRecipe = generateChiselRecipe(itemsInSlot); + GTRecipe tRecipe = generateChiselRecipe(itemsInSlot); if (tRecipe != null) { return tRecipe; } @@ -265,7 +263,7 @@ public class GregtechMetaTileEntity_IndustrialChisel for (int i = bus.getSizeInventory() - 1; i >= 0; i--) { ItemStack itemsInSlot = bus.mInventory[i]; if (itemsInSlot != null) { - GT_Recipe tRecipe = generateChiselRecipe(itemsInSlot); + GTRecipe tRecipe = generateChiselRecipe(itemsInSlot); if (tRecipe != null) { return tRecipe; } @@ -283,8 +281,8 @@ public class GregtechMetaTileEntity_IndustrialChisel @Nonnull @Override - protected Stream<GT_Recipe> findRecipeMatches(@Nullable RecipeMap<?> map) { - return GT_StreamUtil.ofNullable(getRecipe()); + protected Stream<GTRecipe> findRecipeMatches(@Nullable RecipeMap<?> map) { + return GTStreamUtil.ofNullable(getRecipe()); } }.setSpeedBonus(1F / 3F) .setEuModifier(0.75F) @@ -298,7 +296,7 @@ public class GregtechMetaTileEntity_IndustrialChisel @Override public int getMaxParallelRecipes() { - return (16 * GT_Utility.getTier(this.getMaxInputVoltage())); + return (16 * GTUtility.getTier(this.getMaxInputVoltage())); } private static ResourceLocation sChiselSound = null; @@ -313,9 +311,9 @@ public class GregtechMetaTileEntity_IndustrialChisel @Override public void doSound(byte aIndex, double aX, double aY, double aZ) { switch (aIndex) { - case PROCESS_START_SOUND_INDEX -> GT_Utility + case PROCESS_START_SOUND_INDEX -> GTUtility .doSoundAtClient(getChiselSound(), getTimeBetweenProcessSounds(), 1.0F, 1.0F, aX, aY, aZ); - case INTERRUPT_SOUND_INDEX -> GT_Utility + case INTERRUPT_SOUND_INDEX -> GTUtility .doSoundAtClient(SoundResource.IC2_MACHINES_INTERRUPT_ONE, 100, 1.0F, aX, aY, aZ); } } @@ -327,7 +325,7 @@ public class GregtechMetaTileEntity_IndustrialChisel @Override public int getPollutionPerSecond(ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialChisel; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialChisel; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java index a20b879fb8..552f90d855 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java @@ -4,14 +4,14 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.item.ItemStack; @@ -27,34 +27,33 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_IndustrialCokeOven - extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialCokeOven> implements ISurvivalConstructable { +public class MTEIndustrialCokeOven extends GTPPMultiBlockBase<MTEIndustrialCokeOven> implements ISurvivalConstructable { private int mLevel = 0; private int mCasing; private int mCasing1; private int mCasing2; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialCokeOven> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialCokeOven> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_IndustrialCokeOven(final int aID, final String aName, final String aNameRegional) { + public MTEIndustrialCokeOven(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_IndustrialCokeOven(final String aName) { + public MTEIndustrialCokeOven(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialCokeOven(this.mName); + return new MTEIndustrialCokeOven(this.mName); } @Override @@ -63,8 +62,8 @@ public class GregtechMetaTileEntity_IndustrialCokeOven } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Processes Logs and Coal into Charcoal and Coal Coke.") .addInfo("Controller Block for the Industrial Coke Oven") @@ -84,14 +83,14 @@ public class GregtechMetaTileEntity_IndustrialCokeOven .addEnergyHatch("Any Structural Coke Oven Casing", 1) .addMaintenanceHatch("Any Structural Coke Oven Casing", 1) .addMufflerHatch("Any Structural Coke Oven Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialCokeOven> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialCokeOven> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialCokeOven>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialCokeOven>builder() .addShape( mName, transpose( @@ -106,7 +105,7 @@ public class GregtechMetaTileEntity_IndustrialCokeOven new String[][] { { "CCC", "CCC", "CCC" }, { "bbb", "b-b", "bbb" }, { "C~C", "CCC", "CCC" }, })) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_IndustrialCokeOven.class) + buildHatchAdder(MTEIndustrialCokeOven.class) .atLeast(InputBus, OutputBus, InputHatch, OutputHatch, Maintenance, Energy, Muffler) .casingIndex(TAE.GTPP_INDEX(1)) .dot(1) @@ -184,7 +183,7 @@ public class GregtechMetaTileEntity_IndustrialCokeOven @Override protected void setupProcessingLogic(ProcessingLogic logic) { super.setupProcessingLogic(logic); - logic.setEuModifier((100F - (GT_Utility.getTier(getMaxInputVoltage()) * 4)) / 100F); + logic.setEuModifier((100F - (GTUtility.getTier(getMaxInputVoltage()) * 4)) / 100F); } @Override @@ -199,7 +198,7 @@ public class GregtechMetaTileEntity_IndustrialCokeOven @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialCokeOven; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialCokeOven; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java index 4910ee4d2f..5d80aac3f4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java @@ -3,13 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.Arrays; import java.util.Collection; @@ -34,44 +34,43 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import gregtech.api.enums.TAE; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public class GregtechMetaTileEntity_IndustrialCuttingMachine extends - GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialCuttingMachine> implements ISurvivalConstructable { +public class MTEIndustrialCuttingMachine extends GTPPMultiBlockBase<MTEIndustrialCuttingMachine> + implements ISurvivalConstructable { private int mCasing; private static final int MACHINEMODE_CUTTER = 0; private static final int MACHINEMODE_SLICER = 1; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialCuttingMachine> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialCuttingMachine> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_IndustrialCuttingMachine(final int aID, final String aName, - final String aNameRegional) { + public MTEIndustrialCuttingMachine(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_IndustrialCuttingMachine(final String aName) { + public MTEIndustrialCuttingMachine(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialCuttingMachine(this.mName); + return new MTEIndustrialCuttingMachine(this.mName); } @Override @@ -80,8 +79,8 @@ public class GregtechMetaTileEntity_IndustrialCuttingMachine extends } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Industrial Cutting Factory") .addInfo("200% faster than using single block machines of the same voltage") @@ -98,14 +97,14 @@ public class GregtechMetaTileEntity_IndustrialCuttingMachine extends .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialCuttingMachine> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialCuttingMachine> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialCuttingMachine>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialCuttingMachine>builder() .addShape( mName, transpose( @@ -113,7 +112,7 @@ public class GregtechMetaTileEntity_IndustrialCuttingMachine extends { "CCC", "CCC", "CCC", "CCC", "CCC" }, })) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_IndustrialCuttingMachine.class) + buildHatchAdder(MTEIndustrialCuttingMachine.class) .atLeast(InputBus, InputHatch, OutputBus, Maintenance, Energy, Muffler) .casingIndex(getCasingTextureIndex()) .dot(1) @@ -180,7 +179,7 @@ public class GregtechMetaTileEntity_IndustrialCuttingMachine extends @Override public int getMaxParallelRecipes() { - return (4 * GT_Utility.getTier(this.getMaxInputVoltage())); + return (4 * GTUtility.getTier(this.getMaxInputVoltage())); } @Override @@ -190,7 +189,7 @@ public class GregtechMetaTileEntity_IndustrialCuttingMachine extends @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialCuttingMachine; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialCuttingMachine; } @Override @@ -231,8 +230,8 @@ public class GregtechMetaTileEntity_IndustrialCuttingMachine extends @Override public void setMachineModeIcons() { machineModeIcons.clear(); - machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_CUTTING); - machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_SLICING); + machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_CUTTING); + machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_SLICING); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java index f4b10890c8..0975c5fa88 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_StructureUtility.ofCoil; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.ofCoil; import java.util.Arrays; import java.util.Collection; @@ -45,46 +45,46 @@ import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public class GregtechMetaTileEntity_IndustrialDehydrator - extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialDehydrator> implements ISurvivalConstructable { +public class MTEIndustrialDehydrator extends GTPPMultiBlockBase<MTEIndustrialDehydrator> + implements ISurvivalConstructable { private static int CASING_TEXTURE_ID; private static String mCasingName = "Vacuum Casing"; private HeatingCoilLevel mHeatingCapacity; private boolean mDehydratorMode = false; private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialDehydrator> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialDehydrator> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_IndustrialDehydrator(int aID, String aName, String aNameRegional) { + public MTEIndustrialDehydrator(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); CASING_TEXTURE_ID = TAE.getIndexFromPage(3, 10); } - public GregtechMetaTileEntity_IndustrialDehydrator(String aName) { + public MTEIndustrialDehydrator(String aName) { super(aName); CASING_TEXTURE_ID = TAE.getIndexFromPage(3, 10); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialDehydrator(mName); + return new MTEIndustrialDehydrator(mName); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Factory Grade Vacuum Furnace") .addInfo("Can toggle the operation temperature with a Screwdriver") @@ -105,14 +105,14 @@ public class GregtechMetaTileEntity_IndustrialDehydrator .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialDehydrator> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialDehydrator> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialDehydrator>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialDehydrator>builder() .addShape( mName, transpose( @@ -120,16 +120,12 @@ public class GregtechMetaTileEntity_IndustrialDehydrator { "HHH", "H-H", "HHH" }, { "C~C", "CCC", "CCC" }, })) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_IndustrialDehydrator.class) + buildHatchAdder(MTEIndustrialDehydrator.class) .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch) .casingIndex(CASING_TEXTURE_ID) .dot(1) .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings4Misc, 10)))) - .addElement( - 'H', - ofCoil( - GregtechMetaTileEntity_IndustrialDehydrator::setCoilLevel, - GregtechMetaTileEntity_IndustrialDehydrator::getCoilLevel)) + .addElement('H', ofCoil(MTEIndustrialDehydrator::setCoilLevel, MTEIndustrialDehydrator::getCoilLevel)) .build(); } return STRUCTURE_DEFINITION; @@ -191,7 +187,7 @@ public class GregtechMetaTileEntity_IndustrialDehydrator @Override public int getPollutionPerSecond(ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialDehydrator; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialDehydrator; } @Override @@ -210,14 +206,14 @@ public class GregtechMetaTileEntity_IndustrialDehydrator @NotNull @Override - protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { return recipe.mSpecialValue <= getCoilLevel().getHeat() ? CheckRecipeResultRegistry.SUCCESSFUL : CheckRecipeResultRegistry.insufficientHeat(recipe.mSpecialValue); } @NotNull @Override - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { + protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { return super.createOverclockCalculator(recipe).setHeatOC(true) .setHeatDiscount(true) .setRecipeHeat(recipe.mSpecialValue) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java index 9114fb5eac..0f2b573a2e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java @@ -3,12 +3,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -26,30 +26,29 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_IndustrialExtruder - extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialExtruder> implements ISurvivalConstructable { +public class MTEIndustrialExtruder extends GTPPMultiBlockBase<MTEIndustrialExtruder> implements ISurvivalConstructable { private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialExtruder> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialExtruder> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_IndustrialExtruder(final int aID, final String aName, final String aNameRegional) { + public MTEIndustrialExtruder(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_IndustrialExtruder(final String aName) { + public MTEIndustrialExtruder(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialExtruder(this.mName); + return new MTEIndustrialExtruder(this.mName); } @Override @@ -58,8 +57,8 @@ public class GregtechMetaTileEntity_IndustrialExtruder } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Material Extruder") .addInfo("250% faster than using single block machines of the same voltage") @@ -77,14 +76,14 @@ public class GregtechMetaTileEntity_IndustrialExtruder .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialExtruder> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialExtruder> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialExtruder>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialExtruder>builder() .addShape( mName, transpose( @@ -92,7 +91,7 @@ public class GregtechMetaTileEntity_IndustrialExtruder { "CCC", "CCC", "CCC", "CCC", "CCC" }, })) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_IndustrialExtruder.class) + buildHatchAdder(MTEIndustrialExtruder.class) .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler) .casingIndex(getCasingTextureIndex()) .dot(1) @@ -157,7 +156,7 @@ public class GregtechMetaTileEntity_IndustrialExtruder @Override public int getMaxParallelRecipes() { - return (4 * GT_Utility.getTier(this.getMaxInputVoltage())); + return (4 * GTUtility.getTier(this.getMaxInputVoltage())); } @Override @@ -167,7 +166,7 @@ public class GregtechMetaTileEntity_IndustrialExtruder @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialExtruder; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialExtruder; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java index 254402d4c1..9c22e81024 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java @@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -27,30 +27,30 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_IndustrialFluidHeater extends - GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialFluidHeater> implements ISurvivalConstructable { +public class MTEIndustrialFluidHeater extends GTPPMultiBlockBase<MTEIndustrialFluidHeater> + implements ISurvivalConstructable { private int mCasing1; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialFluidHeater> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialFluidHeater> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_IndustrialFluidHeater(final int aID, final String aName, final String aNameRegional) { + public MTEIndustrialFluidHeater(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_IndustrialFluidHeater(final String aName) { + public MTEIndustrialFluidHeater(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialFluidHeater(this.mName); + return new MTEIndustrialFluidHeater(this.mName); } @Override @@ -59,8 +59,8 @@ public class GregtechMetaTileEntity_IndustrialFluidHeater extends } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Industrial Fluid Heater") .addInfo("120% faster than using single block machines of the same voltage") @@ -79,14 +79,14 @@ public class GregtechMetaTileEntity_IndustrialFluidHeater extends .addEnergyHatch("Any Multi-use Casing", 1) .addMaintenanceHatch("Any Multi-use Casing", 1) .addMufflerHatch("Any Multi-use Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialFluidHeater> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialFluidHeater> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialFluidHeater>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialFluidHeater>builder() .addShape( mName, transpose( @@ -98,7 +98,7 @@ public class GregtechMetaTileEntity_IndustrialFluidHeater extends { " BBB ", "BBBBB", "BBBBB", "BBBBB", " BBB " }, })) .addElement( 'B', - buildHatchAdder(GregtechMetaTileEntity_IndustrialFluidHeater.class) + buildHatchAdder(MTEIndustrialFluidHeater.class) .atLeast(InputBus, InputHatch, Maintenance, Energy, Muffler) .casingIndex(getCasingTextureIndex()) .dot(1) @@ -106,7 +106,7 @@ public class GregtechMetaTileEntity_IndustrialFluidHeater extends .addElement('X', ofBlock(getCasingBlock1(), getCasingMeta1())) .addElement( 'T', - buildHatchAdder(GregtechMetaTileEntity_IndustrialFluidHeater.class) + buildHatchAdder(MTEIndustrialFluidHeater.class) .atLeast(OutputBus, OutputHatch, Maintenance, Energy, Muffler) .casingIndex(getCasingTextureIndex()) .dot(1) @@ -164,7 +164,7 @@ public class GregtechMetaTileEntity_IndustrialFluidHeater extends @Override public int getMaxParallelRecipes() { - return (8 * GT_Utility.getTier(this.getMaxInputVoltage())); + return (8 * GTUtility.getTier(this.getMaxInputVoltage())); } @Override @@ -174,7 +174,7 @@ public class GregtechMetaTileEntity_IndustrialFluidHeater extends @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialThermalCentrifuge; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialThermalCentrifuge; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java index 44484cb90e..b809feaa6e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java @@ -4,17 +4,17 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.enums.Mods.ThaumicBases; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.HashMap; import java.util.List; @@ -42,32 +42,32 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @SuppressWarnings("SpellCheckingInspection") -public class GregtechMetaTileEntity_IndustrialForgeHammer extends - GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialForgeHammer> implements ISurvivalConstructable { +public class MTEIndustrialForgeHammer extends GTPPMultiBlockBase<MTEIndustrialForgeHammer> + implements ISurvivalConstructable { private int mCasing; private int mAnvilTier = 0; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialForgeHammer> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialForgeHammer> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_IndustrialForgeHammer(final int aID, final String aName, final String aNameRegional) { + public MTEIndustrialForgeHammer(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_IndustrialForgeHammer(final String aName) { + public MTEIndustrialForgeHammer(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialForgeHammer(this.mName); + return new MTEIndustrialForgeHammer(this.mName); } @Override @@ -76,8 +76,8 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Industrial Forge Hammer") .addInfo("Speed: +100% | EU Usage: 100% | Parallel: Tier x Anvil Tier x 8") @@ -106,12 +106,12 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) .addOtherStructurePart("Anvil", "In the center of 3x3x3 structure", 2) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialForgeHammer> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialForgeHammer> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { Map<Block, Integer> anvilTiers = new HashMap<>(); @@ -130,14 +130,14 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends anvilTiers.put(GameRegistry.findBlock(ThaumicBases.ID, "voidAnvil"), 4); } - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialForgeHammer>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialForgeHammer>builder() .addShape( mName, transpose( new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "CAC", "CCC" }, { "CCC", "CCC", "CCC" }, })) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_IndustrialForgeHammer.class) + buildHatchAdder(MTEIndustrialForgeHammer.class) .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch) .casingIndex(TAE.getIndexFromPage(1, 11)) .dot(1) @@ -148,8 +148,8 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends anvilTierConverter(anvilTiers), getAllAnvilTiers(anvilTiers), 0, - GregtechMetaTileEntity_IndustrialForgeHammer::setAnvilTier, - GregtechMetaTileEntity_IndustrialForgeHammer::getAnvilTier)) + MTEIndustrialForgeHammer::setAnvilTier, + MTEIndustrialForgeHammer::getAnvilTier)) .build(); } return STRUCTURE_DEFINITION; @@ -216,7 +216,7 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends @Override public int getMaxParallelRecipes() { - return (8 * getAnvilTier() * GT_Utility.getTier(this.getMaxInputVoltage())); + return (8 * getAnvilTier() * GTUtility.getTier(this.getMaxInputVoltage())); } @Override @@ -226,7 +226,7 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialForgeHammer; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialForgeHammer; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java index ff66b930ad..635e5889f5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java @@ -4,12 +4,12 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksT import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.List; import java.util.Random; @@ -33,30 +33,30 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.SoundResource; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.MTEHatch; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.common.tileentities.machines.IDualInputHatch; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public class GregtechMetaTileEntity_IndustrialMacerator - extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialMacerator> implements ISurvivalConstructable { +public class MTEIndustrialMacerator extends GTPPMultiBlockBase<MTEIndustrialMacerator> + implements ISurvivalConstructable { private int controllerTier = 1; private int structureTier; @@ -67,25 +67,25 @@ public class GregtechMetaTileEntity_IndustrialMacerator private static final int HORIZONTAL_OFF_SET = 1; private static final int VERTICAL_OFF_SET = 5; private static final int DEPTH_OFF_SET = 0; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialMacerator> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialMacerator> STRUCTURE_DEFINITION = null; private static int getStructureCasingTier(Block b, int m) { - if (b == GregTech_API.sBlockCasings4 && m == 2) return 1; + if (b == GregTechAPI.sBlockCasings4 && m == 2) return 1; if (b == ModBlocks.blockCasingsMisc && m == 7) return 2; return 0; } - public GregtechMetaTileEntity_IndustrialMacerator(final int aID, final String aName, final String aNameRegional) { + public MTEIndustrialMacerator(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_IndustrialMacerator(final String aName) { + public MTEIndustrialMacerator(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialMacerator(this.mName); + return new MTEIndustrialMacerator(this.mName); } @Override @@ -94,8 +94,8 @@ public class GregtechMetaTileEntity_IndustrialMacerator } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller block for the Industrial Maceration Stack") .addInfo("60% faster than using single block machines of the same voltage") @@ -112,14 +112,14 @@ public class GregtechMetaTileEntity_IndustrialMacerator .addMaintenanceHatch("Any casing", 1) .addOutputBus("One per layer except bottom layer", 2) .addMufflerHatch("Any casing except bottom layer", 2) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialMacerator> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialMacerator> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialMacerator>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialMacerator>builder() .addShape( STRUCTURE_PIECE_MAIN, // spotless:off @@ -135,19 +135,18 @@ public class GregtechMetaTileEntity_IndustrialMacerator .addElement( 'A', ofChain( - buildHatchAdder(GregtechMetaTileEntity_IndustrialMacerator.class) + buildHatchAdder(MTEIndustrialMacerator.class) .atLeast(Energy, Maintenance, InputBus, Muffler, OutputBus) - .casingIndex(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings4, 2)) + .casingIndex(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings4, 2)) .allowOnly(ForgeDirection.NORTH) .dot(1) .build(), onElementPass( m -> m.mCasing++, ofBlocksTiered( - GregtechMetaTileEntity_IndustrialMacerator::getStructureCasingTier, - ImmutableList.of( - Pair.of(GregTech_API.sBlockCasings4, 2), - Pair.of(ModBlocks.blockCasingsMisc, 7)), + MTEIndustrialMacerator::getStructureCasingTier, + ImmutableList + .of(Pair.of(GregTechAPI.sBlockCasings4, 2), Pair.of(ModBlocks.blockCasingsMisc, 7)), -1, (m, t) -> m.structureTier = t, m -> m.structureTier)))) @@ -194,12 +193,12 @@ public class GregtechMetaTileEntity_IndustrialMacerator protected void updateHatchTexture() { int textureID = getCasingTextureId(); - for (GT_MetaTileEntity_Hatch h : mInputBusses) h.updateTexture(textureID); + for (MTEHatch h : mInputBusses) h.updateTexture(textureID); for (IDualInputHatch h : mDualInputHatches) h.updateTexture(textureID); - for (GT_MetaTileEntity_Hatch h : mOutputBusses) h.updateTexture(textureID); - for (GT_MetaTileEntity_Hatch h : mMaintenanceHatches) h.updateTexture(textureID); - for (GT_MetaTileEntity_Hatch h : mMufflerHatches) h.updateTexture(textureID); - for (GT_MetaTileEntity_Hatch h : mEnergyHatches) h.updateTexture(textureID); + for (MTEHatch h : mOutputBusses) h.updateTexture(textureID); + for (MTEHatch h : mMaintenanceHatches) h.updateTexture(textureID); + for (MTEHatch h : mMufflerHatches) h.updateTexture(textureID); + for (MTEHatch h : mEnergyHatches) h.updateTexture(textureID); } @Override @@ -227,7 +226,7 @@ public class GregtechMetaTileEntity_IndustrialMacerator @Override protected int getCasingTextureId() { if (structureTier == 2) return TAE.GTPP_INDEX(7); - return GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings4, 2); + return GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings4, 2); } @Override @@ -349,7 +348,7 @@ public class GregtechMetaTileEntity_IndustrialMacerator @Override public int getMaxParallelRecipes() { final long tVoltage = getMaxInputVoltage(); - final byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); + final byte tTier = (byte) Math.max(1, GTUtility.getTier(tVoltage)); return Math.max(1, (controllerTier == 1 ? 2 : 8) * tTier); } @@ -360,7 +359,7 @@ public class GregtechMetaTileEntity_IndustrialMacerator @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMacerator; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMacerator; } @Override @@ -383,7 +382,7 @@ public class GregtechMetaTileEntity_IndustrialMacerator if (tag.hasKey("tier")) { currentTip.add( "Tier: " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(tag.getInteger("tier")) + + GTUtility.formatNumbers(tag.getInteger("tier")) + EnumChatFormatting.RESET); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java index 39b5d6e73e..e733168fca 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java @@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -23,7 +23,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.SoundResource; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; @@ -31,29 +31,28 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_IndustrialMixer - extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialMixer> implements ISurvivalConstructable { +public class MTEIndustrialMixer extends GTPPMultiBlockBase<MTEIndustrialMixer> implements ISurvivalConstructable { public static int CASING_TEXTURE_ID; public static String mCasingName = "Multi-Use Casing"; public static String mCasingName2 = "Titanium Turbine Casing"; private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialMixer> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialMixer> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_IndustrialMixer(final int aID, final String aName, final String aNameRegional) { + public MTEIndustrialMixer(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 2); } - public GregtechMetaTileEntity_IndustrialMixer(final String aName) { + public MTEIndustrialMixer(final String aName) { super(aName); CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 2); } @@ -74,7 +73,7 @@ public class GregtechMetaTileEntity_IndustrialMixer @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialMixer(this.mName); + return new MTEIndustrialMixer(this.mName); } @Override @@ -83,8 +82,8 @@ public class GregtechMetaTileEntity_IndustrialMixer } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Industrial Mixer") .addInfo("250% faster than using single block machines of the same voltage") @@ -102,14 +101,14 @@ public class GregtechMetaTileEntity_IndustrialMixer .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialMixer> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialMixer> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialMixer>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialMixer>builder() .addShape( mName, transpose( @@ -117,12 +116,12 @@ public class GregtechMetaTileEntity_IndustrialMixer { "CCC", "CCC", "CCC" }, })) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_IndustrialMixer.class) + buildHatchAdder(MTEIndustrialMixer.class) .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch) .casingIndex(CASING_TEXTURE_ID) .dot(1) .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings3Misc, 2)))) - .addElement('M', ofBlock(GregTech_API.sBlockCasings4, 11)) + .addElement('M', ofBlock(GregTechAPI.sBlockCasings4, 11)) .build(); } return STRUCTURE_DEFINITION; @@ -178,7 +177,7 @@ public class GregtechMetaTileEntity_IndustrialMixer @Override public int getMaxParallelRecipes() { - return (8 * GT_Utility.getTier(this.getMaxInputVoltage())); + return (8 * GTUtility.getTier(this.getMaxInputVoltage())); } @Override @@ -188,13 +187,13 @@ public class GregtechMetaTileEntity_IndustrialMixer @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMixer; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMixer; } @Override public void onModeChangeByScrewdriver(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { inputSeparation = !inputSeparation; - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java index f40e851c55..4ffd484163 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java @@ -2,12 +2,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -19,38 +19,36 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_IndustrialMolecularTransformer - extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialMolecularTransformer> +public class MTEIndustrialMolecularTransformer extends GTPPMultiBlockBase<MTEIndustrialMolecularTransformer> implements ISurvivalConstructable { private static final int CASING_TEXTURE_ID = 48; private int mCasing = 0; - public GregtechMetaTileEntity_IndustrialMolecularTransformer(final int aID, final String aName, - final String aNameRegional) { + public MTEIndustrialMolecularTransformer(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_IndustrialMolecularTransformer(final String aName) { + public MTEIndustrialMolecularTransformer(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialMolecularTransformer(this.mName); + return new MTEIndustrialMolecularTransformer(this.mName); } @Override @@ -59,9 +57,9 @@ public class GregtechMetaTileEntity_IndustrialMolecularTransformer } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { + protected MultiblockTooltipBuilder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Changes the structure of items to produce new ones") .addInfo("Maximum 1x of each bus/hatch.") @@ -81,17 +79,17 @@ public class GregtechMetaTileEntity_IndustrialMolecularTransformer .addEnergyHatch("Any Robust Tungstensteel Machine Casing", 1) .addMaintenanceHatch("Any Robust Tungstensteel Machine Casing", 1) .addMufflerHatch("Any Robust Tungstensteel Machine Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } private static final String STRUCTURE_PIECE_MAIN = "main"; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialMolecularTransformer> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialMolecularTransformer> STRUCTURE_DEFINITION = null; @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialMolecularTransformer> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialMolecularTransformer> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialMolecularTransformer>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialMolecularTransformer>builder() .addShape( STRUCTURE_PIECE_MAIN, (new String[][] { { " ", " ", " xxx ", " x~x ", " xxx ", " ", " " }, @@ -110,7 +108,7 @@ public class GregtechMetaTileEntity_IndustrialMolecularTransformer .addElement('t', ofBlock(getCasingBlock3(), getTungstenCasingMeta())) .addElement( 'h', - buildHatchAdder(GregtechMetaTileEntity_IndustrialMolecularTransformer.class) + buildHatchAdder(MTEIndustrialMolecularTransformer.class) .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler) .casingIndex(getCasingTextureIndex()) .dot(1) @@ -156,11 +154,11 @@ public class GregtechMetaTileEntity_IndustrialMolecularTransformer } protected static Block getCasingBlock3() { - return GregTech_API.sBlockCasings4; + return GregTechAPI.sBlockCasings4; } protected static Block getCoilBlock() { - return GregTech_API.sBlockCasings5; + return GregTechAPI.sBlockCasings5; } protected static int getCasingMeta() { @@ -226,7 +224,7 @@ public class GregtechMetaTileEntity_IndustrialMolecularTransformer @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiMolecularTransformer; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiMolecularTransformer; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java index d9a9a1549a..472b1f66fd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTUtility.filterValidMTEs; import java.util.ArrayList; import java.util.Arrays; @@ -39,37 +39,37 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import gregtech.api.enums.TAE; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_MultiInput; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchInputBus; +import gregtech.api.metatileentity.implementations.MTEHatchMultiInput; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; -import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_CraftingInput_ME; -import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Input_ME; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.common.tileentities.machines.IDualInputHatch; import gregtech.common.tileentities.machines.IDualInputInventory; +import gregtech.common.tileentities.machines.MTEHatchCraftingInputME; +import gregtech.common.tileentities.machines.MTEHatchInputME; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Solidifier; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchSolidifier; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public class GregtechMetaTileEntity_IndustrialMultiMachine extends - GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialMultiMachine> implements ISurvivalConstructable { +public class MTEIndustrialMultiMachine extends GTPPMultiBlockBase<MTEIndustrialMultiMachine> + implements ISurvivalConstructable { private final static int MACHINEMODE_METAL = 0; private final static int MACHINEMODE_FLUID = 1; @@ -87,30 +87,29 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends private static final int[][] MODE_MAP = new int[][] { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 } }; public static final String[] aToolTipNames = new String[9]; private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialMultiMachine> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialMultiMachine> STRUCTURE_DEFINITION = null; static { for (int id = 0; id < 9; id++) { RecipeMap<?> recipeMap = getRecipeMap(id); if (recipeMap != null) { - String aNEI = GT_LanguageManager.getTranslation(getRecipeMap(id).unlocalizedName); + String aNEI = GTLanguageManager.getTranslation(getRecipeMap(id).unlocalizedName); aToolTipNames[id] = aNEI != null ? aNEI : "BAD NEI NAME (Report to Github)"; } } } - public GregtechMetaTileEntity_IndustrialMultiMachine(final int aID, final String aName, - final String aNameRegional) { + public MTEIndustrialMultiMachine(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_IndustrialMultiMachine(final String aName) { + public MTEIndustrialMultiMachine(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialMultiMachine(this.mName); + return new MTEIndustrialMultiMachine(this.mName); } @Override @@ -119,13 +118,13 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { + protected MultiblockTooltipBuilder createTooltip() { String[] aBuiltStrings = new String[3]; aBuiltStrings[0] = aToolTipNames[0] + ", " + aToolTipNames[1] + ", " + aToolTipNames[2]; aBuiltStrings[1] = aToolTipNames[3] + ", " + aToolTipNames[4] + ", " + aToolTipNames[5]; aBuiltStrings[2] = aToolTipNames[6] + ", " + aToolTipNames[7] + ", " + aToolTipNames[8]; - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Industrial Multi-Machine") .addInfo("250% faster than using single block machines of the same voltage") @@ -150,21 +149,21 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialMultiMachine> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialMultiMachine> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialMultiMachine>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialMultiMachine>builder() .addShape( mName, transpose( new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" }, { "CCC", "CCC", "CCC" }, })) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_IndustrialMultiMachine.class) + buildHatchAdder(MTEIndustrialMultiMachine.class) .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch) .casingIndex(getTextureIndex()) .dot(1) @@ -208,7 +207,7 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends @Override public int getMaxParallelRecipes() { - return (2 * GT_Utility.getTier(this.getMaxInputVoltage())); + return (2 * GTUtility.getTier(this.getMaxInputVoltage())); } @Override @@ -220,13 +219,13 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends public int getPollutionPerSecond(final ItemStack aStack) { switch (machineMode) { case MACHINEMODE_METAL -> { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal; } case MACHINEMODE_FLUID -> { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid; } default -> { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc; } } } @@ -242,7 +241,7 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends private ItemStack getCircuit(ItemStack[] t) { for (ItemStack j : t) { - if (j.getItem() == GT_Utility.getIntegratedCircuit(0) + if (j.getItem() == GTUtility.getIntegratedCircuit(0) .getItem()) { if (j.getItemDamage() >= 20 && j.getItemDamage() <= 22) { return j; @@ -316,12 +315,12 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends @Nonnull @Override - protected Stream<GT_Recipe> findRecipeMatches(@Nullable RecipeMap<?> map) { + protected Stream<GTRecipe> findRecipeMatches(@Nullable RecipeMap<?> map) { ItemStack circuit = getCircuit(inputItems); if (circuit == null) { return Stream.empty(); } - if (!GT_Utility.areStacksEqual(circuit, lastCircuit)) { + if (!GTUtility.areStacksEqual(circuit, lastCircuit)) { lastRecipe = null; lastCircuit = circuit; } @@ -400,15 +399,15 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends } // Logic for GT_MetaTileEntity_Hatch_Solidifier - for (GT_MetaTileEntity_Hatch_Input solidifierHatch : mInputHatches) { - if (solidifierHatch instanceof GT_MetaTileEntity_Hatch_Solidifier) { - ItemStack mold = ((GT_MetaTileEntity_Hatch_Solidifier) solidifierHatch).getMold(); + for (MTEHatchInput solidifierHatch : mInputHatches) { + if (solidifierHatch instanceof MTEHatchSolidifier) { + ItemStack mold = ((MTEHatchSolidifier) solidifierHatch).getMold(); FluidStack fluid = solidifierHatch.getFluid(); if (mold != null && fluid != null) { List<ItemStack> inputItems = new ArrayList<>(); inputItems.add(mold); - inputItems.add(GT_Utility.getIntegratedCircuit(22)); + inputItems.add(GTUtility.getIntegratedCircuit(22)); processingLogic.setInputItems(inputItems.toArray(new ItemStack[0])); processingLogic.setInputFluids(fluid); @@ -427,8 +426,8 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends processingLogic.clear(); processingLogic.setInputFluids(getStoredFluids()); // Default logic - for (GT_MetaTileEntity_Hatch_InputBus bus : mInputBusses) { - if (bus instanceof GT_MetaTileEntity_Hatch_CraftingInput_ME) { + for (MTEHatchInputBus bus : mInputBusses) { + if (bus instanceof MTEHatchCraftingInputME) { continue; } List<ItemStack> inputItems = new ArrayList<>(); @@ -459,21 +458,21 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends @Override public ArrayList<FluidStack> getStoredFluids() { ArrayList<FluidStack> rList = new ArrayList<>(); - for (GT_MetaTileEntity_Hatch_Input tHatch : filterValidMTEs(mInputHatches)) { - if (tHatch instanceof GT_MetaTileEntity_Hatch_Solidifier) { + for (MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) { + if (tHatch instanceof MTEHatchSolidifier) { continue; } setHatchRecipeMap(tHatch); - if (tHatch instanceof GT_MetaTileEntity_Hatch_MultiInput) { - for (FluidStack tFluid : ((GT_MetaTileEntity_Hatch_MultiInput) tHatch).getStoredFluid()) { + if (tHatch instanceof MTEHatchMultiInput) { + for (FluidStack tFluid : ((MTEHatchMultiInput) tHatch).getStoredFluid()) { if (tFluid != null) { rList.add(tFluid); } } - } else if (tHatch instanceof GT_MetaTileEntity_Hatch_Input_ME) { + } else if (tHatch instanceof MTEHatchInputME) { if (tHatch.isValid()) { - for (FluidStack fluidStack : ((GT_MetaTileEntity_Hatch_Input_ME) tHatch).getStoredFluids()) { + for (FluidStack fluidStack : ((MTEHatchInputME) tHatch).getStoredFluids()) { if (fluidStack == null) continue; rList.add(fluidStack); } @@ -534,8 +533,8 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends @Override public void setMachineModeIcons() { machineModeIcons.clear(); - machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_LPF_METAL); - machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_LPF_FLUID); - machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_DEFAULT); + machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_LPF_METAL); + machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_LPF_FLUID); + machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_DEFAULT); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java index d7e7b2047f..f41ebdd292 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java @@ -3,12 +3,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.Arrays; import java.util.Collection; @@ -32,44 +32,44 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import gregtech.api.enums.SoundResource; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public class GregtechMetaTileEntity_IndustrialPlatePress - extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialPlatePress> implements ISurvivalConstructable { +public class MTEIndustrialPlatePress extends GTPPMultiBlockBase<MTEIndustrialPlatePress> + implements ISurvivalConstructable { private int mCasing; private static final int MACHINEMODE_BENDER = 0; private static final int MACHINEMODE_FORMER = 1; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialPlatePress> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialPlatePress> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_IndustrialPlatePress(final int aID, final String aName, final String aNameRegional) { + public MTEIndustrialPlatePress(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_IndustrialPlatePress(final String aName) { + public MTEIndustrialPlatePress(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialPlatePress(this.mName); + return new MTEIndustrialPlatePress(this.mName); } @Override @@ -78,8 +78,8 @@ public class GregtechMetaTileEntity_IndustrialPlatePress } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for Advanced Bending & Forming") .addInfo("500% faster than using single block machines of the same voltage") @@ -96,21 +96,21 @@ public class GregtechMetaTileEntity_IndustrialPlatePress .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialPlatePress> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialPlatePress> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialPlatePress>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialPlatePress>builder() .addShape( mName, transpose( new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" }, { "CCC", "CCC", "CCC" }, })) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_IndustrialPlatePress.class) + buildHatchAdder(MTEIndustrialPlatePress.class) .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler) .casingIndex(50) .dot(1) @@ -181,7 +181,7 @@ public class GregtechMetaTileEntity_IndustrialPlatePress @Override public int getMaxParallelRecipes() { - return (4 * GT_Utility.getTier(this.getMaxInputVoltage())); + return (4 * GTUtility.getTier(this.getMaxInputVoltage())); } @Override @@ -192,8 +192,8 @@ public class GregtechMetaTileEntity_IndustrialPlatePress @Override public int getPollutionPerSecond(final ItemStack aStack) { if (machineMode == MACHINEMODE_FORMER) - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialPlatePress_ModeForming; - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialPlatePress_ModeBending; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialPlatePress_ModeForming; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialPlatePress_ModeBending; } @Override @@ -226,8 +226,8 @@ public class GregtechMetaTileEntity_IndustrialPlatePress @Override public void setMachineModeIcons() { machineModeIcons.clear(); - machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_BENDING); - machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_FORMING); + machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_BENDING); + machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_FORMING); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java index 5189e546a5..6dbd019887 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java @@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.Random; @@ -29,30 +29,29 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_IndustrialSifter - extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialSifter> implements ISurvivalConstructable { +public class MTEIndustrialSifter extends GTPPMultiBlockBase<MTEIndustrialSifter> implements ISurvivalConstructable { private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialSifter> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialSifter> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_IndustrialSifter(final int aID, final String aName, final String aNameRegional) { + public MTEIndustrialSifter(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_IndustrialSifter(final String aName) { + public MTEIndustrialSifter(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialSifter(this.mName); + return new MTEIndustrialSifter(this.mName); } @Override @@ -61,8 +60,8 @@ public class GregtechMetaTileEntity_IndustrialSifter } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Industrial Sifter") .addInfo("400% faster than single-block machines of the same voltage") @@ -81,14 +80,14 @@ public class GregtechMetaTileEntity_IndustrialSifter .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialSifter> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialSifter> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialSifter>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialSifter>builder() .addShape( mName, transpose( @@ -97,7 +96,7 @@ public class GregtechMetaTileEntity_IndustrialSifter { "CC~CC", "CCCCC", "CCCCC", "CCCCC", "CCCCC" }, })) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_IndustrialSifter.class) + buildHatchAdder(MTEIndustrialSifter.class) .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch) .casingIndex(TAE.GTPP_INDEX(21)) .dot(1) @@ -184,7 +183,7 @@ public class GregtechMetaTileEntity_IndustrialSifter @Override public int getMaxParallelRecipes() { - return (4 * GT_Utility.getTier(this.getMaxInputVoltage())); + return (4 * GTUtility.getTier(this.getMaxInputVoltage())); } @Override @@ -194,7 +193,7 @@ public class GregtechMetaTileEntity_IndustrialSifter @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialSifter; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialSifter; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java index d1e9e0d6a0..b494d0bfa7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java @@ -4,12 +4,12 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -19,7 +19,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -27,31 +27,30 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_IndustrialThermalCentrifuge extends - GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialThermalCentrifuge> implements ISurvivalConstructable { +public class MTEIndustrialThermalCentrifuge extends GTPPMultiBlockBase<MTEIndustrialThermalCentrifuge> + implements ISurvivalConstructable { private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialThermalCentrifuge> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialThermalCentrifuge> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_IndustrialThermalCentrifuge(final int aID, final String aName, - final String aNameRegional) { + public MTEIndustrialThermalCentrifuge(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_IndustrialThermalCentrifuge(final String aName) { + public MTEIndustrialThermalCentrifuge(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialThermalCentrifuge(this.mName); + return new MTEIndustrialThermalCentrifuge(this.mName); } @Override @@ -60,8 +59,8 @@ public class GregtechMetaTileEntity_IndustrialThermalCentrifuge extends } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Industrial Thermal Centrifuge") .addInfo("150% faster than using single block machines of the same voltage") @@ -77,30 +76,30 @@ public class GregtechMetaTileEntity_IndustrialThermalCentrifuge extends .addEnergyHatch("Bottom Casing", 1) .addMaintenanceHatch("Bottom Casing", 1) .addMufflerHatch("Bottom Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialThermalCentrifuge> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialThermalCentrifuge> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialThermalCentrifuge>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialThermalCentrifuge>builder() .addShape(mName, transpose(new String[][] { { "X~X", "XXX", "XXX" }, { "CCC", "CCC", "CCC" }, })) .addElement( 'C', ofChain( - buildHatchAdder(GregtechMetaTileEntity_IndustrialThermalCentrifuge.class) + buildHatchAdder(MTEIndustrialThermalCentrifuge.class) .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler) .casingIndex(getCasingTextureIndex()) .dot(1) .build(), onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 0)), - onElementPass(x -> ++x.mCasing, ofBlock(GregTech_API.sBlockCasings3, 9)))) + onElementPass(x -> ++x.mCasing, ofBlock(GregTechAPI.sBlockCasings3, 9)))) .addElement( 'X', ofChain( onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 0)), - onElementPass(x -> ++x.mCasing, ofBlock(GregTech_API.sBlockCasings3, 9)))) + onElementPass(x -> ++x.mCasing, ofBlock(GregTechAPI.sBlockCasings3, 9)))) .build(); } return STRUCTURE_DEFINITION; @@ -152,7 +151,7 @@ public class GregtechMetaTileEntity_IndustrialThermalCentrifuge extends @Override public int getMaxParallelRecipes() { - return (8 * GT_Utility.getTier(this.getMaxInputVoltage())); + return (8 * GTUtility.getTier(this.getMaxInputVoltage())); } @Override @@ -162,7 +161,7 @@ public class GregtechMetaTileEntity_IndustrialThermalCentrifuge extends @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialThermalCentrifuge; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialThermalCentrifuge; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java index a38b7f1a9e..3d18a9eda0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java @@ -4,15 +4,15 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTUtility.filterValidMTEs; import java.util.ArrayList; import java.util.Objects; @@ -31,18 +31,18 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GT_MetaTileEntity_Hatch_CustomFluidBase; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTEHatchCustomFluidBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends - GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialVacuumFreezer> implements ISurvivalConstructable { +public class MTEIndustrialVacuumFreezer extends GTPPMultiBlockBase<MTEIndustrialVacuumFreezer> + implements ISurvivalConstructable { public static int CASING_TEXTURE_ID; public static String mCryoFuelName = "Gelid Cryotheum"; @@ -50,18 +50,17 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends public static String mHatchName = "Cryotheum Hatch"; public static FluidStack mFuelStack; private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialVacuumFreezer> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialVacuumFreezer> STRUCTURE_DEFINITION = null; - private final ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase> mCryotheumHatches = new ArrayList<>(); + private final ArrayList<MTEHatchCustomFluidBase> mCryotheumHatches = new ArrayList<>(); - public GregtechMetaTileEntity_IndustrialVacuumFreezer(final int aID, final String aName, - final String aNameRegional) { + public MTEIndustrialVacuumFreezer(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); mFuelStack = FluidUtils.getFluidStack("cryotheum", 1); CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 10); } - public GregtechMetaTileEntity_IndustrialVacuumFreezer(final String aName) { + public MTEIndustrialVacuumFreezer(final String aName) { super(aName); mFuelStack = FluidUtils.getFluidStack("cryotheum", 1); CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 10); @@ -69,7 +68,7 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return (IMetaTileEntity) new GregtechMetaTileEntity_IndustrialVacuumFreezer(this.mName); + return (IMetaTileEntity) new MTEIndustrialVacuumFreezer(this.mName); } @Override @@ -78,8 +77,8 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Factory Grade Advanced Vacuum Freezer") .addInfo("Speed: +100% | EU Usage: 100% | Parallel: 4") @@ -98,14 +97,14 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends .addMufflerHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addOtherStructurePart(mHatchName, "Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialVacuumFreezer> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialVacuumFreezer> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialVacuumFreezer>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialVacuumFreezer>builder() .addShape( mName, transpose( @@ -113,14 +112,14 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends .addElement( 'C', ofChain( - buildHatchAdder(GregtechMetaTileEntity_IndustrialVacuumFreezer.class) - .adder(GregtechMetaTileEntity_IndustrialVacuumFreezer::addCryotheumHatch) + buildHatchAdder(MTEIndustrialVacuumFreezer.class) + .adder(MTEIndustrialVacuumFreezer::addCryotheumHatch) .hatchId(967) .shouldReject(t -> !t.mCryotheumHatches.isEmpty()) .casingIndex(CASING_TEXTURE_ID) .dot(1) .build(), - buildHatchAdder(GregtechMetaTileEntity_IndustrialVacuumFreezer.class) + buildHatchAdder(MTEIndustrialVacuumFreezer.class) .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch) .casingIndex(CASING_TEXTURE_ID) .dot(1) @@ -159,9 +158,8 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_CustomFluidBase - && aMetaTileEntity.getBaseMetaTileEntity() - .getMetaTileID() == 967) { + if (aMetaTileEntity instanceof MTEHatchCustomFluidBase && aMetaTileEntity.getBaseMetaTileEntity() + .getMetaTileID() == 967) { return addToMachineListInternal(mCryotheumHatches, aTileEntity, aBaseCasingIndex); } } @@ -170,7 +168,7 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends @Override public void updateSlots() { - for (GT_MetaTileEntity_Hatch_CustomFluidBase tHatch : filterValidMTEs(mCryotheumHatches)) tHatch.updateSlots(); + for (MTEHatchCustomFluidBase tHatch : filterValidMTEs(mCryotheumHatches)) tHatch.updateSlots(); super.updateSlots(); } @@ -217,7 +215,7 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialVacuumFreezer; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialVacuumFreezer; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java index 8645bc6686..35d0867cee 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java @@ -6,14 +6,14 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockAn import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.Arrays; import java.util.Collection; @@ -43,7 +43,7 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import gregtech.api.enums.TAE; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -53,44 +53,44 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import ic2.core.init.BlocksItems; import ic2.core.init.InternalName; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public class GregtechMetaTileEntity_IndustrialWashPlant - extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialWashPlant> implements ISurvivalConstructable { +public class MTEIndustrialWashPlant extends GTPPMultiBlockBase<MTEIndustrialWashPlant> + implements ISurvivalConstructable { private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialWashPlant> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialWashPlant> STRUCTURE_DEFINITION = null; private static final int MACHINEMODE_OREWASH = 0; private static final int MACHINEMODE_SIMPLEWASH = 1; private static final int MACHINEMODE_CHEMBATH = 2; - public GregtechMetaTileEntity_IndustrialWashPlant(final int aID, final String aName, final String aNameRegional) { + public MTEIndustrialWashPlant(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_IndustrialWashPlant(final String aName) { + public MTEIndustrialWashPlant(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialWashPlant(this.mName); + return new MTEIndustrialWashPlant(this.mName); } @Override @@ -99,8 +99,8 @@ public class GregtechMetaTileEntity_IndustrialWashPlant } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Industrial Wash Plant") .addInfo("Can be configured with a screwdriver to also do Simple Washer and process Chemical Bathing") @@ -121,14 +121,14 @@ public class GregtechMetaTileEntity_IndustrialWashPlant .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialWashPlant> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialWashPlant> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialWashPlant>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialWashPlant>builder() .addShape( mName, transpose( @@ -137,7 +137,7 @@ public class GregtechMetaTileEntity_IndustrialWashPlant { "CCCCC", "CCCCC", "CCCCC", "CCCCC", "CCCCC", "CCCCC", "CCCCC" }, })) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_IndustrialWashPlant.class) + buildHatchAdder(MTEIndustrialWashPlant.class) .atLeast(InputBus, InputHatch, OutputHatch, OutputBus, Maintenance, Energy, Muffler) .casingIndex(getCasingTextureIndex()) .dot(1) @@ -225,7 +225,7 @@ public class GregtechMetaTileEntity_IndustrialWashPlant @NotNull @Override - protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { if (checkForWater()) { return CheckRecipeResultRegistry.SUCCESSFUL; } @@ -237,7 +237,7 @@ public class GregtechMetaTileEntity_IndustrialWashPlant @Override public int getMaxParallelRecipes() { - return (4 * GT_Utility.getTier(this.getMaxInputVoltage())); + return (4 * GTUtility.getTier(this.getMaxInputVoltage())); } @Override @@ -248,8 +248,8 @@ public class GregtechMetaTileEntity_IndustrialWashPlant @Override public int getPollutionPerSecond(final ItemStack aStack) { if (machineMode == MACHINEMODE_CHEMBATH) - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath; - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialWashPlant_ModeWasher; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialWashPlant_ModeWasher; } @Override @@ -418,8 +418,8 @@ public class GregtechMetaTileEntity_IndustrialWashPlant @Override public void setMachineModeIcons() { machineModeIcons.clear(); - machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_WASHPLANT); - machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_SIMPLEWASHER); - machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_CHEMBATH); + machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_WASHPLANT); + machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_SIMPLEWASHER); + machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_CHEMBATH); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.java index 4304b5b52a..292fd1041b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.java @@ -3,12 +3,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -30,30 +30,29 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_IndustrialWireMill - extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialWireMill> implements ISurvivalConstructable { +public class MTEIndustrialWireMill extends GTPPMultiBlockBase<MTEIndustrialWireMill> implements ISurvivalConstructable { private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialWireMill> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialWireMill> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_IndustrialWireMill(final int aID, final String aName, final String aNameRegional) { + public MTEIndustrialWireMill(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_IndustrialWireMill(final String aName) { + public MTEIndustrialWireMill(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialWireMill(this.mName); + return new MTEIndustrialWireMill(this.mName); } @Override @@ -62,8 +61,8 @@ public class GregtechMetaTileEntity_IndustrialWireMill } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Industrial Wire Factory") .addInfo("200% faster than using single block machines of the same voltage") @@ -79,14 +78,14 @@ public class GregtechMetaTileEntity_IndustrialWireMill .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialWireMill> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialWireMill> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialWireMill>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialWireMill>builder() .addShape( mName, transpose( @@ -94,7 +93,7 @@ public class GregtechMetaTileEntity_IndustrialWireMill { "CCC", "CCC", "CCC", "CCC", "CCC" }, })) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_IndustrialWireMill.class) + buildHatchAdder(MTEIndustrialWireMill.class) .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler) .casingIndex(getCasingTextureIndex()) .dot(1) @@ -176,7 +175,7 @@ public class GregtechMetaTileEntity_IndustrialWireMill @Override public int getMaxParallelRecipes() { - return (4 * GT_Utility.getTier(this.getMaxInputVoltage())); + return (4 * GTUtility.getTier(this.getMaxInputVoltage())); } @Override @@ -186,7 +185,7 @@ public class GregtechMetaTileEntity_IndustrialWireMill @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialWireMill; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialWireMill; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java index c14cae9b88..d1a6ac34f0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java @@ -4,15 +4,15 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTUtility.filterValidMTEs; import java.util.ArrayList; import java.util.HashSet; @@ -44,48 +44,47 @@ import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.GT_MetaTileEntity_Hatch_MillingBalls; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.MTEHatchMillingBalls; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon; -public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IsaMill> - implements ISurvivalConstructable { +public class MTEIsaMill extends GTPPMultiBlockBase<MTEIsaMill> implements ISurvivalConstructable { protected boolean boostEu = false; private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_IsaMill> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIsaMill> STRUCTURE_DEFINITION = null; private static final IIconContainer frontFaceActive = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE5"); private static final IIconContainer frontFace = new CustomIcon("iconsets/Grinder/GRINDER5"); - private final ArrayList<GT_MetaTileEntity_Hatch_MillingBalls> mMillingBallBuses = new ArrayList<>(); + private final ArrayList<MTEHatchMillingBalls> mMillingBallBuses = new ArrayList<>(); private static final DamageSource mIsaMillDamageSource = new DamageSource("gtpp.grinder").setDamageBypassesArmor(); - public GregtechMetaTileEntity_IsaMill(int aID, String aName, String aNameRegional) { + public MTEIsaMill(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_IsaMill(String aName) { + public MTEIsaMill(String aName) { super(aName); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Large Grinding Machine") .addInfo("Grind ores.") @@ -103,14 +102,14 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IsaMill> getStructureDefinition() { + public IStructureDefinition<MTEIsaMill> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IsaMill>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIsaMill>builder() .addShape( mName, transpose( @@ -120,14 +119,13 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< .addElement( 'C', ofChain( - buildHatchAdder(GregtechMetaTileEntity_IsaMill.class) - .adder(GregtechMetaTileEntity_IsaMill::addMillingBallsHatch) - .hatchClass(GT_MetaTileEntity_Hatch_MillingBalls.class) + buildHatchAdder(MTEIsaMill.class).adder(MTEIsaMill::addMillingBallsHatch) + .hatchClass(MTEHatchMillingBalls.class) .shouldReject(t -> !t.mMillingBallBuses.isEmpty()) .casingIndex(getCasingTextureIndex()) .dot(1) .build(), - buildHatchAdder(GregtechMetaTileEntity_IsaMill.class) + buildHatchAdder(MTEIsaMill.class) .atLeast(InputBus, OutputBus, InputHatch, OutputHatch, Maintenance, Energy, Muffler) .casingIndex(getCasingTextureIndex()) .dot(1) @@ -188,7 +186,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_MillingBalls) { + if (aMetaTileEntity instanceof MTEHatchMillingBalls) { return addToMachineListInternal(mMillingBallBuses, aMetaTileEntity, aBaseCasingIndex); } } @@ -202,7 +200,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< if (aMetaTileEntity == null) { return false; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_MillingBalls) { + if (aMetaTileEntity instanceof MTEHatchMillingBalls) { log("Found GT_MetaTileEntity_Hatch_MillingBalls"); return addToMachineListInternal(mMillingBallBuses, aMetaTileEntity, aBaseCasingIndex); } @@ -378,7 +376,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IsaMill(this.mName); + return new MTEIsaMill(this.mName); } @Override @@ -403,7 +401,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< @Override public int getPollutionPerSecond(ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIsaMill; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIsaMill; } @Override @@ -439,7 +437,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< @Override public ArrayList<ItemStack> getStoredInputs() { ArrayList<ItemStack> tItems = super.getStoredInputs(); - for (GT_MetaTileEntity_Hatch_MillingBalls tHatch : filterValidMTEs(mMillingBallBuses)) { + for (MTEHatchMillingBalls tHatch : filterValidMTEs(mMillingBallBuses)) { AutoMap<ItemStack> aHatchContent = tHatch.getContentUsageSlots(); if (!aHatchContent.isEmpty()) { tItems.addAll(aHatchContent); @@ -456,14 +454,14 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< if (mMillingBallBuses.size() != 1) { return null; } else { - GT_MetaTileEntity_Hatch_MillingBalls aBus = mMillingBallBuses.get(0); + MTEHatchMillingBalls aBus = mMillingBallBuses.get(0); if (aBus != null) { AutoMap<ItemStack> aAvailableItems = aBus.getContentUsageSlots(); if (!aAvailableItems.isEmpty()) { for (final ItemStack aInput : aItemInputs) { if (ItemUtils.isMillingBall(aInput)) { for (ItemStack aBall : aAvailableItems) { - if (GT_Utility.areStacksEqual(aBall, aInput, true)) { + if (GTUtility.areStacksEqual(aBall, aInput, true)) { Logger.INFO("Found a valid milling ball to use."); return aBall; } @@ -507,7 +505,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< @NotNull @Override - protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { millingBall = findMillingBall(inputItems); if (millingBall == null) { return SimpleCheckRecipeResult.ofFailure("no_milling_ball"); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_NuclearSaltProcessingPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java index 6d1593bec9..139ea00d82 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_NuclearSaltProcessingPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java @@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.item.ItemStack; @@ -19,7 +19,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; @@ -27,26 +27,26 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.recipe.RecipeMap; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; -public class GregtechMetaTileEntity_NuclearSaltProcessingPlant extends - GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_NuclearSaltProcessingPlant> implements ISurvivalConstructable { +public class MTENuclearSaltProcessingPlant extends GTPPMultiBlockBase<MTENuclearSaltProcessingPlant> + implements ISurvivalConstructable { - protected GT_Recipe lastRecipeToBuffer; + protected GTRecipe lastRecipeToBuffer; private int casing; - private static IStructureDefinition<GregtechMetaTileEntity_NuclearSaltProcessingPlant> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTENuclearSaltProcessingPlant> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_NuclearSaltProcessingPlant(int aID, String aName, String aNameRegional) { + public MTENuclearSaltProcessingPlant(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_NuclearSaltProcessingPlant(String mName) { + public MTENuclearSaltProcessingPlant(String mName) { super(mName); } @@ -57,7 +57,7 @@ public class GregtechMetaTileEntity_NuclearSaltProcessingPlant extends @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity tileEntity) { - return new GregtechMetaTileEntity_NuclearSaltProcessingPlant(this.mName); + return new MTENuclearSaltProcessingPlant(this.mName); } @Override @@ -67,12 +67,12 @@ public class GregtechMetaTileEntity_NuclearSaltProcessingPlant extends @Override public int getPollutionPerSecond(ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiAutoCrafter; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAutoCrafter; } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Nuclear Salt Processing Plant") .addInfo("Processes depleted nuclear salts that come from the LFTR") @@ -96,7 +96,7 @@ public class GregtechMetaTileEntity_NuclearSaltProcessingPlant extends .addMufflerHatch("Top Side, 2 Required", 4) .addEnergyHatch("Bottom Side, 2 Required", 5) .addMaintenanceHatch("Back Side, Opposite of Controller", 6) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -116,45 +116,43 @@ public class GregtechMetaTileEntity_NuclearSaltProcessingPlant extends } @Override - public IStructureDefinition<GregtechMetaTileEntity_NuclearSaltProcessingPlant> getStructureDefinition() { + public IStructureDefinition<MTENuclearSaltProcessingPlant> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_NuclearSaltProcessingPlant>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTENuclearSaltProcessingPlant>builder() .addShape( mName, transpose( new String[][] { { "AAA AAA", "ADA ADA", "AAA AAA" }, { "ABBA ACCA", "B AAA C", "ABBA ACCA" }, { "ABBB~CCCA", "B C", "ABBBFCCCA" }, { "ABBA ACCA", "B AAA C", "ABBA ACCA" }, { "AAA AAA", "AEA AEA", "AAA AAA" } })) - .addElement('A', ofBlock(GregTech_API.sBlockCasings1, 5)) + .addElement('A', ofBlock(GregTechAPI.sBlockCasings1, 5)) .addElement( 'B', - buildHatchAdder(GregtechMetaTileEntity_NuclearSaltProcessingPlant.class) - .atLeast(InputBus, InputHatch) + buildHatchAdder(MTENuclearSaltProcessingPlant.class).atLeast(InputBus, InputHatch) .casingIndex(TAE.getIndexFromPage(0, 10)) .dot(2) .buildAndChain(onElementPass(x -> ++x.casing, ofBlock(ModBlocks.blockSpecialMultiCasings, 8)))) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_NuclearSaltProcessingPlant.class) - .atLeast(OutputBus, OutputHatch) + buildHatchAdder(MTENuclearSaltProcessingPlant.class).atLeast(OutputBus, OutputHatch) .casingIndex(TAE.getIndexFromPage(0, 10)) .dot(3) .buildAndChain(onElementPass(x -> ++x.casing, ofBlock(ModBlocks.blockSpecialMultiCasings, 8)))) .addElement( 'D', - buildHatchAdder(GregtechMetaTileEntity_NuclearSaltProcessingPlant.class).atLeast(Muffler) + buildHatchAdder(MTENuclearSaltProcessingPlant.class).atLeast(Muffler) .casingIndex(TAE.getIndexFromPage(0, 10)) .dot(4) .buildAndChain(onElementPass(x -> ++x.casing, ofBlock(ModBlocks.blockSpecialMultiCasings, 8)))) .addElement( 'E', - buildHatchAdder(GregtechMetaTileEntity_NuclearSaltProcessingPlant.class).atLeast(Energy) + buildHatchAdder(MTENuclearSaltProcessingPlant.class).atLeast(Energy) .casingIndex(TAE.getIndexFromPage(0, 10)) .dot(5) .buildAndChain(onElementPass(x -> ++x.casing, ofBlock(ModBlocks.blockSpecialMultiCasings, 8)))) .addElement( 'F', - buildHatchAdder(GregtechMetaTileEntity_NuclearSaltProcessingPlant.class).atLeast(Maintenance) + buildHatchAdder(MTENuclearSaltProcessingPlant.class).atLeast(Maintenance) .casingIndex(TAE.getIndexFromPage(0, 10)) .dot(6) .buildAndChain(onElementPass(x -> ++x.casing, ofBlock(ModBlocks.blockSpecialMultiCasings, 8)))) @@ -198,7 +196,7 @@ public class GregtechMetaTileEntity_NuclearSaltProcessingPlant extends @Override public int getMaxParallelRecipes() { - return 2 * (Math.max(1, GT_Utility.getTier(getMaxInputVoltage()))); + return 2 * (Math.max(1, GTUtility.getTier(getMaxInputVoltage()))); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTESpargeTower.java index 19873c9dca..d78bbc0e45 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTESpargeTower.java @@ -5,13 +5,13 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.ofHatchAdder; import java.util.ArrayList; import java.util.List; @@ -30,98 +30,90 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; +import gregtech.api.enums.GTValues; import gregtech.api.interfaces.IHatchElement; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.fluid.IFluidStore; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; import gregtech.api.util.GasSpargingRecipe; import gregtech.api.util.GasSpargingRecipeMap; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_SpargeTower> - implements ISurvivalConstructable { +public class MTESpargeTower extends GTPPMultiBlockBase<MTESpargeTower> implements ISurvivalConstructable { protected static final String STRUCTURE_PIECE_BASE = "base"; protected static final String STRUCTURE_PIECE_LAYER = "layer"; protected static final String STRUCTURE_PIECE_LAYER_HINT = "layerHint"; protected static final String STRUCTURE_PIECE_TOP_HINT = "topHint"; - private static final IStructureDefinition<GregtechMetaTileEntity_SpargeTower> STRUCTURE_DEFINITION; + private static final IStructureDefinition<MTESpargeTower> STRUCTURE_DEFINITION; static { - IHatchElement<GregtechMetaTileEntity_SpargeTower> layeredOutputHatch = OutputHatch - .withCount(GregtechMetaTileEntity_SpargeTower::getCurrentLayerOutputHatchCount) - .withAdder(GregtechMetaTileEntity_SpargeTower::addLayerOutputHatch); - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SpargeTower>builder() + IHatchElement<MTESpargeTower> layeredOutputHatch = OutputHatch + .withCount(MTESpargeTower::getCurrentLayerOutputHatchCount) + .withAdder(MTESpargeTower::addLayerOutputHatch); + STRUCTURE_DEFINITION = StructureDefinition.<MTESpargeTower>builder() .addShape(STRUCTURE_PIECE_BASE, transpose(new String[][] { { "b~b", "bbb", "bbb" }, })) .addShape(STRUCTURE_PIECE_LAYER, transpose(new String[][] { { "lll", "lcl", "lll" } })) .addShape(STRUCTURE_PIECE_LAYER_HINT, transpose(new String[][] { { "lll", "l-l", "lll" } })) .addShape(STRUCTURE_PIECE_TOP_HINT, transpose(new String[][] { { "lll", "lll", "lll" } })) .addElement( 'b', - buildHatchAdder(GregtechMetaTileEntity_SpargeTower.class) - .atLeast(Energy, InputHatch, InputBus, Maintenance) + buildHatchAdder(MTESpargeTower.class).atLeast(Energy, InputHatch, InputBus, Maintenance) .disallowOnly(ForgeDirection.UP) .casingIndex(getCasingIndex()) .dot(1) .buildAndChain( - onElementPass( - GregtechMetaTileEntity_SpargeTower::onCasingFound, - ofBlock(ModBlocks.blockCasings5Misc, 4)))) + onElementPass(MTESpargeTower::onCasingFound, ofBlock(ModBlocks.blockCasings5Misc, 4)))) .addElement( 'l', ofChain( - buildHatchAdder(GregtechMetaTileEntity_SpargeTower.class).atLeast(layeredOutputHatch) + buildHatchAdder(MTESpargeTower.class).atLeast(layeredOutputHatch) .disallowOnly(ForgeDirection.UP, ForgeDirection.DOWN) .casingIndex(getCasingIndex()) .dot(2) .build(), - ofHatchAdder(GregtechMetaTileEntity_SpargeTower::addEnergyInputToMachineList, getCasingIndex(), 2), - ofHatchAdder(GregtechMetaTileEntity_SpargeTower::addMaintenanceToMachineList, getCasingIndex(), 2), - onElementPass( - GregtechMetaTileEntity_SpargeTower::onCasingFound, - ofBlock(ModBlocks.blockCasings5Misc, 4)))) + ofHatchAdder(MTESpargeTower::addEnergyInputToMachineList, getCasingIndex(), 2), + ofHatchAdder(MTESpargeTower::addMaintenanceToMachineList, getCasingIndex(), 2), + onElementPass(MTESpargeTower::onCasingFound, ofBlock(ModBlocks.blockCasings5Misc, 4)))) .addElement( 'c', ofChain( onElementPass( t -> t.onTopLayerFound(false), - ofHatchAdder(GregtechMetaTileEntity_SpargeTower::addOutputToMachineList, getCasingIndex(), 3)), + ofHatchAdder(MTESpargeTower::addOutputToMachineList, getCasingIndex(), 3)), onElementPass( t -> t.onTopLayerFound(false), - ofHatchAdder( - GregtechMetaTileEntity_SpargeTower::addMaintenanceToMachineList, - getCasingIndex(), - 3)), + ofHatchAdder(MTESpargeTower::addMaintenanceToMachineList, getCasingIndex(), 3)), onElementPass(t -> t.onTopLayerFound(true), ofBlock(ModBlocks.blockCasings5Misc, 4)), isAir())) .build(); } - protected final List<List<GT_MetaTileEntity_Hatch_Output>> mOutputHatchesByLayer = new ArrayList<>(); + protected final List<List<MTEHatchOutput>> mOutputHatchesByLayer = new ArrayList<>(); protected int mHeight; protected int mCasing; protected boolean mTopLayerFound; - public GregtechMetaTileEntity_SpargeTower(int aID, String aName, String aNameRegional) { + public MTESpargeTower(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_SpargeTower(String aName) { + public MTESpargeTower(String aName) { super(aName); } @@ -131,12 +123,12 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_SpargeTower(this.mName); + return new MTESpargeTower(this.mName); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Gas Sparge Tower") .addInfo("Controller block for the Sparging Tower") .addInfo("Runs gases through depleted molten salts to extract precious fluids") @@ -151,7 +143,7 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB .addMaintenanceHatch("Any casing", 1, 2, 3) .addInputHatch("2x Input Hatches (Any bottom layer casing)", 1) .addOutputHatch("6x Output Hatches (At least one per layer except bottom layer)", 2, 3) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -181,7 +173,7 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB private static boolean generateRecipes() { for (GasSpargingRecipe aRecipe : GasSpargingRecipeMap.mRecipes) { - GT_Recipe newRecipe = new GT_Recipe( + GTRecipe newRecipe = new GTRecipe( false, new ItemStack[] {}, new ItemStack[] {}, @@ -206,12 +198,11 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB @Override public @NotNull CheckRecipeResult checkProcessing() { ArrayList<FluidStack> tFluidList = getStoredFluids(); - long tVoltage = GT_Utility.roundUpVoltage(this.getMaxInputVoltage()); - byte tTier = (byte) Math.max(0, GT_Utility.getTier(tVoltage)); + long tVoltage = GTUtility.roundUpVoltage(this.getMaxInputVoltage()); + byte tTier = (byte) Math.max(0, GTUtility.getTier(tVoltage)); FluidStack[] tFluids = tFluidList.toArray(new FluidStack[0]); if (tFluids.length > 0) { - GT_Recipe tRecipe = getRecipeMap() - .findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], tFluids); + GTRecipe tRecipe = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, GTValues.V[tTier], tFluids); if (tRecipe != null) { FluidStack[] possibleOutputs = getPossibleByproductsOfSparge( tRecipe.mFluidInputs[0], @@ -317,7 +308,7 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB protected boolean addLayerOutputHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { if (aTileEntity == null || aTileEntity.isDead() - || !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output tHatch)) { + || !(aTileEntity.getMetaTileEntity() instanceof MTEHatchOutput tHatch)) { Logger.INFO("Bad Output Hatch"); return false; } @@ -343,7 +334,7 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB } @Override - public IStructureDefinition<GregtechMetaTileEntity_SpargeTower> getStructureDefinition() { + public IStructureDefinition<MTESpargeTower> getStructureDefinition() { return STRUCTURE_DEFINITION; } @@ -473,9 +464,9 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB int aLayerIndex = 0; PlayerUtils .messagePlayer(aPlayer, "Trying to clear " + mOutputHatchesByLayer.size() + " layers of output hatches."); - for (List<GT_MetaTileEntity_Hatch_Output> layer : this.mOutputHatchesByLayer) { + for (List<MTEHatchOutput> layer : this.mOutputHatchesByLayer) { int aHatchIndex = 0; - for (GT_MetaTileEntity_Hatch_Output hatch : layer) { + for (MTEHatchOutput hatch : layer) { if (hatch.mFluid != null) { PlayerUtils.messagePlayer( aPlayer, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java index cf03c6aae9..487e22f3f2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java @@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.item.ItemStack; @@ -25,32 +25,31 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_IndustrialElectrolyzer extends - GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialElectrolyzer> implements ISurvivalConstructable { +public class MTEndustrialElectrolyzer extends GTPPMultiBlockBase<MTEndustrialElectrolyzer> + implements ISurvivalConstructable { private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialElectrolyzer> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEndustrialElectrolyzer> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_IndustrialElectrolyzer(final int aID, final String aName, - final String aNameRegional) { + public MTEndustrialElectrolyzer(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_IndustrialElectrolyzer(final String aName) { + public MTEndustrialElectrolyzer(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialElectrolyzer(this.mName); + return new MTEndustrialElectrolyzer(this.mName); } @Override @@ -59,8 +58,8 @@ public class GregtechMetaTileEntity_IndustrialElectrolyzer extends } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Industrial Electrolyzer") .addInfo("180% faster than using single block machines of the same voltage") @@ -78,21 +77,21 @@ public class GregtechMetaTileEntity_IndustrialElectrolyzer extends .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialElectrolyzer> getStructureDefinition() { + public IStructureDefinition<MTEndustrialElectrolyzer> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialElectrolyzer>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEndustrialElectrolyzer>builder() .addShape( mName, transpose( new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" }, { "CCC", "CCC", "CCC" }, })) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_IndustrialElectrolyzer.class) + buildHatchAdder(MTEndustrialElectrolyzer.class) .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch) .casingIndex(TAE.GTPP_INDEX(5)) .dot(1) @@ -153,7 +152,7 @@ public class GregtechMetaTileEntity_IndustrialElectrolyzer extends @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialElectrolyzer; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialElectrolyzer; } @Override @@ -163,7 +162,7 @@ public class GregtechMetaTileEntity_IndustrialElectrolyzer extends @Override public int getMaxParallelRecipes() { - return 2 * GT_Utility.getTier(this.getMaxInputVoltage()); + return 2 * GTUtility.getTier(this.getMaxInputVoltage()); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java index 0befc6f7c7..ad351caf55 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java @@ -5,15 +5,15 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.ofHatchAdder; import java.util.ArrayList; import java.util.Arrays; @@ -39,7 +39,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IHatchElement; import gregtech.api.interfaces.IIconContainer; @@ -47,22 +47,22 @@ import gregtech.api.interfaces.fluid.IFluidStore; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; -import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Output_ME; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.common.tileentities.machines.MTEHatchOutputME; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public class GregtechMetaTileEntity_Adv_DistillationTower extends - GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Adv_DistillationTower> implements ISurvivalConstructable { +public class MTEAdvDistillationTower extends GTPPMultiBlockBase<MTEAdvDistillationTower> + implements ISurvivalConstructable { private Mode mMode = Mode.DistillationTower; private boolean mUpgraded = false; @@ -72,33 +72,33 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends protected static final String STRUCTURE_PIECE_LAYER_HINT = "layerHint"; protected static final String STRUCTURE_PIECE_TOP_HINT = "topHint"; - protected final List<List<GT_MetaTileEntity_Hatch_Output>> mOutputHatchesByLayer = new ArrayList<>(); + protected final List<List<MTEHatchOutput>> mOutputHatchesByLayer = new ArrayList<>(); protected int mHeight; protected int mCasing; protected boolean mTopLayerFound; - private static IStructureDefinition<GregtechMetaTileEntity_Adv_DistillationTower> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEAdvDistillationTower> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_Adv_DistillationTower(int aID, String aName, String aNameRegional) { + public MTEAdvDistillationTower(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_Adv_DistillationTower(String aName) { + public MTEAdvDistillationTower(String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_Adv_DistillationTower(this.mName); + return new MTEAdvDistillationTower(this.mName); } @Override - public IStructureDefinition<GregtechMetaTileEntity_Adv_DistillationTower> getStructureDefinition() { + public IStructureDefinition<MTEAdvDistillationTower> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - IHatchElement<GregtechMetaTileEntity_Adv_DistillationTower> layeredOutputHatch = OutputHatch - .withCount(GregtechMetaTileEntity_Adv_DistillationTower::getCurrentLayerOutputHatchCount) - .withAdder(GregtechMetaTileEntity_Adv_DistillationTower::addLayerOutputHatch); - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_Adv_DistillationTower>builder() + IHatchElement<MTEAdvDistillationTower> layeredOutputHatch = OutputHatch + .withCount(MTEAdvDistillationTower::getCurrentLayerOutputHatchCount) + .withAdder(MTEAdvDistillationTower::addLayerOutputHatch); + STRUCTURE_DEFINITION = StructureDefinition.<MTEAdvDistillationTower>builder() .addShape(STRUCTURE_PIECE_BASE, transpose(new String[][] { { "b~b", "bbb", "bbb" }, })) .addShape(STRUCTURE_PIECE_LAYER, transpose(new String[][] { { "lll", "lcl", "lll" }, })) .addShape(STRUCTURE_PIECE_LAYER_HINT, transpose(new String[][] { { "lll", "l-l", "lll" }, })) @@ -106,60 +106,47 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends .addElement( 'b', ofChain( - buildHatchAdder(GregtechMetaTileEntity_Adv_DistillationTower.class) + buildHatchAdder(MTEAdvDistillationTower.class) .atLeast(Energy, OutputBus, InputHatch, InputBus, Maintenance) .disallowOnly(ForgeDirection.UP) .casingIndex(getCasingTextureId()) .dot(1) .build(), - ofBlock(GregTech_API.sBlockCasings4, 1))) + ofBlock(GregTechAPI.sBlockCasings4, 1))) .addElement( 'l', ofChain( - buildHatchAdder(GregtechMetaTileEntity_Adv_DistillationTower.class) - .atLeast(layeredOutputHatch, Energy, Maintenance) + buildHatchAdder(MTEAdvDistillationTower.class).atLeast(layeredOutputHatch, Energy, Maintenance) .disallowOnly(ForgeDirection.UP, ForgeDirection.DOWN) .casingIndex(getCasingTextureId()) .dot(2) .build(), - ofHatchAdder( - GregtechMetaTileEntity_Adv_DistillationTower::addMufflerToMachineList, - getCasingTextureId(), - 3), - ofBlock(GregTech_API.sBlockCasings4, 1))) + ofHatchAdder(MTEAdvDistillationTower::addMufflerToMachineList, getCasingTextureId(), 3), + ofBlock(GregTechAPI.sBlockCasings4, 1))) .addElement( 'c', ofChain( onElementPass( - GregtechMetaTileEntity_Adv_DistillationTower::onTopLayerFound, - ofHatchAdder( - GregtechMetaTileEntity_Adv_DistillationTower::addMufflerToMachineList, - getCasingTextureId(), - 3)), + MTEAdvDistillationTower::onTopLayerFound, + ofHatchAdder(MTEAdvDistillationTower::addMufflerToMachineList, getCasingTextureId(), 3)), onElementPass( - GregtechMetaTileEntity_Adv_DistillationTower::onTopLayerFound, - ofHatchAdder( - GregtechMetaTileEntity_Adv_DistillationTower::addOutputToMachineList, - getCasingTextureId(), - 3)), + MTEAdvDistillationTower::onTopLayerFound, + ofHatchAdder(MTEAdvDistillationTower::addOutputToMachineList, getCasingTextureId(), 3)), onElementPass( - GregtechMetaTileEntity_Adv_DistillationTower::onTopLayerFound, + MTEAdvDistillationTower::onTopLayerFound, ofHatchAdder( - GregtechMetaTileEntity_Adv_DistillationTower::addMaintenanceToMachineList, + MTEAdvDistillationTower::addMaintenanceToMachineList, getCasingTextureId(), 3)), - onElementPass( - GregtechMetaTileEntity_Adv_DistillationTower::onTopLayerFound, - ofBlock(GregTech_API.sBlockCasings4, 1)), + onElementPass(MTEAdvDistillationTower::onTopLayerFound, ofBlock(GregTechAPI.sBlockCasings4, 1)), isAir())) .addElement( 't', - buildHatchAdder(GregtechMetaTileEntity_Adv_DistillationTower.class) - .atLeast(layeredOutputHatch, Muffler) + buildHatchAdder(MTEAdvDistillationTower.class).atLeast(layeredOutputHatch, Muffler) .disallowOnly(ForgeDirection.DOWN) .casingIndex(getCasingTextureId()) .dot(2) - .buildAndChain(GregTech_API.sBlockCasings4, 1)) + .buildAndChain(GregTechAPI.sBlockCasings4, 1)) .build(); } return STRUCTURE_DEFINITION; @@ -173,7 +160,7 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends protected boolean addLayerOutputHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { if (aTileEntity == null || aTileEntity.isDead() - || !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output tHatch)) return false; + || !(aTileEntity.getMetaTileEntity() instanceof MTEHatchOutput tHatch)) return false; while (mOutputHatchesByLayer.size() < mHeight) mOutputHatchesByLayer.add(new ArrayList<>()); tHatch.updateTexture(aBaseCasingIndex); return mOutputHatchesByLayer.get(mHeight - 1) @@ -185,8 +172,8 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Advanced Distillation Tower") .addInfo("Use 85% less energy in distillery mode") @@ -206,7 +193,7 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends .addEnergyHatch("Any Casing", 1) .addOutputHatch("One per layer except bottom", 2) .addMufflerHatch("Top Casing", 3) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -317,8 +304,8 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends @Override public int getPollutionPerSecond(ItemStack aStack) { if (this.mMode == Mode.Distillery) - return CORE.ConfigSwitches.pollutionPerSecondMultiAdvDistillationTower_ModeDistillery; - return CORE.ConfigSwitches.pollutionPerSecondMultiAdvDistillationTower_ModeDT; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAdvDistillationTower_ModeDistillery; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAdvDistillationTower_ModeDT; } @Override @@ -360,10 +347,10 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends public boolean addOutput(FluidStack aLiquid) { if (aLiquid == null) return false; FluidStack copiedFluidStack = aLiquid.copy(); - for (List<GT_MetaTileEntity_Hatch_Output> hatches : mOutputHatchesByLayer) { + for (List<MTEHatchOutput> hatches : mOutputHatchesByLayer) { if (dumpFluid(hatches, copiedFluidStack, true)) return true; } - for (List<GT_MetaTileEntity_Hatch_Output> hatches : mOutputHatchesByLayer) { + for (List<MTEHatchOutput> hatches : mOutputHatchesByLayer) { if (dumpFluid(hatches, copiedFluidStack, false)) return true; } return false; @@ -412,7 +399,7 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends public int getMaxParallelRecipes() { return switch (mMode) { case DistillationTower -> getTierOfTower() == 1 ? 4 : getTierOfTower() == 2 ? 12 : 0; - case Distillery -> getTierOfTower() * (4 * GT_Utility.getTier(this.getMaxInputVoltage())); + case Distillery -> getTierOfTower() * (4 * GTUtility.getTier(this.getMaxInputVoltage())); default -> 0; }; } @@ -442,7 +429,7 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends if (aTick % 20 == 0 && !mUpgraded) { ItemStack aGuiStack = this.getControllerSlot(); if (aGuiStack != null) { - if (GT_Utility.areStacksEqual(aGuiStack, GregtechItemList.Distillus_Upgrade_Chip.get(1))) { + if (GTUtility.areStacksEqual(aGuiStack, GregtechItemList.Distillus_Upgrade_Chip.get(1))) { this.mUpgraded = true; mInventory[1] = ItemUtils.depleteStack(aGuiStack); } @@ -456,9 +443,7 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends return this.mOutputHatchesByLayer.stream() .allMatch( tLayerOutputHatches -> tLayerOutputHatches.stream() - .anyMatch( - tHatch -> (tHatch instanceof GT_MetaTileEntity_Hatch_Output_ME tMEHatch) - && (tMEHatch.canAcceptFluid()))); + .anyMatch(tHatch -> (tHatch instanceof MTEHatchOutputME tMEHatch) && (tMEHatch.canAcceptFluid()))); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java index 91a1274d69..63aec37990 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java @@ -4,16 +4,16 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_StructureUtility.ofCoil; -import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.ofCoil; +import static gregtech.api.util.GTUtility.filterValidMTEs; import java.util.ArrayList; import java.util.Objects; @@ -43,37 +43,36 @@ import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GT_MetaTileEntity_Hatch_CustomFluidBase; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTEHatchCustomFluidBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Adv_EBF> - implements ISurvivalConstructable { +public class MTEAdvEBF extends GTPPMultiBlockBase<MTEAdvEBF> implements ISurvivalConstructable { public static int CASING_TEXTURE_ID; public static String mHotFuelName = "Blazing Pyrotheum"; public static String mCasingName = "Volcanus Casing"; public static String mHatchName = "Pyrotheum Hatch"; - private static IStructureDefinition<GregtechMetaTileEntity_Adv_EBF> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEAdvEBF> STRUCTURE_DEFINITION = null; private int mCasing; - private final ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase> mPyrotheumHatches = new ArrayList<>(); + private final ArrayList<MTEHatchCustomFluidBase> mPyrotheumHatches = new ArrayList<>(); private HeatingCoilLevel mHeatingCapacity = HeatingCoilLevel.None; - public GregtechMetaTileEntity_Adv_EBF(int aID, String aName, String aNameRegional) { + public MTEAdvEBF(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 11); } - public GregtechMetaTileEntity_Adv_EBF(String aName) { + public MTEAdvEBF(String aName) { super(aName); CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 11); } @@ -85,12 +84,12 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase< @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_Adv_EBF(this.mName); + return new MTEAdvEBF(this.mName); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Factory Grade Advanced Blast Furnace") .addInfo("Speed: +120% | EU Usage: 90% | Parallel: 8") @@ -108,7 +107,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase< .addMufflerHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addOtherStructurePart(mHatchName, "Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -116,15 +115,15 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase< public String[] getExtraInfoData() { return new String[] { StatCollector.translateToLocal("GT5U.EBF.heat") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(mHeatingCapacity.getHeat()) + + GTUtility.formatNumbers(mHeatingCapacity.getHeat()) + EnumChatFormatting.RESET + " K" }; } @Override - public IStructureDefinition<GregtechMetaTileEntity_Adv_EBF> getStructureDefinition() { + public IStructureDefinition<MTEAdvEBF> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_Adv_EBF>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEAdvEBF>builder() .addShape( mName, transpose( @@ -133,22 +132,19 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase< .addElement( 'C', ofChain( - buildHatchAdder(GregtechMetaTileEntity_Adv_EBF.class) - .adder(GregtechMetaTileEntity_Adv_EBF::addPyrotheumHatch) + buildHatchAdder(MTEAdvEBF.class).adder(MTEAdvEBF::addPyrotheumHatch) .hatchId(968) .shouldReject(x -> !x.mPyrotheumHatches.isEmpty()) .casingIndex(CASING_TEXTURE_ID) .dot(1) .build(), - buildHatchAdder(GregtechMetaTileEntity_Adv_EBF.class) + buildHatchAdder(MTEAdvEBF.class) .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch) .casingIndex(CASING_TEXTURE_ID) .dot(1) .build(), onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings3Misc, 11)))) - .addElement( - 'H', - ofCoil(GregtechMetaTileEntity_Adv_EBF::setCoilLevel, GregtechMetaTileEntity_Adv_EBF::getCoilLevel)) + .addElement('H', ofCoil(MTEAdvEBF::setCoilLevel, MTEAdvEBF::getCoilLevel)) .build(); } return STRUCTURE_DEFINITION; @@ -183,9 +179,8 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase< return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_CustomFluidBase - && aMetaTileEntity.getBaseMetaTileEntity() - .getMetaTileID() == 968) { + if (aMetaTileEntity instanceof MTEHatchCustomFluidBase && aMetaTileEntity.getBaseMetaTileEntity() + .getMetaTileID() == 968) { return addToMachineListInternal(mPyrotheumHatches, aTileEntity, aBaseCasingIndex); } } @@ -194,7 +189,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase< @Override public void updateSlots() { - for (GT_MetaTileEntity_Hatch_CustomFluidBase tHatch : filterValidMTEs(mPyrotheumHatches)) tHatch.updateSlots(); + for (MTEHatchCustomFluidBase tHatch : filterValidMTEs(mPyrotheumHatches)) tHatch.updateSlots(); super.updateSlots(); } @@ -234,14 +229,14 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase< @NotNull @Override - protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { return recipe.mSpecialValue <= getCoilLevel().getHeat() ? CheckRecipeResultRegistry.SUCCESSFUL : CheckRecipeResultRegistry.insufficientHeat(recipe.mSpecialValue); } @NotNull @Override - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { + protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { return super.createOverclockCalculator(recipe).setHeatOC(true) .setHeatDiscount(true) .setRecipeHeat(recipe.mSpecialValue) @@ -259,7 +254,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase< @Override public int getPollutionPerSecond(ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiAdvEBF; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAdvEBF; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk4.java index 11f56cbd13..eed5159271 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk4.java @@ -13,34 +13,34 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.objects.overclockdescriber.OverclockDescriber; import gregtech.api.render.TextureFactory; import gregtech.api.util.AdvancedFusionOverclockDescriber; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.common.tileentities.machines.multi.MTEFusionComputer; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_FusionComputer { +public class MTEAdvFusionMk4 extends MTEFusionComputer { public static final Method mUpdateHatchTexture; static { - mUpdateHatchTexture = ReflectionUtils.getMethod(GT_MetaTileEntity_Hatch.class, "updateTexture", int.class); + mUpdateHatchTexture = ReflectionUtils.getMethod(MTEHatch.class, "updateTexture", int.class); } - public GregtechMetaTileEntity_Adv_Fusion_MK4(int aID, String aName, String aNameRegional) { + public MTEAdvFusionMk4(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_Adv_Fusion_MK4(String aName) { + public MTEAdvFusionMk4(String aName) { super(aName); } @@ -50,8 +50,8 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("HARNESSING THE POWER OF A BLUE GIANT") .addInfo("Controller block for the Fusion Reactor Mk IV") @@ -69,7 +69,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus .addInputHatch("2-16, Specified casings", 1) .addOutputHatch("1-16, Specified casings", 3) .addStructureInfo("ALL Hatches must be UHV or better") - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -95,7 +95,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_Adv_Fusion_MK4(mName); + return new MTEAdvFusionMk4(mName); } @Override @@ -128,7 +128,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { if (side == facing) { return new ITexture[] { - new GT_RenderedTexture( + new GTRenderedTexture( Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa)), TextureFactory.builder() @@ -136,11 +136,11 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus .extFacing() .build() }; } else if (!aActive) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa)) }; } else { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA, Dyes.getModulation(-1, Dyes._NULL.mRGBa)) }; } @@ -148,7 +148,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus @Override public ITexture getTextureOverlay() { - return new GT_RenderedTexture( + return new GTRenderedTexture( this.getBaseMetaTileEntity() .isActive() ? TexturesGtBlock.Casing_Machine_Screen_3 : TexturesGtBlock.Casing_Machine_Screen_1); } @@ -162,17 +162,17 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus public boolean turnCasingActive(final boolean status) { try { if (this.mEnergyHatches != null) { - for (final GT_MetaTileEntity_Hatch_Energy hatch : this.mEnergyHatches) { + for (final MTEHatchEnergy hatch : this.mEnergyHatches) { mUpdateHatchTexture.invoke(hatch, (status ? TAE.getIndexFromPage(2, 14) : 53)); } } if (this.mOutputHatches != null) { - for (final GT_MetaTileEntity_Hatch_Output hatch2 : this.mOutputHatches) { + for (final MTEHatchOutput hatch2 : this.mOutputHatches) { mUpdateHatchTexture.invoke(hatch2, (status ? TAE.getIndexFromPage(2, 14) : 53)); } } if (this.mInputHatches != null) { - for (final GT_MetaTileEntity_Hatch_Input hatch3 : this.mInputHatches) { + for (final MTEHatchInput hatch3 : this.mInputHatches) { mUpdateHatchTexture.invoke(hatch3, (status ? TAE.getIndexFromPage(2, 14) : 53)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk5.java index 9b0dce3674..9ed65ffa08 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK5.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk5.java @@ -13,34 +13,34 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.objects.overclockdescriber.OverclockDescriber; import gregtech.api.render.TextureFactory; import gregtech.api.util.AdvancedFusionOverclockDescriber; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.common.tileentities.machines.multi.MTEFusionComputer; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_Adv_Fusion_MK5 extends GT_MetaTileEntity_FusionComputer { +public class MTEAdvFusionMk5 extends MTEFusionComputer { public static final Method mUpdateHatchTexture; static { - mUpdateHatchTexture = ReflectionUtils.getMethod(GT_MetaTileEntity_Hatch.class, "updateTexture", int.class); + mUpdateHatchTexture = ReflectionUtils.getMethod(MTEHatch.class, "updateTexture", int.class); } - public GregtechMetaTileEntity_Adv_Fusion_MK5(int aID, String aName, String aNameRegional) { + public MTEAdvFusionMk5(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_Adv_Fusion_MK5(String aName) { + public MTEAdvFusionMk5(String aName) { super(aName); } @@ -50,8 +50,8 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK5 extends GT_MetaTileEntity_Fus } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("HARNESSING THE POWER OF A NEUTRON STAR") .addInfo("Controller block for the Fusion Reactor Mk V") @@ -69,7 +69,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK5 extends GT_MetaTileEntity_Fus .addInputHatch("2-16, Specified casings", 1) .addOutputHatch("1-16, Specified casings", 3) .addStructureInfo("ALL Hatches must be UEV or better") - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -95,7 +95,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK5 extends GT_MetaTileEntity_Fus @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_Adv_Fusion_MK5(mName); + return new MTEAdvFusionMk5(mName); } @Override @@ -128,7 +128,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK5 extends GT_MetaTileEntity_Fus final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { if (side == facing) { return new ITexture[] { - new GT_RenderedTexture( + new GTRenderedTexture( Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa)), TextureFactory.builder() @@ -136,11 +136,11 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK5 extends GT_MetaTileEntity_Fus .extFacing() .build() }; } else if (!aActive) { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa)) }; } else { - return new ITexture[] { new GT_RenderedTexture( + return new ITexture[] { new GTRenderedTexture( TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_HYPER, Dyes.getModulation(-1, Dyes._NULL.mRGBa)) }; } @@ -148,7 +148,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK5 extends GT_MetaTileEntity_Fus @Override public ITexture getTextureOverlay() { - return new GT_RenderedTexture( + return new GTRenderedTexture( this.getBaseMetaTileEntity() .isActive() ? TexturesGtBlock.Casing_Machine_Screen_Rainbow : TexturesGtBlock.Casing_Machine_Screen_1); } @@ -162,17 +162,17 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK5 extends GT_MetaTileEntity_Fus public boolean turnCasingActive(final boolean status) { try { if (this.mEnergyHatches != null) { - for (final GT_MetaTileEntity_Hatch_Energy hatch : this.mEnergyHatches) { + for (final MTEHatchEnergy hatch : this.mEnergyHatches) { mUpdateHatchTexture.invoke(hatch, (status ? TAE.getIndexFromPage(3, 6) : 53)); } } if (this.mOutputHatches != null) { - for (final GT_MetaTileEntity_Hatch_Output hatch2 : this.mOutputHatches) { + for (final MTEHatchOutput hatch2 : this.mOutputHatches) { mUpdateHatchTexture.invoke(hatch2, (status ? TAE.getIndexFromPage(3, 6) : 53)); } } if (this.mInputHatches != null) { - for (final GT_MetaTileEntity_Hatch_Input hatch3 : this.mInputHatches) { + for (final MTEHatchInput hatch3 : this.mInputHatches) { mUpdateHatchTexture.invoke(hatch3, (status ? TAE.getIndexFromPage(3, 6) : 53)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvHeatExchanger.java index f8579957f3..0779c03183 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvHeatExchanger.java @@ -4,7 +4,7 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; +import static gregtech.api.util.GTStructureUtility.ofHatchAdder; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -20,37 +20,36 @@ import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.registries.LHECoolantRegistry; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; import gtPlusPlus.core.block.base.BlockBaseModular; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.material.MaterialsAlloy; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_Adv_HeatExchanger - extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Adv_HeatExchanger> { +public class MTEAdvHeatExchanger extends GTPPMultiBlockBase<MTEAdvHeatExchanger> { private static final int CASING_INDEX = TAE.getIndexFromPage(1, 12); private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final IStructureDefinition<GregtechMetaTileEntity_Adv_HeatExchanger> STRUCTURE_DEFINITION = StructureDefinition - .<GregtechMetaTileEntity_Adv_HeatExchanger>builder() + private static final IStructureDefinition<MTEAdvHeatExchanger> STRUCTURE_DEFINITION = StructureDefinition + .<MTEAdvHeatExchanger>builder() .addShape( STRUCTURE_PIECE_MAIN, transpose( @@ -60,61 +59,49 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger { " c~c ", "cPPPc", "cPPPc", "cPPPc", " ccc " }, { " hhh ", "hHHHh", "hHHHh", "hHHHh", " hhh " }, { " f f ", "f f", " ", "f f", " f f " }, { " f f ", "f f", " ", "f f", " f f " }, })) - .addElement('P', ofBlock(GregTech_API.sBlockCasings2, 15)) + .addElement('P', ofBlock(GregTechAPI.sBlockCasings2, 15)) .addElement('f', ofBlock(getFrame(), 0)) .addElement( 'C', ofChain( - ofHatchAdder( - GregtechMetaTileEntity_Adv_HeatExchanger::addColdFluidOutputToMachineList, - CASING_INDEX, - 2), - onElementPass( - GregtechMetaTileEntity_Adv_HeatExchanger::onCasingAdded, - ofBlock(ModBlocks.blockSpecialMultiCasings, 14)))) + ofHatchAdder(MTEAdvHeatExchanger::addColdFluidOutputToMachineList, CASING_INDEX, 2), + onElementPass(MTEAdvHeatExchanger::onCasingAdded, ofBlock(ModBlocks.blockSpecialMultiCasings, 14)))) .addElement( 'H', ofChain( - ofHatchAdder(GregtechMetaTileEntity_Adv_HeatExchanger::addHotFluidInputToMachineList, CASING_INDEX, 3), - onElementPass( - GregtechMetaTileEntity_Adv_HeatExchanger::onCasingAdded, - ofBlock(ModBlocks.blockSpecialMultiCasings, 14)))) + ofHatchAdder(MTEAdvHeatExchanger::addHotFluidInputToMachineList, CASING_INDEX, 3), + onElementPass(MTEAdvHeatExchanger::onCasingAdded, ofBlock(ModBlocks.blockSpecialMultiCasings, 14)))) .addElement( 'h', ofChain( - ofHatchAdder(GregtechMetaTileEntity_Adv_HeatExchanger::addInputToMachineList, CASING_INDEX, 1), - ofHatchAdder(GregtechMetaTileEntity_Adv_HeatExchanger::addOutputToMachineList, CASING_INDEX, 1), - ofHatchAdder(GregtechMetaTileEntity_Adv_HeatExchanger::addMaintenanceToMachineList, CASING_INDEX, 1), - onElementPass( - GregtechMetaTileEntity_Adv_HeatExchanger::onCasingAdded, - ofBlock(ModBlocks.blockSpecialMultiCasings, 14)))) + ofHatchAdder(MTEAdvHeatExchanger::addInputToMachineList, CASING_INDEX, 1), + ofHatchAdder(MTEAdvHeatExchanger::addOutputToMachineList, CASING_INDEX, 1), + ofHatchAdder(MTEAdvHeatExchanger::addMaintenanceToMachineList, CASING_INDEX, 1), + onElementPass(MTEAdvHeatExchanger::onCasingAdded, ofBlock(ModBlocks.blockSpecialMultiCasings, 14)))) .addElement( 'c', - ofChain( - onElementPass( - GregtechMetaTileEntity_Adv_HeatExchanger::onCasingAdded, - ofBlock(ModBlocks.blockSpecialMultiCasings, 14)))) + ofChain(onElementPass(MTEAdvHeatExchanger::onCasingAdded, ofBlock(ModBlocks.blockSpecialMultiCasings, 14)))) .build(); public static float penalty_per_config = 0.015f; // penalize 1.5% efficiency per circuitry level (1-25) - private GT_MetaTileEntity_Hatch_Input mInputHotFluidHatch; - private GT_MetaTileEntity_Hatch_Output mOutputColdFluidHatch; + private MTEHatchInput mInputHotFluidHatch; + private MTEHatchOutput mOutputColdFluidHatch; private boolean superheated = false; private int superheated_threshold = 0; private float water; private int mCasingAmount; - public GregtechMetaTileEntity_Adv_HeatExchanger(int aID, String aName, String aNameRegional) { + public MTEAdvHeatExchanger(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_Adv_HeatExchanger(String aName) { + public MTEAdvHeatExchanger(String aName) { super(aName); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the XL Heat Exchanger") .addInfo("More complicated than a Fusion Reactor. Seriously") @@ -138,7 +125,7 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger .addInputHatch("Distilled water, any bottom layer casing", 1) .addOutputHatch("Cold fluid, top center", 3) .addOutputHatch("Steam/SH Steam, any bottom layer casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -254,7 +241,7 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger // tGeneratedEU = distilledConsumed * 160; // EXACTLY how much steam to generate, producing a perfect // 1:160 ratio with distilled water consumption - FluidStack distilledStack = GT_ModHandler.getDistilledWater(distilledConsumed); + FluidStack distilledStack = GTModHandler.getDistilledWater(distilledConsumed); if (depleteInput(distilledStack)) // Consume the distilled water { if (superheated) { @@ -262,10 +249,10 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger // superheated // steam } else { - addOutput(GT_ModHandler.getSteam(tGeneratedEU)); // Generate regular steam + addOutput(GTModHandler.getSteam(tGeneratedEU)); // Generate regular steam } } else { - GT_Log.exp.println(this.mName + " had no more Distilled water!"); + GTLog.exp.println(this.mName + " had no more Distilled water!"); explodeMultiblock(); // Generate crater } } @@ -275,7 +262,7 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger } @Override - public IStructureDefinition<GregtechMetaTileEntity_Adv_HeatExchanger> getStructureDefinition() { + public IStructureDefinition<MTEAdvHeatExchanger> getStructureDefinition() { return STRUCTURE_DEFINITION; } @@ -295,9 +282,9 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger if (aTileEntity == null) return false; IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - mOutputColdFluidHatch = (GT_MetaTileEntity_Hatch_Output) aMetaTileEntity; + if (aMetaTileEntity instanceof MTEHatchOutput) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + mOutputColdFluidHatch = (MTEHatchOutput) aMetaTileEntity; return true; } return false; @@ -307,10 +294,10 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger if (aTileEntity == null) return false; IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mRecipeMap = getRecipeMap(); - mInputHotFluidHatch = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity; + if (aMetaTileEntity instanceof MTEHatchInput) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + ((MTEHatchInput) aMetaTileEntity).mRecipeMap = getRecipeMap(); + mInputHotFluidHatch = (MTEHatchInput) aMetaTileEntity; return true; } return false; @@ -333,7 +320,7 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_Adv_HeatExchanger(this.mName); + return new MTEAdvHeatExchanger(this.mName); } @Override @@ -346,18 +333,18 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger return new String[] { StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(mProgresstime / 20) + + GTUtility.formatNumbers(mProgresstime / 20) + EnumChatFormatting.RESET + " s / " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(mMaxProgresstime / 20) + + GTUtility.formatNumbers(mMaxProgresstime / 20) + EnumChatFormatting.RESET + " s", StatCollector.translateToLocal("GT5U.multiblock.usage") + " " + StatCollector.translateToLocal("GT5U.LHE.steam") + ": " + (superheated ? EnumChatFormatting.RED : EnumChatFormatting.YELLOW) - + GT_Utility.formatNumbers(superheated ? -2 * lEUt : -lEUt) + + GTUtility.formatNumbers(superheated ? -2 * lEUt : -lEUt) + EnumChatFormatting.RESET + " EU/t", StatCollector.translateToLocal("GT5U.multiblock.problems") + ": " @@ -379,7 +366,7 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger + StatCollector.translateToLocal("GT5U.LHE.threshold") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(superheated_threshold) + + GTUtility.formatNumbers(superheated_threshold) + EnumChatFormatting.RESET }; } @@ -402,7 +389,7 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger public static Block getFrame() { if (sFrame == null) { - sFrame = BlockBaseModular.getMaterialBlock(ALLOY.TALONITE, BlockTypes.FRAME); + sFrame = BlockBaseModular.getMaterialBlock(MaterialsAlloy.TALONITE, BlockTypes.FRAME); } return sFrame; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java index a2bb155809..109022932d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java @@ -4,13 +4,13 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.GregTech_API.sBlockCasings4; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.GregTechAPI.sBlockCasings4; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.item.ItemStack; @@ -24,29 +24,28 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_Adv_Implosion - extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Adv_Implosion> { +public class MTEAdvImplosionCompressor extends GTPPMultiBlockBase<MTEAdvImplosionCompressor> { private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_Adv_Implosion> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEAdvImplosionCompressor> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_Adv_Implosion(int aID, String aName, String aNameRegional) { + public MTEAdvImplosionCompressor(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_Adv_Implosion(String aName) { + public MTEAdvImplosionCompressor(String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_Adv_Implosion(this.mName); + return new MTEAdvImplosionCompressor(this.mName); } @Override @@ -55,8 +54,8 @@ public class GregtechMetaTileEntity_Adv_Implosion } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Factory Grade Advanced Implosion Compressor") .addInfo("Speed: +100% | EU Usage: 100% | Parallel: ((Tier/2)+1)") @@ -71,14 +70,14 @@ public class GregtechMetaTileEntity_Adv_Implosion .addEnergyHatch("Any casing", 1) .addMaintenanceHatch("Any casing", 1) .addMufflerHatch("Any casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_Adv_Implosion> getStructureDefinition() { + public IStructureDefinition<MTEAdvImplosionCompressor> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_Adv_Implosion>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEAdvImplosionCompressor>builder() .addShape( mName, transpose( @@ -86,7 +85,7 @@ public class GregtechMetaTileEntity_Adv_Implosion .addElement( 'C', ofChain( - buildHatchAdder(GregtechMetaTileEntity_Adv_Implosion.class) + buildHatchAdder(MTEAdvImplosionCompressor.class) .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler) .casingIndex(48) .dot(1) @@ -156,7 +155,7 @@ public class GregtechMetaTileEntity_Adv_Implosion @Override public int getPollutionPerSecond(ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiAdvImplosion; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAdvImplosion; } @Override @@ -171,7 +170,7 @@ public class GregtechMetaTileEntity_Adv_Implosion @Override public int getMaxParallelRecipes() { - return (GT_Utility.getTier(this.getMaxInputVoltage()) / 2 + 1); + return (GTUtility.getTier(this.getMaxInputVoltage()) / 2 + 1); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.java index 644893964b..7d2628d958 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.java @@ -1,10 +1,10 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.GregTech_API.*; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.enums.GT_Values.AuthorEvgenWarGold; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.GregTechAPI.*; +import static gregtech.api.enums.GTValues.AuthorEvgenWarGold; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.ArrayList; import java.util.Arrays; @@ -34,42 +34,41 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; -import gregtech.common.blocks.GT_Block_Casings1; -import gregtech.common.blocks.GT_Block_Casings2; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_SteamMultiBase; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; +import gregtech.common.blocks.BlockCasings1; +import gregtech.common.blocks.BlockCasings2; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTESteamMultiBase; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public class GregtechMetaTileEntity_SteamCentrifuge - extends GregtechMeta_SteamMultiBase<GregtechMetaTileEntity_SteamCentrifuge> implements ISurvivalConstructable { +public class MTESteamCentrifuge extends MTESteamMultiBase<MTESteamCentrifuge> implements ISurvivalConstructable { - public GregtechMetaTileEntity_SteamCentrifuge(String aName) { + public MTESteamCentrifuge(String aName) { super(aName); } - public GregtechMetaTileEntity_SteamCentrifuge(int aID, String aName, String aNameRegional) { + public MTESteamCentrifuge(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_SteamCentrifuge(this.mName); + return new MTESteamCentrifuge(this.mName); } @Override @@ -79,7 +78,7 @@ public class GregtechMetaTileEntity_SteamCentrifuge private static final String STRUCTUR_PIECE_MAIN = "main"; - private IStructureDefinition<GregtechMetaTileEntity_SteamCentrifuge> STRUCTURE_DEFINITION = null; + private IStructureDefinition<MTESteamCentrifuge> STRUCTURE_DEFINITION = null; // spotless:off private final String[][] shape = new String[][] { { " AAA ", "AAAAA", "AAAAA", "AAAAA", " AAA " }, @@ -133,16 +132,16 @@ public class GregtechMetaTileEntity_SteamCentrifuge } protected void updateHatchTexture() { - for (GT_MetaTileEntity_Hatch h : mSteamInputs) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mSteamOutputs) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mOutputHatches) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mSteamInputs) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mSteamOutputs) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mOutputHatches) h.updateTexture(getCasingTextureID()); } private int getCasingTextureID() { if (tierGearBoxCasing == 2 || tierPipeCasing == 2 || tierFireBoxCasing == 2 || tierMachineCasing == 2) - return ((GT_Block_Casings2) GregTech_API.sBlockCasings2).getTextureIndex(0); - return ((GT_Block_Casings1) GregTech_API.sBlockCasings1).getTextureIndex(10); + return ((BlockCasings2) GregTechAPI.sBlockCasings2).getTextureIndex(0); + return ((BlockCasings1) GregTechAPI.sBlockCasings1).getTextureIndex(10); } @Override @@ -156,13 +155,13 @@ public class GregtechMetaTileEntity_SteamCentrifuge } @Override - protected GT_RenderedTexture getFrontOverlay() { - return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_CENTRIFUGE); + protected GTRenderedTexture getFrontOverlay() { + return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_CENTRIFUGE); } @Override - protected GT_RenderedTexture getFrontOverlayActive() { - return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_CENTRIFUGE_ACTIVE); + protected GTRenderedTexture getFrontOverlayActive() { + return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_CENTRIFUGE_ACTIVE); } @Override @@ -176,16 +175,16 @@ public class GregtechMetaTileEntity_SteamCentrifuge } @Override - public IStructureDefinition<GregtechMetaTileEntity_SteamCentrifuge> getStructureDefinition() { + public IStructureDefinition<MTESteamCentrifuge> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SteamCentrifuge>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTESteamCentrifuge>builder() .addShape(STRUCTUR_PIECE_MAIN, transpose(shape)) .addElement( 'B', ofBlocksTiered( - GregtechMetaTileEntity_SteamCentrifuge::getTierGearBoxCasing, + MTESteamCentrifuge::getTierGearBoxCasing, ImmutableList.of(Pair.of(sBlockCasings2, 2), Pair.of(sBlockCasings2, 3)), -1, (t, m) -> t.tierGearBoxCasing = m, @@ -193,7 +192,7 @@ public class GregtechMetaTileEntity_SteamCentrifuge .addElement( 'C', ofBlocksTiered( - GregtechMetaTileEntity_SteamCentrifuge::getTierPipeCasing, + MTESteamCentrifuge::getTierPipeCasing, ImmutableList.of(Pair.of(sBlockCasings2, 12), Pair.of(sBlockCasings2, 13)), -1, (t, m) -> t.tierPipeCasing = m, @@ -201,7 +200,7 @@ public class GregtechMetaTileEntity_SteamCentrifuge .addElement( 'D', ofBlocksTiered( - GregtechMetaTileEntity_SteamCentrifuge::getTierFireBoxCasing, + MTESteamCentrifuge::getTierFireBoxCasing, ImmutableList.of(Pair.of(sBlockCasings3, 13), Pair.of(sBlockCasings3, 14)), -1, (t, m) -> t.tierFireBoxCasing = m, @@ -209,10 +208,10 @@ public class GregtechMetaTileEntity_SteamCentrifuge .addElement( 'A', ofChain( - buildSteamInput(GregtechMetaTileEntity_SteamCentrifuge.class).casingIndex(10) + buildSteamInput(MTESteamCentrifuge.class).casingIndex(10) .dot(1) .build(), - buildHatchAdder(GregtechMetaTileEntity_SteamCentrifuge.class) + buildHatchAdder(MTESteamCentrifuge.class) .atLeast(SteamHatchElement.InputBus_Steam, SteamHatchElement.OutputBus_Steam, OutputHatch) .casingIndex(10) .dot(1) @@ -302,7 +301,7 @@ public class GregtechMetaTileEntity_SteamCentrifuge @Nonnull @Override - protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) { if (availableVoltage < recipe.mEUt) { return CheckRecipeResultRegistry.insufficientPower(recipe.mEUt); } @@ -311,8 +310,8 @@ public class GregtechMetaTileEntity_SteamCentrifuge @Override @Nonnull - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { - return GT_OverclockCalculator.ofNoOverclock(recipe) + protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { + return OverclockCalculator.ofNoOverclock(recipe) .setEUtDiscount(1.33F) .setSpeedBoost(1.5F); } @@ -325,8 +324,8 @@ public class GregtechMetaTileEntity_SteamCentrifuge } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Steam Centrifuge") .addInfo("33.3% faster than a single block steam machine would run.") diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java index f2debf5981..9588a5d11a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java @@ -3,9 +3,9 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.s import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.GregTech_API.sBlockCasings1; -import static gregtech.api.GregTech_API.sBlockCasings2; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.GregTechAPI.sBlockCasings1; +import static gregtech.api.GregTechAPI.sBlockCasings2; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.ArrayList; import java.util.Arrays; @@ -35,43 +35,42 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; -import gregtech.common.blocks.GT_Block_Casings1; -import gregtech.common.blocks.GT_Block_Casings2; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_SteamMultiBase; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; +import gregtech.common.blocks.BlockCasings1; +import gregtech.common.blocks.BlockCasings2; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTESteamMultiBase; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public class GregtechMetaTileEntity_SteamCompressor - extends GregtechMeta_SteamMultiBase<GregtechMetaTileEntity_SteamCompressor> implements ISurvivalConstructable { +public class MTESteamCompressor extends MTESteamMultiBase<MTESteamCompressor> implements ISurvivalConstructable { - public GregtechMetaTileEntity_SteamCompressor(String aName) { + public MTESteamCompressor(String aName) { super(aName); } - public GregtechMetaTileEntity_SteamCompressor(int aID, String aName, String aNameRegional) { + public MTESteamCompressor(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity arg0) { - return new GregtechMetaTileEntity_SteamCompressor(this.mName); + return new MTESteamCompressor(this.mName); } @Override @@ -81,7 +80,7 @@ public class GregtechMetaTileEntity_SteamCompressor private static final String STRUCTUR_PIECE_MAIN = "main"; - private IStructureDefinition<GregtechMetaTileEntity_SteamCompressor> STRUCTURE_DEFINITION = null; + private IStructureDefinition<MTESteamCompressor> STRUCTURE_DEFINITION = null; // spotless:off private final String[][] shape = new String[][] { @@ -113,14 +112,14 @@ public class GregtechMetaTileEntity_SteamCompressor } protected void updateHatchTexture() { - for (GT_MetaTileEntity_Hatch h : mSteamInputs) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mSteamOutputs) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mSteamInputs) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mSteamOutputs) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID()); } private int getCasingTextureID() { - if (tierMachineCasing == 2) return ((GT_Block_Casings2) GregTech_API.sBlockCasings2).getTextureIndex(0); - return ((GT_Block_Casings1) GregTech_API.sBlockCasings1).getTextureIndex(10); + if (tierMachineCasing == 2) return ((BlockCasings2) GregTechAPI.sBlockCasings2).getTextureIndex(0); + return ((BlockCasings1) GregTechAPI.sBlockCasings1).getTextureIndex(10); } @Override @@ -134,13 +133,13 @@ public class GregtechMetaTileEntity_SteamCompressor } @Override - protected GT_RenderedTexture getFrontOverlay() { - return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_COMPRESSOR); + protected GTRenderedTexture getFrontOverlay() { + return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_COMPRESSOR); } @Override - protected GT_RenderedTexture getFrontOverlayActive() { - return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE); + protected GTRenderedTexture getFrontOverlayActive() { + return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE); } @Override @@ -154,17 +153,17 @@ public class GregtechMetaTileEntity_SteamCompressor } @Override - public IStructureDefinition<GregtechMetaTileEntity_SteamCompressor> getStructureDefinition() { + public IStructureDefinition<MTESteamCompressor> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SteamCompressor>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTESteamCompressor>builder() .addShape(STRUCTUR_PIECE_MAIN, transpose(shape)) .addElement( 'C', ofChain( - buildSteamInput(GregtechMetaTileEntity_SteamCompressor.class).casingIndex(10) + buildSteamInput(MTESteamCompressor.class).casingIndex(10) .dot(1) .build(), - buildHatchAdder(GregtechMetaTileEntity_SteamCompressor.class) + buildHatchAdder(MTESteamCompressor.class) .atLeast(SteamHatchElement.InputBus_Steam, SteamHatchElement.OutputBus_Steam) .casingIndex(10) .dot(1) @@ -243,7 +242,7 @@ public class GregtechMetaTileEntity_SteamCompressor @Nonnull @Override - protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) { if (availableVoltage < recipe.mEUt) { return CheckRecipeResultRegistry.insufficientPower(recipe.mEUt); } @@ -252,8 +251,8 @@ public class GregtechMetaTileEntity_SteamCompressor @Override @Nonnull - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { - return GT_OverclockCalculator.ofNoOverclock(recipe) + protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { + return OverclockCalculator.ofNoOverclock(recipe) .setEUtDiscount(1.33F) .setSpeedBoost(1.5F); } @@ -266,8 +265,8 @@ public class GregtechMetaTileEntity_SteamCompressor } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Steam Compressor") .addInfo("33.3% faster than using a single block Steam Compressor.") @@ -293,7 +292,7 @@ public class GregtechMetaTileEntity_SteamCompressor .addStructureInfo( EnumChatFormatting.GOLD + "25-30x" + EnumChatFormatting.GRAY + " Solid Steel Machine Casing") .addStructureInfo("") - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java index c444743ca9..76e3ade135 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamForgeHammer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java @@ -3,10 +3,10 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.s import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.GregTech_API.sBlockCasings1; -import static gregtech.api.GregTech_API.sBlockCasings2; -import static gregtech.api.enums.GT_Values.AuthorEvgenWarGold; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.GregTechAPI.sBlockCasings1; +import static gregtech.api.GregTechAPI.sBlockCasings2; +import static gregtech.api.enums.GTValues.AuthorEvgenWarGold; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.ArrayList; import java.util.Arrays; @@ -37,42 +37,41 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; -import gregtech.common.blocks.GT_Block_Casings1; -import gregtech.common.blocks.GT_Block_Casings2; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_SteamMultiBase; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; +import gregtech.common.blocks.BlockCasings1; +import gregtech.common.blocks.BlockCasings2; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTESteamMultiBase; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public class GregtechMetaTileEntity_SteamForgeHammer - extends GregtechMeta_SteamMultiBase<GregtechMetaTileEntity_SteamForgeHammer> implements ISurvivalConstructable { +public class MTESteamForgeHammer extends MTESteamMultiBase<MTESteamForgeHammer> implements ISurvivalConstructable { - public GregtechMetaTileEntity_SteamForgeHammer(String aName) { + public MTESteamForgeHammer(String aName) { super(aName); } - public GregtechMetaTileEntity_SteamForgeHammer(int aID, String aName, String aNameRegional) { + public MTESteamForgeHammer(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_SteamForgeHammer(this.mName); + return new MTESteamForgeHammer(this.mName); } @Override @@ -82,7 +81,7 @@ public class GregtechMetaTileEntity_SteamForgeHammer private static final String STRUCTUR_PIECE_MAIN = "main"; - private IStructureDefinition<GregtechMetaTileEntity_SteamForgeHammer> STRUCTURE_DEFINITION = null; + private IStructureDefinition<MTESteamForgeHammer> STRUCTURE_DEFINITION = null; // spotless:off private final String[][] shape = new String[][] { @@ -110,7 +109,7 @@ public class GregtechMetaTileEntity_SteamForgeHammer public static int getTierSimpleBlock(Block block, int meta) { if (block == Blocks.iron_block && meta == 0) return 1; - if (block == GregTech_API.sBlockMetal6 && meta == 13) return 2; + if (block == GregTechAPI.sBlockMetal6 && meta == 13) return 2; return 0; } @@ -133,15 +132,15 @@ public class GregtechMetaTileEntity_SteamForgeHammer } protected void updateHatchTexture() { - for (GT_MetaTileEntity_Hatch h : mSteamInputs) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mSteamOutputs) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mSteamInputs) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mSteamOutputs) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID()); } private int getCasingTextureID() { if (tierPipeCasing == 2 || tierMachineCasing == 2 || tierSimpleBlock == 2) - return ((GT_Block_Casings2) GregTech_API.sBlockCasings2).getTextureIndex(0); - return ((GT_Block_Casings1) GregTech_API.sBlockCasings1).getTextureIndex(10); + return ((BlockCasings2) GregTechAPI.sBlockCasings2).getTextureIndex(0); + return ((BlockCasings1) GregTechAPI.sBlockCasings1).getTextureIndex(10); } @Override @@ -155,13 +154,13 @@ public class GregtechMetaTileEntity_SteamForgeHammer } @Override - protected GT_RenderedTexture getFrontOverlay() { - return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_FORGE_HAMMER); + protected GTRenderedTexture getFrontOverlay() { + return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_FORGE_HAMMER); } @Override - protected GT_RenderedTexture getFrontOverlayActive() { - return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_FORGE_HAMMER_ACTIVE); + protected GTRenderedTexture getFrontOverlayActive() { + return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_FORGE_HAMMER_ACTIVE); } @Override @@ -175,16 +174,16 @@ public class GregtechMetaTileEntity_SteamForgeHammer } @Override - public IStructureDefinition<GregtechMetaTileEntity_SteamForgeHammer> getStructureDefinition() { + public IStructureDefinition<MTESteamForgeHammer> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SteamForgeHammer>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTESteamForgeHammer>builder() .addShape(STRUCTUR_PIECE_MAIN, transpose(shape)) .addElement( 'B', ofBlocksTiered( - GregtechMetaTileEntity_SteamForgeHammer::getTierPipeCasing, + MTESteamForgeHammer::getTierPipeCasing, ImmutableList.of(Pair.of(sBlockCasings2, 12), Pair.of(sBlockCasings2, 13)), -1, (t, m) -> t.tierPipeCasing = m, @@ -192,18 +191,18 @@ public class GregtechMetaTileEntity_SteamForgeHammer .addElement( 'C', ofBlocksTiered( - GregtechMetaTileEntity_SteamForgeHammer::getTierSimpleBlock, - ImmutableList.of(Pair.of(Blocks.iron_block, 0), Pair.of(GregTech_API.sBlockMetal6, 13)), + MTESteamForgeHammer::getTierSimpleBlock, + ImmutableList.of(Pair.of(Blocks.iron_block, 0), Pair.of(GregTechAPI.sBlockMetal6, 13)), -1, (t, m) -> t.tierSimpleBlock = m, t -> t.tierSimpleBlock)) .addElement( 'A', ofChain( - buildSteamInput(GregtechMetaTileEntity_SteamForgeHammer.class).casingIndex(10) + buildSteamInput(MTESteamForgeHammer.class).casingIndex(10) .dot(1) .build(), - buildHatchAdder(GregtechMetaTileEntity_SteamForgeHammer.class) + buildHatchAdder(MTESteamForgeHammer.class) .atLeast(SteamHatchElement.InputBus_Steam, SteamHatchElement.OutputBus_Steam) .casingIndex(10) .dot(1) @@ -296,7 +295,7 @@ public class GregtechMetaTileEntity_SteamForgeHammer @Nonnull @Override - protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) { if (availableVoltage < recipe.mEUt) { return CheckRecipeResultRegistry.insufficientPower(recipe.mEUt); } @@ -305,8 +304,8 @@ public class GregtechMetaTileEntity_SteamForgeHammer @Override @Nonnull - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { - return GT_OverclockCalculator.ofNoOverclock(recipe) + protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { + return OverclockCalculator.ofNoOverclock(recipe) .setEUtDiscount(1.33F) .setSpeedBoost(1.5F); } @@ -319,8 +318,8 @@ public class GregtechMetaTileEntity_SteamForgeHammer } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Steam Forge Hammer") .addInfo("33.3% faster than a single block steam machine would run.") diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java index 3a055d7403..43e6245557 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java @@ -3,9 +3,9 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.s import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.GregTech_API.sBlockCasings1; -import static gregtech.api.GregTech_API.sBlockCasings2; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.GregTechAPI.sBlockCasings1; +import static gregtech.api.GregTechAPI.sBlockCasings2; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.ArrayList; import java.util.Arrays; @@ -35,43 +35,42 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; -import gregtech.common.blocks.GT_Block_Casings1; -import gregtech.common.blocks.GT_Block_Casings2; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_SteamMultiBase; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; +import gregtech.common.blocks.BlockCasings1; +import gregtech.common.blocks.BlockCasings2; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTESteamMultiBase; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public class GregtechMetaTileEntity_SteamMacerator - extends GregtechMeta_SteamMultiBase<GregtechMetaTileEntity_SteamMacerator> implements ISurvivalConstructable { +public class MTESteamMacerator extends MTESteamMultiBase<MTESteamMacerator> implements ISurvivalConstructable { - public GregtechMetaTileEntity_SteamMacerator(String aName) { + public MTESteamMacerator(String aName) { super(aName); } - public GregtechMetaTileEntity_SteamMacerator(int aID, String aName, String aNameRegional) { + public MTESteamMacerator(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity arg0) { - return new GregtechMetaTileEntity_SteamMacerator(this.mName); + return new MTESteamMacerator(this.mName); } @Override @@ -81,7 +80,7 @@ public class GregtechMetaTileEntity_SteamMacerator private static final String STRUCTUR_PIECE_MAIN = "main"; - private IStructureDefinition<GregtechMetaTileEntity_SteamMacerator> STRUCTURE_DEFINITION = null; + private IStructureDefinition<MTESteamMacerator> STRUCTURE_DEFINITION = null; private final String[][] shape = new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" }, { "CCC", "CCC", "CCC" } }; @@ -110,14 +109,14 @@ public class GregtechMetaTileEntity_SteamMacerator } protected void updateHatchTexture() { - for (GT_MetaTileEntity_Hatch h : mSteamInputs) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mSteamOutputs) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mSteamInputs) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mSteamOutputs) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID()); } private int getCasingTextureID() { - if (tierMachineCasing == 2) return ((GT_Block_Casings2) GregTech_API.sBlockCasings2).getTextureIndex(0); - return ((GT_Block_Casings1) GregTech_API.sBlockCasings1).getTextureIndex(10); + if (tierMachineCasing == 2) return ((BlockCasings2) GregTechAPI.sBlockCasings2).getTextureIndex(0); + return ((BlockCasings1) GregTechAPI.sBlockCasings1).getTextureIndex(10); } @Override @@ -131,13 +130,13 @@ public class GregtechMetaTileEntity_SteamMacerator } @Override - protected GT_RenderedTexture getFrontOverlay() { - return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR); + protected GTRenderedTexture getFrontOverlay() { + return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR); } @Override - protected GT_RenderedTexture getFrontOverlayActive() { - return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR_ACTIVE); + protected GTRenderedTexture getFrontOverlayActive() { + return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR_ACTIVE); } @Override @@ -151,17 +150,17 @@ public class GregtechMetaTileEntity_SteamMacerator } @Override - public IStructureDefinition<GregtechMetaTileEntity_SteamMacerator> getStructureDefinition() { + public IStructureDefinition<MTESteamMacerator> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SteamMacerator>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTESteamMacerator>builder() .addShape(STRUCTUR_PIECE_MAIN, transpose(shape)) .addElement( 'C', ofChain( - buildSteamInput(GregtechMetaTileEntity_SteamMacerator.class).casingIndex(10) + buildSteamInput(MTESteamMacerator.class).casingIndex(10) .dot(1) .build(), - buildHatchAdder(GregtechMetaTileEntity_SteamMacerator.class) + buildHatchAdder(MTESteamMacerator.class) .atLeast(SteamHatchElement.InputBus_Steam, SteamHatchElement.OutputBus_Steam) .casingIndex(10) .dot(1) @@ -244,7 +243,7 @@ public class GregtechMetaTileEntity_SteamMacerator @Nonnull @Override - protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) { if (availableVoltage < recipe.mEUt) { return CheckRecipeResultRegistry.insufficientPower(recipe.mEUt); } @@ -254,8 +253,8 @@ public class GregtechMetaTileEntity_SteamMacerator // note that a basic steam machine has .setEUtDiscount(2F).setSpeedBoost(2F). So these here are bonuses. @Override @Nonnull - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { - return GT_OverclockCalculator.ofNoOverclock(recipe) + protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { + return OverclockCalculator.ofNoOverclock(recipe) .setEUtDiscount(1.33F) .setSpeedBoost(1.5F); } @@ -268,8 +267,8 @@ public class GregtechMetaTileEntity_SteamMacerator } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Steam Macerator") .addInfo("33.3% faster than using a single block Steam Macerator.") @@ -295,7 +294,7 @@ public class GregtechMetaTileEntity_SteamMacerator .addStructureInfo( EnumChatFormatting.GOLD + "14-22x" + EnumChatFormatting.GRAY + " Solid Steel Machine Casing") .addStructureInfo("") - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java index ae91b28152..1fc6e55042 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java @@ -3,13 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.s import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.GregTech_API.sBlockCasings1; -import static gregtech.api.GregTech_API.sBlockCasings2; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.enums.GT_Values.AuthorEvgenWarGold; +import static gregtech.api.GregTechAPI.sBlockCasings1; +import static gregtech.api.GregTechAPI.sBlockCasings2; +import static gregtech.api.enums.GTValues.AuthorEvgenWarGold; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.OutputHatch; import static gregtech.api.enums.Mods.EnderIO; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.ArrayList; import java.util.Arrays; @@ -45,42 +45,41 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; -import gregtech.common.blocks.GT_Block_Casings1; -import gregtech.common.blocks.GT_Block_Casings2; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; +import gregtech.common.blocks.BlockCasings1; +import gregtech.common.blocks.BlockCasings2; import gtPlusPlus.api.recipe.GTPPRecipeMaps; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_SteamMultiBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTESteamMultiBase; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBase<GregtechMetaTileEntity_SteamMixer> - implements ISurvivalConstructable { +public class MTESteamMixer extends MTESteamMultiBase<MTESteamMixer> implements ISurvivalConstructable { - public GregtechMetaTileEntity_SteamMixer(String aName) { + public MTESteamMixer(String aName) { super(aName); } - public GregtechMetaTileEntity_SteamMixer(int aID, String aName, String aNameRegional) { + public MTESteamMixer(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_SteamMixer(this.mName); + return new MTESteamMixer(this.mName); } @Override @@ -90,7 +89,7 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa private static final String STRUCTUR_PIECE_MAIN = "main"; - private IStructureDefinition<GregtechMetaTileEntity_SteamMixer> STRUCTURE_DEFINITION = null; + private IStructureDefinition<MTESteamMixer> STRUCTURE_DEFINITION = null; // spotless:off private final String[][] shape = new String[][]{ {" "," A "," A "," AAAAA "," A "," A "," "}, @@ -161,17 +160,17 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa } protected void updateHatchTexture() { - for (GT_MetaTileEntity_Hatch h : mSteamInputs) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mSteamOutputs) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mOutputHatches) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mInputHatches) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mSteamInputs) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mSteamOutputs) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mOutputHatches) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mInputHatches) h.updateTexture(getCasingTextureID()); } private int getCasingTextureID() { if (tierGearBoxCasing == 2 || tierPipeCasing == 2 || tierMachineCasing == 2 || tierSimpleBlock == 2) - return ((GT_Block_Casings2) GregTech_API.sBlockCasings2).getTextureIndex(0); - return ((GT_Block_Casings1) GregTech_API.sBlockCasings1).getTextureIndex(10); + return ((BlockCasings2) GregTechAPI.sBlockCasings2).getTextureIndex(0); + return ((BlockCasings1) GregTechAPI.sBlockCasings1).getTextureIndex(10); } @Override @@ -185,13 +184,13 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa } @Override - protected GT_RenderedTexture getFrontOverlay() { - return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_CENTRIFUGE); + protected GTRenderedTexture getFrontOverlay() { + return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_CENTRIFUGE); } @Override - protected GT_RenderedTexture getFrontOverlayActive() { - return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_CENTRIFUGE_ACTIVE); + protected GTRenderedTexture getFrontOverlayActive() { + return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_CENTRIFUGE_ACTIVE); } @Override @@ -205,7 +204,7 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa } @Override - public IStructureDefinition<GregtechMetaTileEntity_SteamMixer> getStructureDefinition() { + public IStructureDefinition<MTESteamMixer> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { simpleBlockTiers.put(Blocks.iron_block, 1); @@ -213,13 +212,13 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa simpleBlockTiers.put(GameRegistry.findBlock(EnderIO.ID, "blockIngotStorage"), 6); } else simpleBlockTiers.put(Blocks.iron_block, 2); - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SteamMixer>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTESteamMixer>builder() .addShape(STRUCTUR_PIECE_MAIN, transpose(shape)) .addElement( 'B', ofBlocksTiered( - GregtechMetaTileEntity_SteamMixer::getTierGearBoxCasing, + MTESteamMixer::getTierGearBoxCasing, ImmutableList.of(Pair.of(sBlockCasings2, 2), Pair.of(sBlockCasings2, 3)), -1, (t, m) -> t.tierGearBoxCasing = m, @@ -227,7 +226,7 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa .addElement( 'C', ofBlocksTiered( - GregtechMetaTileEntity_SteamMixer::getTierPipeCasing, + MTESteamMixer::getTierPipeCasing, ImmutableList.of(Pair.of(sBlockCasings2, 12), Pair.of(sBlockCasings2, 13)), -1, (t, m) -> t.tierPipeCasing = m, @@ -238,16 +237,16 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa simpleBlockTierConverter(simpleBlockTiers), getAllSimpleBlockTiers(simpleBlockTiers), -1, - GregtechMetaTileEntity_SteamMixer::setSimpleBlockTier, - GregtechMetaTileEntity_SteamMixer::getSimpleBlockTier)) + MTESteamMixer::setSimpleBlockTier, + MTESteamMixer::getSimpleBlockTier)) .addElement( 'A', ofChain( - buildSteamInput(GregtechMetaTileEntity_SteamMixer.class).casingIndex(10) + buildSteamInput(MTESteamMixer.class).casingIndex(10) .dot(1) .allowOnly(ForgeDirection.NORTH) .build(), - buildHatchAdder(GregtechMetaTileEntity_SteamMixer.class) + buildHatchAdder(MTESteamMixer.class) .atLeast( SteamHatchElement.InputBus_Steam, SteamHatchElement.OutputBus_Steam, @@ -343,7 +342,7 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa @Nonnull @Override - protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) { if (availableVoltage < recipe.mEUt) { return CheckRecipeResultRegistry.insufficientPower(recipe.mEUt); } @@ -352,8 +351,8 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa @Override @Nonnull - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { - return GT_OverclockCalculator.ofNoOverclock(recipe) + protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { + return OverclockCalculator.ofNoOverclock(recipe) .setEUtDiscount(1.33F) .setSpeedBoost(1.5F); } @@ -366,8 +365,8 @@ public class GregtechMetaTileEntity_SteamMixer extends GregtechMeta_SteamMultiBa } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Steam Mixer") .addInfo("Bronze tier runs recipes up to LV tier") diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java index a245f696f9..438a762da6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamWasher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java @@ -1,10 +1,10 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.GregTech_API.*; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_Values.AuthorEvgenWarGold; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.GregTechAPI.*; +import static gregtech.api.enums.GTValues.AuthorEvgenWarGold; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.ArrayList; import java.util.Arrays; @@ -40,48 +40,47 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; -import gregtech.common.blocks.GT_Block_Casings1; -import gregtech.common.blocks.GT_Block_Casings2; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; +import gregtech.common.blocks.BlockCasings1; +import gregtech.common.blocks.BlockCasings2; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_SteamMultiBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTESteamMultiBase; import ic2.core.init.BlocksItems; import ic2.core.init.InternalName; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiBase<GregtechMetaTileEntity_SteamWasher> - implements ISurvivalConstructable { +public class MTESteamWasher extends MTESteamMultiBase<MTESteamWasher> implements ISurvivalConstructable { - public GregtechMetaTileEntity_SteamWasher(String aName) { + public MTESteamWasher(String aName) { super(aName); } - public GregtechMetaTileEntity_SteamWasher(int aID, String aName, String aNameRegional) { + public MTESteamWasher(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_SteamWasher(this.mName); + return new MTESteamWasher(this.mName); } @Override @@ -91,7 +90,7 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB private static final String STRUCTUR_PIECE_MAIN = "main"; - private IStructureDefinition<GregtechMetaTileEntity_SteamWasher> STRUCTURE_DEFINITION = null; + private IStructureDefinition<MTESteamWasher> STRUCTURE_DEFINITION = null; private final String[][] shape = new String[][] { { " ", " ", " CCCCCC ", " ", " " }, @@ -142,16 +141,16 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB } protected void updateHatchTexture() { - for (GT_MetaTileEntity_Hatch h : mSteamInputs) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mSteamOutputs) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mInputHatches) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mSteamInputs) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mSteamOutputs) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mSteamInputFluids) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mInputHatches) h.updateTexture(getCasingTextureID()); } private int getCasingTextureID() { if (tierGearBoxCasing == 2 || tierPipeCasing == 2 || tierMachineCasing == 2) - return ((GT_Block_Casings2) GregTech_API.sBlockCasings2).getTextureIndex(0); - return ((GT_Block_Casings1) GregTech_API.sBlockCasings1).getTextureIndex(10); + return ((BlockCasings2) GregTechAPI.sBlockCasings2).getTextureIndex(0); + return ((BlockCasings1) GregTechAPI.sBlockCasings1).getTextureIndex(10); } @Override @@ -165,13 +164,13 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB } @Override - protected GT_RenderedTexture getFrontOverlay() { - return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_WASHER); + protected GTRenderedTexture getFrontOverlay() { + return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_WASHER); } @Override - protected GT_RenderedTexture getFrontOverlayActive() { - return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_WASHER_ACTIVE); + protected GTRenderedTexture getFrontOverlayActive() { + return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_WASHER_ACTIVE); } @Override @@ -185,16 +184,16 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB } @Override - public IStructureDefinition<GregtechMetaTileEntity_SteamWasher> getStructureDefinition() { + public IStructureDefinition<MTESteamWasher> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SteamWasher>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTESteamWasher>builder() .addShape(STRUCTUR_PIECE_MAIN, transpose(shape)) .addElement( 'B', ofBlocksTiered( - GregtechMetaTileEntity_SteamWasher::getTierGearBoxCasing, + MTESteamWasher::getTierGearBoxCasing, ImmutableList.of(Pair.of(sBlockCasings2, 2), Pair.of(sBlockCasings2, 3)), -1, (t, m) -> t.tierGearBoxCasing = m, @@ -202,7 +201,7 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB .addElement( 'C', ofBlocksTiered( - GregtechMetaTileEntity_SteamWasher::getTierPipeCasing, + MTESteamWasher::getTierPipeCasing, ImmutableList.of(Pair.of(sBlockCasings2, 12), Pair.of(sBlockCasings2, 13)), -1, (t, m) -> t.tierPipeCasing = m, @@ -217,11 +216,11 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB .addElement( 'A', ofChain( - buildSteamInput(GregtechMetaTileEntity_SteamWasher.class).casingIndex(10) + buildSteamInput(MTESteamWasher.class).casingIndex(10) .dot(1) .allowOnly(ForgeDirection.NORTH) .build(), - buildHatchAdder(GregtechMetaTileEntity_SteamWasher.class) + buildHatchAdder(MTESteamWasher.class) .atLeast(SteamHatchElement.InputBus_Steam, SteamHatchElement.OutputBus_Steam, InputHatch) .casingIndex(10) .dot(1) @@ -318,7 +317,7 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB @NotNull @Override - protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) { if (isBroken) { checkForWater(); isBroken = false; @@ -330,8 +329,8 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB @Override @Nonnull - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { - return GT_OverclockCalculator.ofNoOverclock(recipe) + protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { + return OverclockCalculator.ofNoOverclock(recipe) .setEUtDiscount(1.33F) .setSpeedBoost(1.5F); } @@ -344,8 +343,8 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Steam Washer") .addInfo("33.3% faster than a single block steam machine would run.") @@ -463,8 +462,8 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB @Override public void setMachineModeIcons() { machineModeIcons.clear(); - machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_WASHPLANT); - machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_SIMPLEWASHER); + machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_WASHPLANT); + machineModeIcons.add(GTUITextures.OVERLAY_BUTTON_MACHINEMODE_SIMPLEWASHER); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamWaterPump.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java index 9d727b21ba..8b11690673 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamWaterPump.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java @@ -4,10 +4,10 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.enums.GT_Values.AuthorEvgenWarGold; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_StructureUtility.ofFrame; +import static gregtech.api.enums.GTValues.AuthorEvgenWarGold; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.ofFrame; import java.util.List; @@ -34,38 +34,37 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.VoidProtectionHelper; -import gregtech.common.blocks.GT_Block_Casings9; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_SteamMultiBase; +import gregtech.common.blocks.BlockCasings9; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTESteamMultiBase; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public class GregtechMetaTileEntity_SteamWaterPump - extends GregtechMeta_SteamMultiBase<GregtechMetaTileEntity_SteamWaterPump> implements ISurvivalConstructable { +public class MTESteamWaterPump extends MTESteamMultiBase<MTESteamWaterPump> implements ISurvivalConstructable { - public GregtechMetaTileEntity_SteamWaterPump(String aName) { + public MTESteamWaterPump(String aName) { super(aName); } - public GregtechMetaTileEntity_SteamWaterPump(int aID, String aName, String aNameRegional) { + public MTESteamWaterPump(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_SteamWaterPump(this.mName); + return new MTESteamWaterPump(this.mName); } @Override @@ -73,7 +72,7 @@ public class GregtechMetaTileEntity_SteamWaterPump return "Water Pump"; } - private static IStructureDefinition<GregtechMetaTileEntity_SteamWaterPump> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTESteamWaterPump> STRUCTURE_DEFINITION = null; private static final int HORIZONTAL_OFF_SET = 1; private static final int VERTICAL_OFF_SET = 2; @@ -111,10 +110,10 @@ public class GregtechMetaTileEntity_SteamWaterPump // spotless:off @Override - public IStructureDefinition<GregtechMetaTileEntity_SteamWaterPump> getStructureDefinition() { + public IStructureDefinition<MTESteamWaterPump> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SteamWaterPump>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTESteamWaterPump>builder() .addShape( tier1, @@ -135,15 +134,15 @@ public class GregtechMetaTileEntity_SteamWaterPump .addElement( 'C', ofChain( - buildSteamInput(GregtechMetaTileEntity_SteamWaterPump.class) - .casingIndex(((GT_Block_Casings9) GregTech_API.sBlockCasings9).getTextureIndex(2)) + buildSteamInput(MTESteamWaterPump.class) + .casingIndex(((BlockCasings9) GregTechAPI.sBlockCasings9).getTextureIndex(2)) .dot(1) .build(), - buildHatchAdder(GregtechMetaTileEntity_SteamWaterPump.class) + buildHatchAdder(MTESteamWaterPump.class) .atLeast(OutputHatch) - .casingIndex(((GT_Block_Casings9) GregTech_API.sBlockCasings9).getTextureIndex(2)) + .casingIndex(((BlockCasings9) GregTechAPI.sBlockCasings9).getTextureIndex(2)) .dot(1) - .buildAndChain(onElementPass(x -> ++x.mCountCasing, ofBlock(GregTech_API.sBlockCasings9, 2))) + .buildAndChain(onElementPass(x -> ++x.mCountCasing, ofBlock(GregTechAPI.sBlockCasings9, 2))) ) ) .build(); @@ -214,26 +213,26 @@ public class GregtechMetaTileEntity_SteamWaterPump if (side == facing) { return new ITexture[] { Textures.BlockIcons - .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings9, 2)), + .getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings9, 2)), aActive ? getFrontOverlayActive() : getFrontOverlay() }; } - return new ITexture[] { Textures.BlockIcons - .getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings9, 2)) }; + return new ITexture[] { + Textures.BlockIcons.getCasingTextureForId(GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings9, 2)) }; } @Override - protected GT_RenderedTexture getFrontOverlay() { - return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_WATER_PUMP); + protected GTRenderedTexture getFrontOverlay() { + return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_WATER_PUMP); } @Override - protected GT_RenderedTexture getFrontOverlayActive() { - return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_WATER_PUMP_ACTIVE); + protected GTRenderedTexture getFrontOverlayActive() { + return new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_WATER_PUMP_ACTIVE); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Water Pump") .addInfo("Pumps Water based on humidity") diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java index 506a68ea12..20c14d1ed2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java @@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -31,35 +31,34 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_AlloyBlastSmelter - extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_AlloyBlastSmelter> implements ISurvivalConstructable { +public class MTEAlloyBlastSmelter extends GTPPMultiBlockBase<MTEAlloyBlastSmelter> implements ISurvivalConstructable { private int mMode = 0; private boolean isUsingControllerCircuit = false; private static Item circuit; private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_AlloyBlastSmelter> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEAlloyBlastSmelter> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_AlloyBlastSmelter(final int aID, final String aName, final String aNameRegional) { + public MTEAlloyBlastSmelter(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_AlloyBlastSmelter(final String aName) { + public MTEAlloyBlastSmelter(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_AlloyBlastSmelter(this.mName); + return new MTEAlloyBlastSmelter(this.mName); } @Override @@ -76,8 +75,8 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Alloy Blast Smelter") .addInfo("Allows Complex GT++ alloys to be created") @@ -95,14 +94,14 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_AlloyBlastSmelter> getStructureDefinition() { + public IStructureDefinition<MTEAlloyBlastSmelter> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_AlloyBlastSmelter>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEAlloyBlastSmelter>builder() .addShape( mName, transpose( @@ -110,7 +109,7 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter { "C~C", "CCC", "CCC" }, })) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_AlloyBlastSmelter.class) + buildHatchAdder(MTEAlloyBlastSmelter.class) .atLeast(InputBus, InputHatch, OutputBus, OutputHatch, Maintenance, Energy, Muffler) .casingIndex(TAE.GTPP_INDEX(15)) .dot(1) @@ -169,7 +168,7 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter .isServerSide()) { // Get Controller Circuit if (circuit == null) { - circuit = GT_Utility.getIntegratedCircuit(0) + circuit = GTUtility.getIntegratedCircuit(0) .getItem(); } if (aStack != null && aStack.getItem() == circuit) { @@ -196,7 +195,7 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter @Override public void onModeChangeByScrewdriver(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { inputSeparation = !inputSeparation; - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation); } @@ -213,7 +212,7 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiABS; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiABS; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java index 6cae5e4bcd..41b9abf12e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java @@ -3,13 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.item.ItemStack; @@ -26,25 +26,24 @@ import gregtech.api.logic.ProcessingLogic; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; -public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity_AutoCrafter> - implements ISurvivalConstructable { +public class MTEAutoCrafter extends GTPPMultiBlockBase<MTEAutoCrafter> implements ISurvivalConstructable { - protected GT_Recipe lastRecipeToBuffer; + protected GTRecipe lastRecipeToBuffer; private int casing; - private static IStructureDefinition<GT4Entity_AutoCrafter> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEAutoCrafter> STRUCTURE_DEFINITION = null; - public GT4Entity_AutoCrafter(int aID, String aName, String aNameRegional) { + public MTEAutoCrafter(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GT4Entity_AutoCrafter(String mName) { + public MTEAutoCrafter(String mName) { super(mName); } @@ -55,7 +54,7 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity tileEntity) { - return new GT4Entity_AutoCrafter(this.mName); + return new MTEAutoCrafter(this.mName); } @Override @@ -80,12 +79,12 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity @Override public int getPollutionPerSecond(ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiAutoCrafter; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAutoCrafter; } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Highly Advanced Assembling Machine") .addInfo("200% faster than using single block machines of the same voltage") @@ -101,7 +100,7 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -121,16 +120,16 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity } @Override - public IStructureDefinition<GT4Entity_AutoCrafter> getStructureDefinition() { + public IStructureDefinition<MTEAutoCrafter> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GT4Entity_AutoCrafter>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEAutoCrafter>builder() .addShape( mName, transpose( new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" }, { "CCC", "CCC", "CCC" }, })) .addElement( 'C', - buildHatchAdder(GT4Entity_AutoCrafter.class) + buildHatchAdder(MTEAutoCrafter.class) .atLeast(InputBus, OutputBus, InputHatch, Maintenance, Energy, Muffler) .casingIndex(TAE.getIndexFromPage(0, 10)) .dot(1) @@ -170,7 +169,7 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity @Override public int getMaxParallelRecipes() { - return 2 * (Math.max(1, GT_Utility.getTier(getMaxInputVoltage()))); + return 2 * (Math.max(1, GTUtility.getTier(getMaxInputVoltage()))); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java index c85e406b6c..051daee9a3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java @@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -32,30 +32,29 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; -import gregtech.api.objects.GT_ItemStack; +import gregtech.api.metatileentity.implementations.MTEHatchOutputBus; +import gregtech.api.objects.GTItemStack; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.chemistry.IonParticles; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Cyclotron> - implements ISurvivalConstructable { +public class MTECyclotron extends GTPPMultiBlockBase<MTECyclotron> implements ISurvivalConstructable { private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_Cyclotron> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTECyclotron> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_Cyclotron(int aID, String aName, String aNameRegional, int tier) { + public MTECyclotron(int aID, String aName, String aNameRegional, int tier) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_Cyclotron(String aName) { + public MTECyclotron(String aName) { super(aName); } @@ -75,11 +74,11 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_Cyclotron(this.mName); + return new MTECyclotron(this.mName); } @Override - public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) { + public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) { return side != getBaseMetaTileEntity().getFrontFacing(); } @@ -94,9 +93,9 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas } @Override - public IStructureDefinition<GregtechMetaTileEntity_Cyclotron> getStructureDefinition() { + public IStructureDefinition<MTECyclotron> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_Cyclotron>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTECyclotron>builder() .addShape( mName, transpose( @@ -115,7 +114,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas " hh hh ", " hhh ", " ", } })) .addElement( 'h', - buildHatchAdder(GregtechMetaTileEntity_Cyclotron.class) + buildHatchAdder(MTECyclotron.class) .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch) .casingIndex(44) .dot(1) @@ -166,8 +165,8 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Super Magnetic Speed Shooter") .addSeparator() @@ -190,7 +189,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -266,7 +265,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas @Override public boolean onRunningTick(ItemStack aStack) { if (this.mOutputBusses.size() > 0) { - for (GT_MetaTileEntity_Hatch_OutputBus g : this.mOutputBusses) { + for (MTEHatchOutputBus g : this.mOutputBusses) { if (g != null) { for (ItemStack s : g.mInventory) { if (s != null) { @@ -297,7 +296,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas @Override public int getPollutionPerSecond(ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiCyclotron; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiCyclotron; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java index 3b99849803..676b6e817a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java @@ -4,14 +4,14 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTUtility.filterValidMTEs; import java.util.ArrayList; import java.util.Collections; @@ -33,32 +33,32 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_ElementalDataOrbHolder; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchElementalDataOrbHolder; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase<GregtechMTE_ElementalDuplicator> +public class MTEElementalDuplicator extends GTPPMultiBlockBase<MTEElementalDuplicator> implements ISurvivalConstructable { - private final ArrayList<GT_MetaTileEntity_Hatch_ElementalDataOrbHolder> mReplicatorDataOrbHatches = new ArrayList<>(); + private final ArrayList<MTEHatchElementalDataOrbHolder> mReplicatorDataOrbHatches = new ArrayList<>(); private static final int CASING_TEXTURE_ID = TAE.getIndexFromPage(0, 3); private int mCasing = 0; - public GregtechMTE_ElementalDuplicator(final int aID, final String aName, final String aNameRegional) { + public MTEElementalDuplicator(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMTE_ElementalDuplicator(final String aName) { + public MTEElementalDuplicator(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMTE_ElementalDuplicator(this.mName); + return new MTEElementalDuplicator(this.mName); } @Override @@ -67,9 +67,9 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { + protected MultiblockTooltipBuilder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Produces Elemental Material from UU Matter") .addInfo("Speed: +100% | EU Usage: 100% | Parallel: 8 * Tier") @@ -94,17 +94,17 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase .addEnergyHatch("Any 1 dot hint", 1) .addMaintenanceHatch("Any 1 dot hint", 1) .addMufflerHatch("Any 1 dot hint", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } private static final String STRUCTURE_PIECE_MAIN = "main"; - private static IStructureDefinition<GregtechMTE_ElementalDuplicator> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEElementalDuplicator> STRUCTURE_DEFINITION = null; @Override - public IStructureDefinition<GregtechMTE_ElementalDuplicator> getStructureDefinition() { + public IStructureDefinition<MTEElementalDuplicator> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_ElementalDuplicator>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEElementalDuplicator>builder() // h = Hatch // c = Casing @@ -144,15 +144,15 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase 'h', lazy( t -> ofChain( - buildHatchAdder(GregtechMTE_ElementalDuplicator.class) + buildHatchAdder(MTEElementalDuplicator.class) .atLeast(InputHatch, OutputBus, OutputHatch, Maintenance, Muffler, Energy) .casingIndex(getCasingTextureIndex()) .dot(1) .build(), - buildHatchAdder(GregtechMTE_ElementalDuplicator.class) - .hatchClass(GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.class) + buildHatchAdder(MTEElementalDuplicator.class) + .hatchClass(MTEHatchElementalDataOrbHolder.class) .shouldReject(x -> x.mReplicatorDataOrbHatches.size() >= 1) - .adder(GregtechMTE_ElementalDuplicator::addDataOrbHatch) + .adder(MTEElementalDuplicator::addDataOrbHatch) .casingIndex(getCasingTextureIndex()) .dot(1) .build(), @@ -242,7 +242,7 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase if (aMetaTileEntity == null) { return false; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_ElementalDataOrbHolder) { + if (aMetaTileEntity instanceof MTEHatchElementalDataOrbHolder) { try { return addToMachineListInternal(mReplicatorDataOrbHatches, aMetaTileEntity, aBaseCasingIndex); } catch (Throwable t) { @@ -293,7 +293,7 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase @Override protected void setupProcessingLogic(ProcessingLogic logic) { super.setupProcessingLogic(logic); - for (GT_MetaTileEntity_Hatch_ElementalDataOrbHolder hatch : filterValidMTEs(mReplicatorDataOrbHatches)) { + for (MTEHatchElementalDataOrbHolder hatch : filterValidMTEs(mReplicatorDataOrbHatches)) { ItemStack orb = hatch.getOrbByCircuit(); logic.setSpecialSlotItem(orb); break; @@ -302,7 +302,7 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase @Override public int getMaxParallelRecipes() { - return (8 * GT_Utility.getTier(this.getMaxInputVoltage())); + return (8 * GTUtility.getTier(this.getMaxInputVoltage())); } @Override @@ -312,7 +312,7 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiMolecularTransformer; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiMolecularTransformer; } @Override @@ -338,7 +338,7 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase @Override public ArrayList<ItemStack> getStoredInputs() { ArrayList<ItemStack> tItems = super.getStoredInputs(); - for (GT_MetaTileEntity_Hatch_ElementalDataOrbHolder tHatch : filterValidMTEs(mReplicatorDataOrbHatches)) { + for (MTEHatchElementalDataOrbHolder tHatch : filterValidMTEs(mReplicatorDataOrbHatches)) { tItems.add(tHatch.getOrbByCircuit()); } tItems.removeAll(Collections.singleton(null)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java index b887c74a47..8e052870fa 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java @@ -2,12 +2,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.List; import java.util.Objects; @@ -39,33 +39,32 @@ import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.helpers.FlotationRecipeHandler; -public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase<GregtechMTE_FrothFlotationCell> - implements ISurvivalConstructable { +public class MTEFrothFlotationCell extends GTPPMultiBlockBase<MTEFrothFlotationCell> implements ISurvivalConstructable { private int mCasing; - private static IStructureDefinition<GregtechMTE_FrothFlotationCell> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEFrothFlotationCell> STRUCTURE_DEFINITION = null; - public GregtechMTE_FrothFlotationCell(final int aID, final String aName, final String aNameRegional) { + public MTEFrothFlotationCell(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMTE_FrothFlotationCell(final String aName) { + public MTEFrothFlotationCell(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMTE_FrothFlotationCell(this.mName); + return new MTEFrothFlotationCell(this.mName); } @Override @@ -74,8 +73,8 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase< } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Process that milled ore!") .addInfo("You can only ever process one type of material per controller") @@ -90,7 +89,7 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase< .addOutputHatch("Bottom Casing", 1) .addEnergyHatch("Bottom Casing", 1) .addMaintenanceHatch("Bottom Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -125,9 +124,9 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase< } @Override - public IStructureDefinition<GregtechMTE_FrothFlotationCell> getStructureDefinition() { + public IStructureDefinition<MTEFrothFlotationCell> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_FrothFlotationCell>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEFrothFlotationCell>builder() .addShape( mName, new String[][] { { " ", " ", " X ", " X~X ", " X ", " ", " " }, @@ -141,7 +140,7 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase< { " CCC ", " CCCCC ", "CCCCCCC", "CCCCCCC", "CCCCCCC", " CCCCC ", " CCC " }, }) .addElement( 'C', - buildHatchAdder(GregtechMTE_FrothFlotationCell.class) + buildHatchAdder(MTEFrothFlotationCell.class) .atLeast(InputBus, InputHatch, OutputHatch, Maintenance, Energy) .casingIndex(getCasingTextureId()) .dot(1) @@ -182,7 +181,7 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase< @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiFrothFlotationCell; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiFrothFlotationCell; } @Override @@ -196,7 +195,7 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase< @NotNull @Override - protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { /* * Material checks Makes sure we can only ever use one type of material in this flotation cell. We used * to depend on Alk's hash, but it's unreliable and user-hostile So we're using unlocalized name of diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java index 0133c8b301..3a7370cf25 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java @@ -3,13 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import static gtPlusPlus.core.util.data.ArrayUtils.removeNulls; import java.util.HashMap; @@ -40,48 +40,48 @@ import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; import gregtech.api.util.FishPondFakeRecipe; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_ParallelHelper; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; +import gregtech.api.util.ParallelHelper; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import ic2.core.init.BlocksItems; import ic2.core.init.InternalName; -public class GregtechMetaTileEntity_IndustrialFishingPond extends - GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialFishingPond> implements ISurvivalConstructable { +public class MTEIndustrialFishingPond extends GTPPMultiBlockBase<MTEIndustrialFishingPond> + implements ISurvivalConstructable { private boolean isUsingControllerCircuit = false; - private static final Item circuit = GT_Utility.getIntegratedCircuit(0) + private static final Item circuit = GTUtility.getIntegratedCircuit(0) .getItem(); private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialFishingPond> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialFishingPond> STRUCTURE_DEFINITION = null; private static final Class<?> cofhWater; static { cofhWater = ReflectionUtils.getClass("cofh.asmhooks.block.BlockWater"); } - public GregtechMetaTileEntity_IndustrialFishingPond(final int aID, final String aName, final String aNameRegional) { + public MTEIndustrialFishingPond(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_IndustrialFishingPond(final String aName) { + public MTEIndustrialFishingPond(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialFishingPond(this.mName); + return new MTEIndustrialFishingPond(this.mName); } @Override @@ -90,8 +90,8 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Fishing Pond") .addInfo("Can process (Tier + 1) * 2 recipes") @@ -112,7 +112,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -122,9 +122,9 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialFishingPond> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialFishingPond> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialFishingPond>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialFishingPond>builder() .addShape( mName, transpose( @@ -137,7 +137,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends "XXXXXXXXX", "XXXXXXXXX" }, })) .addElement( 'X', - buildHatchAdder(GregtechMetaTileEntity_IndustrialFishingPond.class) + buildHatchAdder(MTEIndustrialFishingPond.class) .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch) .casingIndex(getCasingTextureIndex()) .dot(1) @@ -221,7 +221,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends ItemStack[] mFishOutput = generateLoot(this.mMode); mFishOutput = removeNulls(mFishOutput); - GT_Recipe g = new GT_Recipe( + GTRecipe g = new GTRecipe( true, new ItemStack[] {}, mFishOutput, @@ -232,10 +232,10 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends 200, 16, 0); - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(g.mEUt) + OverclockCalculator calculator = new OverclockCalculator().setRecipeEUt(g.mEUt) .setEUt(tEnergy) .setDuration(g.mDuration); - GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(g) + ParallelHelper helper = new ParallelHelper().setRecipe(g) .setItemInputs(tItemInputs) .setFluidInputs(tFluidInputs) .setAvailableEUt(tEnergy) @@ -267,7 +267,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends @Override public int getMaxParallelRecipes() { - return (2 * (GT_Utility.getTier(this.getMaxInputVoltage()) + 1)); + return (2 * (GTUtility.getTier(this.getMaxInputVoltage()) + 1)); } @Override @@ -277,7 +277,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialFishingPond; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialFishingPond; } @Override @@ -393,7 +393,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends private int getCircuit(ItemStack[] t) { if (!this.isUsingControllerCircuit) { for (ItemStack j : t) { - if (j.getItem() == GT_Utility.getIntegratedCircuit(0) + if (j.getItem() == GTUtility.getIntegratedCircuit(0) .getItem()) { // Fish if (j.getItemDamage() == 14) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java index 520d52c9c5..4b91b42d9f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java @@ -3,13 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.ArrayList; @@ -37,36 +37,36 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_ParallelHelper; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; +import gregtech.api.util.ParallelHelper; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_IndustrialRockBreaker extends - GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialRockBreaker> implements ISurvivalConstructable { +public class MTEIndustrialRockBreaker extends GTPPMultiBlockBase<MTEIndustrialRockBreaker> + implements ISurvivalConstructable { private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_IndustrialRockBreaker> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEIndustrialRockBreaker> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_IndustrialRockBreaker(final int aID, final String aName, final String aNameRegional) { + public MTEIndustrialRockBreaker(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_IndustrialRockBreaker(final String aName) { + public MTEIndustrialRockBreaker(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_IndustrialRockBreaker(this.mName); + return new MTEIndustrialRockBreaker(this.mName); } @Override @@ -74,14 +74,14 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends return "Rock Breaker"; } - private static final String casingBaseName = GT_LanguageManager.getTranslation("gtplusplus.blockcasings.2.0.name"); - private static final String casingMiddleName = GT_LanguageManager + private static final String casingBaseName = GTLanguageManager.getTranslation("gtplusplus.blockcasings.2.0.name"); + private static final String casingMiddleName = GTLanguageManager .getTranslation("gtplusplus.blockcasings.2.11.name"); private static final String anyBaseCasing = "Any " + casingBaseName; @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Industrial Rock Breaker") .addInfo("Speed: +200% | EU Usage: 75% | Parallel: Tier x 8") @@ -100,14 +100,14 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends .addEnergyHatch(anyBaseCasing, 1) .addMaintenanceHatch(anyBaseCasing, 1) .addMufflerHatch(anyBaseCasing, 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_IndustrialRockBreaker> getStructureDefinition() { + public IStructureDefinition<MTEIndustrialRockBreaker> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialRockBreaker>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEIndustrialRockBreaker>builder() .addShape( mName, transpose( @@ -115,7 +115,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends { "C~C", "CCC", "CCC" }, })) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_IndustrialRockBreaker.class) + buildHatchAdder(MTEIndustrialRockBreaker.class) .atLeast(InputBus, InputHatch, OutputBus, Maintenance, Energy, Muffler) .casingIndex(TAE.GTPP_INDEX(16)) .dot(1) @@ -182,14 +182,14 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends return true; } - private static GT_Recipe sRecipe_Cobblestone; - private static GT_Recipe sRecipe_SmoothStone; - private static GT_Recipe sRecipe_Redstone; + private static GTRecipe sRecipe_Cobblestone; + private static GTRecipe sRecipe_SmoothStone; + private static GTRecipe sRecipe_Redstone; private static void generateRecipes() { - sRecipe_Cobblestone = new GT_Recipe( + sRecipe_Cobblestone = new GTRecipe( false, - new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new ItemStack[] { GTUtility.getIntegratedCircuit(1) }, new ItemStack[] { ItemUtils.getSimpleStack(Blocks.cobblestone) }, null, new int[] { 10000 }, @@ -198,9 +198,9 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends 16, 32, 0); - sRecipe_SmoothStone = new GT_Recipe( + sRecipe_SmoothStone = new GTRecipe( false, - new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, + new ItemStack[] { GTUtility.getIntegratedCircuit(2) }, new ItemStack[] { ItemUtils.getSimpleStack(Blocks.stone) }, null, new int[] { 10000 }, @@ -209,10 +209,10 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends 16, 32, 0); - sRecipe_Redstone = new GT_Recipe( + sRecipe_Redstone = new GTRecipe( false, - new ItemStack[] { GT_Utility.getIntegratedCircuit(3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L) }, + new ItemStack[] { GTUtility.getIntegratedCircuit(3), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L) }, new ItemStack[] { ItemUtils.getSimpleStack(Blocks.obsidian) }, null, new int[] { 10000 }, @@ -243,8 +243,8 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends boolean aHasRedstone = false; if (!aItems.isEmpty()) { for (ItemStack aItem : aItems) { - if (GT_Utility - .areStacksEqual(aItem, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L))) { + if (GTUtility + .areStacksEqual(aItem, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L))) { aHasRedstone = true; break; } @@ -268,7 +268,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends int aCircuit = aGuiCircuit.getItemDamage(); - GT_Recipe tRecipe = null; + GTRecipe tRecipe = null; switch (aCircuit) { case 1 -> tRecipe = sRecipe_Cobblestone; case 2 -> tRecipe = sRecipe_SmoothStone; @@ -290,7 +290,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends // Remember last recipe - an optimization for findRecipe() this.mLastRecipe = tRecipe; - GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe) + ParallelHelper helper = new ParallelHelper().setRecipe(tRecipe) .setItemInputs(aItemInputs) .setFluidInputs(aFluidInputs) .setAvailableEUt(tEnergy) @@ -313,7 +313,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(tRecipe.mEUt) + OverclockCalculator calculator = new OverclockCalculator().setRecipeEUt(tRecipe.mEUt) .setEUt(tEnergy) .setDuration(tRecipe.mDuration) .setEUtDiscount(0.75F) @@ -332,7 +332,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends @Override public int getMaxParallelRecipes() { - return (8 * GT_Utility.getTier(this.getMaxInputVoltage())); + return (8 * GTUtility.getTier(this.getMaxInputVoltage())); } @Override @@ -342,7 +342,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialRockBreaker; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialRockBreaker; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java index 96a477bb26..3a5bbaa42a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Dynamo; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_Utility.filterValidMTEs; -import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.AirIntake; -import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTDynamo; +import static gregtech.api.enums.HatchElement.Dynamo; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTUtility.filterValidMTEs; +import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase.GTPPHatchElement.AirIntake; +import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase.GTPPHatchElement.TTDynamo; import java.util.ArrayList; @@ -29,31 +29,30 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.MTEHatch; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.chemistry.RocketFuels; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.material.MaterialMisc; import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_AirIntake; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.METHatchAirIntake; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaTileEntity_LargeRocketEngine - extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_LargeRocketEngine> implements ISurvivalConstructable { +public class MTELargeRocketEngine extends GTPPMultiBlockBase<MTELargeRocketEngine> implements ISurvivalConstructable { protected int fuelConsumption; protected int fuelValue; @@ -73,11 +72,11 @@ public class GregtechMetaTileEntity_LargeRocketEngine private static FluidStack sAirFluidStack = null; private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_LargeRocketEngine> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTELargeRocketEngine> STRUCTURE_DEFINITION = null; private static final int CASING_ID = TAE.getIndexFromPage(3, 11); - public GregtechMetaTileEntity_LargeRocketEngine(final int aID, final String aName, final String aNameRegional) { + public MTELargeRocketEngine(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); this.fuelConsumption = 0; this.fuelValue = 0; @@ -86,7 +85,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine setAir(); } - public GregtechMetaTileEntity_LargeRocketEngine(final String aName) { + public MTELargeRocketEngine(final String aName) { super(aName); this.fuelConsumption = 0; this.fuelValue = 0; @@ -96,8 +95,8 @@ public class GregtechMetaTileEntity_LargeRocketEngine } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Large Rocket Engine") .addInfo("Generating Power from Rocket Fuels - Supports TecTech Multi-Amp Dynamos!") @@ -127,14 +126,14 @@ public class GregtechMetaTileEntity_LargeRocketEngine .addMaintenanceHatch("Any Block Touching Inconel Reinforced Casing", 1) .addDynamoHatch("Top center line", 2) .addMufflerHatch("Back Center", 3) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @Override - public IStructureDefinition<GregtechMetaTileEntity_LargeRocketEngine> getStructureDefinition() { + public IStructureDefinition<MTELargeRocketEngine> getStructureDefinition() { if (this.STRUCTURE_DEFINITION == null) { - this.STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_LargeRocketEngine>builder() + this.STRUCTURE_DEFINITION = StructureDefinition.<MTELargeRocketEngine>builder() .addShape( this.mName, transpose( @@ -146,7 +145,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine // side .addElement( 'S', - buildHatchAdder(GregtechMetaTileEntity_LargeRocketEngine.class) + buildHatchAdder(MTELargeRocketEngine.class) .atLeast(ImmutableMap.of(AirIntake, 8, InputBus, 1, InputHatch, 3, Maintenance, 1)) .casingIndex(getCasingTextureIndex()) .dot(1) @@ -154,7 +153,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine // top .addElement( 'T', - buildHatchAdder(GregtechMetaTileEntity_LargeRocketEngine.class) + buildHatchAdder(MTELargeRocketEngine.class) .atLeast(ImmutableMap.of(AirIntake, 8, Dynamo.or(TTDynamo), 1, Maintenance, 1)) .casingIndex(getCasingTextureIndex()) .dot(2) @@ -222,7 +221,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine return 0; } else { int totalAir = 0; - for (GT_MetaTileEntity_Hatch_AirIntake u : this.mAirIntakes) { + for (METHatchAirIntake u : this.mAirIntakes) { if (u != null && u.mFluid != null) { FluidStack f = u.mFluid; if (f.isFluidEqual(sAirFluidStack)) { @@ -250,7 +249,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine return SimpleCheckRecipeResult.ofFailure("no_air"); } else { int aTotalAir = 0; - for (GT_MetaTileEntity_Hatch_AirIntake aAirHatch : this.mAirIntakes) { + for (METHatchAirIntake aAirHatch : this.mAirIntakes) { if (aAirHatch.mFluid != null) { aTotalAir += aAirHatch.getFluidAmount(); } @@ -258,7 +257,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine if (aTotalAir >= aAirToConsume) { int aSplitAmount = (aAirToConsume / this.mAirIntakes.size()); if (aSplitAmount > 0) { - for (GT_MetaTileEntity_Hatch_AirIntake aAirHatch : mAirIntakes) { + for (METHatchAirIntake aAirHatch : mAirIntakes) { boolean hasIntakeAir = aAirHatch.drain(aSplitAmount, true) != null; if (!hasIntakeAir) { this.freeFuelTicks = 0; @@ -286,7 +285,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine continue; } if (this.freeFuelTicks == 0) { - for (final GT_Recipe aFuel : getRecipeMap().getAllRecipes()) { + for (final GTRecipe aFuel : getRecipeMap().getAllRecipes()) { final FluidStack tLiquid; tLiquid = aFuel.mFluidInputs[0]; if (hatchFluid1.isFluidEqual(tLiquid)) { @@ -295,7 +294,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine } this.fuelValue = aFuel.mSpecialValue * 3; this.fuelRemaining = hatchFluid1.amount; - this.lEUt = ((this.mEfficiency < 2000) ? 0 : GT_Values.V[5] << 1); + this.lEUt = ((this.mEfficiency < 2000) ? 0 : GTValues.V[5] << 1); this.mProgresstime = 1; this.mMaxProgresstime = 1; this.mEfficiencyIncrease = this.euProduction / 2000; @@ -305,7 +304,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine } else { this.mEfficiencyIncrease = this.euProduction / 2000; this.freeFuelTicks--; - this.lEUt = ((this.mEfficiency < 1000) ? 0 : GT_Values.V[5] << 1); + this.lEUt = ((this.mEfficiency < 1000) ? 0 : GTValues.V[5] << 1); this.mProgresstime = 1; this.mMaxProgresstime = 1; return CheckRecipeResultRegistry.GENERATING; @@ -324,7 +323,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine * @param aFuel * @return */ - public boolean consumeFuel(GT_Recipe aFuel, int amount) { + public boolean consumeFuel(GTRecipe aFuel, int amount) { amount *= this.boostEu ? 0.3 : 0.9; this.freeFuelTicks = 0; int value = aFuel.mSpecialValue * 3; @@ -360,7 +359,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine } public boolean consumeCO2() { - return this.depleteInput(MISC_MATERIALS.CARBON_DIOXIDE.getFluidStack(this.boostEu ? 3 : 1)) + return this.depleteInput(MaterialMisc.CARBON_DIOXIDE.getFluidStack(this.boostEu ? 3 : 1)) || this.depleteInput(FluidUtils.getFluidStack("carbondioxide", (this.boostEu ? 3 : 1))); } @@ -388,7 +387,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine long totalOutput = 0; long aFirstVoltageFound = -1; boolean aFoundMixedDynamos = false; - for (GT_MetaTileEntity_Hatch aDynamo : filterValidMTEs(this.mAllDynamoHatches)) { + for (MTEHatch aDynamo : filterValidMTEs(this.mAllDynamoHatches)) { long aVoltage = aDynamo.maxEUOutput(); long aTotal = aDynamo.maxAmperesOut() * aVoltage; // Check against voltage to check when hatch mixing @@ -412,7 +411,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine int aAmpsToInject; int aRemainder; - for (GT_MetaTileEntity_Hatch aDynamo : filterValidMTEs(this.mAllDynamoHatches)) { + for (MTEHatch aDynamo : filterValidMTEs(this.mAllDynamoHatches)) { leftToInject = aEU - injected; aVoltage = aDynamo.maxEUOutput(); aAmpsToInject = (int) (leftToInject / aVoltage); @@ -454,7 +453,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_LargeRocketEngine(this.mName); + return new MTELargeRocketEngine(this.mName); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java index 4403779d09..141fbff41f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java @@ -3,12 +3,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Dynamo; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTDynamo; +import static gregtech.api.enums.HatchElement.Dynamo; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase.GTPPHatchElement.TTDynamo; import java.util.ArrayList; @@ -24,47 +24,47 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.MTEHatchDynamo; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchMaintenance; +import gregtech.api.metatileentity.implementations.MTEHatchMuffler; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; -public class GregtechMetaTileEntity_LargeSemifluidGenerator extends - GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_LargeSemifluidGenerator> implements ISurvivalConstructable { +public class MTELargeSemifluidGenerator extends GTPPMultiBlockBase<MTELargeSemifluidGenerator> + implements ISurvivalConstructable { private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_LargeSemifluidGenerator> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTELargeSemifluidGenerator> STRUCTURE_DEFINITION = null; protected int fuelConsumption = 0; protected int fuelValue = 0; protected int fuelRemaining = 0; protected boolean boostEu = false; - public GregtechMetaTileEntity_LargeSemifluidGenerator(int aID, String aName, String aNameRegional) { + public MTELargeSemifluidGenerator(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_LargeSemifluidGenerator(String aName) { + public MTELargeSemifluidGenerator(String aName) { super(aName); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Large Semifluid Generator") .addInfo("Engine Intake Casings must not be obstructed in front (only air blocks)") @@ -83,7 +83,7 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) .addDynamoHatch("Back Center", 2) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -130,7 +130,7 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends } for (FluidStack hatchFluid : tFluids) { // Loops through hatches - GT_Recipe aFuel = GTPPRecipeMaps.semiFluidFuels.getBackend() + GTRecipe aFuel = GTPPRecipeMaps.semiFluidFuels.getBackend() .findFuel(hatchFluid); if (aFuel == null) { // Not a valid semi-fluid fuel. @@ -171,9 +171,9 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends } @Override - public IStructureDefinition<GregtechMetaTileEntity_LargeSemifluidGenerator> getStructureDefinition() { + public IStructureDefinition<MTELargeSemifluidGenerator> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_LargeSemifluidGenerator>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTELargeSemifluidGenerator>builder() .addShape( mName, transpose( @@ -181,8 +181,7 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends { "III", "CCC", "CCC", "CCC" }, })) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_LargeSemifluidGenerator.class) - .atLeast(Muffler, InputHatch, Maintenance) + buildHatchAdder(MTELargeSemifluidGenerator.class).atLeast(Muffler, InputHatch, Maintenance) .casingIndex(getCasingTextureIndex()) .dot(1) .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(getCasingBlock(), getCasingMeta())))) @@ -220,11 +219,11 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { + if (aMetaTileEntity instanceof MTEHatchMaintenance) { return addToMachineList(aTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { + } else if (aMetaTileEntity instanceof MTEHatchMuffler) { return addToMachineList(aTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { + } else if (aMetaTileEntity instanceof MTEHatchInput) { return addToMachineList(aTileEntity, aBaseCasingIndex); } } @@ -236,7 +235,7 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo || this.isThisHatchMultiDynamo(aTileEntity)) { + if (aMetaTileEntity instanceof MTEHatchDynamo || this.isThisHatchMultiDynamo(aTileEntity)) { return addToMachineList(aTileEntity, aBaseCasingIndex); } } @@ -244,7 +243,7 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends } public Block getCasingBlock() { - return GregTech_API.sBlockCasings4; + return GregTechAPI.sBlockCasings4; } public byte getCasingMeta() { @@ -252,7 +251,7 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends } public Block getIntakeBlock() { - return GregTech_API.sBlockCasings4; + return GregTechAPI.sBlockCasings4; } public byte getIntakeMeta() { @@ -260,7 +259,7 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends } public Block getGearboxBlock() { - return GregTech_API.sBlockCasings2; + return GregTechAPI.sBlockCasings2; } public byte getGearboxMeta() { @@ -273,7 +272,7 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_LargeSemifluidGenerator(this.mName); + return new MTELargeSemifluidGenerator(this.mName); } @Override @@ -298,7 +297,7 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends @Override public int getPollutionPerSecond(ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiLargeSemiFluidGenerator; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiLargeSemiFluidGenerator; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java index ee989d22ca..0bcf503daf 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java @@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.Arrays; import java.util.Collection; @@ -50,23 +50,22 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.common.config.machinestats.ConfigMassFabricator; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public class GregtechMetaTileEntity_MassFabricator - extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_MassFabricator> implements ISurvivalConstructable { +public class MTEMassFabricator extends GTPPMultiBlockBase<MTEMassFabricator> implements ISurvivalConstructable { public static int sUUAperUUM = 1; public static int sUUASpeedBonus = 4; @@ -86,13 +85,13 @@ public class GregtechMetaTileEntity_MassFabricator private static final ItemStack[] mScrap = new ItemStack[2]; private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_MassFabricator> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEMassFabricator> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_MassFabricator(final int aID, final String aName, final String aNameRegional) { + public MTEMassFabricator(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_MassFabricator(final String aName) { + public MTEMassFabricator(final String aName) { super(aName); } @@ -102,8 +101,8 @@ public class GregtechMetaTileEntity_MassFabricator } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Matter Fabricator") .addInfo("Speed: +0% | EU Usage: 80%") @@ -124,7 +123,7 @@ public class GregtechMetaTileEntity_MassFabricator .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -173,9 +172,9 @@ public class GregtechMetaTileEntity_MassFabricator } @Override - public IStructureDefinition<GregtechMetaTileEntity_MassFabricator> getStructureDefinition() { + public IStructureDefinition<MTEMassFabricator> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_MassFabricator>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEMassFabricator>builder() .addShape( mName, transpose( @@ -185,7 +184,7 @@ public class GregtechMetaTileEntity_MassFabricator { "CC~CC", "CHHHC", "CHHHC", "CHHHC", "CCCCC" }, })) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntity_MassFabricator.class) + buildHatchAdder(MTEMassFabricator.class) .atLeast(InputBus, OutputBus, InputHatch, OutputHatch, Maintenance, Energy, Muffler) .casingIndex(TAE.GTPP_INDEX(9)) .dot(1) @@ -221,7 +220,7 @@ public class GregtechMetaTileEntity_MassFabricator @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiMassFabricator; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiMassFabricator; } @Override @@ -231,7 +230,7 @@ public class GregtechMetaTileEntity_MassFabricator @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_MassFabricator(this.mName); + return new MTEMassFabricator(this.mName); } /** @@ -261,7 +260,7 @@ public class GregtechMetaTileEntity_MassFabricator @NotNull @Override - protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { if (mMode == MODE_SCRAP) { if (recipe.mOutputs == null) { return SimpleCheckRecipeResult.ofSuccess("no_scrap"); @@ -272,16 +271,16 @@ public class GregtechMetaTileEntity_MassFabricator @Nonnull @Override - protected Stream<GT_Recipe> findRecipeMatches(@Nullable RecipeMap<?> map) { + protected Stream<GTRecipe> findRecipeMatches(@Nullable RecipeMap<?> map) { if (mMode == MODE_SCRAP) { if (inputItems != null) { for (ItemStack item : inputItems) { if (item == null || item.stackSize == 0) continue; - ItemStack aPotentialOutput = GT_ModHandler - .getRecyclerOutput(GT_Utility.copyAmount(1, item), 0); - GT_Recipe recipe = new GT_Recipe( + ItemStack aPotentialOutput = GTModHandler + .getRecyclerOutput(GTUtility.copyAmount(1, item), 0); + GTRecipe recipe = new GTRecipe( false, - new ItemStack[] { GT_Utility.copyAmount(1, item) }, + new ItemStack[] { GTUtility.copyAmount(1, item) }, aPotentialOutput == null ? null : new ItemStack[] { aPotentialOutput }, null, new int[] { 2000 }, @@ -309,7 +308,7 @@ public class GregtechMetaTileEntity_MassFabricator @Override public int getMaxParallelRecipes() { - return this.mMode == MODE_SCRAP ? 64 : 8 * (Math.max(1, GT_Utility.getTier(getMaxInputVoltage()))); + return this.mMode == MODE_SCRAP ? 64 : 8 * (Math.max(1, GTUtility.getTier(getMaxInputVoltage()))); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTENuclearReactor.java index 5bea6bb91f..3da77cf783 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTENuclearReactor.java @@ -4,14 +4,14 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Dynamo; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_RecipeConstants.LFTR_OUTPUT_POWER; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_StructureUtility.filterByMTETier; +import static gregtech.api.enums.HatchElement.Dynamo; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTRecipeConstants.LFTR_OUTPUT_POWER; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.filterByMTETier; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -32,42 +32,41 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; -import gregtech.api.objects.GT_ItemStack; +import gregtech.api.metatileentity.implementations.MTEHatchDynamo; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchMaintenance; +import gregtech.api.metatileentity.implementations.MTEHatchMuffler; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; +import gregtech.api.objects.GTItemStack; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.nuclear.NUCLIDE; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.material.MaterialsElements; +import gtPlusPlus.core.material.nuclear.MaterialsNuclides; import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; -public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<GregtechMTE_NuclearReactor> - implements ISurvivalConstructable { +public class MTENuclearReactor extends GTPPMultiBlockBase<MTENuclearReactor> implements ISurvivalConstructable { protected int mFuelRemaining = 0; private int mCasing; - private static IStructureDefinition<GregtechMTE_NuclearReactor> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTENuclearReactor> STRUCTURE_DEFINITION = null; - public GregtechMTE_NuclearReactor(final int aID, final String aName, final String aNameRegional) { + public MTENuclearReactor(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMTE_NuclearReactor(final String aName) { + public MTENuclearReactor(final String aName) { super(aName); } @@ -87,8 +86,8 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Liquid Fluoride Thorium Reactor.") .addInfo("Produces energy and new elements from Radioactive Beta Decay!") @@ -111,7 +110,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg .addStructureInfo("All other hatches must be IV+ tier.") .addStructureInfo("4x Output Hatches or 1x Output Hatch (ME), 1+ Input Hatches") .addStructureInfo("4x Dynamo Hatches, 4x Mufflers") - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -128,7 +127,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg } @Override - public boolean allowCoverOnSide(final ForgeDirection side, final GT_ItemStack aStack) { + public boolean allowCoverOnSide(final ForgeDirection side, final GTItemStack aStack) { return side != this.getBaseMetaTileEntity() .getFrontFacing(); } @@ -174,19 +173,16 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { + if (aMetaTileEntity instanceof MTEHatchMaintenance) { return addToMachineList(aTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo dynamo - && dynamo.getTierForStructure() >= 4 + } else if (aMetaTileEntity instanceof MTEHatchDynamo dynamo && dynamo.getTierForStructure() >= 4 && dynamo.getTierForStructure() <= 6) { return addToMachineList(aTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input hatch - && hatch.getTierForStructure() >= 5) { - return addToMachineList(aTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output hatch - && hatch.getTierForStructure() >= 5) { - return addToMachineList(aTileEntity, aBaseCasingIndex); - } + } else if (aMetaTileEntity instanceof MTEHatchInput hatch && hatch.getTierForStructure() >= 5) { + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof MTEHatchOutput hatch && hatch.getTierForStructure() >= 5) { + return addToMachineList(aTileEntity, aBaseCasingIndex); + } } return false; } @@ -196,7 +192,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler hatch && hatch.getTierForStructure() >= 5) { + if (aMetaTileEntity instanceof MTEHatchMuffler hatch && hatch.getTierForStructure() >= 5) { return addToMachineList(aTileEntity, aBaseCasingIndex); } } @@ -204,9 +200,9 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg } @Override - public IStructureDefinition<GregtechMTE_NuclearReactor> getStructureDefinition() { + public IStructureDefinition<MTENuclearReactor> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_NuclearReactor>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTENuclearReactor>builder() .addShape( mName, transpose( @@ -218,18 +214,18 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg .addElement( 'C', ofChain( - buildHatchAdder(GregtechMTE_NuclearReactor.class).atLeast(Maintenance) + buildHatchAdder(MTENuclearReactor.class).atLeast(Maintenance) .casingIndex(TAE.GTPP_INDEX(12)) .dot(1) .build(), - buildHatchAdder(GregtechMTE_NuclearReactor.class).atLeast(InputHatch, OutputHatch) - .adder(GregtechMTE_NuclearReactor::addNuclearReactorEdgeList) + buildHatchAdder(MTENuclearReactor.class).atLeast(InputHatch, OutputHatch) + .adder(MTENuclearReactor::addNuclearReactorEdgeList) .hatchItemFilterAnd(t -> filterByMTETier(5, Integer.MAX_VALUE)) .casingIndex(TAE.GTPP_INDEX(12)) .dot(1) .build(), - buildHatchAdder(GregtechMTE_NuclearReactor.class).atLeast(Dynamo) - .adder(GregtechMTE_NuclearReactor::addNuclearReactorEdgeList) + buildHatchAdder(MTENuclearReactor.class).atLeast(Dynamo) + .adder(MTENuclearReactor::addNuclearReactorEdgeList) .hatchItemFilterAnd(t -> filterByMTETier(4, 6)) .casingIndex(TAE.GTPP_INDEX(12)) .dot(1) @@ -237,8 +233,8 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasingsMisc, 12)))) .addElement( 'X', - buildHatchAdder(GregtechMTE_NuclearReactor.class).atLeast(Muffler) - .adder(GregtechMTE_NuclearReactor::addNuclearReactorTopList) + buildHatchAdder(MTENuclearReactor.class).atLeast(Muffler) + .adder(MTENuclearReactor::addNuclearReactorTopList) .hatchItemFilterAnd(t -> filterByMTETier(5, Integer.MAX_VALUE)) .casingIndex(TAE.GTPP_INDEX(12)) .dot(1) @@ -314,33 +310,33 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMTE_NuclearReactor(this.mName); + return new MTENuclearReactor(this.mName); } public boolean turnCasingActive(final boolean status) { // TODO if (this.mDynamoHatches != null) { - for (final GT_MetaTileEntity_Hatch_Dynamo hatch : this.mDynamoHatches) { + for (final MTEHatchDynamo hatch : this.mDynamoHatches) { hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12)); } } if (this.mMufflerHatches != null) { - for (final GT_MetaTileEntity_Hatch_Muffler hatch : this.mMufflerHatches) { + for (final MTEHatchMuffler hatch : this.mMufflerHatches) { hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12)); } } if (this.mOutputHatches != null) { - for (final GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) { + for (final MTEHatchOutput hatch : this.mOutputHatches) { hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12)); } } if (this.mInputHatches != null) { - for (final GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) { + for (final MTEHatchInput hatch : this.mInputHatches) { hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12)); } } if (this.mMaintenanceHatches != null) { - for (final GT_MetaTileEntity_Hatch_Maintenance hatch : this.mMaintenanceHatches) { + for (final MTEHatchMaintenance hatch : this.mMaintenanceHatches) { hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12)); } } @@ -353,8 +349,8 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg @NotNull @Override - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { - return GT_OverclockCalculator + protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { + return OverclockCalculator .ofNoOverclock(recipe.getMetadataOrDefault(LFTR_OUTPUT_POWER, 0) * 4L, recipe.mDuration); } @@ -370,13 +366,13 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg @NotNull @Override - protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { mFuelRemaining = 0; int li2bef4 = 0; FluidStack aFuelFluid = null; for (FluidStack aFluidInput : recipe.mFluidInputs) { if (!aFluidInput.getFluid() - .equals(NUCLIDE.Li2BeF4.getFluid())) { + .equals(MaterialsNuclides.Li2BeF4.getFluid())) { aFuelFluid = aFluidInput; break; } @@ -386,7 +382,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg if (fluidStack.isFluidEqual(aFuelFluid)) { mFuelRemaining += fluidStack.amount; } else if (fluidStack.getFluid() - .equals(NUCLIDE.Li2BeF4.getFluid())) { + .equals(MaterialsNuclides.Li2BeF4.getFluid())) { li2bef4 += fluidStack.amount; } } @@ -500,7 +496,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg if (this.mEfficiency == this.getMaxEfficiency(null)) { // Try output some Uranium-233 if (MathUtils.randInt(1, 300) == 1) { - this.addOutput(ELEMENT.getInstance().URANIUM233.getFluidStack(MathUtils.randInt(1, 10))); + this.addOutput(MaterialsElements.getInstance().URANIUM233.getFluidStack(MathUtils.randInt(1, 10))); } } return super.onRunningTick(aStack); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java index 9f25f59f1f..b3f3f2b136 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java @@ -4,20 +4,20 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.ExoticEnergy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_OreDictUnificator.getAssociation; -import static gregtech.api.util.GT_ParallelHelper.addFluidsLong; -import static gregtech.api.util.GT_ParallelHelper.addItemsLong; -import static gregtech.api.util.GT_ParallelHelper.calculateChancedOutputMultiplier; -import static gregtech.api.util.GT_RecipeBuilder.BUCKETS; -import static gregtech.api.util.GT_RecipeBuilder.INGOTS; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.ExoticEnergy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTOreDictUnificator.getAssociation; +import static gregtech.api.util.GTRecipeBuilder.BUCKETS; +import static gregtech.api.util.GTRecipeBuilder.INGOTS; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.ParallelHelper.addFluidsLong; +import static gregtech.api.util.ParallelHelper.addItemsLong; +import static gregtech.api.util.ParallelHelper.calculateChancedOutputMultiplier; import java.util.ArrayList; import java.util.Arrays; @@ -51,7 +51,7 @@ import com.gtnewhorizon.structurelib.structure.StructureUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; @@ -60,29 +60,28 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; +import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchInput; import gregtech.api.objects.ItemData; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_ParallelHelper; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.ParallelHelper; import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @SuppressWarnings("SpellCheckingInspection") -public class GregtechMetaTileEntity_QuantumForceTransformer - extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GregtechMetaTileEntity_QuantumForceTransformer> +public class MTEQuantumForceTransformer extends MTEExtendedPowerMultiBlockBase<MTEQuantumForceTransformer> implements ISurvivalConstructable { private int mCasing; @@ -90,13 +89,13 @@ public class GregtechMetaTileEntity_QuantumForceTransformer protected int mFocusingTier = 0; protected int mMaxParallel = 0; private boolean mFluidMode = false, doFermium = false, doNeptunium = false; - private static final Fluid mNeptunium = ELEMENT.getInstance().NEPTUNIUM.getPlasma(); - private static final Fluid mFermium = ELEMENT.getInstance().FERMIUM.getPlasma(); + private static final Fluid mNeptunium = MaterialsElements.getInstance().NEPTUNIUM.getPlasma(); + private static final Fluid mFermium = MaterialsElements.getInstance().FERMIUM.getPlasma(); private static final String MAIN_PIECE = "main"; - private GT_MetaTileEntity_Hatch_Input mNeptuniumHatch; - private GT_MetaTileEntity_Hatch_Input mFermiumHatch; - private static final IStructureDefinition<GregtechMetaTileEntity_QuantumForceTransformer> STRUCTURE_DEFINITION = StructureDefinition - .<GregtechMetaTileEntity_QuantumForceTransformer>builder() + private MTEHatchInput mNeptuniumHatch; + private MTEHatchInput mFermiumHatch; + private static final IStructureDefinition<MTEQuantumForceTransformer> STRUCTURE_DEFINITION = StructureDefinition + .<MTEQuantumForceTransformer>builder() .addShape( MAIN_PIECE, new String[][] { // A - 142, B - 234, C - 177, D - 96, E - 224, H - 36, M - 21 @@ -183,8 +182,8 @@ public class GregtechMetaTileEntity_QuantumForceTransformer craftingTierConverter(), getAllCraftingTiers(), 0, - GregtechMetaTileEntity_QuantumForceTransformer::setCraftingTier, - GregtechMetaTileEntity_QuantumForceTransformer::getCraftingTier))) + MTEQuantumForceTransformer::setCraftingTier, + MTEQuantumForceTransformer::getCraftingTier))) .addElement( 'B', withChannel( @@ -193,60 +192,56 @@ public class GregtechMetaTileEntity_QuantumForceTransformer focusingTierConverter(), getAllFocusingTiers(), 0, - GregtechMetaTileEntity_QuantumForceTransformer::setFocusingTier, - GregtechMetaTileEntity_QuantumForceTransformer::getFocusingTier))) + MTEQuantumForceTransformer::setFocusingTier, + MTEQuantumForceTransformer::getFocusingTier))) .addElement('C', ofBlock(ModBlocks.blockCasings4Misc, 4)) .addElement('D', ofBlock(ModBlocks.blockCasings2Misc, 12)) .addElement('E', lazy(t -> ofBlock(t.getCasingBlock1(), t.getCasingMeta1()))) .addElement( 'H', - buildHatchAdder(GregtechMetaTileEntity_QuantumForceTransformer.class) + buildHatchAdder(MTEQuantumForceTransformer.class) .atLeast(InputBus, InputHatch, Maintenance, Energy.or(ExoticEnergy)) .casingIndex(TAE.getIndexFromPage(0, 10)) .dot(4) .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 12)))) .addElement( 'T', - buildHatchAdder(GregtechMetaTileEntity_QuantumForceTransformer.class) - .atLeast(OutputBus, OutputHatch, Maintenance) + buildHatchAdder(MTEQuantumForceTransformer.class).atLeast(OutputBus, OutputHatch, Maintenance) .casingIndex(TAE.getIndexFromPage(0, 10)) .dot(5) .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 12)))) .addElement( 'Z', - buildHatchAdder(GregtechMetaTileEntity_QuantumForceTransformer.class) - .hatchClass(GT_MetaTileEntity_Hatch_Input.class) - .adder(GregtechMetaTileEntity_QuantumForceTransformer::addNeptuniumHatch) + buildHatchAdder(MTEQuantumForceTransformer.class).hatchClass(MTEHatchInput.class) + .adder(MTEQuantumForceTransformer::addNeptuniumHatch) .casingIndex(TAE.getIndexFromPage(0, 10)) .dot(5) .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 12)))) .addElement( 'X', - buildHatchAdder(GregtechMetaTileEntity_QuantumForceTransformer.class) - .hatchClass(GT_MetaTileEntity_Hatch_Input.class) - .adder(GregtechMetaTileEntity_QuantumForceTransformer::addFermiumHatch) + buildHatchAdder(MTEQuantumForceTransformer.class).hatchClass(MTEHatchInput.class) + .adder(MTEQuantumForceTransformer::addFermiumHatch) .casingIndex(TAE.getIndexFromPage(0, 10)) .dot(5) .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 12)))) .build(); - public GregtechMetaTileEntity_QuantumForceTransformer(final int aID, final String aName, - final String aNameRegional) { + public MTEQuantumForceTransformer(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_QuantumForceTransformer(final String aName) { + public MTEQuantumForceTransformer(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_QuantumForceTransformer(this.mName); + return new MTEQuantumForceTransformer(this.mName); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Quantum Force Transformer") .addInfo("Controller Block for the Quantum Force Transformer") .addInfo("Allows Complex chemical lines to be performed instantly in one step") @@ -292,7 +287,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer + EnumChatFormatting.GRAY + " side of Controller") .toolTipFinisher( - GT_Values.AuthorBlueWeabo + EnumChatFormatting.RESET + GTValues.AuthorBlueWeabo + EnumChatFormatting.RESET + EnumChatFormatting.GREEN + " + Steelux" + EnumChatFormatting.RESET @@ -301,7 +296,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer } @Override - public IStructureDefinition<GregtechMetaTileEntity_QuantumForceTransformer> getStructureDefinition() { + public IStructureDefinition<MTEQuantumForceTransformer> getStructureDefinition() { return STRUCTURE_DEFINITION; } @@ -457,7 +452,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer @NotNull @Override - protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { if (recipe.mSpecialValue > getCraftingTier()) { return CheckRecipeResultRegistry.insufficientMachineTier(recipe.mSpecialValue); } @@ -519,7 +514,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer @NotNull @Override - public GT_ParallelHelper createParallelHelper(@Nonnull GT_Recipe recipe) { + public ParallelHelper createParallelHelper(@Nonnull GTRecipe recipe) { return super.createParallelHelper(recipe).setCustomItemOutputCalculation(parallel -> { ArrayList<ItemStack> items = new ArrayList<>(); @@ -567,15 +562,14 @@ public class GregtechMetaTileEntity_QuantumForceTransformer private int findProgrammedCircuitNumber() { if (isInputSeparationEnabled()) { for (ItemStack stack : inputItems) { - if (GT_Utility.isAnyIntegratedCircuit(stack)) { + if (GTUtility.isAnyIntegratedCircuit(stack)) { return stack.getItemDamage() - 1; } } return -1; } else { final ItemStack controllerStack = getControllerSlot(); - return GT_Utility.isAnyIntegratedCircuit(controllerStack) ? controllerStack.getItemDamage() - 1 - : -1; + return GTUtility.isAnyIntegratedCircuit(controllerStack) ? controllerStack.getItemDamage() - 1 : -1; } } }; @@ -654,12 +648,12 @@ public class GregtechMetaTileEntity_QuantumForceTransformer return false; } - public static int getBaseOutputChance(GT_Recipe tRecipe) { + public static int getBaseOutputChance(GTRecipe tRecipe) { int aOutputsAmount = tRecipe.mOutputs.length + tRecipe.mFluidOutputs.length; return 10000 / aOutputsAmount; } - private int[] getOutputChances(GT_Recipe tRecipe, int aChanceIncreased) { + private int[] getOutputChances(GTRecipe tRecipe, int aChanceIncreased) { int difference = getFocusingTier() - tRecipe.mSpecialValue; int aOutputsAmount = tRecipe.mOutputs.length + tRecipe.mFluidOutputs.length; int aChancePerOutput = 10000 / aOutputsAmount; @@ -719,7 +713,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer @Override public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { mFluidMode = !mFluidMode; - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, StatCollector.translateToLocal("miscutils.machines.QFTFluidMode") + " " + mFluidMode); } @@ -728,10 +722,10 @@ public class GregtechMetaTileEntity_QuantumForceTransformer if (aTileEntity == null) return false; IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mRecipeMap = null; - mNeptuniumHatch = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity; + if (aMetaTileEntity instanceof MTEHatchInput) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + ((MTEHatchInput) aMetaTileEntity).mRecipeMap = null; + mNeptuniumHatch = (MTEHatchInput) aMetaTileEntity; return true; } return false; @@ -741,10 +735,10 @@ public class GregtechMetaTileEntity_QuantumForceTransformer if (aTileEntity == null) return false; IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mRecipeMap = null; - mFermiumHatch = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity; + if (aMetaTileEntity instanceof MTEHatchInput) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + ((MTEHatchInput) aMetaTileEntity).mRecipeMap = null; + mFermiumHatch = (MTEHatchInput) aMetaTileEntity; return true; } return false; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java index 8a6564858e..2160f43546 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java @@ -4,14 +4,14 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_StructureUtility.filterByMTETier; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.filterByMTETier; import net.minecraft.item.ItemStack; @@ -26,25 +26,24 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.MTEHatchMuffler; import gregtech.api.recipe.RecipeMap; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; -public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Refinery> - implements ISurvivalConstructable { +public class MTERefinery extends GTPPMultiBlockBase<MTERefinery> implements ISurvivalConstructable { private int mCasing; - private static IStructureDefinition<GregtechMetaTileEntity_Refinery> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTERefinery> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntity_Refinery(final int aID, final String aName, final String aNameRegional) { + public MTERefinery(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_Refinery(final String aName) { + public MTERefinery(final String aName) { super(aName); } @@ -54,8 +53,8 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Fission Fuel Processing Unit") .addInfo("Refines fluorides and Uranium into nuclear fuel for the LFTR") @@ -79,7 +78,7 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase .addStructureInfo("Muffler's Tier must be IV+") .addStructureInfo("2-4x Input Hatches, 1-2x Output Hatches") .addStructureInfo("1x Muffler, 1x Maintenance Hatch, 1x Energy Hatch") - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -119,8 +118,7 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler - && ((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity).mTier >= 5) { + if (aMetaTileEntity instanceof MTEHatchMuffler && ((MTEHatchMuffler) aMetaTileEntity).mTier >= 5) { return addToMachineList(aTileEntity, aBaseCasingIndex); } } @@ -128,9 +126,9 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase } @Override - public IStructureDefinition<GregtechMetaTileEntity_Refinery> getStructureDefinition() { + public IStructureDefinition<MTERefinery> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_Refinery>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTERefinery>builder() .addShape( mName, transpose( @@ -140,13 +138,13 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase .addElement( 'X', ofChain( - buildHatchAdder(GregtechMetaTileEntity_Refinery.class) + buildHatchAdder(MTERefinery.class) .atLeast(Energy, Maintenance, OutputHatch, OutputBus, InputHatch) .casingIndex(TAE.GTPP_INDEX(18)) .dot(1) .build(), - buildHatchAdder(GregtechMetaTileEntity_Refinery.class).atLeast(Muffler) - .adder(GregtechMetaTileEntity_Refinery::addMufflerToMachineList) + buildHatchAdder(MTERefinery.class).atLeast(Muffler) + .adder(MTERefinery::addMufflerToMachineList) .hatchItemFilterAnd(t -> filterByMTETier(6, Integer.MAX_VALUE)) .casingIndex(TAE.GTPP_INDEX(18)) .dot(1) @@ -200,7 +198,7 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiRefinery; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiRefinery; } @Override @@ -215,6 +213,6 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_Refinery(this.mName); + return new MTERefinery(this.mName); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java index 0f3d201cb5..085cb1b784 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java @@ -3,10 +3,10 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.ArrayList; @@ -37,19 +37,18 @@ import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.material.MaterialMisc; import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -import gtPlusPlus.xmod.gregtech.common.tileentities.misc.TileEntitySolarHeater; +import gtPlusPlus.xmod.gregtech.common.tileentities.misc.MTESolarHeater; -public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_SolarTower> - implements ISurvivalConstructable { +public class MTESolarTower extends GTPPMultiBlockBase<MTESolarTower> implements ISurvivalConstructable { // 862 private static final int mCasingTextureID = TAE.getIndexFromPage(3, 9); @@ -59,19 +58,19 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa private int mCasing3; private int mCasing4; - public ArrayList<TileEntitySolarHeater> mSolarHeaters = new ArrayList<>(); + public ArrayList<MTESolarHeater> mSolarHeaters = new ArrayList<>(); - public GregtechMetaTileEntity_SolarTower(final int aID, final String aName, final String aNameRegional) { + public MTESolarTower(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMetaTileEntity_SolarTower(final String aName) { + public MTESolarTower(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_SolarTower(this.mName); + return new MTESolarTower(this.mName); } @Override @@ -80,15 +79,15 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa } @Override - protected final GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected final MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Contributing Green Energy towards the future") .addInfo("Surround with rings of Solar Reflectors") .addInfo("The Reflectors increase the internal heat value of the Tower (see below for formula)") .addInfo("Each Reflector ring increases tier, the first ring is required for the Tower to work") - .addInfo("Input: " + MISC_MATERIALS.SOLAR_SALT_COLD.getLocalizedName()) - .addInfo("Output: " + MISC_MATERIALS.SOLAR_SALT_HOT.getLocalizedName()) + .addInfo("Input: " + MaterialMisc.SOLAR_SALT_COLD.getLocalizedName()) + .addInfo("Output: " + MaterialMisc.SOLAR_SALT_HOT.getLocalizedName()) .addInfo("Every cycle (10 seconds), heat increases and all the Cold Solar Salt is heated") .addInfo("Converting Cold to Hot Solar Salt reduces heat, equal to the amount converted") .addInfo("This conversion only happens if heat >= 30000 and controller efficiency = 100%") @@ -110,7 +109,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa .addInputHatch("Any 2 dot hint(min 1)", 2) .addOutputHatch("Any 2 dot hint(min 1)", 2) .addMaintenanceHatch("Any 2 dot hint", 2) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -125,11 +124,11 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa private static final String SOLAR_HEATER_RING_4 = STRUCTURE_PIECE_SOLAR_HEATER_RING[3]; private static final String SOLAR_HEATER_RING_5 = STRUCTURE_PIECE_SOLAR_HEATER_RING[4]; - private static final ClassValue<IStructureDefinition<GregtechMetaTileEntity_SolarTower>> STRUCTURE_DEFINITION = new ClassValue<>() { + private static final ClassValue<IStructureDefinition<MTESolarTower>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override - protected IStructureDefinition<GregtechMetaTileEntity_SolarTower> computeValue(Class<?> type) { - return StructureDefinition.<GregtechMetaTileEntity_SolarTower>builder() + protected IStructureDefinition<MTESolarTower> computeValue(Class<?> type) { + return StructureDefinition.<MTESolarTower>builder() // s = salt // c = thermal containment @@ -226,9 +225,8 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa .addElement( 'g', lazy( - t -> buildHatchAdder(GregtechMetaTileEntity_SolarTower.class) - .hatchClass(TileEntitySolarHeater.class) - .adder(GregtechMetaTileEntity_SolarTower::addSolarHeater) + t -> buildHatchAdder(MTESolarTower.class).hatchClass(MTESolarHeater.class) + .adder(MTESolarTower::addSolarHeater) // Use a positive casing index to make adder builder happy .casingIndex(1) .dot(1) @@ -249,8 +247,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa .addElement( 'h', lazy( - t -> buildHatchAdder(GregtechMetaTileEntity_SolarTower.class) - .atLeast(InputHatch, OutputHatch, Maintenance) + t -> buildHatchAdder(MTESolarTower.class).atLeast(InputHatch, OutputHatch, Maintenance) .casingIndex(t.getCasingTextureIndex()) .dot(2) .buildAndChain( @@ -387,7 +384,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa } @Override - public IStructureDefinition<GregtechMetaTileEntity_SolarTower> getStructureDefinition() { + public IStructureDefinition<MTESolarTower> getStructureDefinition() { return STRUCTURE_DEFINITION.get(getClass()); } @@ -497,7 +494,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof TileEntitySolarHeater mTile) { + if (aMetaTileEntity instanceof MTESolarHeater mTile) { if (!mTile.hasSolarTower() && mTile.canSeeSky()) { // Logger.INFO("Found Solar Reflector, Injecting Data."); mTile.setSolarTower(this); @@ -544,9 +541,9 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa if (aHeaters > 0 && w.isDaytime()) { if (w.isRaining() && this.getBaseMetaTileEntity() .getBiome().rainfall > 0.0F) { - this.mHeatLevel += GT_Utility.safeInt((long) ((aHeaters / 2) * aEfficiency * (10 + aTier))); + this.mHeatLevel += GTUtility.safeInt((long) ((aHeaters / 2) * aEfficiency * (10 + aTier))); } else { - this.mHeatLevel += GT_Utility.safeInt((long) (aHeaters * aEfficiency * (10 + aTier))); + this.mHeatLevel += GTUtility.safeInt((long) (aHeaters * aEfficiency * (10 + aTier))); } } @@ -562,10 +559,10 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa if (this.mEfficiency == this.getMaxEfficiency(null) && this.mHeatLevel >= 30000) { if (mColdSalt == null) { - mColdSalt = MISC_MATERIALS.SOLAR_SALT_COLD.getFluid(); + mColdSalt = MaterialMisc.SOLAR_SALT_COLD.getFluid(); } if (mHotSalt == null) { - mHotSalt = MISC_MATERIALS.SOLAR_SALT_HOT.getFluid(); + mHotSalt = MaterialMisc.SOLAR_SALT_HOT.getFluid(); } ArrayList<FluidStack> aFluids = this.getStoredFluids(); for (FluidStack aFluid : aFluids) { @@ -656,7 +653,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa } private void resetSolarHeaters() { - for (TileEntitySolarHeater aTile : this.mSolarHeaters) { + for (MTESolarHeater aTile : this.mSolarHeaters) { aTile.clearSolarTower(); } this.mSolarHeaters.clear(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java index 694444f423..8889cbd501 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java @@ -3,13 +3,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.stream.Stream; @@ -30,7 +30,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; @@ -39,22 +39,21 @@ import gregtech.api.logic.ProcessingLogic; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_ParallelHelper; -import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.ParallelHelper; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Entity_ThermalBoiler> - implements ISurvivalConstructable { +public class MTEThermalBoiler extends GTPPMultiBlockBase<MTEThermalBoiler> implements ISurvivalConstructable { private int mCasing; - private static IStructureDefinition<GT4Entity_ThermalBoiler> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEThermalBoiler> STRUCTURE_DEFINITION = null; private static final int lavaFilterResilience = 30; // Damage lava filter with 1/n probability every operation. private int dryHeatCounter = 0; // Counts up to dryHeatMaximum to check for explosion conditions. @@ -70,17 +69,17 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti private static final Fluid fluidSHSteam = FluidUtils.getSuperHeatedSteam(1) .getFluid(); - public GT4Entity_ThermalBoiler(int aID, String aName, String aNameRegional) { + public MTEThermalBoiler(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GT4Entity_ThermalBoiler(String mName) { + public MTEThermalBoiler(String mName) { super(mName); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT4Entity_ThermalBoiler(this.mName); + return new MTEThermalBoiler(this.mName); } @Override @@ -121,7 +120,7 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti // We still want to run if we lack water (and subsequently explode). @NotNull @Override - protected Stream<GT_Recipe> findRecipeMatches(@Nullable RecipeMap<?> map) { + protected Stream<GTRecipe> findRecipeMatches(@Nullable RecipeMap<?> map) { if (lastRecipe != null && depleteInput(lastRecipe.mFluidInputs[0], true)) { return Stream.of(lastRecipe); } @@ -135,8 +134,8 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti @NotNull @Override - protected GT_ParallelHelper createParallelHelper(@Nonnull GT_Recipe recipe) { - GT_Recipe adjustedRecipe = recipe.copy(); + protected ParallelHelper createParallelHelper(@Nonnull GTRecipe recipe) { + GTRecipe adjustedRecipe = recipe.copy(); // Hack the recipe logic to not consume water, so that we can explode. for (FluidStack inputFluid : adjustedRecipe.mFluidInputs) { @@ -241,7 +240,7 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti private boolean useWater(int steamAmount) { // Round up to not dupe decimal amounts of water. - int waterAmount = Math.floorDiv(steamAmount + GT_Values.STEAM_PER_WATER - 1, GT_Values.STEAM_PER_WATER); + int waterAmount = Math.floorDiv(steamAmount + GTValues.STEAM_PER_WATER - 1, GTValues.STEAM_PER_WATER); if (depleteInput(FluidUtils.getWater(waterAmount)) || depleteInput(FluidUtils.getDistilledWater(waterAmount))) { dryHeatCounter = 0; return true; @@ -250,7 +249,7 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti if (dryHeatCounter < dryHeatMaximum) { ++dryHeatCounter; } else { - GT_Log.exp.println(this.mName + " was too hot and had no more Water!"); + GTLog.exp.println(this.mName + " was too hot and had no more Water!"); explodeMultiblock(); // Generate crater } return false; @@ -273,12 +272,12 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti @Override public int getPollutionPerSecond(ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiThermalBoiler; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiThermalBoiler; } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Thermal Boiler Controller") .addInfo("Converts Water & Heat into Steam") @@ -295,7 +294,7 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti .addOutputHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -315,16 +314,16 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti } @Override - public IStructureDefinition<GT4Entity_ThermalBoiler> getStructureDefinition() { + public IStructureDefinition<MTEThermalBoiler> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GT4Entity_ThermalBoiler>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEThermalBoiler>builder() .addShape( mName, transpose( new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" }, { "CCC", "CCC", "CCC" }, })) .addElement( 'C', - buildHatchAdder(GT4Entity_ThermalBoiler.class) + buildHatchAdder(MTEThermalBoiler.class) .atLeast(InputBus, OutputBus, InputHatch, OutputHatch, Maintenance, Muffler) .casingIndex(TAE.getIndexFromPage(0, 1)) .dot(1) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java index 8017ffbf47..6f8dd28c03 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java @@ -3,31 +3,31 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_Utility.filterValidMTEs; -import static gregtech.common.items.ID_MetaTool_01.BRANCHCUTTER; -import static gregtech.common.items.ID_MetaTool_01.BUZZSAW_HV; -import static gregtech.common.items.ID_MetaTool_01.BUZZSAW_LV; -import static gregtech.common.items.ID_MetaTool_01.BUZZSAW_MV; -import static gregtech.common.items.ID_MetaTool_01.CHAINSAW_HV; -import static gregtech.common.items.ID_MetaTool_01.CHAINSAW_LV; -import static gregtech.common.items.ID_MetaTool_01.CHAINSAW_MV; -import static gregtech.common.items.ID_MetaTool_01.KNIFE; -import static gregtech.common.items.ID_MetaTool_01.POCKET_BRANCHCUTTER; -import static gregtech.common.items.ID_MetaTool_01.POCKET_KNIFE; -import static gregtech.common.items.ID_MetaTool_01.POCKET_MULTITOOL; -import static gregtech.common.items.ID_MetaTool_01.POCKET_SAW; -import static gregtech.common.items.ID_MetaTool_01.POCKET_WIRECUTTER; -import static gregtech.common.items.ID_MetaTool_01.SAW; -import static gregtech.common.items.ID_MetaTool_01.WIRECUTTER; -import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTEnergy; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTUtility.filterValidMTEs; +import static gregtech.common.items.IDMetaTool01.BRANCHCUTTER; +import static gregtech.common.items.IDMetaTool01.BUZZSAW_HV; +import static gregtech.common.items.IDMetaTool01.BUZZSAW_LV; +import static gregtech.common.items.IDMetaTool01.BUZZSAW_MV; +import static gregtech.common.items.IDMetaTool01.CHAINSAW_HV; +import static gregtech.common.items.IDMetaTool01.CHAINSAW_LV; +import static gregtech.common.items.IDMetaTool01.CHAINSAW_MV; +import static gregtech.common.items.IDMetaTool01.KNIFE; +import static gregtech.common.items.IDMetaTool01.POCKET_BRANCHCUTTER; +import static gregtech.common.items.IDMetaTool01.POCKET_KNIFE; +import static gregtech.common.items.IDMetaTool01.POCKET_MULTITOOL; +import static gregtech.common.items.IDMetaTool01.POCKET_SAW; +import static gregtech.common.items.IDMetaTool01.POCKET_WIRECUTTER; +import static gregtech.common.items.IDMetaTool01.SAW; +import static gregtech.common.items.IDMetaTool01.WIRECUTTER; +import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase.GTPPHatchElement.TTEnergy; import java.util.ArrayList; import java.util.EnumMap; @@ -51,38 +51,38 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import forestry.api.arboriculture.IToolGrafter; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.TreeManager; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Mods; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.GT_MetaGenerated_Tool; +import gregtech.api.items.MetaGeneratedTool; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; +import gregtech.api.metatileentity.implementations.MTEHatchInputBus; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.VoidProtectionHelper; -import gregtech.common.items.GT_MetaGenerated_Tool_01; -import gregtech.common.items.ID_MetaTool_01; -import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_InputBus_ME; +import gregtech.common.items.IDMetaTool01; +import gregtech.common.items.MetaGeneratedTool01; +import gregtech.common.tileentities.machines.MTEHatchInputBusME; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; +import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoaderTreeFarm; -public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntityTreeFarm> - implements ISurvivalConstructable { +public class MTETreeFarm extends GTPPMultiBlockBase<MTETreeFarm> implements ISurvivalConstructable { public static int CASING_TEXTURE_ID; private static final int TICKS_PER_OPERATION = 100; @@ -91,21 +91,21 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< private int mCasing; public static String mCasingName = "Sterile Farm Casing"; - private static IStructureDefinition<GregtechMetaTileEntityTreeFarm> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTETreeFarm> STRUCTURE_DEFINITION = null; - public GregtechMetaTileEntityTreeFarm(final int aID, final String aName, final String aNameRegional) { + public MTETreeFarm(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); CASING_TEXTURE_ID = TAE.getIndexFromPage(1, 15); } - public GregtechMetaTileEntityTreeFarm(final String aName) { + public MTETreeFarm(final String aName) { super(aName); CASING_TEXTURE_ID = TAE.getIndexFromPage(1, 15); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntityTreeFarm(this.mName); + return new MTETreeFarm(this.mName); } @Override @@ -114,8 +114,8 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller block for the Tree Growth Simulator") .addInfo("Farms and harvests trees using EU") @@ -144,7 +144,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< .addEnergyHatch("Any casing", 1) .addMaintenanceHatch("Any casing", 1) .addMufflerHatch("Any casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -176,7 +176,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< if (aTileEntity == null) return false; IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus_ME) return false; + if (aMetaTileEntity instanceof MTEHatchInputBusME) return false; return super.addInputBusToMachineList(aTileEntity, aBaseCasingIndex); } @@ -208,7 +208,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiTreeFarm; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiTreeFarm; } @Override @@ -217,16 +217,16 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< } @Override - public IStructureDefinition<GregtechMetaTileEntityTreeFarm> getStructureDefinition() { + public IStructureDefinition<MTETreeFarm> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntityTreeFarm>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTETreeFarm>builder() .addShape( mName, transpose( new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" }, { "CCC", "CCC", "CCC" }, })) .addElement( 'C', - buildHatchAdder(GregtechMetaTileEntityTreeFarm.class) + buildHatchAdder(MTETreeFarm.class) .atLeast( InputHatch, OutputHatch, @@ -264,7 +264,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< * In previous versions, a saw used to go in the controller slot. We do not want an update to stop processing of * a machine set up like this. Instead, a sapling is placed in this slot at the start of the next operation. */ - if (aStack.getItem() instanceof GT_MetaGenerated_Tool_01) return true; + if (aStack.getItem() instanceof MetaGeneratedTool01) return true; return false; } @@ -343,7 +343,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< return SimpleCheckRecipeResult.ofFailure("no_output_for_sapling"); } - int tier = Math.max(1, GT_Utility.getTier(availableVoltage * availableAmperage)); + int tier = Math.max(1, GTUtility.getTier(availableVoltage * availableAmperage)); int tierMultiplier = getTierMultiplier(tier); List<ItemStack> outputs = new ArrayList<>(); @@ -376,7 +376,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< } duration = TICKS_PER_OPERATION; - calculatedEut = GT_Values.VP[tier]; + calculatedEut = GTValues.VP[tier]; for (Mode mode : Mode.values()) { if (outputPerMode.get(mode) != null) { @@ -407,11 +407,11 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< continue; } boolean canDamage = shouldDamage - ? GT_ModHandler.damageOrDechargeItem(stack, TOOL_DAMAGE_PER_OPERATION, TOOL_CHARGE_PER_OPERATION, null) - : GT_ModHandler.damageOrDechargeItem(stack, 0, 0, null); + ? GTModHandler.damageOrDechargeItem(stack, TOOL_DAMAGE_PER_OPERATION, TOOL_CHARGE_PER_OPERATION, null) + : GTModHandler.damageOrDechargeItem(stack, 0, 0, null); if (shouldDamage) { - if (!canDamage || GT_ModHandler.isElectricItem(stack) - && !GT_ModHandler.canUseElectricItem(stack, TOOL_CHARGE_PER_OPERATION)) { + if (!canDamage || GTModHandler.isElectricItem(stack) + && !GTModHandler.canUseElectricItem(stack, TOOL_CHARGE_PER_OPERATION)) { depleteInput(stack); addOutput(stack); } @@ -436,7 +436,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< int damage = toolStack.getItemDamage(); switch (mode) { case LOG: - if (tool instanceof GT_MetaGenerated_Tool_01) { + if (tool instanceof MetaGeneratedTool01) { if (damage == SAW.ID || damage == POCKET_SAW.ID || damage == POCKET_MULTITOOL.ID) { return 1; @@ -453,7 +453,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< break; case SAPLING: - if (tool instanceof GT_MetaGenerated_Tool_01 + if (tool instanceof MetaGeneratedTool01 && (damage == BRANCHCUTTER.ID || damage == POCKET_BRANCHCUTTER.ID || damage == POCKET_MULTITOOL.ID)) { return 1; @@ -468,7 +468,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< if (tool instanceof ItemShears && tool.isDamageable()) { return 1; } - if (tool instanceof GT_MetaGenerated_Tool_01) { + if (tool instanceof MetaGeneratedTool01) { if (damage == POCKET_MULTITOOL.ID) { return 1; } @@ -484,7 +484,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< break; case FRUIT: - if (tool instanceof GT_MetaGenerated_Tool_01 + if (tool instanceof MetaGeneratedTool01 && (damage == KNIFE.ID || damage == POCKET_KNIFE.ID || damage == POCKET_MULTITOOL.ID)) { return 1; } @@ -539,9 +539,9 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< */ private boolean legacyToolSwap() { ItemStack controllerSlot = getControllerSlot(); - if (controllerSlot == null || !(controllerSlot.getItem() instanceof GT_MetaGenerated_Tool_01)) return false; + if (controllerSlot == null || !(controllerSlot.getItem() instanceof MetaGeneratedTool01)) return false; - for (GT_MetaTileEntity_Hatch_InputBus inputBus : filterValidMTEs(mInputBusses)) { + for (MTEHatchInputBus inputBus : filterValidMTEs(mInputBusses)) { ItemStack[] inventory = inputBus.getRealInventory(); for (int slot = 0; slot < inventory.length; ++slot) { if (isValidSapling(inventory[slot])) { @@ -663,7 +663,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< /** * Registers outputs for a sapling. This method assumes that output in mode SAPLING is the same as the input * sapling. Output amount is further modified by mode, machine tier, and tool used. Recipes are added in - * {@link gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_TreeFarm}. + * {@link RecipeLoaderTreeFarm}. * * @param sapling The input sapling to farm, and also the output in mode SAPLING. * @param log ItemStack to output in mode LOG. @@ -676,7 +676,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< /** * Registers outputs for a sapling. Output amount is further modified by mode, machine tier, and tool used. Recipes - * are added in {@link gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_TreeFarm}. + * are added in {@link RecipeLoaderTreeFarm}. * * @param saplingIn The input sapling to farm. * @param log ItemStack to output in mode LOG. @@ -734,30 +734,30 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< */ private static final ItemStack[][] altToolsForNEI; static { - GT_MetaGenerated_Tool toolInstance = GT_MetaGenerated_Tool_01.INSTANCE; + MetaGeneratedTool toolInstance = MetaGeneratedTool01.INSTANCE; altToolsForNEI = new ItemStack[][] { // Mode.LOG { toolInstance.getToolWithStats(SAW.ID, 1, null, null, null), toolInstance.getToolWithStats(POCKET_SAW.ID, 1, null, null, null), - toolInstance.getToolWithStats(ID_MetaTool_01.BUZZSAW_LV.ID, 1, null, null, null), + toolInstance.getToolWithStats(IDMetaTool01.BUZZSAW_LV.ID, 1, null, null, null), toolInstance.getToolWithStats(CHAINSAW_LV.ID, 1, null, null, null), - toolInstance.getToolWithStats(ID_MetaTool_01.BUZZSAW_MV.ID, 1, null, null, null), + toolInstance.getToolWithStats(IDMetaTool01.BUZZSAW_MV.ID, 1, null, null, null), toolInstance.getToolWithStats(CHAINSAW_MV.ID, 1, null, null, null), - toolInstance.getToolWithStats(ID_MetaTool_01.BUZZSAW_HV.ID, 1, null, null, null), + toolInstance.getToolWithStats(IDMetaTool01.BUZZSAW_HV.ID, 1, null, null, null), toolInstance.getToolWithStats(CHAINSAW_HV.ID, 1, null, null, null), }, // Mode.SAPLING - { toolInstance.getToolWithStats(ID_MetaTool_01.BRANCHCUTTER.ID, 1, null, null, null), - toolInstance.getToolWithStats(ID_MetaTool_01.POCKET_BRANCHCUTTER.ID, 1, null, null, null), - GT_ModHandler.getModItem(Mods.Forestry.ID, "grafter", 1, 0), }, + { toolInstance.getToolWithStats(IDMetaTool01.BRANCHCUTTER.ID, 1, null, null, null), + toolInstance.getToolWithStats(IDMetaTool01.POCKET_BRANCHCUTTER.ID, 1, null, null, null), + GTModHandler.getModItem(Mods.Forestry.ID, "grafter", 1, 0), }, // Mode.LEAVES { new ItemStack(Items.shears), - toolInstance.getToolWithStats(ID_MetaTool_01.WIRECUTTER.ID, 1, null, null, null), - toolInstance.getToolWithStats(ID_MetaTool_01.POCKET_WIRECUTTER.ID, 1, null, null, null), + toolInstance.getToolWithStats(IDMetaTool01.WIRECUTTER.ID, 1, null, null, null), + toolInstance.getToolWithStats(IDMetaTool01.POCKET_WIRECUTTER.ID, 1, null, null, null), MetaGeneratedGregtechTools.getInstance() .getToolWithStats(MetaGeneratedGregtechTools.ELECTRIC_SNIPS, 1, null, null, null), }, // Mode.FRUIT - { toolInstance.getToolWithStats(ID_MetaTool_01.KNIFE.ID, 1, null, null, null), - toolInstance.getToolWithStats(ID_MetaTool_01.POCKET_KNIFE.ID, 1, null, null, null), } }; + { toolInstance.getToolWithStats(IDMetaTool01.KNIFE.ID, 1, null, null, null), + toolInstance.getToolWithStats(IDMetaTool01.POCKET_KNIFE.ID, 1, null, null, null), } }; } /** @@ -804,7 +804,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< GTPPRecipeMaps.treeGrowthSimulatorFakeRecipes.addFakeRecipe( false, - new GT_Recipe.GT_Recipe_WithAlt( + new GTRecipe.GTRecipe_WithAlt( false, null, // All inputs are taken from aAtl argument. outputStacks, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java index 7e5200e16c..1223158f31 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java @@ -4,10 +4,10 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.stream.Stream; @@ -21,48 +21,47 @@ import net.minecraftforge.fluids.FluidStack; import org.jetbrains.annotations.NotNull; -import com.github.technus.tectech.thing.casing.TT_Container_Casings; import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.SoundResource; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; +import gregtech.api.metatileentity.implementations.MTEHatchInput; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_StreamUtil; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTStreamUtil; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.chemistry.AgriculturalChem; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_AlgaeFarm; +import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoaderAlgaeFarm; import ic2.core.init.BlocksItems; import ic2.core.init.InternalName; +import tectech.thing.casing.TTCasingsContainer; -public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<GregtechMTE_AlgaePondBase> - implements ISurvivalConstructable { +public class MTEAlgaePondBase extends GTPPMultiBlockBase<MTEAlgaePondBase> implements ISurvivalConstructable { private int mLevel = -1; private int mCasing; - private static IStructureDefinition<GregtechMTE_AlgaePondBase> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEAlgaePondBase> STRUCTURE_DEFINITION = null; private int checkMeta; private static final Class<?> cofhWater; @@ -70,17 +69,17 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt cofhWater = ReflectionUtils.getClass("cofh.asmhooks.block.BlockWater"); } - public GregtechMTE_AlgaePondBase(final int aID, final String aName, final String aNameRegional) { + public MTEAlgaePondBase(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMTE_AlgaePondBase(final String aName) { + public MTEAlgaePondBase(final String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMTE_AlgaePondBase(this.mName); + return new MTEAlgaePondBase(this.mName); } @Override @@ -89,8 +88,8 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Grows Algae!") .addInfo("Controller Block for the Algae Farm") @@ -108,7 +107,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt .addInputBus("Any Casing", 1) .addOutputBus("Any Casing", 1) .addInputHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -121,9 +120,9 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt } @Override - public IStructureDefinition<GregtechMTE_AlgaePondBase> getStructureDefinition() { + public IStructureDefinition<MTEAlgaePondBase> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_AlgaePondBase>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEAlgaePondBase>builder() .addShape( mName, transpose( @@ -137,23 +136,23 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt .addElement( 'C', ofChain( - buildHatchAdder(GregtechMTE_AlgaePondBase.class).atLeast(InputHatch, InputBus, OutputBus) + buildHatchAdder(MTEAlgaePondBase.class).atLeast(InputHatch, InputBus, OutputBus) .casingIndex(TAE.getIndexFromPage(1, 15)) .dot(1) .build(), onElementPass( x -> ++x.mCasing, addTieredBlock( - GregTech_API.sBlockCasings1, - GregtechMTE_AlgaePondBase::setMeta, - GregtechMTE_AlgaePondBase::getMeta, + GregTechAPI.sBlockCasings1, + MTEAlgaePondBase::setMeta, + MTEAlgaePondBase::getMeta, 10)), onElementPass( x -> ++x.mCasing, addTieredBlock( - TT_Container_Casings.sBlockCasingsNH, - GregtechMTE_AlgaePondBase::setMeta, - GregtechMTE_AlgaePondBase::getMeta, + TTCasingsContainer.sBlockCasingsNH, + MTEAlgaePondBase::setMeta, + MTEAlgaePondBase::getMeta, 10, 15)))) .addElement('X', ofBlock(ModBlocks.blockCasings2Misc, 15)) @@ -184,7 +183,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt && mInputHatches.size() >= 1 && mOutputBusses.size() >= 1) { mLevel = checkMeta - 1; - for (GT_MetaTileEntity_Hatch_Input inputHatch : mInputHatches) { + for (MTEHatchInput inputHatch : mInputHatches) { if (inputHatch.mTier < mLevel) { return false; } @@ -310,7 +309,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt @Override public int getPollutionPerSecond(final ItemStack aStack) { - return CORE.ConfigSwitches.pollutionPerSecondMultiAlgaePond; + return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAlgaePond; } @Override @@ -333,14 +332,14 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt @Nonnull @Override - protected Stream<GT_Recipe> findRecipeMatches(@Nullable RecipeMap<?> map) { - return GT_StreamUtil - .ofNullable(RecipeLoader_AlgaeFarm.getTieredRecipeFromCache(mLevel, isUsingCompost(inputItems))); + protected Stream<GTRecipe> findRecipeMatches(@Nullable RecipeMap<?> map) { + return GTStreamUtil + .ofNullable(RecipeLoaderAlgaeFarm.getTieredRecipeFromCache(mLevel, isUsingCompost(inputItems))); } @NotNull @Override - protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { if (!checkForWater()) { return SimpleCheckRecipeResult.ofFailure("no_water"); } @@ -353,8 +352,8 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt private boolean isUsingCompost(ItemStack[] aItemInputs) { ItemStack aCompost = ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1); for (ItemStack i : aItemInputs) { - if (GT_Utility.areStacksEqual(aCompost, i)) { - if (i.stackSize >= RecipeLoader_AlgaeFarm.compostForTier(mLevel)) { + if (GTUtility.areStacksEqual(aCompost, i)) { + if (i.stackSize >= RecipeLoaderAlgaeFarm.compostForTier(mLevel)) { return true; } } @@ -375,8 +374,8 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt int zDir = aBaseMetaTileEntity.getBackFacing().offsetZ; aInitStructureCheck = aBaseMetaTileEntity.getBlockOffset(xDir, -1, zDir); aInitStructureCheckMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir, -1, zDir); - if (aInitStructureCheck == GregTech_API.sBlockCasings1 - || aInitStructureCheck == TT_Container_Casings.sBlockCasingsNH) { + if (aInitStructureCheck == GregTechAPI.sBlockCasings1 + || aInitStructureCheck == TTCasingsContainer.sBlockCasingsNH) { return aInitStructureCheckMeta; } return 0; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java index b359a3b831..2046de6c1c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.c import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_StructureUtility.filterByMTETier; -import static gregtech.api.util.GT_StructureUtility.ofCoil; -import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.filterByMTETier; +import static gregtech.api.util.GTStructureUtility.ofCoil; +import static gregtech.api.util.GTUtility.filterValidMTEs; import java.util.ArrayList; import java.util.Arrays; @@ -38,7 +38,7 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureUtility; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.HeatingCoilLevel; import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.IIconContainer; @@ -46,36 +46,35 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.metatileentity.GregTechTileClientEvents; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchInputBus; +import gregtech.api.metatileentity.implementations.MTEHatchMaintenance; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; +import gregtech.api.metatileentity.implementations.MTEHatchOutputBus; +import gregtech.api.metatileentity.implementations.MTETieredMachineBlock; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.common.tileentities.machines.IDualInputHatch; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Triplet; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.GT_MetaTileEntity_Hatch_Catalysts; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.MTEHatchCatalysts; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<GregtechMTE_ChemicalPlant> - implements ISurvivalConstructable { +public class MTEChemicalPlant extends GTPPMultiBlockBase<MTEChemicalPlant> implements ISurvivalConstructable { private int mSolidCasingTier = 0; private int mMachineCasingTier = 0; @@ -87,24 +86,24 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt private int checkPipe; private int maxTierOfHatch; private int mCasing; - private static IStructureDefinition<GregtechMTE_ChemicalPlant> STRUCTURE_DEFINITION = null; + private static IStructureDefinition<MTEChemicalPlant> STRUCTURE_DEFINITION = null; - private final ArrayList<GT_MetaTileEntity_Hatch_Catalysts> mCatalystBuses = new ArrayList<>(); + private final ArrayList<MTEHatchCatalysts> mCatalystBuses = new ArrayList<>(); private static final HashMap<Integer, Triplet<Block, Integer, Integer>> mTieredBlockRegistry = new HashMap<>(); - public GregtechMTE_ChemicalPlant(final int aID, final String aName, final String aNameRegional) { + public MTEChemicalPlant(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } - public GregtechMTE_ChemicalPlant(final String aName) { + public MTEChemicalPlant(final String aName) { super(aName); } public static boolean registerMachineCasingForTier(int aTier, Block aBlock, int aMeta, int aCasingTextureID) { Triplet<Block, Integer, Integer> aCasingData = new Triplet<>(aBlock, aMeta, aCasingTextureID); if (mTieredBlockRegistry.containsKey(aTier)) { - CORE.crash( + GTPPCore.crash( "Tried to register a Machine casing for tier " + aTier + " to the Chemical Plant, however this tier already contains one."); } @@ -124,7 +123,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMTE_ChemicalPlant(this.mName); + return new MTEChemicalPlant(this.mName); } @Override @@ -133,8 +132,8 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Chemical Plant") .addInfo("Heavy Industry, now right at your doorstep!") @@ -152,7 +151,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt .addSubChannelUsage("machine", "tier machine casing") .addSubChannelUsage("coil", "heating coil blocks") .addSubChannelUsage("pipe", "pipe casing blocks") - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -181,15 +180,15 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt } @Override - public IStructureDefinition<GregtechMTE_ChemicalPlant> getStructureDefinition() { + public IStructureDefinition<MTEChemicalPlant> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - IStructureElement<GregtechMTE_ChemicalPlant> allCasingsElement = withChannel( + IStructureElement<MTEChemicalPlant> allCasingsElement = withChannel( "casing", ofChain( IntStream.range(0, 8) - .mapToObj(GregtechMTE_ChemicalPlant::ofSolidCasing) + .mapToObj(MTEChemicalPlant::ofSolidCasing) .collect(Collectors.toList()))); - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_ChemicalPlant>builder() + STRUCTURE_DEFINITION = StructureDefinition.<MTEChemicalPlant>builder() .addShape( mName, transpose( @@ -204,13 +203,12 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt .addElement( 'C', ofChain( - buildHatchAdder(GregtechMTE_ChemicalPlant.class).atLeast(Maintenance) + buildHatchAdder(MTEChemicalPlant.class).atLeast(Maintenance) .casingIndex(getCasingTextureID()) .dot(1) .build(), - buildHatchAdder(GregtechMTE_ChemicalPlant.class) - .atLeast(InputHatch, OutputHatch, InputBus, OutputBus) - .adder(GregtechMTE_ChemicalPlant::addChemicalPlantList) + buildHatchAdder(MTEChemicalPlant.class).atLeast(InputHatch, OutputHatch, InputBus, OutputBus) + .adder(MTEChemicalPlant::addChemicalPlantList) .hatchItemFilterAnd( (t, s) -> filterByMTETier( Integer.MIN_VALUE, @@ -218,10 +216,9 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt .casingIndex(getCasingTextureID()) .dot(1) .build(), - buildHatchAdder(GregtechMTE_ChemicalPlant.class) - .hatchClass(GT_MetaTileEntity_Hatch_Catalysts.class) + buildHatchAdder(MTEChemicalPlant.class).hatchClass(MTEHatchCatalysts.class) .shouldReject(t -> t.mCatalystBuses.size() >= 1) - .adder(GregtechMTE_ChemicalPlant::addChemicalPlantList) + .adder(MTEChemicalPlant::addChemicalPlantList) .casingIndex(getCasingTextureID()) .dot(1) .build(), @@ -232,23 +229,21 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt withChannel( "machine", addTieredBlock( - GregTech_API.sBlockCasings1, - GregtechMTE_ChemicalPlant::setMachineMeta, - GregtechMTE_ChemicalPlant::getMachineMeta, + GregTechAPI.sBlockCasings1, + MTEChemicalPlant::setMachineMeta, + MTEChemicalPlant::getMachineMeta, 10))) .addElement( 'H', - withChannel( - "coil", - ofCoil(GregtechMTE_ChemicalPlant::setCoilMeta, GregtechMTE_ChemicalPlant::getCoilMeta))) + withChannel("coil", ofCoil(MTEChemicalPlant::setCoilMeta, MTEChemicalPlant::getCoilMeta))) .addElement( 'P', withChannel( "pipe", addTieredBlock( - GregTech_API.sBlockCasings2, - GregtechMTE_ChemicalPlant::setPipeMeta, - GregtechMTE_ChemicalPlant::getPipeMeta, + GregTechAPI.sBlockCasings2, + MTEChemicalPlant::setPipeMeta, + MTEChemicalPlant::getPipeMeta, 12, 16))) .build(); @@ -256,11 +251,11 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt return STRUCTURE_DEFINITION; } - private static IStructureElement<GregtechMTE_ChemicalPlant> ofSolidCasing(int aIndex) { - return new IStructureElement<GregtechMTE_ChemicalPlant>() { + private static IStructureElement<MTEChemicalPlant> ofSolidCasing(int aIndex) { + return new IStructureElement<MTEChemicalPlant>() { @Override - public boolean check(GregtechMTE_ChemicalPlant t, World world, int x, int y, int z) { + public boolean check(MTEChemicalPlant t, World world, int x, int y, int z) { if (check(aIndex, world, x, y, z)) { t.checkCasing[aIndex]++; t.mCasing++; @@ -284,7 +279,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt } @Override - public boolean spawnHint(GregtechMTE_ChemicalPlant t, World world, int x, int y, int z, ItemStack trigger) { + public boolean spawnHint(MTEChemicalPlant t, World world, int x, int y, int z, ItemStack trigger) { StructureLibAPI.hintParticle( world, x, @@ -298,8 +293,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt } @Override - public boolean placeBlock(GregtechMTE_ChemicalPlant t, World world, int x, int y, int z, - ItemStack trigger) { + public boolean placeBlock(MTEChemicalPlant t, World world, int x, int y, int z, ItemStack trigger) { return world.setBlock( x, y, @@ -313,8 +307,8 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt @Nullable @Override - public BlocksToPlace getBlocksToPlace(GregtechMTE_ChemicalPlant gregtechMTE_chemicalPlant, World world, - int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { + public BlocksToPlace getBlocksToPlace(MTEChemicalPlant gregtechMTE_chemicalPlant, World world, int x, int y, + int z, ItemStack trigger, AutoPlaceEnvironment env) { return BlocksToPlace.create( mTieredBlockRegistry.get(getIndex(trigger.stackSize)) .getValue_1(), @@ -323,7 +317,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt } @Override - public PlaceResult survivalPlaceBlock(GregtechMTE_ChemicalPlant t, World world, int x, int y, int z, + public PlaceResult survivalPlaceBlock(MTEChemicalPlant t, World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { if (check(getIndex(trigger.stackSize), world, x, y, z)) return PlaceResult.SKIP; return StructureUtility.survivalPlaceBlock( @@ -385,14 +379,14 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt } public void updateHatchTexture() { - for (GT_MetaTileEntity_Hatch h : mCatalystBuses) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mCatalystBuses) h.updateTexture(getCasingTextureID()); for (IDualInputHatch h : mDualInputHatches) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mInputBusses) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mMaintenanceHatches) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mEnergyHatches) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mOutputBusses) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mInputHatches) h.updateTexture(getCasingTextureID()); - for (GT_MetaTileEntity_Hatch h : mOutputHatches) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mInputBusses) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mMaintenanceHatches) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mEnergyHatches) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mOutputBusses) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mInputHatches) h.updateTexture(getCasingTextureID()); + for (MTEHatch h : mOutputHatches) h.updateTexture(getCasingTextureID()); } public final boolean addChemicalPlantList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { @@ -400,24 +394,24 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Catalysts) { + if (aMetaTileEntity instanceof MTEHatchCatalysts) { return addToMachineList(aTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) { - maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity).mTier); + } else if (aMetaTileEntity instanceof MTEHatchInputBus) { + maxTierOfHatch = Math.max(maxTierOfHatch, ((MTEHatchInputBus) aMetaTileEntity).mTier); return addToMachineList(aTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { + } else if (aMetaTileEntity instanceof MTEHatchMaintenance) { return addToMachineList(aTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) { - maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity).mTier); + } else if (aMetaTileEntity instanceof MTEHatchEnergy) { + maxTierOfHatch = Math.max(maxTierOfHatch, ((MTEHatchEnergy) aMetaTileEntity).mTier); return addToMachineList(aTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity).mTier); + } else if (aMetaTileEntity instanceof MTEHatchOutputBus) { + maxTierOfHatch = Math.max(maxTierOfHatch, ((MTEHatchOutputBus) aMetaTileEntity).mTier); return addToMachineList(aTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mTier); + } else if (aMetaTileEntity instanceof MTEHatchInput) { + maxTierOfHatch = Math.max(maxTierOfHatch, ((MTEHatchInput) aMetaTileEntity).mTier); return addToMachineList(aTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity).mTier); + } else if (aMetaTileEntity instanceof MTEHatchOutput) { + maxTierOfHatch = Math.max(maxTierOfHatch, ((MTEHatchOutput) aMetaTileEntity).mTier); return addToMachineList(aTileEntity, aBaseCasingIndex); } } @@ -475,7 +469,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt public boolean addToMachineList(IGregTechTileEntity aTileEntity) { int aMaxTier = getMachineCasingTier(); final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_TieredMachineBlock aMachineBlock) { + if (aMetaTileEntity instanceof MTETieredMachineBlock aMachineBlock) { int aTileTier = aMachineBlock.mTier; if (aTileTier > aMaxTier) { log("Hatch tier too high."); @@ -513,7 +507,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt if (aMetaTileEntity == null) { return false; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Catalysts) { + if (aMetaTileEntity instanceof MTEHatchCatalysts) { log("Found GT_MetaTileEntity_Hatch_Catalysts"); return addToMachineListInternal(mCatalystBuses, aMetaTileEntity, aBaseCasingIndex); } @@ -583,7 +577,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt @NotNull @Override - protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { if (recipe.mSpecialValue > mSolidCasingTier) { return CheckRecipeResultRegistry.insufficientMachineTier(recipe.mSpecialValue + 1); } @@ -616,7 +610,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt @NotNull @Override - protected CheckRecipeResult onRecipeStart(@NotNull GT_Recipe recipe) { + protected CheckRecipeResult onRecipeStart(@NotNull GTRecipe recipe) { if (catalyst != null) { damageCatalyst(catalyst, getCurrentParallels()); } @@ -635,7 +629,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt @Override public void updateSlots() { super.updateSlots(); - for (GT_MetaTileEntity_Hatch_Catalysts h : mCatalystBuses) { + for (MTEHatchCatalysts h : mCatalystBuses) { h.updateSlots(); h.tryFillUsageSlots(); } @@ -644,7 +638,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt private ItemStack findCatalyst(ItemStack[] aItemInputs, ItemStack catalyst) { if (aItemInputs != null) { for (ItemStack item : aItemInputs) { - if (GT_Utility.areStacksEqual(item, catalyst, true)) { + if (GTUtility.areStacksEqual(item, catalyst, true)) { return item; } } @@ -665,7 +659,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt */ public ArrayList<ItemStack> getCatalystInputs() { ArrayList<ItemStack> tItems = new ArrayList<>(); - for (GT_MetaTileEntity_Hatch_Catalysts tHatch : filterValidMTEs(mCatalystBuses)) { + for (MTEHatchCatalysts tHatch : filterValidMTEs(mCatalystBuses)) { AutoMap<ItemStack> aHatchContent = tHatch.getContentUsageSlots(); if (!aHatchContent.isEmpty()) { tItems.addAll(aHatchContent); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/MTEMegaAlloyBlastSmelter.java index 2e3370fe4c..1f97f38402 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/MTEMegaAlloyBlastSmelter.java @@ -4,17 +4,17 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.ExoticEnergy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_StructureUtility.ofCoil; -import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.ExoticEnergy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.ofCoil; +import static gregtech.api.util.GTUtility.filterValidMTEs; import java.util.ArrayList; import java.util.List; @@ -28,13 +28,13 @@ import net.minecraftforge.common.util.ForgeDirection; import org.jetbrains.annotations.NotNull; -import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.enums.GT_Values; +import bartworks.API.BorosilicateGlass; +import gregtech.api.enums.GTValues; import gregtech.api.enums.HeatingCoilLevel; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; @@ -42,22 +42,21 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase; +import gregtech.api.metatileentity.implementations.MTEHatch; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregTechMetaTileEntity_MegaAlloyBlastSmelter - extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GregTechMetaTileEntity_MegaAlloyBlastSmelter> +public class MTEMegaAlloyBlastSmelter extends MTEExtendedPowerMultiBlockBase<MTEMegaAlloyBlastSmelter> implements ISurvivalConstructable { private static final int MAX_PARALLELS = 256; @@ -67,8 +66,8 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter private float energyDiscount = 1; private boolean hasNormalCoils; - private static final IStructureDefinition<GregTechMetaTileEntity_MegaAlloyBlastSmelter> STRUCTURE_DEFINITION = StructureDefinition - .<GregTechMetaTileEntity_MegaAlloyBlastSmelter>builder() + private static final IStructureDefinition<MTEMegaAlloyBlastSmelter> STRUCTURE_DEFINITION = StructureDefinition + .<MTEMegaAlloyBlastSmelter>builder() .addShape( "main", new String[][] { @@ -123,21 +122,19 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter ofChain( onElementPass( te -> te.hasNormalCoils = false, - ofCoil( - GregTechMetaTileEntity_MegaAlloyBlastSmelter::setCoilLevel, - GregTechMetaTileEntity_MegaAlloyBlastSmelter::getCoilLevel)), + ofCoil(MTEMegaAlloyBlastSmelter::setCoilLevel, MTEMegaAlloyBlastSmelter::getCoilLevel)), onElementPass(te -> te.hasNormalCoils = true, ofBlock(ModBlocks.blockCasingsMisc, 14))))) .addElement( 'Z', - buildHatchAdder(GregTechMetaTileEntity_MegaAlloyBlastSmelter.class) + buildHatchAdder(MTEMegaAlloyBlastSmelter.class) .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Energy, ExoticEnergy) .casingIndex(TAE.GTPP_INDEX(15)) .dot(1) .buildAndChain(ofBlock(ModBlocks.blockCasingsMisc, 15))) .addElement( 'E', - buildHatchAdder(GregTechMetaTileEntity_MegaAlloyBlastSmelter.class).atLeast(Maintenance) + buildHatchAdder(MTEMegaAlloyBlastSmelter.class).atLeast(Maintenance) .casingIndex(TAE.GTPP_INDEX(15)) .dot(2) .buildAndChain(ofBlock(ModBlocks.blockCasingsMisc, 15))) @@ -151,11 +148,11 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter .addElement('F', Muffler.newAny(TAE.GTPP_INDEX(15), 3)) .build(); - public GregTechMetaTileEntity_MegaAlloyBlastSmelter(int aID, String aName, String aNameRegional) { + public MTEMegaAlloyBlastSmelter(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GregTechMetaTileEntity_MegaAlloyBlastSmelter(String aName) { + public MTEMegaAlloyBlastSmelter(String aName) { super(aName); } @@ -170,16 +167,16 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter @NotNull @Override - protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) { - if (glassTier < GT_Utility.getTier(recipe.mEUt)) { - return CheckRecipeResultRegistry.insufficientMachineTier(GT_Utility.getTier(recipe.mEUt)); + protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { + if (glassTier < GTUtility.getTier(recipe.mEUt)) { + return CheckRecipeResultRegistry.insufficientMachineTier(GTUtility.getTier(recipe.mEUt)); } return CheckRecipeResultRegistry.SUCCESSFUL; } @NotNull @Override - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { + protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { calculateEnergyDiscount(coilLevel, recipe); return super.createOverclockCalculator(recipe).setSpeedBoost(speedBonus) .setEUtDiscount(energyDiscount); @@ -208,7 +205,7 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter if (mMaintenanceHatches.size() != 1) return false; if (mMufflerHatches.size() != 1) return false; if (this.glassTier < 10 && !getExoticAndNormalEnergyHatchList().isEmpty()) { - for (GT_MetaTileEntity_Hatch hatchEnergy : getExoticAndNormalEnergyHatchList()) { + for (MTEHatch hatchEnergy : getExoticAndNormalEnergyHatchList()) { if (this.glassTier < hatchEnergy.mTier) { return false; } @@ -216,8 +213,8 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter } // Disallow lasers if the glass is below UV tier if (glassTier < 8) { - for (GT_MetaTileEntity_Hatch hatchEnergy : getExoticEnergyHatches()) { - if (hatchEnergy.getConnectionType() == GT_MetaTileEntity_Hatch.ConnectionType.LASER) { + for (MTEHatch hatchEnergy : getExoticEnergyHatches()) { + if (hatchEnergy.getConnectionType() == MTEHatch.ConnectionType.LASER) { return false; } } @@ -250,8 +247,8 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter speedBonus = 1 - 0.05f * bonusTier; } - private void calculateEnergyDiscount(HeatingCoilLevel lvl, GT_Recipe recipe) { - int recipeTier = GT_Utility.getTier(recipe.mEUt); + private void calculateEnergyDiscount(HeatingCoilLevel lvl, GTRecipe recipe) { + int recipeTier = GTUtility.getTier(recipe.mEUt); int tierDifference = lvl != null ? lvl.getTier() + 1 - recipeTier : 0; if (tierDifference < 0) { energyDiscount = 1; @@ -266,8 +263,8 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter } @Override - public List<GT_MetaTileEntity_Hatch> getExoticAndNormalEnergyHatchList() { - List<GT_MetaTileEntity_Hatch> tHatches = new ArrayList<>(); + public List<MTEHatch> getExoticAndNormalEnergyHatchList() { + List<MTEHatch> tHatches = new ArrayList<>(); tHatches.addAll(mExoticEnergyHatches); tHatches.addAll(mEnergyHatches); return tHatches; @@ -279,13 +276,13 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter } @Override - public IStructureDefinition<GregTechMetaTileEntity_MegaAlloyBlastSmelter> getStructureDefinition() { + public IStructureDefinition<MTEMegaAlloyBlastSmelter> getStructureDefinition() { return STRUCTURE_DEFINITION; } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fluid Alloy Cooker") .addInfo("Controller block for the Mega Alloy Blast Smelter") .addInfo( @@ -338,7 +335,7 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter int paras = getBaseMetaTileEntity().isActive() ? processingLogic.getCurrentParallels() : 0; int moreSpeed = (int) ((1 - speedBonus) * 100); int lessEnergy = (int) ((1 - energyDiscount) * 100); - for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(mExoticEnergyHatches)) { + for (MTEHatch tHatch : filterValidMTEs(mExoticEnergyHatches)) { storedEnergy += tHatch.getBaseMetaTileEntity() .getStoredEU(); maxEnergy += tHatch.getBaseMetaTileEntity() @@ -348,40 +345,40 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter return new String[] { "------------ Critical Information ------------", StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(mProgresstime) + + GTUtility.formatNumbers(mProgresstime) + EnumChatFormatting.RESET + "t / " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(mMaxProgresstime) + + GTUtility.formatNumbers(mMaxProgresstime) + EnumChatFormatting.RESET + "t", StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(storedEnergy) + + GTUtility.formatNumbers(storedEnergy) + EnumChatFormatting.RESET + " EU / " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(maxEnergy) + + GTUtility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET + " EU", StatCollector.translateToLocal("GT5U.multiblock.usage") + ": " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(-lEUt) + + GTUtility.formatNumbers(-lEUt) + EnumChatFormatting.RESET + " EU/t", StatCollector.translateToLocal("GT5U.multiblock.mei") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(getAverageInputVoltage()) + + GTUtility.formatNumbers(getAverageInputVoltage()) + EnumChatFormatting.RESET + " EU/t(*" + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(getMaxInputAmps()) + + GTUtility.formatNumbers(getMaxInputAmps()) + EnumChatFormatting.RESET + "A) " + StatCollector.translateToLocal("GT5U.machines.tier") + ": " + EnumChatFormatting.YELLOW - + GT_Values.VN[GT_Utility.getTier(getAverageInputVoltage())] + + GTValues.VN[GTUtility.getTier(getAverageInputVoltage())] + EnumChatFormatting.RESET, "Parallels: " + EnumChatFormatting.BLUE + paras + EnumChatFormatting.RESET, "Speed Bonus: " + EnumChatFormatting.BLUE + moreSpeed + "%" + EnumChatFormatting.RESET, @@ -391,7 +388,7 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregTechMetaTileEntity_MegaAlloyBlastSmelter(this.mName); + return new MTEMegaAlloyBlastSmelter(this.mName); } @Override @@ -434,7 +431,7 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ); } else { inputSeparation = !inputSeparation; - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation); } @@ -446,9 +443,9 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter if (aPlayer.isSneaking()) { batchMode = !batchMode; if (batchMode) { - GT_Utility.sendChatToPlayer(aPlayer, "Batch recipes."); + GTUtility.sendChatToPlayer(aPlayer, "Batch recipes."); } else { - GT_Utility.sendChatToPlayer(aPlayer, "Don't batch recipes."); + GTUtility.sendChatToPlayer(aPlayer, "Don't batch recipes."); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java index 84fac40265..e57a7d7e77 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines; -import static gtPlusPlus.core.lib.CORE.RANDOM; +import static gtPlusPlus.core.lib.GTPPCore.RANDOM; import java.util.ArrayList; import java.util.HashSet; @@ -17,18 +17,18 @@ import gregtech.api.enums.Materials; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.SimpleCheckRecipeResult; import gregtech.api.recipe.maps.FuelBackend; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @SuppressWarnings("deprecation") -public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbineBase { +public class MTELargeTurbineGas extends MTELargerTurbineBase { private static final HashSet<Fluid> BLACKLIST = new HashSet<>(); @@ -38,17 +38,17 @@ public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbin .getFluid()); } - public GT_MTE_LargeTurbine_Gas(int aID, String aName, String aNameRegional) { + public MTELargeTurbineGas(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GT_MTE_LargeTurbine_Gas(String aName) { + public MTELargeTurbineGas(String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MTE_LargeTurbine_Gas(mName); + return new MTELargeTurbineGas(mName); } @Override @@ -76,7 +76,7 @@ public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbin if (aLiquid == null) { return 0; } - GT_Recipe tFuel = getRecipeMap().getBackend() + GTRecipe tFuel = getRecipeMap().getBackend() .findFuel(aLiquid); if (tFuel != null) { return tFuel.mSpecialValue; @@ -126,15 +126,15 @@ public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbin // wastes the extra fuel and generate aOptFlow directly depleteInput(new FluidStack(firstFuelType, 1)); this.storedFluid += 1; - return GT_Utility.safeInt((long) aOptFlow * (long) aBaseEff / 10000L); + return GTUtility.safeInt((long) aOptFlow * (long) aBaseEff / 10000L); } - actualOptimalFlow = GT_Utility.safeInt((long) (aOptFlow * (double) flowMultipliers[1] / fuelValue)); + actualOptimalFlow = GTUtility.safeInt((long) (aOptFlow * (double) flowMultipliers[1] / fuelValue)); this.realOptFlow = actualOptimalFlow; - int remainingFlow = GT_Utility.safeInt((long) (actualOptimalFlow * 1.25f)); // Allowed to use up to 125% of - // optimal flow. Variable - // required outside of loop for + int remainingFlow = GTUtility.safeInt((long) (actualOptimalFlow * 1.25f)); // Allowed to use up to 125% of + // optimal flow. Variable + // required outside of loop for // multi-hatch scenarios. int flow = 0; int totalFlow = 0; @@ -151,14 +151,14 @@ public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbin } } if (totalFlow <= 0) return 0; - tEU = GT_Utility.safeInt((long) totalFlow * fuelValue); + tEU = GTUtility.safeInt((long) totalFlow * fuelValue); if (totalFlow == actualOptimalFlow) { - tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); + tEU = GTUtility.safeInt((long) tEU * (long) aBaseEff / 10000L); } else { float efficiency = 1.0f - Math.abs((totalFlow - actualOptimalFlow) / (float) actualOptimalFlow); tEU *= efficiency; - tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); + tEU = GTUtility.safeInt((long) tEU * (long) aBaseEff / 10000L); } return tEU; @@ -198,11 +198,11 @@ public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbin @Override protected ITexture getTextureFrontFace() { - return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced); + return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced); } @Override protected ITexture getTextureFrontFaceActive() { - return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active); + return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbinePlasma.java index db99b52be1..310463e0d5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbinePlasma.java @@ -13,37 +13,37 @@ import org.jetbrains.annotations.NotNull; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.items.MetaGeneratedTool; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; import gregtech.api.recipe.maps.FuelBackend; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Turbine; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchTurbine; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @SuppressWarnings("deprecation") -public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTurbineBase { +public class MTELargeTurbinePlasma extends MTELargerTurbineBase { private static final HashSet<Fluid> BLACKLIST = new HashSet<>(); - public GT_MTE_LargeTurbine_Plasma(int aID, String aName, String aNameRegional) { + public MTELargeTurbinePlasma(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GT_MTE_LargeTurbine_Plasma(String aName) { + public MTELargeTurbinePlasma(String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MTE_LargeTurbine_Plasma(mName); + return new MTELargeTurbinePlasma(mName); } @Override @@ -71,7 +71,7 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur if (aLiquid == null) { return 0; } - GT_Recipe tFuel = getRecipeMap().getBackend() + GTRecipe tFuel = getRecipeMap().getBackend() .findFuel(aLiquid); if (tFuel != null) { return tFuel.mSpecialValue; @@ -98,9 +98,9 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur public @NotNull CheckRecipeResult checkProcessing() { try { - ArrayList<GT_MetaTileEntity_Hatch_Turbine> aEmptyTurbineRotorHatches = getEmptyTurbineAssemblies(); + ArrayList<MTEHatchTurbine> aEmptyTurbineRotorHatches = getEmptyTurbineAssemblies(); if (aEmptyTurbineRotorHatches.size() > 0) { - hatch: for (GT_MetaTileEntity_Hatch_Turbine aHatch : aEmptyTurbineRotorHatches) { + hatch: for (MTEHatchTurbine aHatch : aEmptyTurbineRotorHatches) { ArrayList<ItemStack> aTurbines = getAllBufferedTurbines(); for (ItemStack aTurbineItem : aTurbines) { if (aTurbineItem == null) { @@ -140,29 +140,30 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur ItemStack aStack = getFullTurbineAssemblies().get(0) .getTurbine(); - aTotalBaseEff += GT_Utility.safeInt( - (long) ((5F + ((GT_MetaGenerated_Tool) aStack.getItem()).getToolCombatDamage(aStack)) * 1000F)); - aTotalOptimalFlow += GT_Utility.safeInt( - (long) Math.max( - Float.MIN_NORMAL, - ((GT_MetaGenerated_Tool) aStack.getItem()).getToolStats(aStack) - .getSpeedMultiplier() * GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolSpeed - * 50)); + aTotalBaseEff += GTUtility.safeInt( + (long) ((5F + ((MetaGeneratedTool) aStack.getItem()).getToolCombatDamage(aStack)) * 1000F)); + aTotalOptimalFlow += GTUtility + .safeInt( + (long) Math.max( + Float.MIN_NORMAL, + ((MetaGeneratedTool) aStack.getItem()).getToolStats(aStack) + .getSpeedMultiplier() * MetaGeneratedTool.getPrimaryMaterial(aStack).mToolSpeed + * 50)); // Calculate total EU/t (as shown on turbine tooltip (Fast mode doesn't affect)) double aEUPerTurbine = aTotalOptimalFlow * 40 * 0.0105 - * GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mPlasmaMultiplier - * (50.0f + (10.0f * ((GT_MetaGenerated_Tool) aStack.getItem()).getToolCombatDamage(aStack))); + * MetaGeneratedTool.getPrimaryMaterial(aStack).mPlasmaMultiplier + * (50.0f + (10.0f * ((MetaGeneratedTool) aStack.getItem()).getToolCombatDamage(aStack))); aTotalOptimalFlow *= getSpeedMultiplier(); if (aTotalOptimalFlow < 0) { aTotalOptimalFlow = 100; } - flowMultipliers[0] = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mSteamMultiplier; - flowMultipliers[1] = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mGasMultiplier; - flowMultipliers[2] = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mPlasmaMultiplier; + flowMultipliers[0] = MetaGeneratedTool.getPrimaryMaterial(aStack).mSteamMultiplier; + flowMultipliers[1] = MetaGeneratedTool.getPrimaryMaterial(aStack).mGasMultiplier; + flowMultipliers[2] = MetaGeneratedTool.getPrimaryMaterial(aStack).mPlasmaMultiplier; baseEff = MathUtils.roundToClosestInt(aTotalBaseEff); optFlow = MathUtils.roundToClosestInt(aTotalOptimalFlow); euPerTurbine = MathUtils.roundToClosestInt(aEUPerTurbine); @@ -194,7 +195,7 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur // Magic numbers: can always change by at least 10 eu/t, but otherwise by at most 1 percent of the // difference in power level (per tick) // This is how much the turbine can actually change during this tick - int maxChangeAllowed = Math.max(10, GT_Utility.safeInt((long) Math.abs(difference) / 100)); + int maxChangeAllowed = Math.max(10, GTUtility.safeInt((long) Math.abs(difference) / 100)); if (Math.abs(difference) > maxChangeAllowed) { // If this difference is too big, use the maximum allowed // change @@ -232,13 +233,13 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur FluidStack firstFuelType = new FluidStack(aFluids.get(0), 0); // Identify a SINGLE type of fluid to process. // Doesn't matter which one. Ignore the rest! int fuelValue = getFuelValue(firstFuelType); - actualOptimalFlow = GT_Utility + actualOptimalFlow = GTUtility .safeInt((long) Math.ceil((double) aOptFlow * (double) flowMultipliers[2] / (double) fuelValue)); this.realOptFlow = actualOptimalFlow; // For scanner info - int remainingFlow = GT_Utility.safeInt((long) (actualOptimalFlow * 1.25f)); // Allowed to use up to 125% of - // optimal flow. Variable - // required outside of loop for + int remainingFlow = GTUtility.safeInt((long) (actualOptimalFlow * 1.25f)); // Allowed to use up to 125% of + // optimal flow. Variable + // required outside of loop for // multi-hatch scenarios. int flow = 0; int totalFlow = 0; @@ -266,15 +267,15 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur } } if (totalFlow <= 0) return 0; - tEU = GT_Utility.safeInt((long) ((fuelValue / 20D) * (double) totalFlow)); + tEU = GTUtility.safeInt((long) ((fuelValue / 20D) * (double) totalFlow)); if (totalFlow == actualOptimalFlow) { - tEU = GT_Utility.safeInt((long) (aBaseEff / 10000D * tEU)); + tEU = GTUtility.safeInt((long) (aBaseEff / 10000D * tEU)); } else { double efficiency = 1.0D - Math.abs((totalFlow - actualOptimalFlow) / (float) actualOptimalFlow); tEU = (int) (tEU * efficiency); - tEU = GT_Utility.safeInt((long) (aBaseEff / 10000D * tEU)); + tEU = GTUtility.safeInt((long) (aBaseEff / 10000D * tEU)); } return tEU; @@ -304,11 +305,11 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur @Override protected ITexture getTextureFrontFace() { - return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced); + return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced); } @Override protected ITexture getTextureFrontFaceActive() { - return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active); + return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SCSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java index 6c3db51577..0ef3ef0256 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SCSteam.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java @@ -10,24 +10,24 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GT_MTE_LargeTurbine_SCSteam extends GregtechMetaTileEntity_LargerTurbineBase { +public class MTELargeTurbineSCSteam extends MTELargerTurbineBase { - public GT_MTE_LargeTurbine_SCSteam(int aID, String aName, String aNameRegional) { + public MTELargeTurbineSCSteam(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GT_MTE_LargeTurbine_SCSteam(String aName) { + public MTELargeTurbineSCSteam(String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MTE_LargeTurbine_SCSteam(mName); + return new MTELargeTurbineSCSteam(mName); } @Override @@ -71,7 +71,7 @@ public class GT_MTE_LargeTurbine_SCSteam extends GregtechMetaTileEntity_LargerTu storedFluid = 0; FluidStack tSCSteam = FluidRegistry.getFluidStack("supercriticalsteam", 1); for (int i = 0; i < aFluids.size() && remainingFlow > 0; i++) { - if (GT_Utility.areFluidsEqual(aFluids.get(i), tSCSteam, true)) { + if (GTUtility.areFluidsEqual(aFluids.get(i), tSCSteam, true)) { flow = Math.min(aFluids.get(i).amount, remainingFlow); // try to use up w/o exceeding remainingFlow depleteInput(new FluidStack(aFluids.get(i), flow)); // deplete that amount this.storedFluid += aFluids.get(i).amount; @@ -81,7 +81,7 @@ public class GT_MTE_LargeTurbine_SCSteam extends GregtechMetaTileEntity_LargerTu } if (totalFlow <= 0) return 0; tEU = totalFlow; - addOutput(GT_ModHandler.getSteam(totalFlow * 100)); + addOutput(GTModHandler.getSteam(totalFlow * 100)); if (totalFlow != realOptFlow) { float efficiency = 1.0f - Math.abs((totalFlow - (float) realOptFlow) / (float) realOptFlow); // if(totalFlow>aOptFlow){efficiency = 1.0f;} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java index d1346d3a51..7fdc36450d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java @@ -8,35 +8,35 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @SuppressWarnings("deprecation") -public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTurbineBase { +public class MTELargeTurbineSHSteam extends MTELargerTurbineBase { public boolean achievement = false; private boolean looseFit = false; - public GT_MTE_LargeTurbine_SHSteam(int aID, String aName, String aNameRegional) { + public MTELargeTurbineSHSteam(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GT_MTE_LargeTurbine_SHSteam(String aName) { + public MTELargeTurbineSHSteam(String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MTE_LargeTurbine_SHSteam(mName); + return new MTELargeTurbineSHSteam(mName); } @Override @@ -103,7 +103,7 @@ public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTu totalFlow += flow; // track total input used if (!achievement) { try { - GT_Mod.achievements.issueAchievement( + GTMod.achievements.issueAchievement( this.getBaseMetaTileEntity() .getWorld() .getPlayerEntityByName( @@ -120,7 +120,7 @@ public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTu } if (totalFlow <= 0) return 0; tEU = totalFlow; - addOutput(GT_ModHandler.getSteam(totalFlow)); + addOutput(GTModHandler.getSteam(totalFlow)); if (totalFlow != realOptFlow) { float efficiency = 1.0f - Math.abs((totalFlow - (float) realOptFlow) / (float) realOptFlow); // if(totalFlow>aOptFlow){efficiency = 1.0f;} @@ -141,7 +141,7 @@ public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTu // (Tight/Loose changes on every action, Slow/Fast changes every other action, all pairs are cycled this way) if (side == getBaseMetaTileEntity().getFrontFacing()) { looseFit ^= true; - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, looseFit ? "Fitting is Loose (Higher Flow)" : "Fitting is Tight (Higher Efficiency)"); } @@ -157,7 +157,7 @@ public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTu @Override public int getDamageToComponent(ItemStack aStack) { - return (looseFit && CORE.RANDOM.nextInt(4) == 0) ? 0 : 1; + return (looseFit && GTPPCore.RANDOM.nextInt(4) == 0) ? 0 : 1; } @Override @@ -194,11 +194,11 @@ public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTu @Override protected ITexture getTextureFrontFace() { - return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced); + return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced); } @Override protected ITexture getTextureFrontFaceActive() { - return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active); + return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java index c882b84aab..68cfc8cd1e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines; -import static gtPlusPlus.core.lib.CORE.RANDOM; +import static gtPlusPlus.core.lib.GTPPCore.RANDOM; import java.util.ArrayList; @@ -10,35 +10,35 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @SuppressWarnings("deprecation") -public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurbineBase { +public class MTELargeTurbineSteam extends MTELargerTurbineBase { private float water; private boolean achievement = false; private boolean looseFit = false; - public GT_MTE_LargeTurbine_Steam(int aID, String aName, String aNameRegional) { + public MTELargeTurbineSteam(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GT_MTE_LargeTurbine_Steam(String aName) { + public MTELargeTurbineSteam(String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MTE_LargeTurbine_Steam(mName); + return new MTELargeTurbineSteam(mName); } @Override @@ -115,7 +115,7 @@ public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurb remainingFlow -= flow; // track amount we're allowed to continue depleting from hatches totalFlow += flow; // track total input used if (!achievement) { - GT_Mod.achievements.issueAchievement( + GTMod.achievements.issueAchievement( this.getBaseMetaTileEntity() .getWorld() .getPlayerEntityByName( @@ -131,7 +131,7 @@ public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurb if (totalFlow <= 0) return 0; tEU = totalFlow; int waterToOutput = useWater(totalFlow / 160.0f); - addOutput(GT_ModHandler.getDistilledWater(waterToOutput)); + addOutput(GTModHandler.getDistilledWater(waterToOutput)); if (totalFlow != realOptFlow) { float efficiency = 1.0f - Math.abs((totalFlow - (float) realOptFlow) / (float) realOptFlow); // if(totalFlow>aOptFlow){efficiency = 1.0f;} @@ -152,7 +152,7 @@ public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurb // (Tight/Loose changes on every action, Slow/Fast changes every other action, all pairs are cycled this way) if (side == getBaseMetaTileEntity().getFrontFacing()) { looseFit ^= true; - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, looseFit ? "Fitting: Loose - More Flow" : "Fitting: Tight - More Efficiency"); } @@ -205,11 +205,11 @@ public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurb @Override protected ITexture getTextureFrontFace() { - return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced); + return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced); } @Override protected ITexture getTextureFrontFaceActive() { - return new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active); + return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java index c343d170f2..69e3580f11 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java @@ -2,15 +2,15 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.t import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; -import static gregtech.api.enums.GT_HatchElement.Dynamo; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_Utility.filterValidMTEs; -import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTDynamo; +import static gregtech.api.enums.HatchElement.Dynamo; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputHatch; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTUtility.filterValidMTEs; +import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase.GTPPHatchElement.TTDynamo; import java.util.ArrayList; @@ -36,30 +36,30 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.items.MetaGeneratedTool; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchDynamo; +import gregtech.api.metatileentity.implementations.MTEHatchInputBus; +import gregtech.api.metatileentity.implementations.MTEHatchMuffler; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.shutdown.ShutDownReason; import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Turbine; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchTurbine; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; -public abstract class GregtechMetaTileEntity_LargerTurbineBase - extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_LargerTurbineBase> implements ISurvivalConstructable { +public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerTurbineBase> + implements ISurvivalConstructable { protected int baseEff = 0; protected long optFlow = 0; @@ -74,15 +74,15 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase public ITexture frontFace; public ITexture frontFaceActive; - public ArrayList<GT_MetaTileEntity_Hatch_Turbine> mTurbineRotorHatches = new ArrayList<>(); + public ArrayList<MTEHatchTurbine> mTurbineRotorHatches = new ArrayList<>(); - public GregtechMetaTileEntity_LargerTurbineBase(int aID, String aName, String aNameRegional) { + public MTELargerTurbineBase(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); frontFace = getTextureFrontFace(); frontFaceActive = getTextureFrontFaceActive(); } - public GregtechMetaTileEntity_LargerTurbineBase(String aName) { + public MTELargerTurbineBase(String aName) { super(aName); frontFace = getTextureFrontFace(); frontFaceActive = getTextureFrontFaceActive(); @@ -99,8 +99,8 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase protected abstract boolean requiresOutputHatch(); @Override - protected final GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected final MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Controller Block for the XL " + getTurbineType() + " Turbine") .addInfo("Runs as fast as 16 Large Turbines of the same type, takes the space of 12") @@ -133,17 +133,17 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase if (requiresMufflers()) { tt.addMufflerHatch("Any 7 dot hint (x4)", 7); } - tt.toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + tt.toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final ClassValue<IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<>() { + private static final ClassValue<IStructureDefinition<MTELargerTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override @SuppressWarnings("SpellCheckingInspection") - protected IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase> computeValue(Class<?> type) { - return StructureDefinition.<GregtechMetaTileEntity_LargerTurbineBase>builder() + protected IStructureDefinition<MTELargerTurbineBase> computeValue(Class<?> type) { + return StructureDefinition.<MTELargerTurbineBase>builder() // c = turbine casing // s = turbine shaft // t = turbine housing @@ -165,16 +165,15 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase .addElement( 't', lazy( - t -> buildHatchAdder(GregtechMetaTileEntity_LargerTurbineBase.class) - .adder(GregtechMetaTileEntity_LargerTurbineBase::addTurbineHatch) - .hatchClass(GT_MetaTileEntity_Hatch_Turbine.class) + t -> buildHatchAdder(MTELargerTurbineBase.class).adder(MTELargerTurbineBase::addTurbineHatch) + .hatchClass(MTEHatchTurbine.class) .casingIndex(t.getCasingTextureIndex()) .dot(1) .build())) .addElement( 'h', lazy( - t -> buildHatchAdder(GregtechMetaTileEntity_LargerTurbineBase.class) + t -> buildHatchAdder(MTELargerTurbineBase.class) .atLeast(InputBus, InputHatch, OutputHatch, Dynamo.or(TTDynamo), Maintenance) .casingIndex(t.getCasingTextureIndex()) .dot(4) @@ -182,7 +181,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase .addElement( 'm', lazy( - t -> buildHatchAdder(GregtechMetaTileEntity_LargerTurbineBase.class).atLeast(Muffler) + t -> buildHatchAdder(MTELargerTurbineBase.class).atLeast(Muffler) .casingIndex(t.getCasingTextureIndex()) .dot(7) .buildAndChain(t.getCasingBlock(), t.getCasingMeta()))) @@ -191,7 +190,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase }; @Override - public IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase> getStructureDefinition() { + public IStructureDefinition<MTELargerTurbineBase> getStructureDefinition() { return STRUCTURE_DEFINITION.get(getClass()); } @@ -204,7 +203,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase public final double getMufflerReduction() { double totalReduction = 0; - for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) { + for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) { totalReduction += ((double) tHatch.calculatePollutionReduction(100)) / 100; } return totalReduction / 4; @@ -267,7 +266,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase if (aMetaTileEntity == null) { return false; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine aTurbineHatch) { + if (aMetaTileEntity instanceof MTEHatchTurbine aTurbineHatch) { log("Found GT_MetaTileEntity_Hatch_Turbine"); updateTexture(aTileEntity, aBaseCasingIndex); IGregTechTileEntity g = this.getBaseMetaTileEntity(); @@ -307,7 +306,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase public abstract int getFuelValue(FluidStack aLiquid); public static boolean isValidTurbine(ItemStack aTurbine) { - return (aTurbine != null && aTurbine.getItem() instanceof GT_MetaGenerated_Tool + return (aTurbine != null && aTurbine.getItem() instanceof MetaGeneratedTool && aTurbine.getItemDamage() >= 170 && aTurbine.getItemDamage() <= 176); } @@ -332,15 +331,15 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase } public boolean areAllTurbinesTheSame() { - ArrayList<GT_MetaTileEntity_Hatch_Turbine> aTurbineAssemblies = getFullTurbineAssemblies(); + ArrayList<MTEHatchTurbine> aTurbineAssemblies = getFullTurbineAssemblies(); if (aTurbineAssemblies.size() < 12) { log("Found " + aTurbineAssemblies.size() + ", expected 12."); return false; } AutoMap<Materials> aTurbineMats = new AutoMap<>(); AutoMap<Integer> aTurbineSizes = new AutoMap<>(); - for (GT_MetaTileEntity_Hatch_Turbine aHatch : aTurbineAssemblies) { - aTurbineMats.add(GT_MetaGenerated_Tool.getPrimaryMaterial(aHatch.getTurbine())); + for (MTEHatchTurbine aHatch : aTurbineAssemblies) { + aTurbineMats.add(MetaGeneratedTool.getPrimaryMaterial(aHatch.getTurbine())); aTurbineSizes.add(getTurbineSize(aHatch.getTurbine())); } Materials aBaseMat = aTurbineMats.get(0); @@ -383,10 +382,10 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase }; } - protected ArrayList<GT_MetaTileEntity_Hatch_Turbine> getEmptyTurbineAssemblies() { - ArrayList<GT_MetaTileEntity_Hatch_Turbine> aEmptyTurbineRotorHatches = new ArrayList<>(); + protected ArrayList<MTEHatchTurbine> getEmptyTurbineAssemblies() { + ArrayList<MTEHatchTurbine> aEmptyTurbineRotorHatches = new ArrayList<>(); // log("Checking "+mTurbineRotorHatches.size()+" Assemblies for empties."); - for (GT_MetaTileEntity_Hatch_Turbine aTurbineHatch : this.mTurbineRotorHatches) { + for (MTEHatchTurbine aTurbineHatch : this.mTurbineRotorHatches) { if (!aTurbineHatch.hasTurbine()) { aEmptyTurbineRotorHatches.add(aTurbineHatch); } @@ -394,10 +393,10 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase return aEmptyTurbineRotorHatches; } - protected ArrayList<GT_MetaTileEntity_Hatch_Turbine> getFullTurbineAssemblies() { - ArrayList<GT_MetaTileEntity_Hatch_Turbine> aTurbineRotorHatches = new ArrayList<>(); + protected ArrayList<MTEHatchTurbine> getFullTurbineAssemblies() { + ArrayList<MTEHatchTurbine> aTurbineRotorHatches = new ArrayList<>(); // log("Checking "+mTurbineRotorHatches.size()+" Assemblies for Turbines."); - for (GT_MetaTileEntity_Hatch_Turbine aTurbineHatch : this.mTurbineRotorHatches) { + for (MTEHatchTurbine aTurbineHatch : this.mTurbineRotorHatches) { if (aTurbineHatch.hasTurbine()) { // log("Found Assembly with Turbine."); aTurbineRotorHatches.add(aTurbineHatch); @@ -411,10 +410,10 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase return; } startRecipeProcessing(); - for (GT_MetaTileEntity_Hatch_InputBus aInputBus : this.mInputBusses) { + for (MTEHatchInputBus aInputBus : this.mInputBusses) { for (int slot = aInputBus.getSizeInventory() - 1; slot >= 0; slot--) { ItemStack aStack = aInputBus.getStackInSlot(slot); - if (aStack != null && GT_Utility.areStacksEqual(aStack, aTurbine)) { + if (aStack != null && GTUtility.areStacksEqual(aStack, aTurbine)) { aStack.stackSize -= aTurbine.stackSize; updateSlots(); endRecipeProcessing(); @@ -428,9 +427,9 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase @Override public @NotNull CheckRecipeResult checkProcessing() { try { - ArrayList<GT_MetaTileEntity_Hatch_Turbine> aEmptyTurbineRotorHatches = getEmptyTurbineAssemblies(); + ArrayList<MTEHatchTurbine> aEmptyTurbineRotorHatches = getEmptyTurbineAssemblies(); if (aEmptyTurbineRotorHatches.size() > 0) { - hatch: for (GT_MetaTileEntity_Hatch_Turbine aHatch : aEmptyTurbineRotorHatches) { + hatch: for (MTEHatchTurbine aHatch : aEmptyTurbineRotorHatches) { ArrayList<ItemStack> aTurbines = getAllBufferedTurbines(); for (ItemStack aTurbineItem : aTurbines) { if (aTurbineItem == null) { @@ -464,22 +463,21 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase ItemStack aStack = getFullTurbineAssemblies().get(0) .getTurbine(); - aTotalBaseEff += GT_Utility.safeInt( - (long) ((5F + ((GT_MetaGenerated_Tool) aStack.getItem()).getToolCombatDamage(aStack)) * 1000F)); - aTotalOptimalFlow += GT_Utility.safeInt( + aTotalBaseEff += GTUtility.safeInt( + (long) ((5F + ((MetaGeneratedTool) aStack.getItem()).getToolCombatDamage(aStack)) * 1000F)); + aTotalOptimalFlow += GTUtility.safeInt( (long) Math.max( Float.MIN_NORMAL, - ((GT_MetaGenerated_Tool) aStack.getItem()).getToolStats(aStack) - .getSpeedMultiplier() * GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolSpeed - * 50) + ((MetaGeneratedTool) aStack.getItem()).getToolStats(aStack) + .getSpeedMultiplier() * MetaGeneratedTool.getPrimaryMaterial(aStack).mToolSpeed * 50) * getSpeedMultiplier()); if (aTotalOptimalFlow < 0) { aTotalOptimalFlow = 100; } - flowMultipliers[0] = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mSteamMultiplier; - flowMultipliers[1] = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mGasMultiplier; - flowMultipliers[2] = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mPlasmaMultiplier; + flowMultipliers[0] = MetaGeneratedTool.getPrimaryMaterial(aStack).mSteamMultiplier; + flowMultipliers[1] = MetaGeneratedTool.getPrimaryMaterial(aStack).mGasMultiplier; + flowMultipliers[2] = MetaGeneratedTool.getPrimaryMaterial(aStack).mPlasmaMultiplier; baseEff = MathUtils.roundToClosestInt(aTotalBaseEff); optFlow = MathUtils.roundToClosestInt(aTotalOptimalFlow); if (optFlow <= 0 || baseEff <= 0) { @@ -498,7 +496,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase // Magic numbers: can always change by at least 10 eu/t, but otherwise by at most 1 percent of the // difference in power level (per tick) // This is how much the turbine can actually change during this tick - int maxChangeAllowed = Math.max(10, GT_Utility.safeInt(Math.abs(difference) / 100)); + int maxChangeAllowed = Math.max(10, GTUtility.safeInt(Math.abs(difference) / 100)); if (Math.abs(difference) > maxChangeAllowed) { // If this difference is too big, use the maximum allowed // change @@ -538,7 +536,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase if (getBaseMetaTileEntity().getRandomNumber(6000) < getMaintenanceThreshold()) { causeMaintenanceIssue(); } - for (GT_MetaTileEntity_Hatch_Turbine aHatch : getFullTurbineAssemblies()) { + for (MTEHatchTurbine aHatch : getFullTurbineAssemblies()) { // This cycle depletes durability from the turbine rotors. // The amount of times it is run depends on turbineDamageMultiplier // In XL turbines, durability loss is around 5.2-5.3x faster than in singles @@ -595,20 +593,20 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase int tDura; StringBuilder aTurbineDamage = new StringBuilder(); - for (GT_MetaTileEntity_Hatch_Turbine aHatch : this.getFullTurbineAssemblies()) { + for (MTEHatchTurbine aHatch : this.getFullTurbineAssemblies()) { ItemStack aTurbine = aHatch.getTurbine(); tDura = MathUtils.safeInt( - (long) (100.0f / GT_MetaGenerated_Tool.getToolMaxDamage(aTurbine) - * (GT_MetaGenerated_Tool.getToolDamage(aTurbine)) + 1)); + (long) (100.0f / MetaGeneratedTool.getToolMaxDamage(aTurbine) + * (MetaGeneratedTool.getToolDamage(aTurbine)) + 1)); aTurbineDamage.append(EnumChatFormatting.RED) - .append(GT_Utility.formatNumbers(tDura)) + .append(GTUtility.formatNumbers(tDura)) .append(EnumChatFormatting.RESET) .append("% | "); } long storedEnergy = 0; long maxEnergy = 0; - for (GT_MetaTileEntity_Hatch_Dynamo tHatch : filterValidMTEs(mDynamoHatches)) { + for (MTEHatchDynamo tHatch : filterValidMTEs(mDynamoHatches)) { storedEnergy += tHatch.getBaseMetaTileEntity() .getStoredEU(); maxEnergy += tHatch.getBaseMetaTileEntity() @@ -624,27 +622,27 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase // 8 Lines available for information panels tRunning + ": " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(((lEUt * mEfficiency) / 10000)) + + GTUtility.formatNumbers(((lEUt * mEfficiency) / 10000)) + EnumChatFormatting.RESET + " EU/t", tMaintenance, StatCollector.translateToLocal("GT5U.turbine.efficiency") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers((mEfficiency / 100F)) + + GTUtility.formatNumbers((mEfficiency / 100F)) + EnumChatFormatting.RESET + "%", StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(storedEnergy) + + GTUtility.formatNumbers(storedEnergy) + EnumChatFormatting.RESET + " EU / " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(maxEnergy) + + GTUtility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET + " EU", StatCollector.translateToLocal("GT5U.turbine.flow") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(MathUtils.safeInt((long) realOptFlow)) + + GTUtility.formatNumbers(MathUtils.safeInt((long) realOptFlow)) + EnumChatFormatting.RESET + " L/s" + EnumChatFormatting.YELLOW @@ -654,18 +652,18 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase + ")", StatCollector.translateToLocal("GT5U.turbine.fuel") + ": " + EnumChatFormatting.GOLD - + GT_Utility.formatNumbers(storedFluid) + + GTUtility.formatNumbers(storedFluid) + EnumChatFormatting.RESET + "L", StatCollector.translateToLocal("GT5U.turbine.dmg") + ": " + aTurbineDamage, StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(mPollutionReduction) + + GTUtility.formatNumbers(mPollutionReduction) + EnumChatFormatting.RESET + " %" }; if (!aIsSteam) ret[4] = StatCollector.translateToLocal("GT5U.turbine.flow") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(MathUtils.safeInt((long) realOptFlow)) + + GTUtility.formatNumbers(MathUtils.safeInt((long) realOptFlow)) + EnumChatFormatting.RESET + " L/t"; return ret; @@ -680,7 +678,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase public boolean polluteEnvironment(int aPollutionLevel) { if (this.requiresMufflers()) { mPollution += aPollutionLevel * getPollutionMultiplier() * mufflerReduction; - for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) { + for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) { if (mPollution >= 10000) { if (PollutionUtils.addPollution(this.getBaseMetaTileEntity(), 10000)) { mPollution -= 10000; @@ -765,7 +763,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase @Override public void onRemoval() { super.onRemoval(); - for (GT_MetaTileEntity_Hatch_Turbine h : this.mTurbineRotorHatches) { + for (MTEHatchTurbine h : this.mTurbineRotorHatches) { h.clearController(); } disableAllTurbineHatches(); @@ -789,7 +787,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase if (this.mTurbineRotorHatches.isEmpty() || ((System.currentTimeMillis() / 1000) - mLastHatchUpdate) <= 2) { return; } - for (GT_MetaTileEntity_Hatch_Turbine h : filterValidMTEs(this.mTurbineRotorHatches)) { + for (MTEHatchTurbine h : filterValidMTEs(this.mTurbineRotorHatches)) { h.setActive(aState); } @@ -828,7 +826,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase public boolean addEnergyOutputMultipleDynamos(long aEU, boolean aAllowMixedVoltageDynamos) { int injected = 0; long aFirstVoltageFound = -1; - for (GT_MetaTileEntity_Hatch aDynamo : filterValidMTEs(mAllDynamoHatches)) { + for (MTEHatch aDynamo : filterValidMTEs(mAllDynamoHatches)) { long aVoltage = aDynamo.maxEUOutput(); // Check against voltage to check when hatch mixing if (aFirstVoltageFound == -1) { @@ -841,7 +839,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase int aAmpsToInject; int aRemainder; int ampsOnCurrentHatch; - for (GT_MetaTileEntity_Hatch aDynamo : filterValidMTEs(mAllDynamoHatches)) { + for (MTEHatch aDynamo : filterValidMTEs(mAllDynamoHatches)) { leftToInject = aEU - injected; aVoltage = aDynamo.maxEUOutput(); aAmpsToInject = (int) (leftToInject / aVoltage); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java index 13bef7c885..7476cd2b90 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java @@ -6,14 +6,14 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElement import static com.gtnewhorizon.structurelib.structure.StructureUtility.onlyIf; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel; -import static gregtech.api.enums.GT_HatchElement.Dynamo; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; -import static gregtech.api.util.GT_Utility.filterValidMTEs; -import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTDynamo; -import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTEnergy; +import static gregtech.api.enums.HatchElement.Dynamo; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.ofHatchAdderOptional; +import static gregtech.api.util.GTUtility.filterValidMTEs; +import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase.GTPPHatchElement.TTDynamo; +import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase.GTPPHatchElement.TTEnergy; import javax.annotation.Nullable; @@ -49,37 +49,37 @@ import com.gtnewhorizons.modularui.common.widget.SlotGroup; import com.gtnewhorizons.modularui.common.widget.SlotWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UIInfos; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUIInfos; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchDynamo; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchMaintenance; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.SimpleCheckRecipeResult; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.MovingAverageLong; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.preloader.asm.AsmConfig; -import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; -public class GregtechMetaTileEntity_PowerSubStationController extends - GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_PowerSubStationController> implements ISurvivalConstructable { +public class GregtechMetaTileEntity_PowerSubStationController + extends GTPPMultiBlockBase<GregtechMetaTileEntity_PowerSubStationController> implements ISurvivalConstructable { private static enum TopState { MayBeTop, @@ -118,8 +118,8 @@ public class GregtechMetaTileEntity_PowerSubStationController extends } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) .addInfo("Consumes " + this.ENERGY_TAX + "% of the average voltage of all energy type hatches") .addInfo("Does not require maintenance") @@ -135,7 +135,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends .addEnergyHatch("Any Casing", 1) .addSubChannelUsage("capacitor", "Vanadium Capacitor Cell Tier") .addSubChannelUsage("height", "Height of structure") - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get()); return tt; } @@ -144,7 +144,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { if (side == facing) { return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(24)), - new GT_RenderedTexture( + new GTRenderedTexture( aActive ? Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER) }; } @@ -160,7 +160,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { // if (mBatteryCapacity <= 0) return false; - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -214,7 +214,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends public static int getMaxHatchTier(int aCellTier) { switch (aCellTier) { case 9 -> { - return GT_Values.VOLTAGE_NAMES[9].equals("Ultimate High Voltage") ? 15 : 9; + return GTValues.VOLTAGE_NAMES[9].equals("Ultimate High Voltage") ? 15 : 9; } default -> { if (aCellTier < 4) { @@ -434,13 +434,13 @@ public class GregtechMetaTileEntity_PowerSubStationController extends } int tier = getMaxHatchTier(level); long volSum = 0; - for (GT_MetaTileEntity_Hatch hatch : mAllDynamoHatches) { + for (MTEHatch hatch : mAllDynamoHatches) { if (hatch.mTier > tier || hatch.mTier < 3) { return false; } volSum += (8L << (hatch.mTier * 2)); } - for (GT_MetaTileEntity_Hatch hatch : mAllEnergyHatches) { + for (MTEHatch hatch : mAllEnergyHatches) { if (hatch.mTier > tier || hatch.mTier < 3) { return false; } @@ -458,11 +458,11 @@ public class GregtechMetaTileEntity_PowerSubStationController extends return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) { + if (aMetaTileEntity instanceof MTEHatchEnergy) { return addToMachineList(aTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) { + } else if (aMetaTileEntity instanceof MTEHatchDynamo) { return addToMachineList(aTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { + } else if (aMetaTileEntity instanceof MTEHatchMaintenance) { return addToMachineList(aTileEntity, aBaseCasingIndex); } else { if (isThisHatchMultiDynamo(aMetaTileEntity)) { @@ -624,18 +624,18 @@ public class GregtechMetaTileEntity_PowerSubStationController extends long aInputAverage = 0; long aOutputAverage = 0; // Input Power - for (GT_MetaTileEntity_Hatch THatch : filterValidMTEs(this.mDischargeHatches)) { + for (MTEHatch THatch : filterValidMTEs(this.mDischargeHatches)) { aInputAverage += drawEnergyFromHatch(THatch); } - for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(this.mAllEnergyHatches)) { + for (MTEHatch tHatch : filterValidMTEs(this.mAllEnergyHatches)) { aInputAverage += drawEnergyFromHatch(tHatch); } // Output Power - for (GT_MetaTileEntity_Hatch THatch : filterValidMTEs(this.mChargeHatches)) { + for (MTEHatch THatch : filterValidMTEs(this.mChargeHatches)) { aOutputAverage += addEnergyToHatch(THatch); } - for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(this.mAllDynamoHatches)) { + for (MTEHatch tHatch : filterValidMTEs(this.mAllDynamoHatches)) { aOutputAverage += addEnergyToHatch(tHatch); } // reset progress time @@ -680,10 +680,10 @@ public class GregtechMetaTileEntity_PowerSubStationController extends String storedEnergyText; if (this.getEUVar() > this.mBatteryCapacity) { - storedEnergyText = EnumChatFormatting.RED + GT_Utility.formatNumbers(this.getEUVar()) + storedEnergyText = EnumChatFormatting.RED + GTUtility.formatNumbers(this.getEUVar()) + EnumChatFormatting.RESET; } else { - storedEnergyText = EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.getEUVar()) + storedEnergyText = EnumChatFormatting.GREEN + GTUtility.formatNumbers(this.getEUVar()) + EnumChatFormatting.RESET; } @@ -693,10 +693,10 @@ public class GregtechMetaTileEntity_PowerSubStationController extends return new String[] { "Ergon Energy - District Sub-Station", "Stored EU: " + storedEnergyText, "Capacity: " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.maxEUStore()) + + GTUtility.formatNumbers(this.maxEUStore()) + EnumChatFormatting.RESET, "Running Costs: " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(this.computeEnergyTax()) + + GTUtility.formatNumbers(this.computeEnergyTax()) + EnumChatFormatting.RESET + " EU/t", "Controller Mode: " + mode, @@ -710,23 +710,23 @@ public class GregtechMetaTileEntity_PowerSubStationController extends + "]", "----------------------", "Stats for Nerds", "Average Input: " + EnumChatFormatting.BLUE - + GT_Utility.formatNumbers(this.getAverageEuAdded()) + + GTUtility.formatNumbers(this.getAverageEuAdded()) + EnumChatFormatting.RESET + " EU", "Average Output: " + EnumChatFormatting.GOLD - + GT_Utility.formatNumbers(this.getAverageEuConsumed()) + + GTUtility.formatNumbers(this.getAverageEuConsumed()) + EnumChatFormatting.RESET + " EU", "Total Input: " + EnumChatFormatting.BLUE - + GT_Utility.formatNumbers(this.mTotalEnergyAdded) + + GTUtility.formatNumbers(this.mTotalEnergyAdded) + EnumChatFormatting.RESET + " EU", "Total Output: " + EnumChatFormatting.GOLD - + GT_Utility.formatNumbers(this.mTotalEnergyConsumed) + + GTUtility.formatNumbers(this.mTotalEnergyConsumed) + EnumChatFormatting.RESET + " EU", "Total Costs: " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(this.mTotalEnergyLost) + + GTUtility.formatNumbers(this.mTotalEnergyLost) + EnumChatFormatting.RESET + " EU", }; } @@ -844,7 +844,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) + new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK) .setPos(4, 4) .setSize(149, 149)) .widget(new SlotWidget(inventoryHandler, 0).setPos(154, 4)) @@ -896,13 +896,13 @@ public class GregtechMetaTileEntity_PowerSubStationController extends .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(10, 40)) .widget( - new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_ENERGY_FRAME) + new DrawableWidget().setDrawable(GTPPUITextures.PICTURE_ENERGY_FRAME) .setPos(4, 155) .setSize(149, 7)) .widget(new FakeSyncWidget.FloatSyncer(this::getProgress, val -> clientProgress = val)) .widget( new ProgressBar().setProgress(this::getProgress) - .setTexture(GTPP_UITextures.PROGRESSBAR_PSS_ENERGY, 147) + .setTexture(GTPPUITextures.PROGRESSBAR_PSS_ENERGY, 147) .setDirection(ProgressBar.Direction.RIGHT) .setPos(5, 156) .setSize(147, 5)) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/MTESolarHeater.java index 141f4bbc43..64925c9bb1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/MTESolarHeater.java @@ -11,34 +11,34 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; -import gregtech.api.objects.GT_ItemStack; -import gregtech.api.objects.GT_RenderedTexture; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.metatileentity.implementations.MTETieredMachineBlock; +import gregtech.api.objects.GTItemStack; +import gregtech.api.objects.GTRenderedTexture; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_SolarTower; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTESolarTower; -public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock { +public class MTESolarHeater extends MTETieredMachineBlock { public boolean mHasTower = false; - private GregtechMetaTileEntity_SolarTower mTower = null; + private MTESolarTower mTower = null; private int mTX, mTY, mTZ; private Byte mRequiredFacing; - public TileEntitySolarHeater(final int aID, final String aName, final String aNameRegional, final int aTier, + public MTESolarHeater(final int aID, final String aName, final String aNameRegional, final int aTier, final String aDescription, final int aSlotCount) { super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription); } - public TileEntitySolarHeater(final String aName, final int aTier, final String[] aDescription, + public MTESolarHeater(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures, final int aSlotCount) { super(aName, aTier, aSlotCount, aDescription, aTextures); } @Override public String[] getDescription() { - return ArrayUtils.addAll(this.mDescriptionArray, "Point me at a Solar Tower", CORE.GT_Tooltip.get()); + return ArrayUtils.addAll(this.mDescriptionArray, "Point me at a Solar Tower", GTPPCore.GT_Tooltip.get()); } @Override @@ -68,54 +68,54 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock } public ITexture[] getFront(final byte aColor) { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) }; + return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top), + new GTRenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) }; } public ITexture[] getBack(final byte aColor) { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top) }; + return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top) }; } public ITexture[] getBottom(final byte aColor) { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getTop(final byte aColor) { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV) }; + return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top), + new GTRenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV) }; } public ITexture[] getSides(final byte aColor) { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) }; + return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top), + new GTRenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) }; } public ITexture[] getFrontActive(final byte aColor) { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) }; + return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top), + new GTRenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) }; } public ITexture[] getBackActive(final byte aColor) { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top) }; + return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top) }; } public ITexture[] getBottomActive(final byte aColor) { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; + return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) }; } public ITexture[] getTopActive(final byte aColor) { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV) }; + return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top), + new GTRenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV) }; } public ITexture[] getSidesActive(final byte aColor) { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top), - new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) }; + return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top), + new GTRenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) }; } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new TileEntitySolarHeater(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, 0); + return new MTESolarHeater(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, 0); } @Override @@ -247,7 +247,7 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock } @Override - public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) { + public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) { return false; } @@ -258,7 +258,7 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock return mHasTower; } - public GregtechMetaTileEntity_SolarTower getSolarTower() { + public MTESolarTower getSolarTower() { if (this.mHasTower) { return mTower; } @@ -280,7 +280,7 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock return false; } - public boolean setSolarTower(GregtechMetaTileEntity_SolarTower aTowerTile) { + public boolean setSolarTower(MTESolarTower aTowerTile) { if (!hasSolarTower()) { this.mTX = aTowerTile.getBaseMetaTileEntity() .getXCoord(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneBase.java index ee6ccff4b1..6da66be563 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneBase.java @@ -9,25 +9,25 @@ import org.apache.commons.lang3.ArrayUtils; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; -import gregtech.api.objects.GT_ItemStack; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.metatileentity.implementations.MTETieredMachineBlock; +import gregtech.api.objects.GTItemStack; +import gtPlusPlus.core.lib.GTPPCore; -public abstract class GT_MetaTileEntity_RedstoneBase extends GT_MetaTileEntity_TieredMachineBlock { +public abstract class MTERedstoneBase extends MTETieredMachineBlock { protected int mOpenerCount; - public GT_MetaTileEntity_RedstoneBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, + public MTERedstoneBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription, ITexture... aTextures) { super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures); } - public GT_MetaTileEntity_RedstoneBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, + public MTERedstoneBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String[] aDescription, ITexture... aTextures) { super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures); } - public GT_MetaTileEntity_RedstoneBase(String aName, int aTier, int aInvSlotCount, String[] aDescription, + public MTERedstoneBase(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aInvSlotCount, aDescription, aTextures); } @@ -38,7 +38,7 @@ public abstract class GT_MetaTileEntity_RedstoneBase extends GT_MetaTileEntity_T } @Override - public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) { + public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) { return side != getBaseMetaTileEntity().getFrontFacing(); } @@ -106,6 +106,6 @@ public abstract class GT_MetaTileEntity_RedstoneBase extends GT_MetaTileEntity_T @Override public String[] getDescription() { - return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get()); + return ArrayUtils.add(this.mDescriptionArray, GTPPCore.GT_Tooltip.get()); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneButtonPanel.java index 174a13d3c8..a83d05f928 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneButtonPanel.java @@ -8,11 +8,11 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.objects.GTRenderedTexture; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon; -public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_RedstoneBase { +public class MTERedstoneButtonPanel extends MTERedstoneBase { public byte mRedstoneStrength = 0, mType = 0, mUpdate = 0; @@ -24,7 +24,7 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red } } - public GT_MetaTileEntity_RedstoneButtonPanel(int aID) { + public MTERedstoneButtonPanel(int aID) { super( aID, "redstone.button.panel", @@ -34,14 +34,13 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red "Right-click with Screwdriver to change Button Design"); } - public GT_MetaTileEntity_RedstoneButtonPanel(final String aName, String[] aDescription, - final ITexture[][][] aTextures) { + public MTERedstoneButtonPanel(final String aName, String[] aDescription, final ITexture[][][] aTextures) { super(aName, 5, 0, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_RedstoneButtonPanel(this.mName, mDescriptionArray, this.mTextures); + return new MTERedstoneButtonPanel(this.mName, mDescriptionArray, this.mTextures); } @Override @@ -162,7 +161,7 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { if (side == facing) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1], - new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) }; + new GTRenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) }; } return this.mTextures[(aActive || hasRedstoneSignal() ? 5 : 0) + (side == facing ? 0 : side == facing.getOpposite() ? 1 @@ -175,31 +174,31 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red public ITexture[] getTop(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_Off) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_Off) }; } public ITexture[] getTopActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_On) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_On) }; } public ITexture[] getBottom(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_Off) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_Off) }; } public ITexture[] getBottomActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_On) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_On) }; } public ITexture[] getSides(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_Off) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_Off) }; } public ITexture[] getSidesActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_On) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_On) }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneCircuitBlock.java index 3b9b9af9a0..20cd569e24 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneCircuitBlock.java @@ -24,44 +24,42 @@ import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; import com.gtnewhorizons.modularui.common.widget.SlotWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; -import gregtech.api.gui.modularui.GT_UIInfos; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; +import gregtech.api.gui.modularui.GTUIInfos; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.IRedstoneCircuitBlock; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.modularui.IAddUIWidgets; import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_ItemStack; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_CircuitryBehavior; -import gregtech.api.util.GT_CoverBehavior; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_Utility; +import gregtech.api.objects.GTItemStack; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.CircuitryBehavior; +import gregtech.api.util.CoverBehavior; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTUtility; import gregtech.api.util.ISerializableObject; -import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; +import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_RedstoneBase - implements IRedstoneCircuitBlock, IAddUIWidgets { +public class MTERedstoneCircuitBlock extends MTERedstoneBase implements IRedstoneCircuitBlock, IAddUIWidgets { public int mGate = 0, mGateData[] = new int[] { 0, 0, 0, 0, 0, 0, 0, 0 }; public boolean bOutput = true; - public GT_MetaTileEntity_RedstoneCircuitBlock(int aID) { + public MTERedstoneCircuitBlock(int aID) { super(aID, "redstone.circuit", "Redstone Circuit Block", 1, 5, "Computes Redstone"); } - public GT_MetaTileEntity_RedstoneCircuitBlock(final String aName, String[] aDescription, - final ITexture[][][] aTextures) { + public MTERedstoneCircuitBlock(final String aName, String[] aDescription, final ITexture[][][] aTextures) { super(aName, 1, 5, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_RedstoneCircuitBlock(this.mName, mDescriptionArray, this.mTextures); + return new MTERedstoneCircuitBlock(this.mName, mDescriptionArray, this.mTextures); } @Override @@ -111,12 +109,12 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re @Override public long maxEUInput() { - return GT_Values.V[1]; + return GTValues.V[1]; } @Override public long maxEUOutput() { - return bOutput ? GT_Values.V[1] : 0; + return bOutput ? GTValues.V[1] : 0; } @Override @@ -136,12 +134,12 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re @Override public long maxEUStore() { - return GT_Values.V[3] * 1024; + return GTValues.V[3] * 1024; } @Override public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -160,37 +158,37 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re public void switchGateForward(boolean aShift) { try { - Set<Integer> tKeys = GregTech_API.sCircuitryBehaviors.keySet(); + Set<Integer> tKeys = GregTechAPI.sCircuitryBehaviors.keySet(); ArrayList<Integer> tList = new ArrayList<>(); tList.addAll(tKeys); if (tList.size() <= 0) return; Collections.sort(tList); - if (!GregTech_API.sCircuitryBehaviors.containsKey(mGate)) mGate = tList.get(0); + if (!GregTechAPI.sCircuitryBehaviors.containsKey(mGate)) mGate = tList.get(0); int tIndex = Collections.binarySearch(tList, mGate); tIndex += aShift ? 16 : 1; while (tIndex >= tList.size()) tIndex -= tList.size(); mGate = tList.get(tIndex); switchGate(); } catch (Throwable e) { - GT_Log.err.print(e); + GTLog.err.print(e); } } public void switchGateBackward(boolean aShift) { try { - Set<Integer> tKeys = GregTech_API.sCircuitryBehaviors.keySet(); + Set<Integer> tKeys = GregTechAPI.sCircuitryBehaviors.keySet(); ArrayList<Integer> tList = new ArrayList<>(); tList.addAll(tKeys); if (tList.size() <= 0) return; Collections.sort(tList); - if (!GregTech_API.sCircuitryBehaviors.containsKey(mGate)) mGate = tList.get(0); + if (!GregTechAPI.sCircuitryBehaviors.containsKey(mGate)) mGate = tList.get(0); int tIndex = Collections.binarySearch(tList, mGate); tIndex -= aShift ? 16 : 1; while (tIndex < 0) tIndex += tList.size(); mGate = tList.get(tIndex); switchGate(); } catch (Throwable e) { - GT_Log.err.print(e); + GTLog.err.print(e); } } @@ -214,28 +212,28 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re } public void stackGateData(int aIndex, ItemStack aStack) { - mGateData[aIndex] = GT_Utility.stackToInt(aStack); + mGateData[aIndex] = GTUtility.stackToInt(aStack); validateGateData(); } private void switchGate() { resetRedstone(); Arrays.fill(mGateData, 0); - GT_CircuitryBehavior tBehaviour = GregTech_API.sCircuitryBehaviors.get(mGate); + CircuitryBehavior tBehaviour = GregTechAPI.sCircuitryBehaviors.get(mGate); if (tBehaviour != null) try { tBehaviour.initParameters(mGateData, this); } catch (Throwable e) { - GT_Log.err.print(e); + GTLog.err.print(e); } validateGateData(); } private void validateGateData() { - GT_CircuitryBehavior tBehaviour = GregTech_API.sCircuitryBehaviors.get(mGate); + CircuitryBehavior tBehaviour = GregTechAPI.sCircuitryBehaviors.get(mGate); if (tBehaviour != null) try { tBehaviour.validateParameters(mGateData, this); } catch (Throwable e) { - GT_Log.err.print(e); + GTLog.err.print(e); } } @@ -254,7 +252,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re mInventory[0] = mInventory[1] = mInventory[2] = mInventory[3] = mInventory[4] = null; if (getBaseMetaTileEntity().getUniversalEnergyStored() >= getMinimumStoredEU()) { if (getBaseMetaTileEntity().isActive()) { - GT_CircuitryBehavior tBehaviour = GregTech_API.sCircuitryBehaviors.get(mGate); + CircuitryBehavior tBehaviour = GregTechAPI.sCircuitryBehaviors.get(mGate); if (tBehaviour != null) { try { tBehaviour.onTick(mGateData, this); @@ -267,7 +265,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re if (tBehaviour.displayItemStack(mGateData, this, 3)) mInventory[4] = getCoverByID(mGateData[3]); } catch (Throwable e) { - GT_Log.err.print(e); + GTLog.err.print(e); } } } @@ -313,11 +311,11 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re public static final Map<Integer, ItemStack> sCoversItems = new HashMap<>(); private static void initCovers() { - for (GT_ItemStack aKey : GregTech_API.sCovers.keySet()) { + for (GTItemStack aKey : GregTechAPI.sCovers.keySet()) { ItemStack aStack = aKey.toStack() .copy(); if (aStack != null) { - sCoversItems.put(GT_Utility.stackToInt(aStack), aStack); + sCoversItems.put(GTUtility.stackToInt(aStack), aStack); } } } @@ -398,8 +396,8 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re } @Override - public GT_CoverBehavior getCover(ForgeDirection side) { - return (GT_CoverBehavior) getBaseMetaTileEntity().getCoverBehaviorAtSideNew(side); + public CoverBehavior getCover(ForgeDirection side) { + return (CoverBehavior) getBaseMetaTileEntity().getCoverBehaviorAtSideNew(side); } @Override @@ -443,48 +441,48 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re : side == ForgeDirection.DOWN ? 2 : side == ForgeDirection.UP ? 3 : 4)][aColorIndex + 1]; } - private GT_RenderedTexture getBase() { - return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top); + private GTRenderedTexture getBase() { + return new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top); } public ITexture[] getTop(final byte aColor) { - return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off) }; + return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off) }; } public ITexture[] getTopActive(final byte aColor) { - return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On) }; + return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On) }; } public ITexture[] getBack(final byte aColor) { - return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off), - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red) }; + return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off), + new GTRenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red) }; } public ITexture[] getBackActive(final byte aColor) { - return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On), - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone) }; + return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On), + new GTRenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone) }; } public ITexture[] getBottom(final byte aColor) { - return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off) }; + return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off) }; } public ITexture[] getBottomActive(final byte aColor) { - return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On) }; + return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On) }; } public ITexture[] getSides(final byte aColor) { - return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off) }; + return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off) }; } public ITexture[] getSidesActive(final byte aColor) { - return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On) }; + return new ITexture[] { getBase(), new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On) }; } @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( - new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_REDSTONE_CIRCUIT_SCREEN) + new DrawableWidget().setDrawable(GTPPUITextures.PICTURE_REDSTONE_CIRCUIT_SCREEN) .setPos(43, 5) .setSize(108, 72)); for (int i = 0; i < 4; i++) { @@ -497,12 +495,12 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re index, clickData.mouseButton == 0 ? clickData.shift ? +128 : +1 : clickData.shift ? -128 : -1); } else { - tStack = GT_Utility.copy(tStack); + tStack = GTUtility.copy(tStack); if (clickData.mouseButton != 0) tStack.setItemDamage(OreDictionary.WILDCARD_VALUE); stackGateData(index, tStack); } }) - .setBackground(GT_UITextures.BUTTON_STANDARD, GTPP_UITextures.OVERLAY_BUTTON_PLUS_MINUS) + .setBackground(GTUITextures.BUTTON_STANDARD, GTPPUITextures.OVERLAY_BUTTON_PLUS_MINUS) .setPos(7, 5 + i * 18) .setSize(18, 18)) .widget( @@ -512,16 +510,16 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re } builder.widget( new CycleButtonWidget().setToggle(() -> bOutput, val -> bOutput = val) - .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EMIT_ENERGY) + .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE) + .setStaticTexture(GTUITextures.OVERLAY_BUTTON_EMIT_ENERGY) .addTooltip("Toggle EU Output") .setPos(151, 5) .setSize(18, 18)) .widget( new CycleButtonWidget() .setToggle(() -> getBaseMetaTileEntity().isActive(), val -> getBaseMetaTileEntity().setActive(val)) - .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setStaticTexture(GTPP_UITextures.OVERLAY_BUTTON_ACTIVE_STATE) + .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE) + .setStaticTexture(GTPPUITextures.OVERLAY_BUTTON_ACTIVE_STATE) .addTooltip("Toggle Active State") .setPos(151, 23) .setSize(18, 18)) @@ -529,7 +527,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re if (clickData.mouseButton == 0) switchGateForward(clickData.shift); else switchGateBackward(clickData.shift); }) - .setBackground(GT_UITextures.BUTTON_STANDARD, GTPP_UITextures.OVERLAY_BUTTON_CHANGE_MODE) + .setBackground(GTUITextures.BUTTON_STANDARD, GTPPUITextures.OVERLAY_BUTTON_CHANGE_MODE) .addTooltip("Change Redstone Circuit") .setPos(151, 41) .setSize(18, 18)); @@ -543,12 +541,12 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re builder.widget(new DrawableWidget().setDrawable(() -> { if (getBaseMetaTileEntity().getErrorDisplayID() > 0) { if ((getBaseMetaTileEntity().getTimer() / 5) % 2 == 0) { - return GTPP_UITextures.PICTURE_ELECTRICITY_ERROR; + return GTPPUITextures.PICTURE_ELECTRICITY_ERROR; } else { return null; } } else { - return GTPP_UITextures.PICTURE_ELECTRICITY_FINE; + return GTPPUITextures.PICTURE_ELECTRICITY_FINE; } }) .setPos(140, 9) @@ -559,7 +557,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re val -> getBaseMetaTileEntity().setErrorDisplayID(val))); builder.widget(TextWidget.dynamicString(() -> { - GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate); + CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate); if (tCircuit != null) return tCircuit.getName(); return ""; }) @@ -567,7 +565,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(46, 8)) .widget(TextWidget.dynamicString(() -> { - GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate); + CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate); if (tCircuit != null) return tCircuit.getDescription(); return ""; }) @@ -575,7 +573,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(46, 19)) .widget(TextWidget.dynamicString(() -> { - GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate); + CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate); if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 0); return ""; }) @@ -583,7 +581,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(46, 33)) .widget(TextWidget.dynamicString(() -> { - GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate); + CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate); if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 1); return ""; }) @@ -591,7 +589,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(46, 44)) .widget(TextWidget.dynamicString(() -> { - GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate); + CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate); if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 2); return ""; }) @@ -599,7 +597,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(46, 55)) .widget(TextWidget.dynamicString(() -> { - GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate); + CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate); if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 3); return ""; }) @@ -607,10 +605,10 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(46, 66)) .widget(TextWidget.dynamicString(() -> { - GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate); + CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate); if (tCircuit != null) { String tString = tCircuit.getDataDisplay(mGateData, 0); - return tString == null ? GT_Utility.parseNumberToString(mGateData[0]) : tString; + return tString == null ? GTUtility.parseNumberToString(mGateData[0]) : tString; } return ""; }) @@ -618,10 +616,10 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(99, 33)) .widget(TextWidget.dynamicString(() -> { - GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate); + CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate); if (tCircuit != null) { String tString = tCircuit.getDataDisplay(mGateData, 1); - return tString == null ? GT_Utility.parseNumberToString(mGateData[1]) : tString; + return tString == null ? GTUtility.parseNumberToString(mGateData[1]) : tString; } return ""; }) @@ -629,10 +627,10 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(99, 44)) .widget(TextWidget.dynamicString(() -> { - GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate); + CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate); if (tCircuit != null) { String tString = tCircuit.getDataDisplay(mGateData, 2); - return tString == null ? GT_Utility.parseNumberToString(mGateData[2]) : tString; + return tString == null ? GTUtility.parseNumberToString(mGateData[2]) : tString; } return ""; }) @@ -640,10 +638,10 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(99, 55)) .widget(TextWidget.dynamicString(() -> { - GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate); + CircuitryBehavior tCircuit = GregTechAPI.sCircuitryBehaviors.get(mGate); if (tCircuit != null) { String tString = tCircuit.getDataDisplay(mGateData, 3); - return tString == null ? GT_Utility.parseNumberToString(mGateData[3]) : tString; + return tString == null ? GTUtility.parseNumberToString(mGateData[3]) : tString; } return ""; }) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneLamp.java index 06dd76c3f4..7b963d3c7d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneLamp.java @@ -6,11 +6,11 @@ import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.objects.GTRenderedTexture; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon; -public class GT_MetaTileEntity_RedstoneLamp extends GT_MetaTileEntity_RedstoneBase { +public class MTERedstoneLamp extends MTERedstoneBase { public byte mRedstoneStrength = 0, mType = 0; public static TexturesGtBlock.CustomIcon[] sIconList = new TexturesGtBlock.CustomIcon[2]; @@ -20,17 +20,17 @@ public class GT_MetaTileEntity_RedstoneLamp extends GT_MetaTileEntity_RedstoneBa sIconList[1] = new CustomIcon("TileEntities/gt4/redstone/Lamp/on"); } - public GT_MetaTileEntity_RedstoneLamp(int aID) { + public MTERedstoneLamp(int aID) { super(aID, "redstone.lamp", "Redstone Controlled Lamp", 0, 0, "Redstone Controlled Lamp"); } - public GT_MetaTileEntity_RedstoneLamp(final String aName, String[] aDescription, final ITexture[][][] aTextures) { + public MTERedstoneLamp(final String aName, String[] aDescription, final ITexture[][][] aTextures) { super(aName, 0, 0, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_RedstoneLamp(this.mName, mDescriptionArray, this.mTextures); + return new MTERedstoneLamp(this.mName, mDescriptionArray, this.mTextures); } @Override @@ -64,10 +64,10 @@ public class GT_MetaTileEntity_RedstoneLamp extends GT_MetaTileEntity_RedstoneBa } public ITexture[] getSides(final byte aColor) { - return new ITexture[] { new GT_RenderedTexture(sIconList[0]) }; + return new ITexture[] { new GTRenderedTexture(sIconList[0]) }; } public ITexture[] getSidesActive(final byte aColor) { - return new ITexture[] { new GT_RenderedTexture(sIconList[1]) }; + return new ITexture[] { new GTRenderedTexture(sIconList[1]) }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneStrengthDisplay.java index b3b9d0fdcb..c2591c6a41 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneStrengthDisplay.java @@ -8,11 +8,11 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.objects.GTRenderedTexture; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon; -public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity_RedstoneBase { +public class MTERedstoneStrengthDisplay extends MTERedstoneBase { public byte mRedstoneStrength = 0, mType = 0; public static TexturesGtBlock.CustomIcon[] sIconList = new TexturesGtBlock.CustomIcon[144]; @@ -23,18 +23,17 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity } } - public GT_MetaTileEntity_RedstoneStrengthDisplay(int aID, String aUnlocal, String aLocal, String aDescription) { + public MTERedstoneStrengthDisplay(int aID, String aUnlocal, String aLocal, String aDescription) { super(aID, aUnlocal, aLocal, 5, 0, aDescription); } - public GT_MetaTileEntity_RedstoneStrengthDisplay(final String aName, String[] aDescription, - final ITexture[][][] aTextures) { + public MTERedstoneStrengthDisplay(final String aName, String[] aDescription, final ITexture[][][] aTextures) { super(aName, 5, 0, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_RedstoneStrengthDisplay(this.mName, mDescriptionArray, this.mTextures); + return new MTERedstoneStrengthDisplay(this.mName, mDescriptionArray, this.mTextures); } @Override @@ -96,7 +95,7 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { if (side == facing) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1], - new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) }; + new GTRenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) }; } return this.mTextures[(aActive || hasRedstoneSignal() ? 5 : 0) + (side == facing ? 0 : side == facing.getOpposite() ? 1 @@ -109,31 +108,31 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity public ITexture[] getTop(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off) }; } public ITexture[] getTopActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On) }; } public ITexture[] getBottom(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off) }; } public ITexture[] getBottomActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On) }; } public ITexture[] getSides(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off) }; } public ITexture[] getSidesActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On) }; + new GTRenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On) }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneStrengthScale.java index 5821dbab1a..e59500dcc0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneStrengthScale.java @@ -7,11 +7,11 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.objects.GTRenderedTexture; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon; -public class GT_MetaTileEntity_RedstoneStrengthScale extends GT_MetaTileEntity_RedstoneStrengthDisplay { +public class MTERedstoneStrengthScale extends MTERedstoneStrengthDisplay { public static TexturesGtBlock.CustomIcon[] sIconList = new TexturesGtBlock.CustomIcon[32]; @@ -21,18 +21,17 @@ public class GT_MetaTileEntity_RedstoneStrengthScale extends GT_MetaTileEntity_R } } - public GT_MetaTileEntity_RedstoneStrengthScale(int aID) { + public MTERedstoneStrengthScale(int aID) { super(aID, "redstone.display.scale", "Redstone Scale", "Redstone Strength on a Scale"); } - public GT_MetaTileEntity_RedstoneStrengthScale(final String aName, String[] aDescription, - final ITexture[][][] aTextures) { + public MTERedstoneStrengthScale(final String aName, String[] aDescription, final ITexture[][][] aTextures) { super(aName, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_RedstoneStrengthScale(this.mName, mDescriptionArray, this.mTextures); + return new MTERedstoneStrengthScale(this.mName, mDescriptionArray, this.mTextures); } @Override @@ -45,7 +44,7 @@ public class GT_MetaTileEntity_RedstoneStrengthScale extends GT_MetaTileEntity_R final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { if (side == facing) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1], - new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) }; + new GTRenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) }; } return this.mTextures[(aActive || hasRedstoneSignal() ? 5 : 0) + (side == facing ? 0 : side == facing.getOpposite() ? 1 diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTEEnergyBuffer.java index 17b2d77756..ed4ff6b4ca 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTEEnergyBuffer.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.storage; -import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GTValues.V; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -12,25 +12,25 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.objects.GT_ItemStack; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Utility; +import gregtech.api.objects.GTItemStack; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMetaTileEntity; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity { +public class MTEEnergyBuffer extends GTPPMetaTileEntity { protected byte aCurrentOutputAmperage = 4; - public GregtechMetaEnergyBuffer(final int aID, final String aName, final String aNameRegional, final int aTier, + public MTEEnergyBuffer(final int aID, final String aName, final String aNameRegional, final int aTier, final String aDescription, final int aSlotCount) { super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription); } - public GregtechMetaEnergyBuffer(final String aName, final int aTier, final String aDescription, + public MTEEnergyBuffer(final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures, final int aSlotCount) { super(aName, aTier, aSlotCount, aDescription, aTextures); } @@ -38,11 +38,11 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity { @Override public String[] getDescription() { return new String[] { this.mDescription, "Defaults 4A In/Out", "Change output Amperage with a screwdriver", - "Now Portable!", CORE.GT_Tooltip.get() }; + "Now Portable!", GTPPCore.GT_Tooltip.get() }; } @Override - public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCover) { + public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aCover) { if (side != this.getBaseMetaTileEntity() .getFrontFacing()) { return true; @@ -87,22 +87,22 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity { public ITexture[] getBack(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) }; + new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) }; } public ITexture[] getBottom(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) }; + new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) }; } public ITexture[] getTop(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Screen_Logo) }; + new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Screen_Logo) }; } public ITexture[] getSides(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) }; + new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) }; } public ITexture[] getFrontActive(final byte aColor) { @@ -112,32 +112,27 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity { public ITexture[] getBackActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) }; + new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) }; } public ITexture[] getBottomActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) }; + new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) }; } public ITexture[] getTopActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Screen_Logo) }; + new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Screen_Logo) }; } public ITexture[] getSidesActive(final byte aColor) { return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) }; + new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) }; } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaEnergyBuffer( - this.mName, - this.mTier, - this.mDescription, - this.mTextures, - this.mInventory.length); + return new MTEEnergyBuffer(this.mName, this.mTier, this.mDescription, this.mTextures, this.mInventory.length); } @Override @@ -294,8 +289,8 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity { final double roundOff = Math.round(c * 100.00) / 100.00; PlayerUtils.messagePlayer( playerIn, - "Energy: " + GT_Utility.formatNumbers(tempStorage) + " EU at " + V[this.mTier] + "v (" + roundOff + "%)"); - PlayerUtils.messagePlayer(playerIn, "Amperage: " + GT_Utility.formatNumbers(maxAmperesOut()) + "A"); + "Energy: " + GTUtility.formatNumbers(tempStorage) + " EU at " + V[this.mTier] + "v (" + roundOff + "%)"); + PlayerUtils.messagePlayer(playerIn, "Amperage: " + GTUtility.formatNumbers(maxAmperesOut()) + "A"); } // Utils.LOG_WARNING("Begin Show Energy"); /* @@ -326,10 +321,10 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity { @Override public String[] getInfoData() { - String cur = GT_Utility.formatNumbers( + String cur = GTUtility.formatNumbers( this.getBaseMetaTileEntity() .getStoredEU()); - String max = GT_Utility.formatNumbers( + String max = GTUtility.formatNumbers( this.getBaseMetaTileEntity() .getEUCapacity()); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTETieredChest.java index 2b1591ab80..423a71c3e1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTETieredChest.java @@ -15,24 +15,24 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; import gregtech.api.enums.Textures.BlockIcons; -import gregtech.api.gui.modularui.GT_UIInfos; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUIInfos; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.modularui.IAddUIWidgets; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; +import gregtech.api.metatileentity.implementations.MTETieredMachineBlock; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTUtility; +import gtPlusPlus.core.lib.GTPPCore; -public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachineBlock implements IAddUIWidgets { +public class MTETieredChest extends MTETieredMachineBlock implements IAddUIWidgets { public int mItemCount = 0; public ItemStack mItemStack = null; private static final double mStorageFactor = (270000.0D / 16); - public GT_MetaTileEntity_TieredChest(int aID, String aName, String aNameRegional, int aTier) { + public MTETieredChest(int aID, String aName, String aNameRegional, int aTier) { super( aID, aName, @@ -43,13 +43,13 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi new ITexture[0]); } - public GT_MetaTileEntity_TieredChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTETieredChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); } @Override public String[] getDescription() { - return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get()); + return ArrayUtils.add(this.mDescriptionArray, GTPPCore.GT_Tooltip.get()); } @Override @@ -73,12 +73,12 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_TieredChest(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTETieredChest(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -98,7 +98,7 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi } if (this.mInventory[0] != null && this.mItemCount < this.getMaxItemCount() - && GT_Utility.areStacksEqual(this.mInventory[0], this.mItemStack)) { + && GTUtility.areStacksEqual(this.mInventory[0], this.mItemStack)) { this.mItemCount += this.mInventory[0].stackSize; if (this.mItemCount > this.getMaxItemCount()) { this.mInventory[0].stackSize = this.mItemCount - this.getMaxItemCount(); @@ -112,7 +112,7 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi this.mInventory[1] = this.mItemStack.copy(); this.mInventory[1].stackSize = Math.min(this.mItemStack.getMaxStackSize(), this.mItemCount); this.mItemCount -= this.mInventory[1].stackSize; - } else if (this.mItemCount > 0 && GT_Utility.areStacksEqual(this.mInventory[1], this.mItemStack) + } else if (this.mItemCount > 0 && GTUtility.areStacksEqual(this.mInventory[1], this.mItemStack) && this.mInventory[1].getMaxStackSize() > this.mInventory[1].stackSize) { int tmp = Math .min(this.mItemCount, this.mInventory[1].getMaxStackSize() - this.mInventory[1].stackSize); @@ -161,7 +161,7 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, ItemStack aStack) { - return aIndex == 0 && (this.mInventory[0] == null || GT_Utility.areStacksEqual(this.mInventory[0], aStack)); + return aIndex == 0 && (this.mInventory[0] == null || GTUtility.areStacksEqual(this.mInventory[0], aStack)); } @Override @@ -201,10 +201,10 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi int aColorIndex, boolean aActive, boolean aRedstone) { return aBaseMetaTileEntity.getFrontFacing() == ForgeDirection.DOWN && side == ForgeDirection.WEST ? new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1], - new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST) } + new GTRenderedTexture(BlockIcons.OVERLAY_QCHEST) } : (side == aBaseMetaTileEntity.getFrontFacing() ? new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1], - new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST) } + new GTRenderedTexture(BlockIcons.OVERLAY_QCHEST) } : new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1] }); } @@ -218,21 +218,21 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) + new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK) .setPos(7, 16) .setSize(71, 45)) .widget( new SlotWidget(inventoryHandler, 0) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN) + .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_IN) .setPos(79, 16)) .widget( new SlotWidget(inventoryHandler, 1).setAccess(true, false) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT) + .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_OUT) .setPos(79, 52)) .widget( SlotWidget.phantom(inventoryHandler, 2) .disableInteraction() - .setBackground(GT_UITextures.TRANSPARENT) + .setBackground(GTUITextures.TRANSPARENT) .setPos(59, 42)) .widget( new TextWidget("Item Amount").setDefaultColor(COLOR_TEXT_WHITE.get()) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTETieredTank.java index e277eb4076..fb766b9dd5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTETieredTank.java @@ -11,34 +11,33 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UIInfos; +import gregtech.api.gui.modularui.GTUIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; +import gregtech.api.metatileentity.implementations.MTEBasicTank; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; -public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank { +public class MTETieredTank extends MTEBasicTank { - public GT_MetaTileEntity_TieredTank(final int aID, final String aName, final String aNameRegional, - final int aTier) { + public MTETieredTank(final int aID, final String aName, final String aNameRegional, final int aTier) { super( aID, aName, aNameRegional, aTier, 3, - "Stores " + GT_Utility.formatNumbers(((int) (Math.pow(2, aTier) * 32000))) + "L of fluid"); + "Stores " + GTUtility.formatNumbers(((int) (Math.pow(2, aTier) * 32000))) + "L of fluid"); } - public GT_MetaTileEntity_TieredTank(final String aName, final int aTier, final String[] aDescription, + public MTETieredTank(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); } @@ -50,7 +49,7 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank { if (this.mFluid != null) { description.add("Fluid: " + mFluid.getLocalizedName() + " " + mFluid.amount + "L"); } - description.add(CORE.GT_Tooltip.get()); + description.add(GTPPCore.GT_Tooltip.get()); return description.toArray(new String[0]); } @@ -64,9 +63,9 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank { final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { return side == ForgeDirection.UP ? new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_FLUIDTANK) } + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_TOP_FLUIDTANK) } : new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_FLUIDTANK) }; + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_FLUIDTANK) }; } @Override @@ -76,18 +75,18 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank { .loadFluidStackFromNBT(stack.stackTagCompound.getCompoundTag("mFluid")); if (tContents != null && tContents.amount > 0) { tooltip.add( - GT_LanguageManager.addStringLocalization( + GTLanguageManager.addStringLocalization( "TileEntity_TANK_INFO", "Contains Fluid: ", - !GregTech_API.sPostloadFinished) + EnumChatFormatting.YELLOW + !GregTechAPI.sPostloadFinished) + EnumChatFormatting.YELLOW + tContents.getLocalizedName() + EnumChatFormatting.GRAY); tooltip.add( - GT_LanguageManager.addStringLocalization( + GTLanguageManager.addStringLocalization( "TileEntity_TANK_AMOUNT", "Fluid Amount: ", - !GregTech_API.sPostloadFinished) + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(tContents.amount) + !GregTechAPI.sPostloadFinished) + EnumChatFormatting.GREEN + + GTUtility.formatNumbers(tContents.amount) + " L" + EnumChatFormatting.GRAY); } @@ -138,16 +137,16 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank { public String[] getInfoData() { if (this.mFluid == null) { - return new String[] { GT_Values.VOLTAGE_NAMES[this.mTier] + " Fluid Tank", "Stored Fluid:", "No Fluid", + return new String[] { GTValues.VOLTAGE_NAMES[this.mTier] + " Fluid Tank", "Stored Fluid:", "No Fluid", 0 + "L", this.getCapacity() + "L" }; } - return new String[] { GT_Values.VOLTAGE_NAMES[this.mTier] + " Fluid Tank", "Stored Fluid:", + return new String[] { GTValues.VOLTAGE_NAMES[this.mTier] + " Fluid Tank", "Stored Fluid:", this.mFluid.getLocalizedName(), this.mFluid.amount + "L", this.getCapacity() + "L" }; } @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_TieredTank(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTETieredTank(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -162,7 +161,7 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank { @Override public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/MTEInfiniteItemHolder.java index 2dca8d5c30..677fe1a1c9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/MTEInfiniteItemHolder.java @@ -9,16 +9,15 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.sys.KeyboardUtils; -import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest; +import gtPlusPlus.xmod.gregtech.common.tileentities.storage.MTETieredChest; -public class GT_MetaTileEntity_InfiniteItemHolder extends GT_MetaTileEntity_TieredChest { +public class MTEInfiniteItemHolder extends MTETieredChest { - public GT_MetaTileEntity_InfiniteItemHolder(int aID, String aName, String aNameRegional, int aTier) { + public MTEInfiniteItemHolder(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_InfiniteItemHolder(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { + public MTEInfiniteItemHolder(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -87,6 +86,6 @@ public class GT_MetaTileEntity_InfiniteItemHolder extends GT_MetaTileEntity_Tier @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_InfiniteItemHolder(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTEInfiniteItemHolder(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolAngleGrinder.java index 6af3a61487..196bc2a5bb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolAngleGrinder.java @@ -15,17 +15,17 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; import net.minecraftforge.event.world.BlockEvent; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.enums.Materials; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures.ItemIcons; import gregtech.api.interfaces.IIconContainer; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.common.items.behaviors.Behaviour_None; -import gregtech.common.tools.GT_Tool; +import gregtech.api.items.MetaGeneratedTool; +import gregtech.common.items.behaviors.BehaviourNone; +import gregtech.common.tools.GTTool; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools; -public class TOOL_Gregtech_AngleGrinder extends GT_Tool { +public class ToolAngleGrinder extends GTTool { public static final List<String> mEffectiveList = Arrays .asList(new String[] { EntityIronGolem.class.getName(), "EntityTowerGuardian" }); @@ -139,7 +139,7 @@ public class TOOL_Gregtech_AngleGrinder extends GT_Tool { @Override public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { - return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : Materials.TungstenSteel.mRGBa; + return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa : Materials.TungstenSteel.mRGBa; } @Override @@ -147,8 +147,8 @@ public class TOOL_Gregtech_AngleGrinder extends GT_Tool { super.onToolCrafted(aStack, aPlayer); aPlayer.triggerAchievement(AchievementList.buildSword); try { - GT_Mod.achievements.issueAchievement(aPlayer, "tools"); - GT_Mod.achievements.issueAchievement(aPlayer, "unitool"); + GTMod.achievements.issueAchievement(aPlayer, "tools"); + GTMod.achievements.issueAchievement(aPlayer, "unitool"); } catch (final Exception e) {} } @@ -164,8 +164,8 @@ public class TOOL_Gregtech_AngleGrinder extends GT_Tool { } @Override - public void onStatsAddedToTool(final GT_MetaGenerated_Tool aItem, final int aID) { - aItem.addItemBehavior(aID, new Behaviour_None()); + public void onStatsAddedToTool(final MetaGeneratedTool aItem, final int aID) { + aItem.addItemBehavior(aID, new BehaviourNone()); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolElectricSnips.java index 25ad03548a..78675f70d5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolElectricSnips.java @@ -8,15 +8,15 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures.ItemIcons; import gregtech.api.interfaces.IIconContainer; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.common.tools.GT_Tool_WireCutter; +import gregtech.api.items.MetaGeneratedTool; +import gregtech.common.tools.ToolWireCutter; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools; -public class TOOL_Gregtech_ElectricSnips extends GT_Tool_WireCutter { +public class ToolElectricSnips extends ToolWireCutter { @Override public int getToolDamagePerBlockBreak() { @@ -70,7 +70,7 @@ public class TOOL_Gregtech_ElectricSnips extends GT_Tool_WireCutter { @Override public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { - return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : Materials.TungstenSteel.mRGBa; + return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa : Materials.TungstenSteel.mRGBa; } @Override @@ -78,8 +78,8 @@ public class TOOL_Gregtech_ElectricSnips extends GT_Tool_WireCutter { super.onToolCrafted(aStack, aPlayer); aPlayer.triggerAchievement(AchievementList.buildSword); try { - GT_Mod.achievements.issueAchievement(aPlayer, "tools"); - GT_Mod.achievements.issueAchievement(aPlayer, "unitool"); + GTMod.achievements.issueAchievement(aPlayer, "tools"); + GTMod.achievements.issueAchievement(aPlayer, "unitool"); } catch (final Exception e) {} } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GTPPBlocks.java index 1a3d07f510..e68ca95cce 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GTPPBlocks.java @@ -13,7 +13,7 @@ import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaSpecialMultiCasings; import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaSpecialMultiCasings2; import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaTieredCasingBlocks1; -public class Gregtech_Blocks { +public class GTPPBlocks { public static void run() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java index e2723e5248..23dd55b22b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java @@ -2,24 +2,24 @@ package gtPlusPlus.xmod.gregtech.loaders; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_ModHandler.RecipeBits; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTModHandler.RecipeBits; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; +import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IOreRecipeRegistrator; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; -public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, Runnable { +public class ProcessingAngleGrinder implements IOreRecipeRegistrator, Runnable { public ProcessingAngleGrinder() { GregtechOrePrefixes.toolAngleGrinder.add(this); @@ -63,8 +63,8 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R Logger.MATERIALS("Generating Angle Grinder from " + MaterialUtils.getMaterialName(aMaterial)); // Input 1 - final ItemStack plate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L); - final ItemStack longrod = GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L); + final ItemStack plate = GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L); + final ItemStack longrod = GTOreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L); if ((null != plate && longrod != null)) { addRecipe(aMaterial, 1600000L, 3, ItemList.Battery_RE_HV_Lithium.get(1)); @@ -80,9 +80,9 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R + (longrod == null) + " |"); } - // GT_ModHandler.addCraftingRecipe(, - // GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | - // GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ", + // GTModHandler.addCraftingRecipe(, + // GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | + // GTModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ", // Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial), // Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), // Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)}); @@ -111,7 +111,7 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R 1, aMaterial, Materials.Titanium, - new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L }); + new long[] { aBatteryStorage, GTValues.V[aVoltageTier], 3L, -1L }); long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack); if (aDura <= 32000) { @@ -122,12 +122,12 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R return false; } - return GT_ModHandler.addCraftingRecipe( + return GTModHandler.addCraftingRecipe( aOutputStack, RecipeBits.DISMANTLEABLE | RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | RecipeBits.BUFFERED, new Object[] { "SXL", "GMG", "PBP", 'X', ItemList.Component_Grinder_Tungsten.get(1), 'M', CI.getElectricMotor(aVoltageTier, 1), 'S', OrePrefixes.screw.get(Materials.Titanium), 'L', OrePrefixes.stickLong.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'G', - ELEMENT.STANDALONE.BLACK_METAL.getGear(1), 'B', aBattery }); + MaterialsElements.STANDALONE.BLACK_METAL.getGear(1), 'B', aBattery }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java index a894a7ad62..a6e9d15ca2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java @@ -2,25 +2,25 @@ package gtPlusPlus.xmod.gregtech.loaders; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.common.items.GT_MetaGenerated_Tool_01; -import gregtech.common.items.ID_MetaTool_01; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.common.items.IDMetaTool01; +import gregtech.common.items.MetaGeneratedTool01; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; +import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IOreRecipeRegistrator; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; -public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator, Runnable { +public class ProcessingElectricSnips implements IOreRecipeRegistrator, Runnable { public ProcessingElectricSnips() { GregtechOrePrefixes.toolElectricSnips.add(this); @@ -64,7 +64,7 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator, Logger.MATERIALS("Generating Electric Snips from " + MaterialUtils.getMaterialName(aMaterial)); // Input 1 - final ItemStack plate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L); + final ItemStack plate = GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L); if ((null != plate)) { addRecipe(aMaterial, 1600000L, 3, ItemList.Battery_RE_HV_Lithium.get(1)); @@ -79,9 +79,9 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator, + " | Rod? " + " |"); } - // GT_ModHandler.addCraftingRecipe(, - // GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | - // GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ", + // GTModHandler.addCraftingRecipe(, + // GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | + // GTModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ", // Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial), // Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), // Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)}); @@ -110,10 +110,10 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator, 1, aMaterial, Materials.Titanium, - new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L }); + new long[] { aBatteryStorage, GTValues.V[aVoltageTier], 3L, -1L }); - ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(ID_MetaTool_01.WIRECUTTER.ID, 1, aMaterial, aMaterial, null); + ItemStack aInputCutter = MetaGeneratedTool01.INSTANCE + .getToolWithStats(IDMetaTool01.WIRECUTTER.ID, 1, aMaterial, aMaterial, null); long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack); if (aDura <= 32000) { @@ -127,9 +127,9 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator, OrePrefixes.wireFine.get(Materials.Electrum), aInputCutter, OrePrefixes.wireFine.get(Materials.Electrum), - ELEMENT.STANDALONE.WHITE_METAL.getGear(1), + MaterialsElements.STANDALONE.WHITE_METAL.getGear(1), CI.getElectricMotor(aVoltageTier, 1), - ELEMENT.STANDALONE.WHITE_METAL.getGear(1), + MaterialsElements.STANDALONE.WHITE_METAL.getGear(1), OrePrefixes.plate.get(aMaterial), aBattery, OrePrefixes.plate.get(aMaterial), diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAlloySmelter.java index b56a480c0c..8ef73917b7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAlloySmelter.java @@ -5,14 +5,14 @@ import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes; import java.util.HashSet; import java.util.Set; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class RecipeGen_AlloySmelter extends RecipeGen_Base { +public class RecipeGenAlloySmelter extends RecipeGenBase { public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); @@ -20,7 +20,7 @@ public class RecipeGen_AlloySmelter extends RecipeGen_Base { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); } - public RecipeGen_AlloySmelter(final Material M) { + public RecipeGenAlloySmelter(final Material M) { this.toGenerate = M; mRecipeGenMap.add(this); } @@ -36,7 +36,7 @@ public class RecipeGen_AlloySmelter extends RecipeGen_Base { // Nuggets if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getNugget(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getIngot(1), ItemList.Shape_Mold_Nugget.get(0)) .itemOutputs(material.getNugget(9)) .duration(duration) @@ -47,7 +47,7 @@ public class RecipeGen_AlloySmelter extends RecipeGen_Base { // Gears if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getGear(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getIngot(8), ItemList.Shape_Mold_Gear.get(0)) .itemOutputs(material.getGear(1)) .duration(duration) @@ -58,7 +58,7 @@ public class RecipeGen_AlloySmelter extends RecipeGen_Base { // Ingot if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getNugget(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getNugget(9), ItemList.Shape_Mold_Ingot.get(0)) .itemOutputs(material.getIngot(1)) .duration(duration) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAssembler.java index 8256b73a44..64ce9d1c42 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAssembler.java @@ -1,22 +1,22 @@ package gtPlusPlus.xmod.gregtech.loaders; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import java.util.HashSet; import java.util.Set; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; -import gregtech.api.util.GT_Utility; +import gregtech.api.enums.GTValues; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class RecipeGen_Assembler extends RecipeGen_Base { +public class RecipeGenAssembler extends RecipeGenBase { public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); @@ -24,7 +24,7 @@ public class RecipeGen_Assembler extends RecipeGen_Base { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); } - public RecipeGen_Assembler(final Material M) { + public RecipeGenAssembler(final Material M) { this.toGenerate = M; mRecipeGenMap.add(this); } @@ -38,8 +38,8 @@ public class RecipeGen_Assembler extends RecipeGen_Base { // Frame Box if (ItemUtils.checkForInvalidItems(new ItemStack[] { material.getRod(1), material.getFrameBox(1) })) { - GT_Values.RA.stdBuilder() - .itemInputs(material.getRod(4), GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(material.getRod(4), GTUtility.getIntegratedCircuit(4)) .itemOutputs(material.getFrameBox(1)) .duration(3 * SECONDS) .eut(material.vVoltageMultiplier) @@ -60,21 +60,21 @@ public class RecipeGen_Assembler extends RecipeGen_Base { @Deprecated private static void addAssemblerRecipe(final ItemStack input1, final ItemStack input2, final ItemStack output1, final int seconds, final int euCost) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(input1, input2) .itemOutputs(output1) .fluidInputs(FluidUtils.getFluidStack("molten.solderingalloy", 16)) .duration(seconds) .eut(euCost) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(input1, input2) .itemOutputs(output1) .fluidInputs(FluidUtils.getFluidStack("molten.tin", 32)) .duration(seconds) .eut(euCost) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(input1, input2) .itemOutputs(output1) .fluidInputs(FluidUtils.getFluidStack("molten.lead", 48)) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBase.java index d000889757..415cdc76aa 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Base.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBase.java @@ -3,7 +3,7 @@ package gtPlusPlus.xmod.gregtech.loaders; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.core.material.Material; -public abstract class RecipeGen_Base implements RunnableWithInfo<Material> { +public abstract class RecipeGenBase implements RunnableWithInfo<Material> { protected Material toGenerate; protected boolean disableOptional; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java index bcf2565b39..d90e842394 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.loaders; -import static gregtech.api.enums.GT_Values.VP; +import static gregtech.api.enums.GTValues.VP; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.alloyBlastSmelterRecipes; @@ -14,24 +14,24 @@ import java.util.Set; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; -import gregtech.api.util.GT_RecipeBuilder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipeBuilder; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeCategories; -import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.material.MaterialStack; -import gtPlusPlus.core.material.nuclear.FLUORIDES; -import gtPlusPlus.core.material.nuclear.NUCLIDE; +import gtPlusPlus.core.material.MaterialsAlloy; +import gtPlusPlus.core.material.nuclear.MaterialsFluorides; +import gtPlusPlus.core.material.nuclear.MaterialsNuclides; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class RecipeGen_BlastSmelter extends RecipeGen_Base { +public class RecipeGenBlastSmelter extends RecipeGenBase { public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); @@ -39,7 +39,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); } - public RecipeGen_BlastSmelter(final Material M) { + public RecipeGenBlastSmelter(final Material M) { this.toGenerate = M; mRecipeGenMap.add(this); } @@ -57,8 +57,9 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { return; } - final Material[] badMaterials = { FLUORIDES.THORIUM_HEXAFLUORIDE, FLUORIDES.THORIUM_TETRAFLUORIDE, - ALLOY.BLOODSTEEL, NUCLIDE.LiFBeF2ThF4UF4, NUCLIDE.LiFBeF2ZrF4UF4, NUCLIDE.LiFBeF2ZrF4U235 }; + final Material[] badMaterials = { MaterialsFluorides.THORIUM_HEXAFLUORIDE, + MaterialsFluorides.THORIUM_TETRAFLUORIDE, MaterialsAlloy.BLOODSTEEL, MaterialsNuclides.LiFBeF2ThF4UF4, + MaterialsNuclides.LiFBeF2ZrF4UF4, MaterialsNuclides.LiFBeF2ZrF4U235 }; for (final Material R : badMaterials) { if (M == R) { return; @@ -103,7 +104,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { Logger.WARNING("[BAS] Size: " + mMaterialListSize); // Make a simple one Material MaterialStack[] and log it for validity. - circuitGT = GT_Utility.getIntegratedCircuit(1); + circuitGT = GTUtility.getIntegratedCircuit(1); final ItemStack[] tItemStackTest = new ItemStack[] { circuitGT, tStack }; inputStackCount = 1; fluidAmount = 144 * inputStackCount; @@ -130,7 +131,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { // Generate Recipes for all singular materials that can be made molten. if (hasMoreInputThanACircuit) { if (M.requiresBlastFurnace()) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(tItemStackTest) .fluidOutputs(M.getFluidStack(fluidAmount)) .duration(duration / (mTotalPartsCounter > 0 ? mTotalPartsCounter : 1)) @@ -141,7 +142,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { Logger.WARNING("[BAS] Failed."); } } else { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(tItemStackTest) .fluidOutputs(M.getFluidStack(fluidAmount)) .eut(aVoltage) @@ -149,7 +150,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { .addTo(alloyBlastSmelterRecipes); Logger.WARNING("[BAS] Success."); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ingot.get(0)) .itemOutputs(M.getIngot(1)) .fluidInputs(M.getFluidStack(144)) @@ -175,7 +176,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { // If this Material has some kind of compound list, proceed final gtPlusPlus.core.material.MaterialStack[] tempStack = new gtPlusPlus.core.material.MaterialStack[mMaterialListSize]; - circuitGT = GT_Utility.getIntegratedCircuit(mMaterialListSize); + circuitGT = GTUtility.getIntegratedCircuit(mMaterialListSize); // Builds me a MaterialStack[] from the MaterialList of M. int ooo = 0; @@ -284,7 +285,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { } // Adds Recipe - GT_RecipeBuilder builder = GT_Values.RA.stdBuilder(); + GTRecipeBuilder builder = GTValues.RA.stdBuilder(); List<ItemStack> inputs = new ArrayList<>(Arrays.asList(components)); inputs.removeIf(Objects::isNull); components = inputs.toArray(new ItemStack[0]); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelterGTNH.java index 0ac39d39bc..84a9290d87 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelterGTNH.java @@ -10,10 +10,10 @@ import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.ArrayUtils; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.ItemStackData; import gtPlusPlus.api.recipe.GTPPRecipeCategories; @@ -22,7 +22,7 @@ import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class RecipeGen_BlastSmelterGT_GTNH { +public class RecipeGenBlastSmelterGTNH { private static Map<String, FluidStack> mCachedIngotToFluidRegistry = new HashMap<>(); private static Map<String, String> mCachedHotToColdRegistry = new HashMap<>(); @@ -73,7 +73,7 @@ public class RecipeGen_BlastSmelterGT_GTNH { Logger.INFO("[ABS] Starting recipe generation based on EBF recipe map."); Logger.INFO("[ABS] Caching Ingots and their Molten fluid.."); // Ingots/Dusts -> Fluids - for (GT_Recipe x : RecipeMaps.fluidExtractionRecipes.getAllRecipes()) { + for (GTRecipe x : RecipeMaps.fluidExtractionRecipes.getAllRecipes()) { ItemStack validInput = null; FluidStack validOutput = null; // If there aren't both non empty inputs and outputs, we skip @@ -109,7 +109,7 @@ public class RecipeGen_BlastSmelterGT_GTNH { Logger.INFO("[ABS] Caching Ingots and their Hot form..."); // Hot Ingots -> Cold Ingots - for (GT_Recipe x : RecipeMaps.vacuumFreezerRecipes.getAllRecipes()) { + for (GTRecipe x : RecipeMaps.vacuumFreezerRecipes.getAllRecipes()) { ItemStack validInput = null; ItemStack validOutput = null; // If we the input is an ingot and it and the output are valid, map it to cache. @@ -136,7 +136,7 @@ public class RecipeGen_BlastSmelterGT_GTNH { Logger.INFO("[ABS] Generating recipes based on existing EBF recipes."); // Okay, so now lets Iterate existing EBF recipes. - for (GT_Recipe x : RecipeMaps.blastFurnaceRecipes.getAllRecipes()) { + for (GTRecipe x : RecipeMaps.blastFurnaceRecipes.getAllRecipes()) { ItemStack[] inputs, outputs; FluidStack[] inputsF; int voltage, time, special; @@ -201,14 +201,14 @@ public class RecipeGen_BlastSmelterGT_GTNH { // If no circuit was found, add a circuit here if (!circuitFound) { l = 1; - newInput[0] = GT_Utility.getIntegratedCircuit(inputs.length); + newInput[0] = GTUtility.getIntegratedCircuit(inputs.length); } for (ItemStack y : inputs) { newInput[l++] = y; } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(newInput) .fluidInputs(inputsF) .fluidOutputs(mMoltenStack) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java index 028149eccd..4c77e31cbb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java @@ -1,12 +1,12 @@ package gtPlusPlus.xmod.gregtech.loaders; -import static gregtech.api.enums.GT_Values.RA; +import static gregtech.api.enums.GTValues.RA; import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.recipe.RecipeMaps.packagerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; import java.util.ArrayList; import java.util.Arrays; @@ -18,10 +18,10 @@ import java.util.Set; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.material.Material; @@ -31,7 +31,7 @@ import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; -public class RecipeGen_DustGeneration extends RecipeGen_Base { +public class RecipeGenDustGeneration extends RecipeGenBase { public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); @@ -39,11 +39,11 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); } - public RecipeGen_DustGeneration(final Material M) { + public RecipeGenDustGeneration(final Material M) { this(M, false); } - public RecipeGen_DustGeneration(final Material M, final boolean O) { + public RecipeGenDustGeneration(final Material M, final boolean O) { this.toGenerate = M; this.disableOptional = O; mRecipeGenMap.add(this); @@ -185,21 +185,21 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { if (inputStacks.length == 1) { input[1] = input[0]; - input[0] = GT_Utility.getIntegratedCircuit(inputStacks.length + 10); + input[0] = GTUtility.getIntegratedCircuit(inputStacks.length + 10); } else if (inputStacks.length == 2) { input[2] = input[1]; input[1] = input[0]; - input[0] = GT_Utility.getIntegratedCircuit(inputStacks.length + 10); + input[0] = GTUtility.getIntegratedCircuit(inputStacks.length + 10); } else if (inputStacks.length == 3) { input[3] = input[2]; input[2] = input[1]; input[1] = input[0]; - input[0] = GT_Utility.getIntegratedCircuit(inputStacks.length + 10); + input[0] = GTUtility.getIntegratedCircuit(inputStacks.length + 10); } // Add mixer Recipe - FluidStack oxygen = GT_Values.NF; + FluidStack oxygen = GTValues.NF; if (material.getComposites() != null) { for (final MaterialStack x : material.getComposites()) { if (material.getComposites() @@ -238,14 +238,14 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { inputs.removeIf(Objects::isNull); if (oxygen == null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(inputs.toArray(new ItemStack[0])) .itemOutputs(outputStacks) .duration((int) Math.max(material.getMass() * 2L * 1, 1)) .eut(material.vVoltageMultiplier) .addTo(mixerRecipes); } else { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(inputs.toArray(new ItemStack[0])) .itemOutputs(outputStacks) .fluidInputs(oxygen) @@ -302,21 +302,21 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { if (inputStacks.length == 1) { input2 = input1; - input1 = GT_Utility.getIntegratedCircuit(20); + input1 = GTUtility.getIntegratedCircuit(20); } else if (inputStacks.length == 2) { input3 = input2; input2 = input1; - input1 = GT_Utility.getIntegratedCircuit(20); + input1 = GTUtility.getIntegratedCircuit(20); } else if (inputStacks.length == 3) { input4 = input3; input3 = input2; input2 = input1; - input1 = GT_Utility.getIntegratedCircuit(20); + input1 = GTUtility.getIntegratedCircuit(20); } // Add mixer Recipe - FluidStack oxygen = GT_Values.NF; + FluidStack oxygen = GTValues.NF; if (material.getComposites() != null) { int compSlot = 0; for (final MaterialStack x : material.getComposites()) { @@ -357,14 +357,14 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { // Add mixer Recipe try { if (oxygen == null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(input1, input2, input3, input4) .itemOutputs(outputStacks) .duration((int) Math.max(material.getMass() * 2L * 1, 1)) .eut(material.vVoltageMultiplier) .addTo(mixerRecipes); } else { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(input1, input2, input3, input4) .itemOutputs(outputStacks) .fluidInputs(oxygen) @@ -383,16 +383,16 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { public static boolean generatePackagerRecipes(Material aMatInfo) { // Small Dust - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, aMatInfo.getSmallDust(4)), ItemList.Schematic_Dust.get(0)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aMatInfo.getSmallDust(4)), ItemList.Schematic_Dust.get(0)) .itemOutputs(aMatInfo.getDust(1)) .duration(5 * SECONDS) .eut(4) .addTo(packagerRecipes); // Tiny Dust - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, aMatInfo.getTinyDust(9)), ItemList.Schematic_Dust.get(0)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, aMatInfo.getTinyDust(9)), ItemList.Schematic_Dust.get(0)) .itemOutputs(aMatInfo.getDust(1)) .duration(5 * SECONDS) .eut(4) @@ -434,7 +434,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { } else { aOutput = aMatInfo.getIngot(1); if (ItemUtils.checkForInvalidItems(aOutput)) { - if (GT_ModHandler.addSmeltingAndAlloySmeltingRecipe(aDust, aOutput, false)) { + if (GTModHandler.addSmeltingAndAlloySmeltingRecipe(aDust, aOutput, false)) { Logger.MATERIALS("Successfully added a furnace recipe for " + aMatInfo.getLocalizedName()); } else { Logger.MATERIALS("Failed to add a furnace recipe for " + aMatInfo.getLocalizedName()); @@ -458,7 +458,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { long aVoltage = aMatInfo.vVoltageMultiplier; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(input1) .itemOutputs(output1) .duration(timeTaken) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenExtruder.java index c559a77e23..80b9a75a14 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenExtruder.java @@ -1,14 +1,14 @@ package gtPlusPlus.xmod.gregtech.loaders; import static gregtech.api.recipe.RecipeMaps.extruderRecipes; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import java.util.HashSet; import java.util.Set; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; @@ -16,7 +16,7 @@ import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class RecipeGen_Extruder extends RecipeGen_Base { +public class RecipeGenExtruder extends RecipeGenBase { public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); @@ -24,7 +24,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); } - public RecipeGen_Extruder(final Material M) { + public RecipeGenExtruder(final Material M) { this.toGenerate = M; mRecipeGenMap.add(this); } @@ -53,7 +53,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base { if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getBlock(1))) { // Ingot Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getBlock(1), shape_Ingot) .itemOutputs(material.getIngot(9)) .duration((int) Math.max(material.getMass() * 2L * 1, 1)) @@ -63,7 +63,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base { Logger.WARNING("Extruder Ingot Recipe: " + material.getLocalizedName() + " - Success"); // Block Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getIngot(9), shape_Block) .itemOutputs(material.getBlock(1)) .duration((int) Math.max(material.getMass() * 2L * 1, 1)) @@ -76,7 +76,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base { // Plate Recipe if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getPlate(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(itemIngot, shape_Plate) .itemOutputs(itemPlate) .duration(10 * TICKS) @@ -90,7 +90,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base { if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getRing(1))) { if (!material.isRadioactive) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(itemIngot, shape_Ring) .itemOutputs(material.getRing(4)) .duration((int) Math.max(material.getMass() * 2L * 1, 1)) @@ -104,7 +104,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base { // Gear Recipe if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getGear(1))) if (!material.isRadioactive) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getIngot(4), shape_Gear) .itemOutputs(itemGear) .duration((int) Math.max(material.getMass() * 5L, 1)) @@ -117,7 +117,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base { // Rod Recipe if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getRod(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(itemIngot, shape_Rod) .itemOutputs(material.getRod(2)) .duration((int) Math.max(material.getMass() * 2L * 1, 1)) @@ -130,7 +130,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base { // Bolt Recipe if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getBolt(1))) if (!material.isRadioactive) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(itemIngot, shape_Bolt) .itemOutputs(material.getBolt(8)) .duration((int) Math.max(material.getMass() * 2L * 1, 1)) @@ -145,7 +145,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base { if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getRotor(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getIngot(5), ItemList.Shape_Extruder_Rotor.get(0)) .itemOutputs(material.getRotor(1)) .duration((int) Math.max(material.getMass() * 5L * 1, 1)) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluidCanning.java index fb6dc807ef..c9f627c0d5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluidCanning.java @@ -5,17 +5,17 @@ import java.util.HashSet; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GTRecipe; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -public class RecipeGen_FluidCanning implements Runnable { +public class RecipeGenFluidCanning implements Runnable { public static void init() { FluidCanningRunnableHandler x = new FluidCanningRunnableHandler(); @@ -27,7 +27,7 @@ public class RecipeGen_FluidCanning implements Runnable { @Override public void run() { mHasRun = true; - for (RecipeGen_FluidCanning aRecipe : mCache) { + for (RecipeGenFluidCanning aRecipe : mCache) { aRecipe.run(); } } @@ -40,18 +40,18 @@ public class RecipeGen_FluidCanning implements Runnable { private static boolean mHasRun = false; - private static HashSet<RecipeGen_FluidCanning> mCache = new HashSet<>(); + private static HashSet<RecipeGenFluidCanning> mCache = new HashSet<>(); - private static void addRunnableToRecipeCache(RecipeGen_FluidCanning r) { + private static void addRunnableToRecipeCache(RecipeGenFluidCanning r) { if (mHasRun) { - CORE.crash(); + GTPPCore.crash(); } mCache.add(r); } protected boolean disableOptional; - private final GT_Recipe recipe; + private final GTRecipe recipe; private final boolean isValid; public boolean valid() { @@ -59,7 +59,7 @@ public class RecipeGen_FluidCanning implements Runnable { } // Alternative Constructor - public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluidIn, + public RecipeGenFluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluidIn, FluidStack aFluidOut, Integer aDuration, Integer aEUt) { ItemStack aInput; ItemStack aOutput; @@ -85,18 +85,18 @@ public class RecipeGen_FluidCanning implements Runnable { if (aExtracting) { aInput = aFull; aOutput = aEmpty; - aFluidInput = GT_Values.NF; + aFluidInput = GTValues.NF; aFluidOutput = aFluidIn; } else { aInput = aEmpty; aOutput = aFull; aFluidInput = aFluidIn; - aFluidOutput = aFluidOut != null ? aFluidOut : GT_Values.NF; + aFluidOutput = aFluidOut != null ? aFluidOut : GTValues.NF; } // Check validity - GT_Recipe aRecipe = new GT_Recipe( + GTRecipe aRecipe = new GTRecipe( true, new ItemStack[] { aInput }, new ItemStack[] { aOutput }, @@ -157,8 +157,8 @@ public class RecipeGen_FluidCanning implements Runnable { } } - private void addFluidExtractionRecipe(GT_Recipe aRecipe) { - CORE.crash(); + private void addFluidExtractionRecipe(GTRecipe aRecipe) { + GTPPCore.crash(); Logger.INFO( "[FE-Debug] " + aRecipe.mFluidOutputs[0].amount + "L of " @@ -186,7 +186,7 @@ public class RecipeGen_FluidCanning implements Runnable { } } - private void addFluidCannerRecipe(GT_Recipe aRecipe) { + private void addFluidCannerRecipe(GTRecipe aRecipe) { boolean result; int aCount1 = getMapSize(RecipeMaps.fluidCannerRecipes); int aCount2 = aCount1; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluids.java index 06bb7a48c2..aa2f85f037 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluids.java @@ -1,13 +1,13 @@ package gtPlusPlus.xmod.gregtech.loaders; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import java.util.HashSet; import java.util.Set; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; @@ -15,7 +15,7 @@ import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class RecipeGen_Fluids extends RecipeGen_Base { +public class RecipeGenFluids extends RecipeGenBase { public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); @@ -23,11 +23,11 @@ public class RecipeGen_Fluids extends RecipeGen_Base { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); } - public RecipeGen_Fluids(final Material M) { + public RecipeGenFluids(final Material M) { this(M, false); } - public RecipeGen_Fluids(final Material M, final boolean dO) { + public RecipeGenFluids(final Material M, final boolean dO) { this.toGenerate = M; this.disableOptional = dO; mRecipeGenMap.add(this); @@ -54,7 +54,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Ingot if (ItemUtils.checkForInvalidItems(material.getIngot(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ingot.get(0)) .itemOutputs(material.getIngot(1)) .fluidInputs(material.getFluidStack(144)) @@ -67,7 +67,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Plate if (ItemUtils.checkForInvalidItems(material.getPlate(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Plate.get(0)) .itemOutputs(material.getPlate(1)) .fluidInputs(material.getFluidStack(144)) @@ -80,7 +80,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Nugget if (ItemUtils.checkForInvalidItems(material.getNugget(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Nugget.get(0)) .itemOutputs(material.getNugget(1)) .fluidInputs(material.getFluidStack(16)) @@ -93,7 +93,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Gears if (ItemUtils.checkForInvalidItems(material.getGear(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Gear.get(0)) .itemOutputs(material.getGear(1)) .fluidInputs(material.getFluidStack(576)) @@ -107,7 +107,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Blocks if (ItemUtils.checkForInvalidItems(material.getBlock(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Block.get(0)) .itemOutputs(material.getBlock(1)) .fluidInputs(material.getFluidStack(144 * 9)) @@ -121,7 +121,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Rod if (ItemUtils.checkForInvalidItems(material.getRod(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Rod.get(0)) .itemOutputs(material.getRod(1)) .fluidInputs(material.getFluidStack(72)) @@ -135,7 +135,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Rod Long if (ItemUtils.checkForInvalidItems(material.getLongRod(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Rod_Long.get(0)) .itemOutputs(material.getLongRod(1)) .fluidInputs(material.getFluidStack(144)) @@ -149,7 +149,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Bolt if (ItemUtils.checkForInvalidItems(material.getBolt(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Bolt.get(0)) .itemOutputs(material.getBolt(1)) .fluidInputs(material.getFluidStack(18)) @@ -163,7 +163,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Screw if (ItemUtils.checkForInvalidItems(material.getScrew(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Screw.get(0)) .itemOutputs(material.getScrew(1)) .fluidInputs(material.getFluidStack(18)) @@ -178,7 +178,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Ring if (ItemUtils.checkForInvalidItems(material.getRing(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ring.get(0)) .itemOutputs(material.getRing(1)) .fluidInputs(material.getFluidStack(36)) @@ -193,7 +193,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Rotor if (ItemUtils.checkForInvalidItems(material.getRotor(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Rotor.get(0)) .itemOutputs(material.getRotor(1)) .fluidInputs(material.getFluidStack(612)) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluorite.java index 8d0ed2ff1d..0916febadc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluorite.java @@ -5,9 +5,9 @@ import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.recipe.RecipeMaps.thermalCentrifugeRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import java.util.HashSet; @@ -16,19 +16,19 @@ import java.util.Set; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; -import gtPlusPlus.core.material.nuclear.FLUORIDES; +import gtPlusPlus.core.material.nuclear.MaterialsFluorides; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; -public class RecipeGen_Fluorite extends RecipeGen_Base { +public class RecipeGenFluorite extends RecipeGenBase { public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); @@ -36,7 +36,7 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); } - public RecipeGen_Fluorite(final Material material) { + public RecipeGenFluorite(final Material material) { this.toGenerate = material; mRecipeGenMap.add(this); @@ -132,10 +132,10 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { final ItemStack dustStone = ItemUtils.getItemStackOfAmountFromOreDict("dustStone", 1); - ItemStack tinyDustA = FLUORIDES.FLUORITE.getTinyDust(1); - ItemStack tinyDustB = FLUORIDES.FLUORITE.getTinyDust(1); - ItemStack matDust = FLUORIDES.FLUORITE.getDust(1); - ItemStack matDustA = FLUORIDES.FLUORITE.getDust(1); + ItemStack tinyDustA = MaterialsFluorides.FLUORITE.getTinyDust(1); + ItemStack tinyDustB = MaterialsFluorides.FLUORITE.getTinyDust(1); + ItemStack matDust = MaterialsFluorides.FLUORITE.getDust(1); + ItemStack matDustA = MaterialsFluorides.FLUORITE.getDust(1); /** * Package @@ -143,14 +143,14 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { // Allow ore dusts to be packaged if (ItemUtils.checkForInvalidItems(material.getSmallDust(1)) && ItemUtils.checkForInvalidItems(material.getTinyDust(1))) { - RecipeGen_DustGeneration.generatePackagerRecipes(material); + RecipeGenDustGeneration.generatePackagerRecipes(material); } /** * Macerate */ // Macerate ore to Crushed - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getOre(1)) .itemOutputs(material.getCrushed(2)) .duration(20 * SECONDS) @@ -160,7 +160,7 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate ore to Crushed ore'"); // Macerate raw ore to Crushed - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getRawOre(1)) .itemOutputs(material.getCrushed(2)) .duration(20 * SECONDS) @@ -170,7 +170,7 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate raw ore to Crushed ore'"); // Macerate Centrifuged to Pure Dust - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getCrushedCentrifuged(1)) .itemOutputs(matDust, matDustA) .outputChances(100_00, 10_00) @@ -180,7 +180,7 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate Centrifuged ore to Pure Dust'"); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getCrushedPurified(1)) .itemOutputs(material.getCrushedCentrifuged(1), tinyDustA, dustStone) .duration(25 * SECONDS) @@ -200,12 +200,12 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { + dustStone.getDisplayName() + "."); - GT_Values.RA.stdBuilder() - .itemInputs(FLUORIDES.FLUORITE.getCrushed(2)) + GTValues.RA.stdBuilder() + .itemInputs(MaterialsFluorides.FLUORITE.getCrushed(2)) .itemOutputs( - FLUORIDES.FLUORITE.getCrushedPurified(8), - FLUORIDES.FLUORITE.getDustImpure(4), - FLUORIDES.FLUORITE.getDustPurified(2)) + MaterialsFluorides.FLUORITE.getCrushedPurified(8), + MaterialsFluorides.FLUORITE.getDustImpure(4), + MaterialsFluorides.FLUORITE.getDustPurified(2)) .outputChances(100_00, 50_00, 10_00) .fluidInputs(FluidUtils.getFluidStack("hydrogen", 2000)) .duration(30 * SECONDS) @@ -216,7 +216,7 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { * Forge Hammer */ - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getCrushedCentrifuged(1)) .itemOutputs(matDust) .duration(10 * TICKS) @@ -229,7 +229,7 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { * Centrifuge */ // Purified Dust to Clean - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getDustPurified(1)) .itemOutputs(matDust, tinyDustA) .eut(tVoltageMultiplier / 2) @@ -239,7 +239,7 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { Logger.MATERIALS("[Centrifuge] Added Recipe: Purified Dust to Clean Dust"); // Impure Dust to Clean - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getDustImpure(1)) .itemOutputs(matDust, tinyDustB) .eut(tVoltageMultiplier / 2) @@ -253,8 +253,8 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { if (aGregtechHydro == null) { aGregtechHydro = FluidUtils.getFluidStack("hydrofluoricacid", 16000); } - GT_Values.RA.stdBuilder() - .itemInputs(CI.getNumberedAdvancedCircuit(5), FLUORIDES.FLUORITE.getDust(37)) + GTValues.RA.stdBuilder() + .itemInputs(CI.getNumberedAdvancedCircuit(5), MaterialsFluorides.FLUORITE.getDust(37)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 15), ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMaterialProcessing.java index dc7a912cd2..8ca1e6f447 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMaterialProcessing.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.loaders; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import java.util.ArrayList; @@ -13,7 +13,7 @@ import java.util.Set; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; @@ -25,7 +25,7 @@ import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class RecipeGen_MaterialProcessing extends RecipeGen_Base { +public class RecipeGenMaterialProcessing extends RecipeGenBase { public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); @@ -33,11 +33,11 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); } - public RecipeGen_MaterialProcessing(final Material M) { + public RecipeGenMaterialProcessing(final Material M) { this(M, false); } - public RecipeGen_MaterialProcessing(final Material M, final boolean O) { + public RecipeGenMaterialProcessing(final Material M, final boolean O) { this.toGenerate = M; this.disableOptional = O; mRecipeGenMap.add(this); @@ -155,7 +155,7 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { for (int j = 0; j < mInternalOutputs.length; j++) { if (mInternalOutputs[j] == null) { - mInternalOutputs[j] = GT_Values.NI; + mInternalOutputs[j] = GTValues.NI; Logger.MATERIALS("[Centrifuge] Set slot " + j + " to null."); } else { Logger.MATERIALS( @@ -179,7 +179,7 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { } else { inputs = new ItemStack[] { mainDust, emptyCell }; } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(inputs) .itemOutputs(internalOutputs.toArray(new ItemStack[0])) .outputChances(chances) @@ -273,7 +273,7 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { for (int j = 0; j < mInternalOutputs.length; j++) { if (mInternalOutputs[j] == null) { - mInternalOutputs[j] = GT_Values.NI; + mInternalOutputs[j] = GTValues.NI; Logger.MATERIALS("[Dehydrator] Set slot " + j + " to null."); } else { Logger.MATERIALS( @@ -296,7 +296,7 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { inputs = new ItemStack[] { mainDust, emptyCell }; } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(inputs) .itemOutputs(internalOutputs.toArray(new ItemStack[0])) .outputChances(chances) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java index ce17a8724c..975d903e87 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java @@ -5,19 +5,19 @@ import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.latheRecipes; import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import java.util.HashSet; import java.util.Set; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class RecipeGen_MetalRecipe extends RecipeGen_Base { +public class RecipeGenMetalRecipe extends RecipeGenBase { public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); @@ -25,7 +25,7 @@ public class RecipeGen_MetalRecipe extends RecipeGen_Base { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); } - public RecipeGen_MetalRecipe(final Material M) { + public RecipeGenMetalRecipe(final Material M) { this.toGenerate = M; mRecipeGenMap.add(this); } @@ -41,7 +41,7 @@ public class RecipeGen_MetalRecipe extends RecipeGen_Base { if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getBlock(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getIngot(9)) .itemOutputs(material.getBlock(1)) .duration(15 * SECONDS) @@ -53,7 +53,7 @@ public class RecipeGen_MetalRecipe extends RecipeGen_Base { if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getRod(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getIngot(1)) .itemOutputs(material.getRod(1), material.getSmallDust(2)) .duration(Math.max(material.getMass() / 8L, 1L)) @@ -64,7 +64,7 @@ public class RecipeGen_MetalRecipe extends RecipeGen_Base { } if (ItemUtils.checkForInvalidItems(material.getRod(1)) && ItemUtils.checkForInvalidItems(material.getBolt(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getRod(1)) .itemOutputs(material.getBolt(4)) .duration(Math.max(material.getMass() * 2L, 1L)) @@ -77,7 +77,7 @@ public class RecipeGen_MetalRecipe extends RecipeGen_Base { if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getHotIngot(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getHotIngot(1)) .itemOutputs(material.getIngot(1)) .duration((int) Math.max(material.getMass() * 3L, 1L)) @@ -88,7 +88,7 @@ public class RecipeGen_MetalRecipe extends RecipeGen_Base { if (ItemUtils.checkForInvalidItems(material.getRod(1)) && ItemUtils.checkForInvalidItems(material.getLongRod(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getRod(2)) .itemOutputs(material.getLongRod(1)) .duration((int) Math.max(material.getMass(), 1L)) @@ -97,7 +97,7 @@ public class RecipeGen_MetalRecipe extends RecipeGen_Base { Logger.WARNING("Hammer Long Rod Recipe: " + material.getLocalizedName() + " - Success"); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getLongRod(1)) .itemOutputs(material.getRod(2)) .duration(Math.max(material.getMass(), 1L)) @@ -108,7 +108,7 @@ public class RecipeGen_MetalRecipe extends RecipeGen_Base { if (ItemUtils.checkForInvalidItems(material.getBolt(1)) && ItemUtils.checkForInvalidItems(material.getScrew(1))) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getBolt(1)) .itemOutputs(material.getScrew(1)) .duration(Math.max(material.getMass() / 8L, 1L)) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMultisUsingFluidInsteadOfCells.java index 208be14c8c..20d4fcdb36 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMultisUsingFluidInsteadOfCells.java @@ -8,15 +8,15 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import gregtech.api.recipe.RecipeMap; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.recipe.GT_RecipeUtils; +import gtPlusPlus.core.util.recipe.GTRecipeUtils; -public class RecipeGen_MultisUsingFluidInsteadOfCells { +public class RecipeGenMultisUsingFluidInsteadOfCells { private static ItemStack mEmptyCell; private static final AutoMap<ItemStack> mItemsToIgnore = new AutoMap<>(); @@ -54,7 +54,7 @@ public class RecipeGen_MultisUsingFluidInsteadOfCells { if (mEmptyCell != null) { ItemStack aTempStack = mEmptyCell.copy(); aTempStack.stackSize = aCell.stackSize; - return GT_Utility.areStacksEqual(aTempStack, aCell); + return GTUtility.areStacksEqual(aTempStack, aCell); } return false; } @@ -63,7 +63,7 @@ public class RecipeGen_MultisUsingFluidInsteadOfCells { if (ingot == null) { return null; } - return GT_Utility.getFluidForFilledItem(ingot, true); + return GTUtility.getFluidForFilledItem(ingot, true); } public static synchronized int generateRecipesNotUsingCells(RecipeMap<?> aInputs, RecipeMap<?> aOutputs) { @@ -72,9 +72,9 @@ public class RecipeGen_MultisUsingFluidInsteadOfCells { int aInvalidRecipesToConvert = 0; int aOriginalCount = aInputs.getAllRecipes() .size(); - ArrayList<GT_Recipe> deDuplicationInputArray = new ArrayList<>(); + ArrayList<GTRecipe> deDuplicationInputArray = new ArrayList<>(); - recipe: for (GT_Recipe x : aInputs.getAllRecipes()) { + recipe: for (GTRecipe x : aInputs.getAllRecipes()) { if (x != null) { ItemStack[] aInputItems = x.mInputs.clone(); @@ -150,7 +150,7 @@ public class RecipeGen_MultisUsingFluidInsteadOfCells { aInvalidRecipesToConvert++; continue; // Skip this recipe entirely if we find an item we don't like } - GT_Recipe aNewRecipe = new GT_Recipe( + GTRecipe aNewRecipe = new GTRecipe( false, aNewItemInputs, aNewItemOutputs, @@ -172,10 +172,10 @@ public class RecipeGen_MultisUsingFluidInsteadOfCells { } } // cast arraylist of input to a regular array and pass it to a duplicate recipe remover. - List<GT_Recipe> deDuplicationOutputArray = GT_RecipeUtils + List<GTRecipe> deDuplicationOutputArray = GTRecipeUtils .removeDuplicates(deDuplicationInputArray, aOutputs.unlocalizedName); // add each recipe from the above output to the intended recipe map - for (GT_Recipe recipe : deDuplicationOutputArray) { + for (GTRecipe recipe : deDuplicationOutputArray) { aOutputs.add(recipe); } Logger.INFO("Generated Recipes for " + aOutputs.unlocalizedName); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java index 69c5c6a7c3..14d5e86e7b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java @@ -1,14 +1,14 @@ package gtPlusPlus.xmod.gregtech.loaders; -import static gregtech.api.enums.GT_Values.RA; +import static gregtech.api.enums.GTValues.RA; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.recipe.RecipeMaps.oreWasherRecipes; import static gregtech.api.recipe.RecipeMaps.thermalCentrifugeRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import java.util.ArrayList; @@ -20,9 +20,9 @@ import java.util.Set; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; -import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GTModHandler; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; @@ -36,7 +36,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; -public class RecipeGen_Ore extends RecipeGen_Base { +public class RecipeGenOre extends RecipeGenBase { public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); @@ -44,11 +44,11 @@ public class RecipeGen_Ore extends RecipeGen_Base { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); } - public RecipeGen_Ore(final Material M) { + public RecipeGenOre(final Material M) { this(M, false); } - public RecipeGen_Ore(final Material M, final boolean O) { + public RecipeGenOre(final Material M, final boolean O) { this.toGenerate = M; this.disableOptional = O; mRecipeGenMap.add(this); @@ -200,14 +200,14 @@ public class RecipeGen_Ore extends RecipeGen_Base { // Allow ore dusts to be packaged if (ItemUtils.checkForInvalidItems(material.getSmallDust(1)) && ItemUtils.checkForInvalidItems(material.getTinyDust(1))) { - RecipeGen_DustGeneration.generatePackagerRecipes(material); + RecipeGenDustGeneration.generatePackagerRecipes(material); } /** * Macerate */ // Macerate ore to Crushed - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getOre(1)) .itemOutputs(material.getCrushed(2)) .duration(20 * SECONDS) @@ -217,7 +217,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate ore to Crushed ore'"); // Macerate raw ore to Crushed - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getRawOre(1)) .itemOutputs(material.getCrushed(2)) .duration(20 * SECONDS) @@ -227,7 +227,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate raw ore to Crushed ore'"); // Macerate Crushed to Impure Dust - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getCrushed(1)) .itemOutputs(material.getDustImpure(1), matDustA) .outputChances(100_00, 10_00) @@ -238,7 +238,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate Crushed ore to Impure Dust'"); // Macerate Washed to Purified Dust - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getCrushedPurified(1)) .itemOutputs(material.getDustPurified(1), matDustA) .outputChances(100_00, 10_00) @@ -249,7 +249,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate Washed ore to Purified Dust'"); // Macerate Centrifuged to Pure Dust - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getCrushedCentrifuged(1)) .itemOutputs(matDust, matDustA) .outputChances(100_00, 10_00) @@ -264,7 +264,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { .itemInputs(material.getCrushed(1)) .itemOutputs(material.getCrushedPurified(1), matDustA, dustStone) .outputChances(100_00, 11_11, 100_00) - .fluidInputs(GT_ModHandler.getWater(1000)) + .fluidInputs(GTModHandler.getWater(1000)) .duration(25 * SECONDS) .eut(16) .addTo(oreWasherRecipes); @@ -273,7 +273,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { .itemInputs(material.getCrushed(1)) .itemOutputs(material.getCrushedPurified(1), matDustA, dustStone) .outputChances(100_00, 11_11, 100_00) - .fluidInputs(GT_ModHandler.getDistilledWater(200)) + .fluidInputs(GTModHandler.getDistilledWater(200)) .duration(15 * SECONDS) .eut(16) .addTo(oreWasherRecipes); @@ -287,7 +287,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { Logger.MATERIALS("material.getTinyDust(1): " + (ItemUtils.getItemName(bonusA.getCrushed(1)))); Logger.MATERIALS("material.getTinyDust(1): " + (ItemUtils.getItemName(bonusB.getCrushed(1)))); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getCrushed(1)) .itemOutputs(material.getCrushedCentrifuged(1), matDustB, dustStone) .outputChances(100_00, 11_11, 100_00) @@ -307,7 +307,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { + dustStone.getDisplayName() + "."); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getCrushedPurified(1)) .itemOutputs(material.getCrushedCentrifuged(1), matDustA, dustStone) .outputChances(100_00, 11_11, 100_00) @@ -330,7 +330,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { // Forge Hammer - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getCrushedCentrifuged(1)) .itemOutputs(matDust) .duration(10 * TICKS) @@ -339,7 +339,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { Logger.MATERIALS("[ForgeHammer] Added Recipe: 'Crushed Centrifuged to Pure Dust'"); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getCrushedPurified(1)) .itemOutputs(material.getDustPurified(1)) .duration(10 * TICKS) @@ -347,7 +347,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { .addTo(hammerRecipes); Logger.MATERIALS("[ForgeHammer] Added Recipe: 'Crushed Purified to Purified Dust'"); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getOre(1)) .itemOutputs(material.getCrushed(1)) .duration(10 * TICKS) @@ -359,7 +359,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { // Centrifuge // Purified Dust to Clean - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getDustPurified(1)) .itemOutputs(matDust, matDustA) .outputChances(100_00, 11_11) @@ -370,7 +370,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { Logger.MATERIALS("[Centrifuge] Added Recipe: Purified Dust to Clean Dust"); // Impure Dust to Clean - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.getDustImpure(1)) .itemOutputs(matDust, matDustB) .outputChances(100_00, 11_11) @@ -463,7 +463,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { for (int j = 0; j < mInternalOutputs.length; j++) { if (mInternalOutputs[j] == null) { - mInternalOutputs[j] = GT_Values.NI; + mInternalOutputs[j] = GTValues.NI; Logger.MATERIALS("[Electrolyzer] Set slot " + j + " to null."); } else { Logger.MATERIALS( @@ -485,7 +485,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { } else { inputs = new ItemStack[] { mainDust, emptyCell }; } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(inputs) .itemOutputs(internalOutputs.toArray(new ItemStack[0])) .outputChances(chances) @@ -579,7 +579,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { for (int j = 0; j < mInternalOutputs.length; j++) { if (mInternalOutputs[j] == null) { - mInternalOutputs[j] = GT_Values.NI; + mInternalOutputs[j] = GTValues.NI; Logger.MATERIALS("[Dehydrator] Set slot " + j + " to null."); } else { Logger.MATERIALS( @@ -603,7 +603,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { inputs = new ItemStack[] { mainDust, emptyCell }; } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(inputs) .itemOutputs(internalOutputs.toArray(new ItemStack[0])) .outputChances(chances) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlasma.java index 2ece69065f..12e3534032 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlasma.java @@ -1,25 +1,25 @@ package gtPlusPlus.xmod.gregtech.loaders; import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; -import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE; -import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; +import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE; +import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE; import java.util.HashSet; import java.util.Set; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_RecipeConstants; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipeConstants; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class RecipeGen_Plasma extends RecipeGen_Base { +public class RecipeGenPlasma extends RecipeGenBase { public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); @@ -27,7 +27,7 @@ public class RecipeGen_Plasma extends RecipeGen_Base { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); } - public RecipeGen_Plasma(final Material M) { + public RecipeGenPlasma(final Material M) { this.toGenerate = M; mRecipeGenMap.add(this); } @@ -42,43 +42,43 @@ public class RecipeGen_Plasma extends RecipeGen_Base { // Cool Plasma ItemStack aPlasmaCell = material.getPlasmaCell(1); ItemStack aCell = material.getCell(1); - ItemStack aContainerItem = GT_Utility.getFluidForFilledItem(aPlasmaCell, true) == null - ? GT_Utility.getContainerItem(aPlasmaCell, true) + ItemStack aContainerItem = GTUtility.getFluidForFilledItem(aPlasmaCell, true) == null + ? GTUtility.getContainerItem(aPlasmaCell, true) : CI.emptyCells(1); if (ItemUtils.checkForInvalidItems(new ItemStack[] { aPlasmaCell, aContainerItem })) { switch (material.getUnlocalizedName()) { case "Runite": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aPlasmaCell)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1L, aPlasmaCell)) .itemOutputs(aContainerItem) .metadata(FUEL_VALUE, 350_000) - .metadata(FUEL_TYPE, GT_RecipeConstants.FuelType.PlasmaTurbine.ordinal()) + .metadata(FUEL_TYPE, GTRecipeConstants.FuelType.PlasmaTurbine.ordinal()) .duration(0) .eut(0) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); case "CelestialTungsten": - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aPlasmaCell)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1L, aPlasmaCell)) .itemOutputs(aContainerItem) .metadata(FUEL_VALUE, 720_000) - .metadata(FUEL_TYPE, GT_RecipeConstants.FuelType.PlasmaTurbine.ordinal()) + .metadata(FUEL_TYPE, GTRecipeConstants.FuelType.PlasmaTurbine.ordinal()) .duration(0) .eut(0) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); default: - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aPlasmaCell)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1L, aPlasmaCell)) .itemOutputs(aContainerItem) .metadata(FUEL_VALUE, (int) Math.max(1024L, 1024L * material.getMass())) - .metadata(FUEL_TYPE, GT_RecipeConstants.FuelType.PlasmaTurbine.ordinal()) + .metadata(FUEL_TYPE, GTRecipeConstants.FuelType.PlasmaTurbine.ordinal()) .duration(0) .eut(0) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); } } if (ItemUtils.checkForInvalidItems(new ItemStack[] { aCell, aPlasmaCell })) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aPlasmaCell) .itemOutputs(aCell) .duration(Math.max(material.getMass() * 2L, 1L)) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlates.java index f126e80834..eb48d6d8e7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlates.java @@ -10,18 +10,18 @@ import java.util.Set; import net.minecraft.item.ItemStack; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Utility; +import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class RecipeGen_Plates extends RecipeGen_Base { +public class RecipeGenPlates extends RecipeGenBase { public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); @@ -29,7 +29,7 @@ public class RecipeGen_Plates extends RecipeGen_Base { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); } - public RecipeGen_Plates(final Material M) { + public RecipeGenPlates(final Material M) { this.toGenerate = M; mRecipeGenMap.add(this); } @@ -58,7 +58,7 @@ public class RecipeGen_Plates extends RecipeGen_Base { // Forge Hammer if (ItemUtils.checkForInvalidItems(ingotStackTwo) && ItemUtils.checkForInvalidItems(plate_Single)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ingotStackThree) .itemOutputs(plate_SingleTwo) .duration(Math.max(material.getMass(), 1L)) @@ -70,8 +70,8 @@ public class RecipeGen_Plates extends RecipeGen_Base { // Bender if (ItemUtils.checkForInvalidItems(ingotStackOne) && ItemUtils.checkForInvalidItems(plate_Single)) { - GT_Values.RA.stdBuilder() - .itemInputs(ingotStackOne, GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(ingotStackOne, GTUtility.getIntegratedCircuit(1)) .itemOutputs(plate_Single) .duration(Math.max(material.getMass() * 1L, 1L)) .eut(material.vVoltageMultiplier) @@ -81,8 +81,8 @@ public class RecipeGen_Plates extends RecipeGen_Base { } if (ItemUtils.checkForInvalidItems(ingotStackOne) && ItemUtils.checkForInvalidItems(foil_SingleFour)) { - GT_Values.RA.stdBuilder() - .itemInputs(ingotStackOne, GT_Utility.getIntegratedCircuit(10)) + GTValues.RA.stdBuilder() + .itemInputs(ingotStackOne, GTUtility.getIntegratedCircuit(10)) .itemOutputs(foil_SingleFour) .duration(Math.max(material.getMass() * 2L, 1L)) .eut(material.vVoltageMultiplier) @@ -93,7 +93,7 @@ public class RecipeGen_Plates extends RecipeGen_Base { // Alloy Smelter if (ItemUtils.checkForInvalidItems(ingotStackTwo) && ItemUtils.checkForInvalidItems(plate_Single)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ingotStackTwo, shape_Mold) .itemOutputs(plate_Single) .duration(Math.max(material.getMass() * 2L, 1L)) @@ -104,7 +104,7 @@ public class RecipeGen_Plates extends RecipeGen_Base { } // Cutting Machine if (ItemUtils.checkForInvalidItems(block) && ItemUtils.checkForInvalidItems(plate_Single)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(block) .itemOutputs(plate_SingleNine) .duration(Math.max(material.getMass() * 10L, 1L)) @@ -116,8 +116,8 @@ public class RecipeGen_Plates extends RecipeGen_Base { // Making Double Plates if (ItemUtils.checkForInvalidItems(ingotStackTwo) && ItemUtils.checkForInvalidItems(plate_Double)) { - GT_Values.RA.stdBuilder() - .itemInputs(ingotStackTwo, GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(ingotStackTwo, GTUtility.getIntegratedCircuit(2)) .itemOutputs(plate_Double) .duration(Math.max(material.getMass() * 2L, 1L)) .eut(material.vVoltageMultiplier) @@ -127,8 +127,8 @@ public class RecipeGen_Plates extends RecipeGen_Base { } if (ItemUtils.checkForInvalidItems(plate_SingleTwo) && ItemUtils.checkForInvalidItems(plate_Double)) { - GT_Values.RA.stdBuilder() - .itemInputs(plate_SingleTwo, GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(plate_SingleTwo, GTUtility.getIntegratedCircuit(2)) .itemOutputs(plate_Double) .duration(Math.max(material.getMass() * 2L, 1L)) .eut(material.vVoltageMultiplier) @@ -139,24 +139,24 @@ public class RecipeGen_Plates extends RecipeGen_Base { // Bender if (ItemUtils.checkForInvalidItems(material.getPlate(1)) && ItemUtils.checkForInvalidItems(material.getFoil(1))) { - GT_Values.RA.stdBuilder() - .itemInputs(material.getPlate(1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(material.getPlate(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(material.getFoil(4)) .duration(Math.max(material.getMass(), 1L)) .eut(material.vVoltageMultiplier) .addTo(benderRecipes); - GregTech_API.registerCover( + GregTechAPI.registerCover( material.getFoil(1), - new GT_RenderedTexture(material.getTextureSet().mTextures[70], material.getRGBA(), false), + new GTRenderedTexture(material.getTextureSet().mTextures[70], material.getRGBA(), false), null); Logger.WARNING("Bender Foil Recipe: " + material.getLocalizedName() + " - Success"); } // Making Dense Plates if (ItemUtils.checkForInvalidItems(ingotStackNine) && ItemUtils.checkForInvalidItems(plate_Dense)) { - GT_Values.RA.stdBuilder() - .itemInputs(ingotStackNine, GT_Utility.getIntegratedCircuit(9)) + GTValues.RA.stdBuilder() + .itemInputs(ingotStackNine, GTUtility.getIntegratedCircuit(9)) .itemOutputs(plate_Dense) .duration(Math.max(material.getMass() * 2L, 1L)) .eut(material.vVoltageMultiplier) @@ -166,8 +166,8 @@ public class RecipeGen_Plates extends RecipeGen_Base { } if (ItemUtils.checkForInvalidItems(plate_SingleNine) && ItemUtils.checkForInvalidItems(plate_Dense)) { - GT_Values.RA.stdBuilder() - .itemInputs(plate_SingleNine, GT_Utility.getIntegratedCircuit(9)) + GTValues.RA.stdBuilder() + .itemInputs(plate_SingleNine, GTUtility.getIntegratedCircuit(9)) .itemOutputs(plate_Dense) .duration(Math.max(material.getMass() * 2L, 1L)) .eut(material.vVoltageMultiplier) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java index ec6929a2ee..8fe051dd71 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java @@ -1,10 +1,10 @@ package gtPlusPlus.xmod.gregtech.loaders; -import static gregtech.api.enums.GT_Values.M; -import static gregtech.api.enums.GT_Values.RA; +import static gregtech.api.enums.GTValues.M; +import static gregtech.api.enums.GTValues.RA; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import java.util.ArrayList; import java.util.Map; @@ -16,11 +16,11 @@ import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.reflect.FieldUtils; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; @@ -30,7 +30,7 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -public class RecipeGen_Recycling implements Runnable { +public class RecipeGenRecycling implements Runnable { public static AutoMap<Runnable> mQueuedRecyclingGenerators = new AutoMap<>(); @@ -45,7 +45,7 @@ public class RecipeGen_Recycling implements Runnable { final Material toGenerate; public static Map<String, ItemStack> mNameMap; - public RecipeGen_Recycling(final Material M) { + public RecipeGenRecycling(final Material M) { this.toGenerate = M; if (mNameMap == null) { mNameMap = this.getNameMap(); @@ -142,7 +142,7 @@ public class RecipeGen_Recycling implements Runnable { int aDuration = (int) Math.max(1, (24 * validPrefix.getKey().mMaterialAmount) / M); FluidStack fluidOutput = material.getFluidStack(aFluidAmount); if (fluidOutput != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(tempStack) .fluidOutputs(fluidOutput) .duration(aDuration) @@ -262,13 +262,13 @@ public class RecipeGen_Recycling implements Runnable { if (!mNameMap.containsKey(aName.toString()) && aMentionPossibleTypos) { Logger.WARNING("Unknown Key for Unification, Typo? " + aName); } - return GT_Utility.copyAmount( + return GTUtility.copyAmount( aAmount, new Object[] { mNameMap.get(aName.toString()), getFirstOre(aName, aAmount), aReplacement }); } public static ItemStack getFirstOre(final Object aName, final long aAmount) { - if (GT_Utility.isStringInvalid(aName)) { + if (GTUtility.isStringInvalid(aName)) { Logger.WARNING("Returning Null. Method: " + ReflectionUtils.getMethodName(0)); Logger.WARNING("Called from method: " + ReflectionUtils.getMethodName(1)); Logger.WARNING("Called from method: " + ReflectionUtils.getMethodName(2)); @@ -277,17 +277,17 @@ public class RecipeGen_Recycling implements Runnable { return null; } final ItemStack tStack = mNameMap.get(aName.toString()); - if (GT_Utility.isStackValid(tStack)) { + if (GTUtility.isStackValid(tStack)) { Logger.WARNING("Found valid stack."); - return GT_Utility.copyAmount(aAmount, new Object[] { tStack }); + return GTUtility.copyAmount(aAmount, new Object[] { tStack }); } - return GT_Utility.copyAmount(aAmount, getOres(aName).toArray()); + return GTUtility.copyAmount(aAmount, getOres(aName).toArray()); } public static ArrayList<ItemStack> getOres(final Object aOreName) { final String aName = (aOreName == null) ? "" : aOreName.toString(); final ArrayList<ItemStack> rList = new ArrayList<>(); - if (GT_Utility.isStringValid(aName)) { + if (GTUtility.isStringValid(aName)) { Logger.WARNING("Making a list of all OreDict entries for " + aOreName + "."); if (rList.addAll(OreDictionary.getOres(aName))) { Logger.WARNING("Added " + rList.size() + " elements to list."); @@ -304,15 +304,15 @@ public class RecipeGen_Recycling implements Runnable { Map<String, ItemStack> tempMap; try { tempMap = (Map<String, ItemStack>) FieldUtils - .readStaticField(GT_OreDictUnificator.class, "sName2StackMap", true); + .readStaticField(GTOreDictUnificator.class, "sName2StackMap", true); if (tempMap != null) { - Logger.WARNING("Found 'sName2StackMap' in GT_OreDictUnificator.class."); + Logger.WARNING("Found 'sName2StackMap' in GTOreDictUnificator.class."); return tempMap; } } catch (final IllegalAccessException e) { e.printStackTrace(); } - Logger.WARNING("Invalid map stored in GT_OreDictUnificator.class, unable to find sName2StackMap field."); + Logger.WARNING("Invalid map stored in GTOreDictUnificator.class, unable to find sName2StackMap field."); return null; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenShapedCrafting.java index 3ef1740189..0c07b382ec 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenShapedCrafting.java @@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.loaders; import java.util.HashSet; import java.util.Set; -import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GTModHandler; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class RecipeGen_ShapedCrafting extends RecipeGen_Base { +public class RecipeGenShapedCrafting extends RecipeGenBase { public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); @@ -18,7 +18,7 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); } - public RecipeGen_ShapedCrafting(final Material M) { + public RecipeGenShapedCrafting(final Material M) { this.toGenerate = M; mRecipeGenMap.add(this); } @@ -34,16 +34,15 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { // Single Plate Shaped/Shapeless if (ItemUtils.checkForInvalidItems(material.getPlate(1)) && ItemUtils.checkForInvalidItems(material.getIngot(1))) - if (material.getPlate(1) != null && material.getIngot(1) != null) GT_ModHandler.addCraftingRecipe( + if (material.getPlate(1) != null && material.getIngot(1) != null) GTModHandler.addCraftingRecipe( material.getPlate(1), - gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "h", "B", "I", Character.valueOf('I'), material.getIngot(1), Character.valueOf('B'), material.getIngot(1) }); if (ItemUtils.checkForInvalidItems(material.getPlate(1)) && ItemUtils.checkForInvalidItems(material.getIngot(1))) - GT_ModHandler.addShapelessCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( material.getPlate(1), new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, material.getIngot(1), material.getIngot(1) }); @@ -51,16 +50,15 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { // Double Plate Shaped/Shapeless if (ItemUtils.checkForInvalidItems(material.getPlateDouble(1)) && ItemUtils.checkForInvalidItems(material.getPlate(1))) - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( material.getPlateDouble(1), - gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "I", "B", "h", Character.valueOf('I'), material.getPlate(1), Character.valueOf('B'), material.getPlate(1) }); if (ItemUtils.checkForInvalidItems(material.getPlateDouble(1)) && ItemUtils.checkForInvalidItems(material.getPlate(1))) - GT_ModHandler.addShapelessCraftingRecipe( + GTModHandler.addShapelessCraftingRecipe( material.getPlateDouble(1), new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, material.getPlate(1), material.getPlate(1) }); @@ -68,9 +66,9 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { // Ring Recipe if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getRing(1)) && ItemUtils.checkForInvalidItems(material.getRod(1))) { - if (GT_ModHandler.addCraftingRecipe( + if (GTModHandler.addCraftingRecipe( material.getRing(1), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "h ", "fR", 'R', material.getRod(1) })) { Logger.WARNING("GT:NH Ring Recipe: " + material.getLocalizedName() + " - Success"); } else { @@ -81,10 +79,9 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { // Framebox Recipe if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getFrameBox(1)) && ItemUtils.checkForInvalidItems(material.getRod(1))) { - if (GT_ModHandler.addCraftingRecipe( + if (GTModHandler.addCraftingRecipe( material.getFrameBox(2), - gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "RRR", "RwR", "RRR", 'R', material.getRod(1) })) { Logger.WARNING("Framebox Recipe: " + material.getLocalizedName() + " - Success"); } else { @@ -95,10 +92,9 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { // Shaped Recipe - Bolts if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getBolt(1)) && ItemUtils.checkForInvalidItems(material.getRod(1))) { - if (GT_ModHandler.addCraftingRecipe( + if (GTModHandler.addCraftingRecipe( material.getBolt(2), - gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "s ", " R", 'R', material.getRod(1) })) { Logger.WARNING("Bolt Recipe: " + material.getLocalizedName() + " - Success"); } else { @@ -109,10 +105,9 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { // Shaped Recipe - Fine Wire if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getFoil(1)) && ItemUtils.checkForInvalidItems(material.getFineWire(1))) { - if (GT_ModHandler.addCraftingRecipe( + if (GTModHandler.addCraftingRecipe( material.getFineWire(1), - gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "Fx", 'F', material.getFoil(1) })) { Logger.WARNING("Fine Wire Recipe: " + material.getLocalizedName() + " - Success"); } else { @@ -123,10 +118,9 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { // Shaped Recipe - Foil if (ItemUtils.checkForInvalidItems(material.getFoil(1)) && ItemUtils.checkForInvalidItems(material.getPlate(1))) { - if (GT_ModHandler.addCraftingRecipe( + if (GTModHandler.addCraftingRecipe( material.getFoil(2), - gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "hP", 'P', material.getPlate(1) })) { Logger.WARNING("Foil Recipe: " + material.getLocalizedName() + " - Success"); } else { @@ -136,10 +130,9 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { // Shaped Recipe - Ingot to Rod if (ItemUtils.checkForInvalidItems(material.getRod(1)) && ItemUtils.checkForInvalidItems(material.getIngot(1))) - if (GT_ModHandler.addCraftingRecipe( + if (GTModHandler.addCraftingRecipe( material.getRod(1), - gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "f ", " I", 'I', material.getIngot(1) })) { Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Success"); } else { @@ -149,10 +142,9 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { // Shaped Recipe - Long Rod to two smalls if (ItemUtils.checkForInvalidItems(material.getRod(1)) && ItemUtils.checkForInvalidItems(material.getLongRod(1))) - if (GT_ModHandler.addCraftingRecipe( + if (GTModHandler.addCraftingRecipe( material.getRod(2), - gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "s", "L", 'L', material.getLongRod(1) })) { Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Success"); } else { @@ -162,10 +154,9 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { // Two small to long rod if (ItemUtils.checkForInvalidItems(material.getLongRod(1)) && ItemUtils.checkForInvalidItems(material.getRod(1))) - if (GT_ModHandler.addCraftingRecipe( + if (GTModHandler.addCraftingRecipe( material.getLongRod(1), - gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "RhR", 'R', material.getRod(1) })) { Logger.WARNING("Long Rod Recipe: " + material.getLocalizedName() + " - Success"); } else { @@ -178,10 +169,9 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { && !material.isRadioactive && ItemUtils.checkForInvalidItems(material.getPlate(1)) && ItemUtils.checkForInvalidItems(material.getScrew(1))) { - if (GT_ModHandler.addCraftingRecipe( + if (GTModHandler.addCraftingRecipe( material.getRotor(1), - gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PhP", "SRf", "PdP", 'P', material.getPlate(1), 'S', material.getScrew(1), 'R', material.getRing(1), })) { Logger.WARNING("Rotor Recipe: " + material.getLocalizedName() + " - Success"); @@ -194,10 +184,9 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getGear(1)) && ItemUtils.checkForInvalidItems(material.getPlate(1)) && ItemUtils.checkForInvalidItems(material.getRod(1))) { - if (GT_ModHandler.addCraftingRecipe( + if (GTModHandler.addCraftingRecipe( material.getGear(1), - gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "RPR", "PwP", "RPR", 'P', material.getPlate(1), 'R', material.getRod(1), })) { Logger.WARNING("Gear Recipe: " + material.getLocalizedName() + " - Success"); } else { @@ -208,10 +197,9 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { // Screws if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getScrew(1)) && ItemUtils.checkForInvalidItems(material.getBolt(1))) { - if (GT_ModHandler.addCraftingRecipe( + if (GTModHandler.addCraftingRecipe( material.getScrew(1), - gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, new Object[] { "fB", "B ", 'B', material.getBolt(1), })) { Logger.WARNING("Screw Recipe: " + material.getLocalizedName() + " - Success"); } else { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java index aab24db6d3..0f19131855 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.loaders.misc; -import gregtech.api.util.GT_ProcessingArray_Manager; +import gregtech.api.util.ProcessingArrayManager; import gtPlusPlus.api.recipe.GTPPRecipeMaps; public class AddCustomMachineToPA { @@ -8,6 +8,6 @@ public class AddCustomMachineToPA { public static void register() { // Simple Washers - GT_ProcessingArray_Manager.addRecipeMapToPA("simplewasher.01", GTPPRecipeMaps.simpleWasherRecipes); + ProcessingArrayManager.addRecipeMapToPA("simplewasher.01", GTPPRecipeMaps.simpleWasherRecipes); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderAlgaeFarm.java index 1d3454c1a0..bfa8b6d1b1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderAlgaeFarm.java @@ -5,8 +5,8 @@ import java.util.HashMap; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.GT_Values; -import gregtech.api.util.GT_Recipe; +import gregtech.api.enums.GTValues; +import gregtech.api.util.GTRecipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.WeightedCollection; @@ -14,10 +14,10 @@ import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class RecipeLoader_AlgaeFarm { +public class RecipeLoaderAlgaeFarm { - private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCache = new HashMap<>(); - private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCompostCache = new HashMap<>(); + private static final HashMap<Integer, AutoMap<GTRecipe>> mRecipeCache = new HashMap<>(); + private static final HashMap<Integer, AutoMap<GTRecipe>> mRecipeCompostCache = new HashMap<>(); public static void generateRecipes() { for (int i = 0; i < 15; i++) { @@ -28,11 +28,11 @@ public class RecipeLoader_AlgaeFarm { } } - public static GT_Recipe getTieredRecipeFromCache(int aTier, boolean aCompost) { - HashMap<Integer, AutoMap<GT_Recipe>> aMap = aCompost ? mRecipeCompostCache : mRecipeCache; + public static GTRecipe getTieredRecipeFromCache(int aTier, boolean aCompost) { + HashMap<Integer, AutoMap<GTRecipe>> aMap = aCompost ? mRecipeCompostCache : mRecipeCache; String aComp = aCompost ? "(Compost)" : ""; - AutoMap<GT_Recipe> aTemp = aMap.get(aTier); + AutoMap<GTRecipe> aTemp = aMap.get(aTier); if (aTemp == null || aTemp.isEmpty()) { aTemp = new AutoMap<>(); aMap.put(aTier, aTemp); @@ -54,7 +54,7 @@ public class RecipeLoader_AlgaeFarm { return aTier > 1 ? (int) Math.min(64, Math.pow(2, aTier - 1)) : 1; } - private static GT_Recipe generateBaseRecipe(boolean aUsingCompost, int aTier) { + private static GTRecipe generateBaseRecipe(boolean aUsingCompost, int aTier) { // Type Safety if (aTier < 0) { @@ -91,14 +91,14 @@ public class RecipeLoader_AlgaeFarm { // We set these elsewhere ItemStack[] aOutputs = getOutputsForTier(aTier); - GT_Recipe tRecipe = new GT_Recipe( + GTRecipe tRecipe = new GTRecipe( false, aInputs, aOutputs, (Object) null, new int[] {}, - new FluidStack[] { GT_Values.NF }, - new FluidStack[] { GT_Values.NF }, + new FluidStack[] { GTValues.NF }, + new FluidStack[] { GTValues.NF }, (int) (aDurations[aTier] * aOutputTimeMulti.get() / 2), // Time 0, 0); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderChemicalSkips.java index c22d57b34f..b3f7f27c56 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderChemicalSkips.java @@ -6,23 +6,19 @@ import static gregtech.api.enums.Mods.GalaxySpace; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.fusionRecipes; -import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.FUSION_THRESHOLD; -import static gregtech.api.util.GT_RecipeConstants.QFT_FOCUS_TIER; +import static gregtech.api.util.GTModHandler.getModItem; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.FUSION_THRESHOLD; +import static gregtech.api.util.GTRecipeConstants.QFT_FOCUS_TIER; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.quantumForceTransformerRecipes; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.technus.tectech.recipe.TT_recipeAdder; -import com.github.technus.tectech.thing.block.QuantumGlassBlock; - -import gregtech.api.enums.GT_Values; +import bartworks.system.material.WerkstoffLoader; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsKevlar; @@ -30,22 +26,25 @@ import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.Mods; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gregtech.common.items.CombType; -import gregtech.loaders.misc.GT_Bees; +import gregtech.loaders.misc.GTBees; import gtPlusPlus.core.item.chemistry.GenericChem; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.material.MaterialMisc; +import gtPlusPlus.core.material.MaterialsAlloy; +import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.material.Particle; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import gtnhlanth.common.register.WerkstoffMaterialPool; +import tectech.recipe.TTRecipeAdder; +import tectech.thing.block.BlockQuantumGlass; -public class RecipeLoader_ChemicalSkips { +public class RecipeLoaderChemicalSkips { public static void generate() { createRecipes(); @@ -67,10 +66,10 @@ public class RecipeLoader_ChemicalSkips { // HSS-G for Tier 2, HSS-S for Tier 3 and HSS-E for Tier 4) private static void quantumTransformerRecipes() { - ItemStack stemcells = GT_Utility.copyAmountUnsafe(64 * 32, ItemList.Circuit_Chip_Stemcell.get(1)); - ItemStack biocells = GT_Utility.copyAmountUnsafe(64 * 32, ItemList.Circuit_Chip_Biocell.get(1)); + ItemStack stemcells = GTUtility.copyAmountUnsafe(64 * 32, ItemList.Circuit_Chip_Stemcell.get(1)); + ItemStack biocells = GTUtility.copyAmountUnsafe(64 * 32, ItemList.Circuit_Chip_Biocell.get(1)); // Platline - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( WerkstoffLoader.PTMetallicPowder.get(OrePrefixes.dust, 32), ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0)) @@ -86,7 +85,7 @@ public class RecipeLoader_ChemicalSkips { .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); // Partial platline (from Pd, Os, Ir, Rh and leach) - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( WerkstoffLoader.PDMetallicPowder.get(OrePrefixes.dust, 32), ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0)) @@ -98,7 +97,7 @@ public class RecipeLoader_ChemicalSkips { .eut(TierEU.RECIPE_UV) .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( WerkstoffLoader.IrLeachResidue.get(OrePrefixes.dust, 32), ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0)) @@ -110,7 +109,7 @@ public class RecipeLoader_ChemicalSkips { .eut(TierEU.RECIPE_UV) .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( WerkstoffLoader.IrOsLeachResidue.get(OrePrefixes.dust, 32), ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0)) @@ -119,7 +118,7 @@ public class RecipeLoader_ChemicalSkips { .eut(TierEU.RECIPE_UV) .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( WerkstoffLoader.CrudeRhMetall.get(OrePrefixes.dust, 32), ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0)) @@ -132,7 +131,7 @@ public class RecipeLoader_ChemicalSkips { .eut(TierEU.RECIPE_UV) .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( WerkstoffLoader.LeachResidue.get(OrePrefixes.dust, 32), ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0)) @@ -146,7 +145,7 @@ public class RecipeLoader_ChemicalSkips { .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); // Early Plastics - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(Materials.Carbon.getDust(64), ItemUtils.getSimpleStack(GenericChem.mPlasticPolymerCatalyst, 0)) .fluidInputs( Materials.Oxygen.getGas(1000 * 16), @@ -165,7 +164,7 @@ public class RecipeLoader_ChemicalSkips { .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); // Early Rubbers/Cable Materials - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(Materials.Carbon.getDust(64), ItemUtils.getSimpleStack(GenericChem.mRubberPolymerCatalyst, 0)) .fluidInputs( Materials.Oxygen.getGas(1000 * 16), @@ -181,7 +180,7 @@ public class RecipeLoader_ChemicalSkips { .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); // Glues and Solders - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( Materials.Carbon.getDust(32), Materials.Bismuth.getDust(32), @@ -189,16 +188,16 @@ public class RecipeLoader_ChemicalSkips { .itemOutputs(ItemList.StableAdhesive.get(1)) .fluidInputs(Materials.Oxygen.getGas(10000), Materials.Hydrogen.getGas(10000)) .fluidOutputs( - MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(1000 * 32), + MaterialMisc.ETHYL_CYANOACRYLATE.getFluidStack(1000 * 32), Materials.AdvancedGlue.getFluid(1000 * 16), - ALLOY.INDALLOY_140.getFluidStack(144 * 64), + MaterialsAlloy.INDALLOY_140.getFluidStack(144 * 64), Materials.SolderingAlloy.getMolten(144 * 128)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); // Titanium, Tungsten, Indium - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( Materials.Lead.getDust(16), Materials.Bauxite.getDust(32), @@ -214,16 +213,16 @@ public class RecipeLoader_ChemicalSkips { .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); // Thorium, Uranium, Plutonium - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( Materials.Thorium.getDust(32), Materials.Uranium.getDust(32), ItemUtils.getSimpleStack(GenericChem.mRadioactivityCatalyst, 0)) .itemOutputs( - ELEMENT.getInstance().THORIUM232.getDust(64), - ELEMENT.getInstance().URANIUM233.getDust(64), + MaterialsElements.getInstance().THORIUM232.getDust(64), + MaterialsElements.getInstance().URANIUM233.getDust(64), Materials.Uranium235.getDust(64), - ELEMENT.getInstance().PLUTONIUM238.getDust(64), + MaterialsElements.getInstance().PLUTONIUM238.getDust(64), Materials.Plutonium.getDust(64), Materials.Plutonium241.getDust(64)) .duration(20 * SECONDS) @@ -231,7 +230,7 @@ public class RecipeLoader_ChemicalSkips { .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); // Monaline - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( Materials.Monazite.getDust(32), ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 0)) @@ -247,7 +246,7 @@ public class RecipeLoader_ChemicalSkips { .metadata(QFT_FOCUS_TIER, 2) .addTo(quantumForceTransformerRecipes); // Bastline - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( Materials.Bastnasite.getDust(32), ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 0)) @@ -262,7 +261,7 @@ public class RecipeLoader_ChemicalSkips { .metadata(QFT_FOCUS_TIER, 2) .addTo(quantumForceTransformerRecipes); // Bastline from Cerium-rich mixture - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 16), ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 0)) @@ -277,7 +276,7 @@ public class RecipeLoader_ChemicalSkips { .metadata(QFT_FOCUS_TIER, 2) .addTo(quantumForceTransformerRecipes); // Early Waterline skip (first 4 tiers) - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(GenericChem.mLimpidWaterCatalyst, 0)) .fluidInputs(Materials.Water.getFluid(40000L)) .fluidOutputs( @@ -290,7 +289,7 @@ public class RecipeLoader_ChemicalSkips { .metadata(QFT_FOCUS_TIER, 2) .addTo(quantumForceTransformerRecipes); // Stem Cells - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( Materials.Calcium.getDust(32), Materials.MeatRaw.getDust(32), @@ -305,7 +304,7 @@ public class RecipeLoader_ChemicalSkips { .metadata(QFT_FOCUS_TIER, 3) .addTo(quantumForceTransformerRecipes); // Unknown Particles - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(GenericChem.mParticleAccelerationCatalyst, 0)) .itemOutputs( Particle.getBaseParticle(Particle.UNKNOWN), @@ -319,7 +318,7 @@ public class RecipeLoader_ChemicalSkips { .metadata(QFT_FOCUS_TIER, 3) .addTo(quantumForceTransformerRecipes); // Lategame Plastics (Missing Radox Polymer and Heavy Radox) - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( Materials.Carbon.getDust(64), Materials.Osmium.getDust(24), @@ -336,9 +335,9 @@ public class RecipeLoader_ChemicalSkips { .addTo(quantumForceTransformerRecipes); if (Mods.Forestry.isModLoaded()) { // Lategame Kevlar using Kevlar bee comb - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Bees.combs.getStackForType(CombType.KEVLAR, 24), + GTBees.combs.getStackForType(CombType.KEVLAR, 24), Materials.Carbon.getDust(64), ItemUtils.getSimpleStack(GenericChem.mUltimatePlasticCatalyst, 0)) .fluidInputs(Materials.Nitrogen.getGas(1000 * 16), Materials.Hydrogen.getGas(1000 * 16)) @@ -351,12 +350,12 @@ public class RecipeLoader_ChemicalSkips { .metadata(QFT_FOCUS_TIER, 4) .addTo(quantumForceTransformerRecipes); // Platline skip using Platline Combs (Palladium, Osmium, Iridium, Platinum) - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Bees.combs.getStackForType(CombType.PLATINUM, 32), - GT_Bees.combs.getStackForType(CombType.PALLADIUM, 32), - GT_Bees.combs.getStackForType(CombType.OSMIUM, 32), - GT_Bees.combs.getStackForType(CombType.IRIDIUM, 32), + GTBees.combs.getStackForType(CombType.PLATINUM, 32), + GTBees.combs.getStackForType(CombType.PALLADIUM, 32), + GTBees.combs.getStackForType(CombType.OSMIUM, 32), + GTBees.combs.getStackForType(CombType.IRIDIUM, 32), ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0)) .fluidOutputs( Materials.Osmium.getMolten(144 * 256), @@ -369,14 +368,14 @@ public class RecipeLoader_ChemicalSkips { .addTo(quantumForceTransformerRecipes); } // Bio Cells and Mutated Solder - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Circuit_Chip_Stemcell.get(16), Materials.InfinityCatalyst.getDust(4), ItemUtils.getSimpleStack(GenericChem.mBiologicalIntelligenceCatalyst, 0)) .itemOutputs(biocells) .fluidOutputs( - MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 128), + MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(144 * 128), Materials.BioMediumSterilized.getFluid(1000 * 256), Materials.BioMediumRaw.getFluid(1000 * 512)) .duration(20 * SECONDS) @@ -384,7 +383,7 @@ public class RecipeLoader_ChemicalSkips { .metadata(QFT_FOCUS_TIER, 4) .addTo(quantumForceTransformerRecipes); // Advanced Waterline skip (last 4 tiers) - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getSimpleStack(GenericChem.mFlawlessWaterCatalyst, 0)) .fluidInputs(Materials.Water.getFluid(40000L)) .fluidOutputs( @@ -397,7 +396,7 @@ public class RecipeLoader_ChemicalSkips { .metadata(QFT_FOCUS_TIER, 4) .addTo(quantumForceTransformerRecipes); // Rare Particles - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(GenericChem.mSynchrotronCapableCatalyst, 0), GregtechItemList.Laser_Lens_Special.get(1)) @@ -411,7 +410,7 @@ public class RecipeLoader_ChemicalSkips { FluidUtils.getFluidStack("plasma.hydrogen", 30000), Materials.Helium.getPlasma(30000L), Materials.Americium.getPlasma(30000L), - new FluidStack(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getPlasma(), 30000)) + new FluidStack(MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getPlasma(), 30000)) .duration(3 * MINUTES + 20 * SECONDS) .eut(TierEU.RECIPE_UIV) .metadata(QFT_FOCUS_TIER, 4) @@ -419,11 +418,11 @@ public class RecipeLoader_ChemicalSkips { if (GalaxySpace.isModLoaded()) { // Seaweed - ItemStack seaweed = GT_Utility + ItemStack seaweed = GTUtility .copyAmountUnsafe(64 * 32, getModItem(GalaxySpace.ID, "tcetiedandelions", 1, 4)); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get("cropSeaweed", 64), + GTOreDictUnificator.get("cropSeaweed", 64), Materials.Mytryl.getDust(16), ItemUtils.getSimpleStack(GenericChem.mAlgagenicGrowthPromoterCatalyst, 0)) .itemOutputs(seaweed, getModItem(NewHorizonsCoreMod.ID, "item.TCetiESeaweedExtract", 16)) @@ -440,34 +439,38 @@ public class RecipeLoader_ChemicalSkips { } private static void fusionReactorRecipes() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(Materials.Radon.getPlasma(100), Materials.Nitrogen.getPlasma(100)) - .fluidOutputs(new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 100)) + .fluidOutputs(new FluidStack(MaterialsElements.getInstance().NEPTUNIUM.getPlasma(), 100)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_UHV) .metadata(FUSION_THRESHOLD, 1_000_000_000) .addTo(fusionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(Materials.Americium.getPlasma(100), Materials.Boron.getPlasma(100)) - .fluidOutputs(new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 100)) + .fluidOutputs(new FluidStack(MaterialsElements.getInstance().FERMIUM.getPlasma(), 100)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_UHV) .metadata(FUSION_THRESHOLD, 1_000_000_000) .addTo(fusionRecipes); // MK5 versions - GT_Values.RA.stdBuilder() - .fluidInputs(new FluidStack(ELEMENT.getInstance().XENON.getPlasma(), 288), Materials.Yttrium.getMolten(288)) - .fluidOutputs(new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 288)) + GTValues.RA.stdBuilder() + .fluidInputs( + new FluidStack(MaterialsElements.getInstance().XENON.getPlasma(), 288), + Materials.Yttrium.getMolten(288)) + .fluidOutputs(new FluidStack(MaterialsElements.getInstance().NEPTUNIUM.getPlasma(), 288)) .duration(1 * SECONDS + 12 * TICKS) .eut(TierEU.RECIPE_UEV) .metadata(FUSION_THRESHOLD, 1_000_000_000) .addTo(fusionRecipes); - GT_Values.RA.stdBuilder() - .fluidInputs(new FluidStack(ELEMENT.STANDALONE.FORCE.getPlasma(), 288), Materials.Rubidium.getMolten(288)) - .fluidOutputs(new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 288)) + GTValues.RA.stdBuilder() + .fluidInputs( + new FluidStack(MaterialsElements.STANDALONE.FORCE.getPlasma(), 288), + Materials.Rubidium.getMolten(288)) + .fluidOutputs(new FluidStack(MaterialsElements.getInstance().FERMIUM.getPlasma(), 288)) .duration(1 * SECONDS + 12 * TICKS) .eut(TierEU.RECIPE_UEV) .metadata(FUSION_THRESHOLD, 1_000_000_000) @@ -475,105 +478,105 @@ public class RecipeLoader_ChemicalSkips { } private static void catalystRecipes() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(10), + GTUtility.getIntegratedCircuit(10), CI.getEmptyCatalyst(1), new ItemStack(WerkstoffLoader.items.get(OrePrefixes.dust), 64, 88), Materials.Osmiridium.getDust(64), Materials.Carbon.getNanite(64)) .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 1)) - .fluidInputs(ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360)) + .fluidInputs(MaterialsElements.STANDALONE.HYPOGEN.getFluidStack(360)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(10), + GTUtility.getIntegratedCircuit(10), CI.getEmptyCatalyst(1), Materials.Polybenzimidazole.getDust(64), Materials.Polytetrafluoroethylene.getDust(64), Materials.Carbon.getNanite(64)) .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mPlasticPolymerCatalyst, 1)) - .fluidInputs(ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360)) + .fluidInputs(MaterialsElements.STANDALONE.HYPOGEN.getFluidStack(360)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(10), + GTUtility.getIntegratedCircuit(10), CI.getEmptyCatalyst(1), Materials.Silicone.getDust(64), Materials.StyreneButadieneRubber.getDust(64), Materials.Carbon.getNanite(64)) .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mRubberPolymerCatalyst, 1)) - .fluidInputs(ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360)) + .fluidInputs(MaterialsElements.STANDALONE.HYPOGEN.getFluidStack(360)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(10), + GTUtility.getIntegratedCircuit(10), CI.getEmptyCatalyst(1), - ALLOY.INDALLOY_140.getDust(64), - MISC_MATERIALS.ETHYL_CYANOACRYLATE.getCell(64), + MaterialsAlloy.INDALLOY_140.getDust(64), + MaterialMisc.ETHYL_CYANOACRYLATE.getCell(64), Materials.Carbon.getNanite(64)) .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mAdhesionPromoterCatalyst, 1)) - .fluidInputs(ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360)) + .fluidInputs(MaterialsElements.STANDALONE.HYPOGEN.getFluidStack(360)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(10), + GTUtility.getIntegratedCircuit(10), CI.getEmptyCatalyst(1), Materials.TungstenSteel.getDust(64), Materials.Indium.getDust(64), Materials.Carbon.getNanite(64)) .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mTitaTungstenIndiumCatalyst, 1)) - .fluidInputs(ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360)) + .fluidInputs(MaterialsElements.STANDALONE.HYPOGEN.getFluidStack(360)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(10), + GTUtility.getIntegratedCircuit(10), CI.getEmptyCatalyst(1), - ELEMENT.getInstance().URANIUM235.getDust(64), - ELEMENT.getInstance().PLUTONIUM241.getDust(64), + MaterialsElements.getInstance().URANIUM235.getDust(64), + MaterialsElements.getInstance().PLUTONIUM241.getDust(64), Materials.Carbon.getNanite(64)) .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mRadioactivityCatalyst, 1)) - .fluidInputs(ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360)) + .fluidInputs(MaterialsElements.STANDALONE.HYPOGEN.getFluidStack(360)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(10), + GTUtility.getIntegratedCircuit(10), CI.getEmptyCatalyst(1), Materials.Samarium.getDust(64), Materials.Gadolinium.getDust(64), Materials.Silver.getNanite(1)) .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 1)) - .fluidInputs(ELEMENT.STANDALONE.HYPOGEN.getFluidStack(9216)) + .fluidInputs(MaterialsElements.STANDALONE.HYPOGEN.getFluidStack(9216)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(10), + GTUtility.getIntegratedCircuit(10), CI.getEmptyCatalyst(1), Materials.Naquadah.getDust(64), Materials.Adamantium.getDust(64), Materials.Silver.getNanite(1)) .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mSimpleNaquadahCatalyst, 1)) - .fluidInputs(ELEMENT.STANDALONE.HYPOGEN.getFluidStack(9216)) + .fluidInputs(MaterialsElements.STANDALONE.HYPOGEN.getFluidStack(9216)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(10), + GTUtility.getIntegratedCircuit(10), CI.getEmptyCatalyst(1), Materials.Naquadria.getDust(64), Materials.Trinium.getDust(64), @@ -583,9 +586,9 @@ public class RecipeLoader_ChemicalSkips { .duration(60 * SECONDS) .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(10), + GTUtility.getIntegratedCircuit(10), CI.getEmptyCatalyst(1), ItemList.Circuit_Chip_Stemcell.get(64), Materials.Gold.getNanite(1)) @@ -594,20 +597,20 @@ public class RecipeLoader_ChemicalSkips { .duration(60 * SECONDS) .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(10), + GTUtility.getIntegratedCircuit(10), CI.getEmptyCatalyst(1), GregtechItemList.Laser_Lens_Special.get(64), - GT_ModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 10)) + GTModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 10)) .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mParticleAccelerationCatalyst, 1)) .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(9216L)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(10), + GTUtility.getIntegratedCircuit(10), CI.getEmptyCatalyst(1), MaterialsKevlar.Kevlar.getDust(64), MaterialsUEVplus.TranscendentMetal.getNanite(1)) @@ -616,9 +619,9 @@ public class RecipeLoader_ChemicalSkips { .duration(60 * SECONDS) .eut(TierEU.RECIPE_UMV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(10), + GTUtility.getIntegratedCircuit(10), CI.getEmptyCatalyst(1), ItemList.Circuit_Chip_Biocell.get(64), MaterialsUEVplus.TranscendentMetal.getNanite(1)) @@ -627,9 +630,9 @@ public class RecipeLoader_ChemicalSkips { .duration(60 * SECONDS) .eut(TierEU.RECIPE_UMV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(10), + GTUtility.getIntegratedCircuit(10), CI.getEmptyCatalyst(1), Particle.getBaseParticle(Particle.HIGGS_BOSON), Particle.getIon("Helium", 0), @@ -640,11 +643,11 @@ public class RecipeLoader_ChemicalSkips { .duration(60 * SECONDS) .eut(TierEU.RECIPE_UMV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(10), + GTUtility.getIntegratedCircuit(10), CI.getEmptyCatalyst(1), - GT_OreDictUnificator.get("blockShirabon", 16), + GTOreDictUnificator.get("blockShirabon", 16), MaterialsUEVplus.Universium.getNanite(1), ItemList.Timepiece.get(1)) .itemOutputs(ItemUtils.getSimpleStack(GenericChem.TemporalHarmonyCatalyst, 1)) @@ -653,12 +656,12 @@ public class RecipeLoader_ChemicalSkips { .eut(TierEU.RECIPE_UXV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(10), + GTUtility.getIntegratedCircuit(10), CI.getEmptyCatalyst(1), getModItem(NewHorizonsCoreMod.ID, "item.TCetiESeaweedExtract", 64), - GT_OreDictUnificator.get("dustIodine", 64), + GTOreDictUnificator.get("dustIodine", 64), MaterialsUEVplus.TranscendentMetal.getNanite(1)) .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mAlgagenicGrowthPromoterCatalyst, 1)) .fluidInputs(FluidUtils.getFluidStack("molten.shirabon", 92_160)) @@ -668,7 +671,7 @@ public class RecipeLoader_ChemicalSkips { } private static void tieredCasingRecipes() { - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( GregtechItemList.ForceFieldGlass.get(1), 1024 * 30 * 20, 1024, @@ -676,16 +679,16 @@ public class RecipeLoader_ChemicalSkips { 32, new ItemStack[] { GregtechItemList.ForceFieldGlass.get(1), Materials.Carbon.getNanite(4), ItemList.Emitter_UV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 8), + GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 8), GregtechItemList.Laser_Lens_Special.get(1), new ItemStack(advancedRadiationProtectionPlate, 2) }, new FluidStack[] { Materials.Thulium.getMolten(144 * 10), MaterialsUEVplus.ExcitedDTCC.getFluid(5000), - new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 500), - new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 500) }, + new FluidStack(MaterialsElements.getInstance().NEPTUNIUM.getPlasma(), 500), + new FluidStack(MaterialsElements.getInstance().FERMIUM.getPlasma(), 500) }, GregtechItemList.NeutronPulseManipulator.get(1), 60 * 20, (int) TierEU.RECIPE_UEV); - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( GregtechItemList.NeutronPulseManipulator.get(1), 2048 * 30 * 20, 2048, @@ -693,17 +696,17 @@ public class RecipeLoader_ChemicalSkips { 32, new ItemStack[] { GregtechItemList.ForceFieldGlass.get(2), Materials.Carbon.getNanite(8), ItemList.Emitter_UEV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 8), + GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 8), GregtechItemList.Laser_Lens_Special.get(1), new ItemStack(advancedRadiationProtectionPlate, 4), ItemList.StableAdhesive.get(4) }, new FluidStack[] { Materials.Thulium.getMolten(144 * 12), MaterialsUEVplus.ExcitedDTPC.getFluid(5000), - new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2500), - new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 2500) }, + new FluidStack(MaterialsElements.getInstance().NEPTUNIUM.getPlasma(), 2500), + new FluidStack(MaterialsElements.getInstance().FERMIUM.getPlasma(), 2500) }, GregtechItemList.CosmicFabricManipulator.get(1), 75 * 20, (int) TierEU.RECIPE_UIV); - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( GregtechItemList.CosmicFabricManipulator.get(1), 4096 * 30 * 20, 4096, @@ -711,16 +714,16 @@ public class RecipeLoader_ChemicalSkips { 32, new ItemStack[] { GregtechItemList.ForceFieldGlass.get(4), Materials.Carbon.getNanite(16), ItemList.Emitter_UIV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUIV, 8), + GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUIV, 8), GregtechItemList.Laser_Lens_Special.get(1), new ItemStack(advancedRadiationProtectionPlate, 8), ItemList.SuperconductorComposite.get(4) }, new FluidStack[] { Materials.Thulium.getMolten(144 * 15), MaterialsUEVplus.ExcitedDTRC.getFluid(5000), - new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 1000 * 10), - new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 1000 * 10) }, + new FluidStack(MaterialsElements.getInstance().NEPTUNIUM.getPlasma(), 1000 * 10), + new FluidStack(MaterialsElements.getInstance().FERMIUM.getPlasma(), 1000 * 10) }, GregtechItemList.InfinityInfusedManipulator.get(1), 90 * 20, (int) TierEU.RECIPE_UMV); - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( GregtechItemList.InfinityInfusedManipulator.get(1), 1024 * 30 * 20, 1024, @@ -728,88 +731,89 @@ public class RecipeLoader_ChemicalSkips { 32, new ItemStack[] { GregtechItemList.ForceFieldGlass.get(8), Materials.Carbon.getNanite(32), ItemList.Emitter_UMV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 8), + GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 8), GregtechItemList.Laser_Lens_Special.get(1), new ItemStack(advancedRadiationProtectionPlate, 16), ItemList.NaquadriaSupersolid.get(4) }, new FluidStack[] { Materials.Thulium.getMolten(144 * 20), MaterialsUEVplus.ExcitedDTEC.getFluid(5000), - new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2000 * 10), - new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 2000 * 10) }, + new FluidStack(MaterialsElements.getInstance().NEPTUNIUM.getPlasma(), 2000 * 10), + new FluidStack(MaterialsElements.getInstance().FERMIUM.getPlasma(), 2000 * 10) }, GregtechItemList.SpaceTimeContinuumRipper.get(1), 60 * 20, (int) TierEU.RECIPE_UXV); - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( ItemList.Casing_AdvancedRadiationProof.get(1), 1024 * 30 * 20, 1024, (int) TierEU.RECIPE_ZPM, 32, - new ItemStack[] { ALLOY.QUANTUM.getFrameBox(1), - GT_OreDictUnificator.get("plateDensePreciousMetalsAlloy", 4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 16), - ItemList.Field_Generator_UV.get(1), ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getScrew(16) }, - new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10), }, + new ItemStack[] { MaterialsAlloy.QUANTUM.getFrameBox(1), + GTOreDictUnificator.get("plateDensePreciousMetalsAlloy", 4), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 16), + ItemList.Field_Generator_UV.get(1), MaterialsElements.STANDALONE.CHRONOMATIC_GLASS.getScrew(16) }, + new FluidStack[] { MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10), }, GregtechItemList.NeutronShieldingCore.get(1), 60 * 20, (int) TierEU.RECIPE_UEV); - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( GregtechItemList.NeutronShieldingCore.get(1), 2048 * 30 * 20, 2048, (int) TierEU.RECIPE_UV, 32, - new ItemStack[] { ALLOY.QUANTUM.getFrameBox(2), - GT_OreDictUnificator.get("plateDenseEnrichedNaquadahAlloy", 4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16), + new ItemStack[] { MaterialsAlloy.QUANTUM.getFrameBox(2), + GTOreDictUnificator.get("plateDenseEnrichedNaquadahAlloy", 4), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16), ItemList.Field_Generator_UEV.get(1), // Radox polymer screw. - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.get("RadoxPoly"), 16), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.get("RadoxPoly"), 16), ItemList.StableAdhesive.get(4) }, - new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 20), }, + new FluidStack[] { MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(144 * 20), }, GregtechItemList.CosmicFabricShieldingCore.get(1), 75 * 20, (int) TierEU.RECIPE_UIV); - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( GregtechItemList.CosmicFabricShieldingCore.get(1), 4096 * 30 * 20, 4096, (int) TierEU.RECIPE_UHV, 32, - new ItemStack[] { ALLOY.QUANTUM.getFrameBox(4), ELEMENT.STANDALONE.HYPOGEN.getPlateDense(4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 16), - ItemList.Field_Generator_UIV.get(1), GT_OreDictUnificator.get("screwMetastableOganesson", 16), + new ItemStack[] { MaterialsAlloy.QUANTUM.getFrameBox(4), + MaterialsElements.STANDALONE.HYPOGEN.getPlateDense(4), + GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 16), + ItemList.Field_Generator_UIV.get(1), GTOreDictUnificator.get("screwMetastableOganesson", 16), ItemList.SuperconductorComposite.get(4) }, - new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 40), }, + new FluidStack[] { MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(144 * 40), }, GregtechItemList.InfinityInfusedShieldingCore.get(1), 90 * 20, (int) TierEU.RECIPE_UMV); - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( GregtechItemList.InfinityInfusedShieldingCore.get(1), 8192 * 30 * 20, 8192, (int) TierEU.RECIPE_UEV, 32, - new ItemStack[] { ALLOY.QUANTUM.getFrameBox(8), GT_OreDictUnificator.get("plateDenseShirabon", 4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 16), + new ItemStack[] { MaterialsAlloy.QUANTUM.getFrameBox(8), GTOreDictUnificator.get("plateDenseShirabon", 4), + GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 16), ItemList.Field_Generator_UMV.get(1), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Dilithium, 16), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.Dilithium, 16), ItemList.NaquadriaSupersolid.get(4) }, - new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 80), }, + new FluidStack[] { MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(144 * 80), }, GregtechItemList.SpaceTimeBendingCore.get(1), 120 * 20, (int) TierEU.RECIPE_UXV); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - new ItemStack(QuantumGlassBlock.INSTANCE, 1), + new ItemStack(BlockQuantumGlass.INSTANCE, 1), ItemList.Field_Generator_ZPM.get(1), - ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getLongRod(6), - ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getPlate(6)) + MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getLongRod(6), + MaterialsElements.STANDALONE.CHRONOMATIC_GLASS.getPlate(6)) .itemOutputs(GregtechItemList.ForceFieldGlass.get(1)) - .fluidInputs(ALLOY.QUANTUM.getFluidStack(144 * 6)) + .fluidInputs(MaterialsAlloy.QUANTUM.getFluidStack(144 * 6)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderGTNH.java index 680a4291e8..19ebb3db93 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderGTNH.java @@ -2,25 +2,25 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.recipe.RecipeMaps.fusionRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.FUSION_THRESHOLD; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.FUSION_THRESHOLD; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.TierEU; -import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.MaterialsElements; -public class RecipeLoader_GTNH { +public class RecipeLoaderGTNH { public static void generate() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ball.get(0L)) .itemOutputs(new ItemStack(Items.ender_pearl, 1, 0)) .fluidInputs(new FluidStack(FluidRegistry.getFluid("ender"), 250)) @@ -29,23 +29,23 @@ public class RecipeLoader_GTNH { .addTo(fluidSolidifierRecipes); // MK4 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(Materials.Plutonium241.getMolten(144), Materials.Helium.getGas(1000)) - .fluidOutputs(ELEMENT.getInstance().CURIUM.getFluidStack(144)) + .fluidOutputs(MaterialsElements.getInstance().CURIUM.getFluidStack(144)) .duration(4 * SECONDS + 16 * TICKS) .eut(98304) .metadata(FUSION_THRESHOLD, 500_000_000) .addTo(fusionRecipes); - GT_Values.RA.stdBuilder() - .fluidInputs(ELEMENT.getInstance().CURIUM.getFluidStack(144), Materials.Helium.getPlasma(144)) - .fluidOutputs(ELEMENT.getInstance().CALIFORNIUM.getFluidStack(144)) + GTValues.RA.stdBuilder() + .fluidInputs(MaterialsElements.getInstance().CURIUM.getFluidStack(144), Materials.Helium.getPlasma(144)) + .fluidOutputs(MaterialsElements.getInstance().CALIFORNIUM.getFluidStack(144)) .duration(6 * SECONDS + 8 * TICKS) .eut(196608) .metadata(FUSION_THRESHOLD, 750_000_000) .addTo(fusionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(Materials.Plutonium241.getMolten(144), Materials.Calcium.getPlasma(144)) .fluidOutputs(Materials.Flerovium.getMolten(144)) .duration(8 * SECONDS) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderGlueLine.java index da4a68d7f5..e517734008 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderGlueLine.java @@ -8,35 +8,35 @@ import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes; import static gregtech.api.recipe.RecipeMaps.fluidHeaterRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalPlantRecipes; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.item.chemistry.GenericChem; -import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.material.MaterialMisc; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.plugin.agrichem.BioRecipes; -public class RecipeLoader_GlueLine { +public class RecipeLoaderGlueLine { public static void generate() { createRecipes(); @@ -55,63 +55,63 @@ public class RecipeLoader_GlueLine { private static void chemicalPlantRecipes() { // CO + C3H6O2 = C4H6O3 - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(17), ItemUtils.getSimpleStack(GenericChem.mBlueCatalyst, 0)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(17), ItemUtils.getSimpleStack(GenericChem.mBlueCatalyst, 0)) .fluidInputs( FluidUtils.getFluidStack("carbonmonoxide", 1000), FluidUtils.getFluidStack("methylacetate", 1000)) - .fluidOutputs(MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000)) + .fluidOutputs(MaterialMisc.ACETIC_ANHYDRIDE.getFluidStack(1000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) .metadata(CHEMPLANT_CASING_TIER, 3) .addTo(chemicalPlantRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(18)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(18)) .fluidInputs( FluidUtils.getFluidStack("aceticacid", 1000), FluidUtils.getFluidStack("chlorine", 1000), - MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000)) + MaterialMisc.ACETIC_ANHYDRIDE.getFluidStack(1000)) .fluidOutputs( - MISC_MATERIALS.CHLOROACETIC_MIXTURE.getFluidStack(1000), - MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(950)) + MaterialMisc.CHLOROACETIC_MIXTURE.getFluidStack(1000), + MaterialMisc.ACETIC_ANHYDRIDE.getFluidStack(950)) .duration(2 * MINUTES + 30 * SECONDS) .eut(1000) .metadata(CHEMPLANT_CASING_TIER, 4) .addTo(chemicalPlantRecipes); // Na2CO3 + NaCN + C2H3O2Cl + 2HCl = C3H3NO2 + 3NaCl + CO2 + H2O - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(19), + GTUtility.getIntegratedCircuit(19), ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6), - MISC_MATERIALS.SODIUM_CYANIDE.getDust(3)) - .itemOutputs(MISC_MATERIALS.CYANOACETIC_ACID.getDust(9), Materials.Salt.getDust(6)) + MaterialMisc.SODIUM_CYANIDE.getDust(3)) + .itemOutputs(MaterialMisc.CYANOACETIC_ACID.getDust(9), Materials.Salt.getDust(6)) .fluidInputs( - MISC_MATERIALS.CHLOROACETIC_ACID.getFluidStack(1000), + MaterialMisc.CHLOROACETIC_ACID.getFluidStack(1000), FluidUtils.getFluidStack("hydrochloricacid_gt5u", 2000)) - .fluidOutputs(Materials.CarbonDioxide.getGas(1000), GT_ModHandler.getWater(1000)) + .fluidOutputs(Materials.CarbonDioxide.getGas(1000), GTModHandler.getWater(1000)) .duration(20 * SECONDS) .eut(1000) .metadata(CHEMPLANT_CASING_TIER, 4) .addTo(chemicalPlantRecipes); // CuSO4 + 5C3H3NO2 + 5C2H6O = CuSO4·5(H2O) + 5C5H7NO2 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(20), + GTUtility.getIntegratedCircuit(20), ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 0), - MISC_MATERIALS.COPPER_SULFATE.getDust(6), - MISC_MATERIALS.CYANOACETIC_ACID.getDust(45)) - .itemOutputs(MISC_MATERIALS.COPPER_SULFATE_HYDRATED.getDust(11)) + MaterialMisc.COPPER_SULFATE.getDust(6), + MaterialMisc.CYANOACETIC_ACID.getDust(45)) + .itemOutputs(MaterialMisc.COPPER_SULFATE_HYDRATED.getDust(11)) .fluidInputs(Materials.Ethanol.getFluid(5000)) - .fluidOutputs(MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(5000)) + .fluidOutputs(MaterialMisc.ETHYL_CYANOACETATE.getFluidStack(5000)) .duration(8 * MINUTES + 20 * SECONDS) .eut(6000) .metadata(CHEMPLANT_CASING_TIER, 5) .addTo(chemicalPlantRecipes); // C3H3NO2 + C2H6O = C5H7NO2 + H2O - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(21), MISC_MATERIALS.CYANOACETIC_ACID.getDust(9)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(21), MaterialMisc.CYANOACETIC_ACID.getDust(9)) .fluidInputs(Materials.Ethanol.getFluid(1000)) - .fluidOutputs(MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(1000)) + .fluidOutputs(MaterialMisc.ETHYL_CYANOACETATE.getFluidStack(1000)) .duration(16 * MINUTES + 40 * SECONDS) .eut(6000) .metadata(CHEMPLANT_CASING_TIER, 5) @@ -120,26 +120,24 @@ public class RecipeLoader_GlueLine { BioRecipes.mFormaldehyde = FluidUtils.getFluidStack("fluid.formaldehyde", 1) .getFluid(); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(22), - ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 0)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(22), ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 0)) .fluidInputs( - MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(100), + MaterialMisc.ETHYL_CYANOACETATE.getFluidStack(100), FluidUtils.getFluidStack(BioRecipes.mFormaldehyde, 100)) - .fluidOutputs(MISC_MATERIALS.CYANOACRYLATE_POLYMER.getFluidStack(100), FluidUtils.getWater(1000)) + .fluidOutputs(MaterialMisc.CYANOACRYLATE_POLYMER.getFluidStack(100), FluidUtils.getWater(1000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .metadata(CHEMPLANT_CASING_TIER, 5) .addTo(chemicalPlantRecipes); // CH4 + NH3 + 3O = HCN + 3H2O - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(23), ItemUtils.getSimpleStack(GenericChem.mPinkCatalyst, 0)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(23), ItemUtils.getSimpleStack(GenericChem.mPinkCatalyst, 0)) .fluidInputs( FluidUtils.getFluidStack("methane", 2000), FluidUtils.getFluidStack("ammonia", 2000), FluidUtils.getFluidStack("oxygen", 6000)) - .fluidOutputs(MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(2000), FluidUtils.getWater(6000)) + .fluidOutputs(MaterialMisc.HYDROGEN_CYANIDE.getFluidStack(2000), FluidUtils.getWater(6000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) .metadata(CHEMPLANT_CASING_TIER, 3) @@ -149,32 +147,32 @@ public class RecipeLoader_GlueLine { private static void chemicalReactorRecipes() { // NaOH + HCN = NaCN + H2O - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(17), + GTUtility.getIntegratedCircuit(17), ItemUtils.getItemStackOfAmountFromOreDict("dustSodiumHydroxide", 3)) - .itemOutputs(MISC_MATERIALS.SODIUM_CYANIDE.getDust(3)) - .fluidInputs(MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(1000)) + .itemOutputs(MaterialMisc.SODIUM_CYANIDE.getDust(3)) + .fluidInputs(MaterialMisc.HYDROGEN_CYANIDE.getFluidStack(1000)) .fluidOutputs(FluidUtils.getWater(1000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(chemicalReactorRecipes); // #UniversalChemical recipemap won't generate LCR recipe if config >= 10 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(17), + GTUtility.getIntegratedCircuit(17), ItemUtils.getItemStackOfAmountFromOreDict("dustSodiumHydroxide", 3)) - .itemOutputs(MISC_MATERIALS.SODIUM_CYANIDE.getDust(3)) - .fluidInputs(MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(1000)) + .itemOutputs(MaterialMisc.SODIUM_CYANIDE.getDust(3)) + .fluidInputs(MaterialMisc.HYDROGEN_CYANIDE.getFluidStack(1000)) .fluidOutputs(FluidUtils.getWater(1000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(multiblockChemicalReactorRecipes); // CaCO3 + 2HCl = CaCl2 + CO2 + H2O - GT_Values.RA.stdBuilder() - .itemInputs(ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 5), GT_Utility.getIntegratedCircuit(8)) + GTValues.RA.stdBuilder() + .itemInputs(ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 5), GTUtility.getIntegratedCircuit(8)) .itemOutputs(ItemUtils.getItemStackFromFQRN("bartworks:gt.bwMetaGenerateddust:63", 3)) .fluidInputs(Materials.HydrochloricAcid.getFluid(2000L)) .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) @@ -184,9 +182,9 @@ public class RecipeLoader_GlueLine { // Cu + 2H2SO4 = CuSO4 + SO2 + 2H2O // SO2 + 2H2O -> diluted sulfuric acid - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(19), ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1)) - .itemOutputs(MISC_MATERIALS.COPPER_SULFATE.getDust(6)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(19), ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1)) + .itemOutputs(MaterialMisc.COPPER_SULFATE.getDust(6)) .fluidInputs(FluidUtils.getFluidStack("sulfuricacid", 2000)) .fluidOutputs(FluidUtils.getFluidStack("dilutedsulfuricacid", 1000)) .duration(5 * SECONDS) @@ -194,9 +192,9 @@ public class RecipeLoader_GlueLine { .addTo(chemicalReactorRecipes); // #UniversalChemical won't generate LCR recipe if config >= 10 - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(19), ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1)) - .itemOutputs(MISC_MATERIALS.COPPER_SULFATE.getDust(6)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(19), ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1)) + .itemOutputs(MaterialMisc.COPPER_SULFATE.getDust(6)) .fluidInputs(FluidUtils.getFluidStack("sulfuricacid", 2000)) .fluidOutputs(FluidUtils.getFluidStack("dilutedsulfuricacid", 1000)) .duration(5 * SECONDS) @@ -205,22 +203,22 @@ public class RecipeLoader_GlueLine { } private static void dehydratorRecipes() { - GT_Values.RA.stdBuilder() - .itemInputs(MISC_MATERIALS.COPPER_SULFATE_HYDRATED.getDust(11)) - .itemOutputs(MISC_MATERIALS.COPPER_SULFATE.getDust(6)) - .fluidOutputs(GT_ModHandler.getWater(5000)) + GTValues.RA.stdBuilder() + .itemInputs(MaterialMisc.COPPER_SULFATE_HYDRATED.getDust(11)) + .itemOutputs(MaterialMisc.COPPER_SULFATE.getDust(6)) + .fluidOutputs(GTModHandler.getWater(5000)) .eut(10) .duration(5 * MINUTES) .addTo(chemicalDehydratorRecipes); } private static void distillationTowerRecipes() { - GT_Values.RA.stdBuilder() - .fluidInputs(MISC_MATERIALS.CHLOROACETIC_MIXTURE.getFluidStack(1000)) + GTValues.RA.stdBuilder() + .fluidInputs(MaterialMisc.CHLOROACETIC_MIXTURE.getFluidStack(1000)) .fluidOutputs( - MISC_MATERIALS.CHLOROACETIC_ACID.getFluidStack(100), - MISC_MATERIALS.DICHLOROACETIC_ACID.getFluidStack(450), - MISC_MATERIALS.TRICHLOROACETIC_ACID.getFluidStack(450)) + MaterialMisc.CHLOROACETIC_ACID.getFluidStack(100), + MaterialMisc.DICHLOROACETIC_ACID.getFluidStack(450), + MaterialMisc.TRICHLOROACETIC_ACID.getFluidStack(450)) .duration(4 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(distillationTowerRecipes); @@ -229,31 +227,31 @@ public class RecipeLoader_GlueLine { private static void fluidHeaterRecipes() { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(16)) - .fluidInputs(MISC_MATERIALS.CYANOACRYLATE_POLYMER.getFluidStack(100)) - .fluidOutputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(100)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(16)) + .fluidInputs(MaterialMisc.CYANOACRYLATE_POLYMER.getFluidStack(100)) + .fluidOutputs(MaterialMisc.ETHYL_CYANOACRYLATE.getFluidStack(100)) .duration(45 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(fluidHeaterRecipes); } private static void mixerRecipes() { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1), MISC_MATERIALS.DICHLOROACETIC_ACID.getCell(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1), MaterialMisc.DICHLOROACETIC_ACID.getCell(1)) .itemOutputs(CI.emptyCells(1)) - .fluidInputs(MISC_MATERIALS.TRICHLOROACETIC_ACID.getFluidStack(1000)) - .fluidOutputs(MISC_MATERIALS.CHLOROACETIC_MIXTURE.getFluidStack(2000)) + .fluidInputs(MaterialMisc.TRICHLOROACETIC_ACID.getFluidStack(1000)) + .fluidOutputs(MaterialMisc.CHLOROACETIC_MIXTURE.getFluidStack(2000)) .duration(5 * SECONDS) .eut(100) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getItemStackOfAmountFromOreDict("cellSulfurTrioxide", 1), - GT_Utility.getIntegratedCircuit(2)) + GTUtility.getIntegratedCircuit(2)) .itemOutputs(CI.emptyCells(1)) .fluidInputs(FluidUtils.getFluidStack("sulfuricacid", 1000)) - .fluidOutputs(MISC_MATERIALS.SOLID_ACID_MIXTURE.getFluidStack(1000)) + .fluidOutputs(MaterialMisc.SOLID_ACID_MIXTURE.getFluidStack(1000)) .duration(5 * SECONDS) .eut(40) .addTo(mixerRecipes); @@ -262,161 +260,161 @@ public class RecipeLoader_GlueLine { private static void glueUsageRecipes() { // Braintech Tape recipe, PBI and superglue make 16 tape at once - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polybenzimidazole, 1L), - GT_ModHandler.getIC2Item("carbonMesh", 1L), - GT_Utility.getIntegratedCircuit(10)) + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polybenzimidazole, 1L), + GTModHandler.getIC2Item("carbonMesh", 1L), + GTUtility.getIntegratedCircuit(10)) .itemOutputs(ItemList.Duct_Tape.get(16L)) - .fluidInputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(100)) + .fluidInputs(MaterialMisc.ETHYL_CYANOACRYLATE.getFluidStack(100)) .duration(6 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(assemblerRecipes); // Maintenance Hatch recipe, using Braintech Tape - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Hull_LV.get(1), ItemList.Duct_Tape.get(1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Hull_LV.get(1), ItemList.Duct_Tape.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Maintenance.get(1)) - .fluidInputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(100)) + .fluidInputs(MaterialMisc.ETHYL_CYANOACRYLATE.getFluidStack(100)) .duration(6 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(assemblerRecipes); // Graphene recipes from later wafer tiers, using superglue instead of the bronze age glue - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getItemStackOfAmountFromOreDict("dustGraphite", 64), ItemList.Circuit_Silicon_Wafer4.get(2L), - GT_Utility.getIntegratedCircuit(2)) + GTUtility.getIntegratedCircuit(2)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustGraphene", 64)) - .fluidInputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(500)) + .fluidInputs(MaterialMisc.ETHYL_CYANOACRYLATE.getFluidStack(500)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LuV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getItemStackOfAmountFromOreDict("dustGraphite", 64), ItemList.Circuit_Silicon_Wafer5.get(1L), - GT_Utility.getIntegratedCircuit(2)) + GTUtility.getIntegratedCircuit(2)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustGraphene", 64)) - .fluidInputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(250)) + .fluidInputs(MaterialMisc.ETHYL_CYANOACRYLATE.getFluidStack(250)) .duration(4 * SECONDS) .eut(TierEU.RECIPE_ZPM) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4L), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4L), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(ItemList.SFMixture.get(32)) - .fluidInputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(100)) + .fluidInputs(MaterialMisc.ETHYL_CYANOACRYLATE.getFluidStack(100)) .duration(1 * MINUTES + 20 * SECONDS) .eut(16) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.GelledToluene.get(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Polybenzimidazole, 1L), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Polybenzimidazole, 1L), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(ItemList.SFMixture.get(64)) - .fluidInputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(100)) + .fluidInputs(MaterialMisc.ETHYL_CYANOACRYLATE.getFluidStack(100)) .duration(1 * MINUTES + 20 * SECONDS) .eut(16) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.PolyvinylChloride, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 32)) + GTOreDictUnificator.get(OrePrefixes.foil, Materials.PolyvinylChloride, 8), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 32)) .itemOutputs(new ItemStack(Items.book, 64, 0)) - .fluidInputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(200)) + .fluidInputs(MaterialMisc.ETHYL_CYANOACRYLATE.getFluidStack(200)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 18)) + GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 18)) .itemOutputs(ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32505", 1)) - .fluidInputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(144)) + .fluidInputs(MaterialMisc.ETHYL_CYANOACRYLATE.getFluidStack(144)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 6)) + GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 2), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 6)) .itemOutputs(ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32506", 1)) - .fluidInputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(288)) + .fluidInputs(MaterialMisc.ETHYL_CYANOACRYLATE.getFluidStack(288)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LuV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.ElectrumFlux, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 18)) + GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.ElectrumFlux, 2), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 18)) .itemOutputs(ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32507", 1)) - .fluidInputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(576)) + .fluidInputs(MaterialMisc.ETHYL_CYANOACRYLATE.getFluidStack(576)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_ZPM) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.ElectrumFlux, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 24)) + GTOreDictUnificator.get(OrePrefixes.cableGt02, Materials.ElectrumFlux, 2), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 24)) .itemOutputs(ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32561", 1)) - .fluidInputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(1152)) + .fluidInputs(MaterialMisc.ETHYL_CYANOACRYLATE.getFluidStack(1152)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.ElectrumFlux, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahEnriched, 36)) + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.ElectrumFlux, 2), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahEnriched, 36)) .itemOutputs(ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32562", 1)) - .fluidInputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(2304)) + .fluidInputs(MaterialMisc.ETHYL_CYANOACRYLATE.getFluidStack(2304)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.ElectrumFlux, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 48)) + GTOreDictUnificator.get(OrePrefixes.cableGt08, Materials.ElectrumFlux, 2), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 48)) .itemOutputs(ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32563", 1)) - .fluidInputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(4608)) + .fluidInputs(MaterialMisc.ETHYL_CYANOACRYLATE.getFluidStack(4608)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 56)) + GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 2), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 56)) .itemOutputs(ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32564", 1)) - .fluidInputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(9216)) + .fluidInputs(MaterialMisc.ETHYL_CYANOACRYLATE.getFluidStack(9216)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 64)) + GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 2), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 64)) .itemOutputs(ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32565", 1)) - .fluidInputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(18432)) + .fluidInputs(MaterialMisc.ETHYL_CYANOACRYLATE.getFluidStack(18432)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); if (NewHorizonsCoreMod.isModLoaded() && GalacticraftCore.isModLoaded()) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getItemStackFromFQRN("GalacticraftMars:item.itemBasicAsteroids:7", 1), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Titanium, 8), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Titanium, 8), ItemUtils.getItemStackFromFQRN("dreamcraft:item.TungstenString", 8), - GT_Utility.getIntegratedCircuit(1)) + GTUtility.getIntegratedCircuit(1)) .itemOutputs(ItemUtils.getItemStackFromFQRN("GalaxySpace:item.ThermalClothT2", 1)) - .fluidInputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(576)) + .fluidInputs(MaterialMisc.ETHYL_CYANOACRYLATE.getFluidStack(576)) .duration(30 * SECONDS) .eut(1024) .addTo(assemblerRecipes); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderLFTR.java index 507e149abf..b5a3a55cd0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderLFTR.java @@ -1,22 +1,22 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.LFTR_OUTPUT_POWER; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.LFTR_OUTPUT_POWER; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.liquidFluorineThoriumReactorRecipes; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.util.GasSpargingRecipeMap; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.nuclear.FLUORIDES; -import gtPlusPlus.core.material.nuclear.NUCLIDE; +import gtPlusPlus.core.material.MaterialsElements; +import gtPlusPlus.core.material.nuclear.MaterialsFluorides; +import gtPlusPlus.core.material.nuclear.MaterialsNuclides; -public class RecipeLoader_LFTR { +public class RecipeLoaderLFTR { private static AutoMap<Fluid> mNobleGases; private static AutoMap<Fluid> mFluorideGases; @@ -35,20 +35,20 @@ public class RecipeLoader_LFTR { if (mNobleGases == null) { mNobleGases = new AutoMap<>(); mNobleGases.add(mSpargeGases.get(0)); - mNobleGases.add(ELEMENT.getInstance().XENON.getFluid()); - mNobleGases.add(ELEMENT.getInstance().NEON.getFluid()); - mNobleGases.add(ELEMENT.getInstance().ARGON.getFluid()); - mNobleGases.add(ELEMENT.getInstance().KRYPTON.getFluid()); - mNobleGases.add(ELEMENT.getInstance().RADON.getFluid()); + mNobleGases.add(MaterialsElements.getInstance().XENON.getFluid()); + mNobleGases.add(MaterialsElements.getInstance().NEON.getFluid()); + mNobleGases.add(MaterialsElements.getInstance().ARGON.getFluid()); + mNobleGases.add(MaterialsElements.getInstance().KRYPTON.getFluid()); + mNobleGases.add(MaterialsElements.getInstance().RADON.getFluid()); } if (mFluorideGases == null) { mFluorideGases = new AutoMap<>(); mFluorideGases.add(mSpargeGases.get(1)); - mFluorideGases.add(FLUORIDES.LITHIUM_FLUORIDE.getFluid()); - mFluorideGases.add(FLUORIDES.NEPTUNIUM_HEXAFLUORIDE.getFluid()); - mFluorideGases.add(FLUORIDES.TECHNETIUM_HEXAFLUORIDE.getFluid()); - mFluorideGases.add(FLUORIDES.SELENIUM_HEXAFLUORIDE.getFluid()); - mFluorideGases.add(FLUORIDES.THORIUM_TETRAFLUORIDE.getFluid()); + mFluorideGases.add(MaterialsFluorides.LITHIUM_FLUORIDE.getFluid()); + mFluorideGases.add(MaterialsFluorides.NEPTUNIUM_HEXAFLUORIDE.getFluid()); + mFluorideGases.add(MaterialsFluorides.TECHNETIUM_HEXAFLUORIDE.getFluid()); + mFluorideGases.add(MaterialsFluorides.SELENIUM_HEXAFLUORIDE.getFluid()); + mFluorideGases.add(MaterialsFluorides.THORIUM_TETRAFLUORIDE.getFluid()); } } @@ -61,42 +61,42 @@ public class RecipeLoader_LFTR { // 1l/10t= 1000l/2.5hr LiFBeF2ZrF4U235 configureSparging(); - FluidStack Li2BeF4 = NUCLIDE.Li2BeF4.getFluidStack(200); + FluidStack Li2BeF4 = MaterialsNuclides.Li2BeF4.getFluidStack(200); // LiFBeF2ThF4UF4 - T3 - GT_Values.RA.stdBuilder() - .fluidInputs(NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(100), Li2BeF4) + GTValues.RA.stdBuilder() + .fluidInputs(MaterialsNuclides.LiFBeF2ThF4UF4.getFluidStack(100), Li2BeF4) .fluidOutputs( - NUCLIDE.LiFBeF2UF4FP.getFluidStack(100), - NUCLIDE.LiFBeF2ThF4.getFluidStack(200), - FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(20), - FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(10)) + MaterialsNuclides.LiFBeF2UF4FP.getFluidStack(100), + MaterialsNuclides.LiFBeF2ThF4.getFluidStack(200), + MaterialsFluorides.URANIUM_HEXAFLUORIDE.getFluidStack(20), + MaterialsFluorides.URANIUM_HEXAFLUORIDE.getFluidStack(10)) .duration(1 * MINUTES + 40 * SECONDS) .eut(0) .metadata(LFTR_OUTPUT_POWER, 32768 * 4) .addTo(liquidFluorineThoriumReactorRecipes); // LiFBeF2ZrF4UF4 - T2 - GT_Values.RA.stdBuilder() - .fluidInputs(NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(100), Li2BeF4) + GTValues.RA.stdBuilder() + .fluidInputs(MaterialsNuclides.LiFBeF2ZrF4UF4.getFluidStack(100), Li2BeF4) .fluidOutputs( - NUCLIDE.LiFBeF2UF4FP.getFluidStack(50), - NUCLIDE.LiFBeF2ThF4.getFluidStack(100), - FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(10), - FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(5)) + MaterialsNuclides.LiFBeF2UF4FP.getFluidStack(50), + MaterialsNuclides.LiFBeF2ThF4.getFluidStack(100), + MaterialsFluorides.URANIUM_HEXAFLUORIDE.getFluidStack(10), + MaterialsFluorides.URANIUM_HEXAFLUORIDE.getFluidStack(5)) .duration(1 * MINUTES + 40 * SECONDS) .eut(0) .metadata(LFTR_OUTPUT_POWER, 8192 * 4) .addTo(liquidFluorineThoriumReactorRecipes); // LiFBeF2ZrF4U235 - T1 - GT_Values.RA.stdBuilder() - .fluidInputs(NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(100), Li2BeF4) + GTValues.RA.stdBuilder() + .fluidInputs(MaterialsNuclides.LiFBeF2ZrF4U235.getFluidStack(100), Li2BeF4) .fluidOutputs( - NUCLIDE.LiFBeF2UF4FP.getFluidStack(25), - NUCLIDE.LiFThF4.getFluidStack(50), - FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(4), - FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(2)) + MaterialsNuclides.LiFBeF2UF4FP.getFluidStack(25), + MaterialsNuclides.LiFThF4.getFluidStack(50), + MaterialsFluorides.URANIUM_HEXAFLUORIDE.getFluidStack(4), + MaterialsFluorides.URANIUM_HEXAFLUORIDE.getFluidStack(2)) .duration(1 * MINUTES + 40 * SECONDS) .eut(0) .metadata(LFTR_OUTPUT_POWER, 8192) @@ -105,8 +105,8 @@ public class RecipeLoader_LFTR { // Sparging NEI Recipes GasSpargingRecipeMap.addRecipe( new FluidStack(mSpargeGases.get(0), 1000), - NUCLIDE.LiFBeF2UF4FP.getFluidStack(50), - NUCLIDE.Sparged_LiFBeF2UF4FP.getFluidStack(50), + MaterialsNuclides.LiFBeF2UF4FP.getFluidStack(50), + MaterialsNuclides.Sparged_LiFBeF2UF4FP.getFluidStack(50), new FluidStack[] { new FluidStack(mNobleGases.get(1), 10), new FluidStack(mNobleGases.get(2), 10), new FluidStack(mNobleGases.get(3), 10), new FluidStack(mNobleGases.get(4), 10), new FluidStack(mNobleGases.get(5), 10) }, @@ -114,8 +114,8 @@ public class RecipeLoader_LFTR { GasSpargingRecipeMap.addRecipe( new FluidStack(mSpargeGases.get(1), 100), - NUCLIDE.LiFThF4.getFluidStack(50), - NUCLIDE.Sparged_LiFThF4.getFluidStack(50), + MaterialsNuclides.LiFThF4.getFluidStack(50), + MaterialsNuclides.Sparged_LiFThF4.getFluidStack(50), new FluidStack[] { new FluidStack(mFluorideGases.get(1), 5), new FluidStack(mFluorideGases.get(2), 5), new FluidStack(mFluorideGases.get(3), 5), new FluidStack(mFluorideGases.get(4), 5), new FluidStack(mFluorideGases.get(5), 5) }, @@ -123,8 +123,8 @@ public class RecipeLoader_LFTR { GasSpargingRecipeMap.addRecipe( new FluidStack(mSpargeGases.get(1), 100), - NUCLIDE.LiFBeF2ThF4.getFluidStack(50), - NUCLIDE.Sparged_LiFBeF2ThF4.getFluidStack(50), + MaterialsNuclides.LiFBeF2ThF4.getFluidStack(50), + MaterialsNuclides.Sparged_LiFBeF2ThF4.getFluidStack(50), new FluidStack[] { new FluidStack(mFluorideGases.get(1), 10), new FluidStack(mFluorideGases.get(2), 10), new FluidStack(mFluorideGases.get(3), 10), new FluidStack(mFluorideGases.get(4), 10), new FluidStack(mFluorideGases.get(5), 10) }, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderMolecularTransformer.java index b1d71ca120..1a96b594fb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderMolecularTransformer.java @@ -3,21 +3,21 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; import static advsolar.utils.MTRecipeManager.transformerRecipes; import static gregtech.api.enums.Mods.AdvancedSolarPanel; import static gregtech.api.enums.Mods.GalaxySpace; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.molecularTransformerRecipes; import advsolar.utils.MTRecipeRecord; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.math.MathUtils; -public class RecipeLoader_MolecularTransformer { +public class RecipeLoaderMolecularTransformer { public static void run() { @@ -33,7 +33,7 @@ public class RecipeLoader_MolecularTransformer { int aTicksRoundedUp = MathUtils.roundToClosestInt(Math.ceil(aTicks)); Logger.INFO("Ticks: " + aTicksRoundedUp); Logger.INFO("Total EU equal or greater? " + ((aTicksRoundedUp * aEU) >= aRecipe.energyPerOperation)); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aRecipe.inputStack) .itemOutputs(aRecipe.outputStack) .duration(aTicksRoundedUp) @@ -46,39 +46,39 @@ public class RecipeLoader_MolecularTransformer { transformerRecipes.clear(); if (AdvancedSolarPanel.isModLoaded() && GalaxySpace.isModLoaded()) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L)) - .itemOutputs(GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L)) + .itemOutputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(molecularTransformerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 0)) - .itemOutputs(GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9)) + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 0)) + .itemOutputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9)) .duration(7 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_IV) .addTo(molecularTransformerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 1)) - .itemOutputs(GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9)) + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 1)) + .itemOutputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9)) .duration(1 * SECONDS + 18 * TICKS) .eut(TierEU.RECIPE_LuV) .addTo(molecularTransformerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 2)) - .itemOutputs(GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9)) + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 2)) + .itemOutputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9)) .duration(10 * TICKS) .eut(TierEU.RECIPE_ZPM) .addTo(molecularTransformerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 3)) - .itemOutputs(GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9)) + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 3)) + .itemOutputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9)) .duration(3 * TICKS) .eut(TierEU.RECIPE_UV) .addTo(molecularTransformerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 4)) - .itemOutputs(GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9)) + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 4)) + .itemOutputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9)) .duration(1 * TICKS) .eut(TierEU.RECIPE_UHV) .addTo(molecularTransformerRecipes); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderNuclear.java index efd6023778..4f67c7160b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderNuclear.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; -import static gregtech.api.enums.GT_Values.RA; +import static gregtech.api.enums.GTValues.RA; import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; @@ -13,41 +13,41 @@ import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes; import static gregtech.api.recipe.RecipeMaps.sifterRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; -import static gregtech.api.util.GT_RecipeConstants.FUSION_THRESHOLD; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; +import static gregtech.api.util.GTRecipeConstants.FUSION_THRESHOLD; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.chemistry.GenericChem; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.MISC_MATERIALS; -import gtPlusPlus.core.material.nuclear.FLUORIDES; -import gtPlusPlus.core.material.nuclear.NUCLIDE; +import gtPlusPlus.core.material.MaterialMisc; +import gtPlusPlus.core.material.MaterialsAlloy; +import gtPlusPlus.core.material.MaterialsElements; +import gtPlusPlus.core.material.nuclear.MaterialsFluorides; +import gtPlusPlus.core.material.nuclear.MaterialsNuclides; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -public class RecipeLoader_Nuclear { +public class RecipeLoaderNuclear { public static void generate() { createRecipes(); - RecipeLoader_LFTR.generate(); - RecipeLoader_NuclearFuelProcessing.generate(); + RecipeLoaderLFTR.generate(); + RecipeLoaderNuclearFuelProcessing.generate(); } private static void createRecipes() { @@ -67,7 +67,7 @@ public class RecipeLoader_Nuclear { } private static void autoclave() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("pelletZirconium", 1)) .fluidInputs(FluidUtils.getFluidStack("chlorine", 4_000)) @@ -78,15 +78,17 @@ public class RecipeLoader_Nuclear { private static void blastFurnace() { - GT_Values.RA.stdBuilder() - .itemInputs(FLUORIDES.LITHIUM_FLUORIDE.getDust(4), FLUORIDES.BERYLLIUM_FLUORIDE.getDust(3)) - .itemOutputs(NUCLIDE.Li2BeF4.getDust(7)) + GTValues.RA.stdBuilder() + .itemInputs( + MaterialsFluorides.LITHIUM_FLUORIDE.getDust(4), + MaterialsFluorides.BERYLLIUM_FLUORIDE.getDust(3)) + .itemOutputs(MaterialsNuclides.Li2BeF4.getDust(7)) .duration(2 * MINUTES + 20 * SECONDS) .eut(TierEU.RECIPE_EV) .metadata(COIL_HEAT, 3000) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("dustZrCl4", 1)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 1)) .duration(1 * MINUTES) @@ -104,15 +106,15 @@ public class RecipeLoader_Nuclear { ItemUtils.getItemStackFromFQRN("IC2:reactorUraniumSimpledepleted", 8), ItemUtils.getItemStackFromFQRN("IC2:reactorUraniumDualdepleted", 4), ItemUtils.getItemStackFromFQRN("IC2:reactorUraniumQuaddepleted", 2) }) { - GT_Values.RA.stdBuilder() - .itemInputs(depletedRod, GT_Utility.getIntegratedCircuit(20)) + GTValues.RA.stdBuilder() + .itemInputs(depletedRod, GTUtility.getIntegratedCircuit(20)) .itemOutputs( ItemList.IC2_Fuel_Rod_Empty.get(8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 2L), - ELEMENT.getInstance().URANIUM232.getSmallDust(1), - ELEMENT.getInstance().URANIUM233.getSmallDust(1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Uranium235, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 2L), + MaterialsElements.getInstance().URANIUM232.getSmallDust(1), + MaterialsElements.getInstance().URANIUM233.getSmallDust(1), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Uranium235, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1L)) .outputChances(10000, 10000, 1000, 1000, 1000, 500) .fluidOutputs(FluidUtils.getFluidStack("krypton", 60)) .duration(4 * MINUTES + 10 * SECONDS) @@ -125,15 +127,15 @@ public class RecipeLoader_Nuclear { ItemUtils.getItemStackFromFQRN("IC2:reactorMOXSimpledepleted", 8), ItemUtils.getItemStackFromFQRN("IC2:reactorMOXDualdepleted", 4), ItemUtils.getItemStackFromFQRN("IC2:reactorMOXQuaddepleted", 2) }) { - GT_Values.RA.stdBuilder() - .itemInputs(depletedRod, GT_Utility.getIntegratedCircuit(20)) + GTValues.RA.stdBuilder() + .itemInputs(depletedRod, GTUtility.getIntegratedCircuit(20)) .itemOutputs( ItemList.IC2_Fuel_Rod_Empty.get(8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 2L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium241, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1L), - ELEMENT.getInstance().PLUTONIUM238.getTinyDust(1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 2L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium241, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1L), + MaterialsElements.getInstance().PLUTONIUM238.getTinyDust(1), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1L)) .outputChances(10000, 10000, 500, 500, 500, 500) .fluidOutputs(FluidUtils.getFluidStack("krypton", 90)) .duration(6 * MINUTES + 15 * SECONDS) @@ -144,15 +146,15 @@ public class RecipeLoader_Nuclear { // Thorium for (ItemStack depletedRod : new ItemStack[] { ItemList.Depleted_Thorium_1.get(8), ItemList.Depleted_Thorium_2.get(4), ItemList.Depleted_Thorium_4.get(2) }) { - GT_Values.RA.stdBuilder() - .itemInputs(depletedRod, GT_Utility.getIntegratedCircuit(20)) + GTValues.RA.stdBuilder() + .itemInputs(depletedRod, GTUtility.getIntegratedCircuit(20)) .itemOutputs( ItemList.IC2_Fuel_Rod_Empty.get(8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 2L), - ELEMENT.getInstance().THORIUM232.getDust(1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lutetium, 1L), - ELEMENT.getInstance().POLONIUM.getSmallDust(1), - ELEMENT.getInstance().THALLIUM.getTinyDust(1)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 2L), + MaterialsElements.getInstance().THORIUM232.getDust(1), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lutetium, 1L), + MaterialsElements.getInstance().POLONIUM.getSmallDust(1), + MaterialsElements.getInstance().THALLIUM.getTinyDust(1)) .outputChances(10000, 10000, 5000, 5000, 5000, 2500) .fluidOutputs(FluidUtils.getFluidStack("krypton", 30)) .duration(2 * MINUTES + 5 * SECONDS) @@ -164,7 +166,7 @@ public class RecipeLoader_Nuclear { private static void chemicalBathRecipes() { int[] chances = { 9000, 6000, 3000 }; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 12)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 3), @@ -177,7 +179,7 @@ public class RecipeLoader_Nuclear { .addTo(chemicalBathRecipes); chances = new int[] { 9000, 3000, 1000 }; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("dustRutile", 5)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 3), @@ -189,7 +191,7 @@ public class RecipeLoader_Nuclear { .eut(1024) .addTo(chemicalBathRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 2)) .fluidInputs(FluidUtils.getFluidStack("hydrofluoricacid", 500)) @@ -204,7 +206,7 @@ public class RecipeLoader_Nuclear { ItemStack aGtHydrofluoricAcid = ItemUtils .getItemStackOfAmountFromOreDictNoBroken("cellHydrofluoricAcid_GT5U", 2); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 6), ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5)) @@ -213,7 +215,7 @@ public class RecipeLoader_Nuclear { .eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 3)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 2)) .fluidInputs(FluidUtils.getFluidStack("hydrofluoricacid", 500)) @@ -222,7 +224,7 @@ public class RecipeLoader_Nuclear { .eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 8), ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 16)) @@ -235,74 +237,74 @@ public class RecipeLoader_Nuclear { // LFTR Fuel Related Compounds // Hydroxide - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(3), ELEMENT.getInstance().OXYGEN.getCell(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(3), MaterialsElements.getInstance().OXYGEN.getCell(1)) .itemOutputs(CI.emptyCells(1)) - .fluidInputs(ELEMENT.getInstance().HYDROGEN.getFluidStack(1000)) - .fluidOutputs(MISC_MATERIALS.HYDROXIDE.getFluidStack(1000)) + .fluidInputs(MaterialsElements.getInstance().HYDROGEN.getFluidStack(1000)) + .fluidOutputs(MaterialMisc.HYDROXIDE.getFluidStack(1000)) .duration(8 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); // Beryllium Hydroxide - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(3), ELEMENT.getInstance().BERYLLIUM.getDust(1)) - .fluidInputs(MISC_MATERIALS.HYDROXIDE.getFluidStack(2000)) - .fluidOutputs(FLUORIDES.BERYLLIUM_HYDROXIDE.getFluidStack(432)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(3), MaterialsElements.getInstance().BERYLLIUM.getDust(1)) + .fluidInputs(MaterialMisc.HYDROXIDE.getFluidStack(2000)) + .fluidOutputs(MaterialsFluorides.BERYLLIUM_HYDROXIDE.getFluidStack(432)) .duration(4 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); // Ammonium Bifluoride - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(3), + GTUtility.getIntegratedCircuit(3), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1)) .itemOutputs(CI.emptyCells(1)) - .fluidInputs(MISC_MATERIALS.AMMONIA.getFluidStack(1000)) - .fluidOutputs(FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(576)) + .fluidInputs(MaterialMisc.AMMONIA.getFluidStack(1000)) + .fluidOutputs(MaterialsFluorides.AMMONIUM_BIFLUORIDE.getFluidStack(576)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); // Ammonium Bifluoride - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(3), aGtHydrofluoricAcid) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(3), aGtHydrofluoricAcid) .itemOutputs(CI.emptyCells(2)) - .fluidInputs(MISC_MATERIALS.AMMONIA.getFluidStack(1000)) - .fluidOutputs(FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(576)) + .fluidInputs(MaterialMisc.AMMONIA.getFluidStack(1000)) + .fluidOutputs(MaterialsFluorides.AMMONIUM_BIFLUORIDE.getFluidStack(576)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); // Ammonium // To be deprecated now that it is no longer needed for ammonium bifluoride - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(3), ELEMENT.getInstance().HYDROGEN.getCell(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(3), MaterialsElements.getInstance().HYDROGEN.getCell(1)) .itemOutputs(CI.emptyCells(1)) - .fluidInputs(MISC_MATERIALS.AMMONIA.getFluidStack(1000)) - .fluidOutputs(MISC_MATERIALS.AMMONIUM.getFluidStack(2000)) + .fluidInputs(MaterialMisc.AMMONIA.getFluidStack(1000)) + .fluidOutputs(MaterialMisc.AMMONIUM.getFluidStack(2000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); // Sodium Fluoride - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedBioCircuit(15), ItemUtils.getItemStackOfAmountFromOreDict("dustSodiumHydroxide", 3)) - .itemOutputs(FLUORIDES.SODIUM_FLUORIDE.getDust(2)) + .itemOutputs(MaterialsFluorides.SODIUM_FLUORIDE.getDust(2)) .fluidInputs(FluidUtils.getFluidStack("hydrofluoricacid", 500)) .fluidOutputs(FluidUtils.getWater(1000)) .duration(1 * MINUTES) .eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedBioCircuit(15), ItemUtils.getItemStackOfAmountFromOreDict("dustSodiumHydroxide", 3)) - .itemOutputs(FLUORIDES.SODIUM_FLUORIDE.getDust(2)) + .itemOutputs(MaterialsFluorides.SODIUM_FLUORIDE.getDust(2)) .fluidInputs(FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 1000)) .fluidOutputs(FluidUtils.getWater(1000)) .duration(1 * MINUTES) @@ -313,7 +315,7 @@ public class RecipeLoader_Nuclear { private static void dehydratorRecipes() { // Makes 7-Lithium - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedAdvancedCircuit(14)) .fluidInputs(FluidUtils.getFluidStack("sulfuriclithium", 1440)) .itemOutputs( @@ -327,11 +329,11 @@ public class RecipeLoader_Nuclear { .addTo(chemicalDehydratorRecipes); // Makes Lithium Carbonate - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.emptyCells(12), ItemUtils.getItemStackOfAmountFromOreDict("dustLepidolite", 20)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4), ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 10), ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 2), ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3)) @@ -344,7 +346,7 @@ public class RecipeLoader_Nuclear { // Calcium Hydroxide if (ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1))) { // CaO + H2O = Ca(OH)2 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedBioCircuit(20), ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 2)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5)) .fluidInputs(FluidUtils.getFluidStack("water", 1000)) @@ -360,7 +362,7 @@ public class RecipeLoader_Nuclear { } // 2 LiOH + CaCO3 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(20), ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 11)) @@ -372,7 +374,7 @@ public class RecipeLoader_Nuclear { .addTo(chemicalDehydratorRecipes); // LiOH Liquid to Dust - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedAdvancedCircuit(22)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1)) .fluidInputs(FluidUtils.getFluidStack("lithiumhydroxide", 144)) @@ -382,11 +384,11 @@ public class RecipeLoader_Nuclear { // Zirconium Chloride -> TetraFluoride FluidStack aHydrogenChloride = new FluidStack(GenericChem.HydrochloricAcid, 800); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(11), ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 1)) - .itemOutputs(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(1)) + .itemOutputs(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE.getDust(1)) .fluidInputs(FluidUtils.getFluidStack("hydrofluoricacid", 400)) .fluidOutputs(aHydrogenChloride) .eut(TierEU.RECIPE_HV) @@ -394,11 +396,11 @@ public class RecipeLoader_Nuclear { .addTo(chemicalDehydratorRecipes); // Zirconium Chloride -> TetraFluoride - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(10), ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 1)) - .itemOutputs(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(1)) + .itemOutputs(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE.getDust(1)) .fluidInputs(FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 800)) .fluidOutputs(aHydrogenChloride) .eut(TierEU.RECIPE_HV) @@ -408,19 +410,21 @@ public class RecipeLoader_Nuclear { // Be(OH)2 + 2 (NH4)HF2 → (NH4)2BeF4 + 2 H2O // Inputs use solid rule because they are molten forms of solids // Outputs use fluid rule because they are not molten forms of solids - GT_Values.RA.stdBuilder() - .itemInputs(FLUORIDES.BERYLLIUM_HYDROXIDE.getDust(3), CI.emptyCells(2)) + GTValues.RA.stdBuilder() + .itemInputs(MaterialsFluorides.BERYLLIUM_HYDROXIDE.getDust(3), CI.emptyCells(2)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 2)) - .fluidInputs(FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(1152)) - .fluidOutputs(FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE.getFluidStack(1000)) + .fluidInputs(MaterialsFluorides.AMMONIUM_BIFLUORIDE.getFluidStack(1152)) + .fluidOutputs(MaterialsFluorides.AMMONIUM_TETRAFLUOROBERYLLATE.getFluidStack(1000)) .eut(64) .duration(6 * SECONDS) .addTo(chemicalDehydratorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(FLUORIDES.BERYLLIUM_HYDROXIDE.getDust(3), CI.getNumberedAdvancedCircuit(17)) - .fluidInputs(FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(1152)) - .fluidOutputs(Materials.Water.getFluid(2000L), FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE.getFluidStack(1000)) + GTValues.RA.stdBuilder() + .itemInputs(MaterialsFluorides.BERYLLIUM_HYDROXIDE.getDust(3), CI.getNumberedAdvancedCircuit(17)) + .fluidInputs(MaterialsFluorides.AMMONIUM_BIFLUORIDE.getFluidStack(1152)) + .fluidOutputs( + Materials.Water.getFluid(2000L), + MaterialsFluorides.AMMONIUM_TETRAFLUOROBERYLLATE.getFluidStack(1000)) .eut(TierEU.RECIPE_MV) .duration(5 * MINUTES) .addTo(multiblockChemicalReactorRecipes); @@ -430,24 +434,22 @@ public class RecipeLoader_Nuclear { // Beryllium fluoride uses solid rule // Industrial strength hydrofluoric acid follows its usual convention where it is twice as dense as regular // hydrofluoric acid - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedAdvancedCircuit(17), CI.emptyCells(3)) .itemOutputs( - MISC_MATERIALS.AMMONIA.getCell(2), + MaterialMisc.AMMONIA.getCell(2), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1), - FLUORIDES.BERYLLIUM_FLUORIDE.getDust(3)) - .fluidInputs(FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE.getFluidStack(1000)) + MaterialsFluorides.BERYLLIUM_FLUORIDE.getDust(3)) + .fluidInputs(MaterialsFluorides.AMMONIUM_TETRAFLUOROBERYLLATE.getFluidStack(1000)) .eut(TierEU.RECIPE_MV) .duration(5 * MINUTES) .addTo(chemicalDehydratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(CI.getNumberedAdvancedCircuit(17)) - .itemOutputs(FLUORIDES.BERYLLIUM_FLUORIDE.getDust(3)) - .fluidInputs(FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE.getFluidStack(1000)) - .fluidOutputs( - MISC_MATERIALS.AMMONIA.getFluidStack(2000), - FluidUtils.getFluidStack("hydrofluoricacid", 1000)) + .itemOutputs(MaterialsFluorides.BERYLLIUM_FLUORIDE.getDust(3)) + .fluidInputs(MaterialsFluorides.AMMONIUM_TETRAFLUOROBERYLLATE.getFluidStack(1000)) + .fluidOutputs(MaterialMisc.AMMONIA.getFluidStack(2000), FluidUtils.getFluidStack("hydrofluoricacid", 1000)) .eut(TierEU.RECIPE_MV) .duration(5 * MINUTES) .addTo(multiblockChemicalReactorRecipes); @@ -456,7 +458,7 @@ public class RecipeLoader_Nuclear { private static void electroMagneticSeperator() { // Zirconium - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedBauxite", 1)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustBauxite", 1), @@ -467,7 +469,7 @@ public class RecipeLoader_Nuclear { .eut(24) .addTo(electroMagneticSeparatorRecipes); // Zircon - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedMagnetite", 1)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustMagnetite", 1), @@ -477,7 +479,7 @@ public class RecipeLoader_Nuclear { .duration(20 * SECONDS) .eut(24) .addTo(electroMagneticSeparatorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCassiterite", 1)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustCassiterite", 1), @@ -493,55 +495,55 @@ public class RecipeLoader_Nuclear { private static void fluidExtractorRecipes() { // FLiBe fuel - GT_Values.RA.stdBuilder() - .itemInputs(NUCLIDE.Li2BeF4.getDust(1)) - .fluidOutputs(NUCLIDE.Li2BeF4.getFluidStack(144)) + GTValues.RA.stdBuilder() + .itemInputs(MaterialsNuclides.Li2BeF4.getDust(1)) + .fluidOutputs(MaterialsNuclides.Li2BeF4.getFluidStack(144)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(fluidExtractionRecipes); // Lithium Fluoride - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 1)) - .fluidOutputs(FLUORIDES.LITHIUM_FLUORIDE.getFluidStack(144)) + .fluidOutputs(MaterialsFluorides.LITHIUM_FLUORIDE.getFluidStack(144)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(fluidExtractionRecipes); // Lithium Fluoride - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("dustBerylliumFluoride", 1)) - .fluidOutputs(FLUORIDES.BERYLLIUM_FLUORIDE.getFluidStack(144)) + .fluidOutputs(MaterialsFluorides.BERYLLIUM_FLUORIDE.getFluidStack(144)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(fluidExtractionRecipes); // LFTR Fuel 1 - GT_Values.RA.stdBuilder() - .itemInputs(NUCLIDE.LiFBeF2ZrF4U235.getDust(1)) - .fluidOutputs(NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(144)) + GTValues.RA.stdBuilder() + .itemInputs(MaterialsNuclides.LiFBeF2ZrF4U235.getDust(1)) + .fluidOutputs(MaterialsNuclides.LiFBeF2ZrF4U235.getFluidStack(144)) .duration(12 * SECONDS + 10 * TICKS) .eut(1000) .addTo(fluidExtractionRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(NUCLIDE.LiFBeF2ZrF4UF4.getDust(1)) - .fluidOutputs(NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(144)) + GTValues.RA.stdBuilder() + .itemInputs(MaterialsNuclides.LiFBeF2ZrF4UF4.getDust(1)) + .fluidOutputs(MaterialsNuclides.LiFBeF2ZrF4UF4.getFluidStack(144)) .duration(7 * SECONDS + 10 * TICKS) .eut(1500) .addTo(fluidExtractionRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(NUCLIDE.LiFBeF2ThF4UF4.getDust(1)) - .fluidOutputs(NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(144)) + GTValues.RA.stdBuilder() + .itemInputs(MaterialsNuclides.LiFBeF2ThF4UF4.getDust(1)) + .fluidOutputs(MaterialsNuclides.LiFBeF2ThF4UF4.getFluidStack(144)) .duration(7 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_EV) .addTo(fluidExtractionRecipes); // ZIRCONIUM_TETRAFLUORIDE - GT_Values.RA.stdBuilder() - .itemInputs(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(1)) - .fluidOutputs(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(144)) + GTValues.RA.stdBuilder() + .itemInputs(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE.getDust(1)) + .fluidOutputs(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(144)) .duration(10 * SECONDS) .eut(512 + 256) .addTo(fluidExtractionRecipes); @@ -549,77 +551,77 @@ public class RecipeLoader_Nuclear { private static void fusionChainRecipes() { // Mk1 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(Materials.Boron.getPlasma(144), Materials.Calcium.getPlasma(16)) - .fluidOutputs(new FluidStack(ELEMENT.getInstance().NEON.getPlasma(), 1000)) + .fluidOutputs(new FluidStack(MaterialsElements.getInstance().NEON.getPlasma(), 1000)) .duration(3 * SECONDS + 4 * TICKS) .eut(TierEU.RECIPE_LuV) .metadata(FUSION_THRESHOLD, 100_000_000) .addTo(fusionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs( - new FluidStack(ELEMENT.getInstance().NEON.getPlasma(), 144), + new FluidStack(MaterialsElements.getInstance().NEON.getPlasma(), 144), Materials.Bedrockium.getMolten(144)) - .fluidOutputs(new FluidStack(ELEMENT.STANDALONE.FORCE.getPlasma(), 1000)) + .fluidOutputs(new FluidStack(MaterialsElements.STANDALONE.FORCE.getPlasma(), 1000)) .duration(1 * SECONDS + 12 * TICKS) .eut(TierEU.RECIPE_LuV) .metadata(FUSION_THRESHOLD, 100_000_000) .addTo(fusionRecipes); // Mk2 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(Materials.Niobium.getPlasma(144), Materials.Zinc.getPlasma(144)) - .fluidOutputs(new FluidStack(ELEMENT.getInstance().KRYPTON.getPlasma(), 144)) + .fluidOutputs(new FluidStack(MaterialsElements.getInstance().KRYPTON.getPlasma(), 144)) .duration(32 * TICKS) .eut(TierEU.RECIPE_ZPM) .metadata(FUSION_THRESHOLD, 300_000_000) .addTo(fusionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs( - new FluidStack(ELEMENT.getInstance().KRYPTON.getPlasma(), 144), - new FluidStack(ELEMENT.STANDALONE.FORCE.getPlasma(), 1000)) - .fluidOutputs(new FluidStack(ELEMENT.STANDALONE.ASTRAL_TITANIUM.getPlasma(), 1000)) + new FluidStack(MaterialsElements.getInstance().KRYPTON.getPlasma(), 144), + new FluidStack(MaterialsElements.STANDALONE.FORCE.getPlasma(), 1000)) + .fluidOutputs(new FluidStack(MaterialsElements.STANDALONE.ASTRAL_TITANIUM.getPlasma(), 1000)) .duration(32 * TICKS) .eut(TierEU.RECIPE_ZPM) .metadata(FUSION_THRESHOLD, 300_000_000) .addTo(fusionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs( - new FluidStack(ELEMENT.STANDALONE.ASTRAL_TITANIUM.getPlasma(), 144), - new FluidStack(ALLOY.TITANSTEEL.getFluid(), 8)) - .fluidOutputs(new FluidStack(ELEMENT.STANDALONE.RUNITE.getPlasma(), 1000)) + new FluidStack(MaterialsElements.STANDALONE.ASTRAL_TITANIUM.getPlasma(), 144), + new FluidStack(MaterialsAlloy.TITANSTEEL.getFluid(), 8)) + .fluidOutputs(new FluidStack(MaterialsElements.STANDALONE.RUNITE.getPlasma(), 1000)) .duration(32 * TICKS) .eut(TierEU.RECIPE_ZPM) .metadata(FUSION_THRESHOLD, 300_000_000) .addTo(fusionRecipes); // Mk3 - GT_Values.RA.stdBuilder() - .fluidInputs(ELEMENT.getInstance().CURIUM.getFluidStack(144), Materials.Americium.getPlasma(144)) - .fluidOutputs(new FluidStack(ELEMENT.getInstance().XENON.getPlasma(), 144)) + GTValues.RA.stdBuilder() + .fluidInputs(MaterialsElements.getInstance().CURIUM.getFluidStack(144), Materials.Americium.getPlasma(144)) + .fluidOutputs(new FluidStack(MaterialsElements.getInstance().XENON.getPlasma(), 144)) .duration(16 * TICKS) .eut(TierEU.RECIPE_UV) .metadata(FUSION_THRESHOLD, 500_000_000) .addTo(fusionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs( - new FluidStack(ELEMENT.getInstance().XENON.getPlasma(), 144), - new FluidStack(ELEMENT.STANDALONE.RUNITE.getPlasma(), 1000)) - .fluidOutputs(new FluidStack(ELEMENT.STANDALONE.ADVANCED_NITINOL.getPlasma(), 1000)) + new FluidStack(MaterialsElements.getInstance().XENON.getPlasma(), 144), + new FluidStack(MaterialsElements.STANDALONE.RUNITE.getPlasma(), 1000)) + .fluidOutputs(new FluidStack(MaterialsElements.STANDALONE.ADVANCED_NITINOL.getPlasma(), 1000)) .duration(16 * TICKS) .eut(TierEU.RECIPE_UV) .metadata(FUSION_THRESHOLD, 500_000_000) .addTo(fusionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs( - new FluidStack(ELEMENT.STANDALONE.ADVANCED_NITINOL.getPlasma(), 72), + new FluidStack(MaterialsElements.STANDALONE.ADVANCED_NITINOL.getPlasma(), 72), Materials.Tartarite.getMolten(2)) - .fluidOutputs(new FluidStack(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getPlasma(), 1000)) + .fluidOutputs(new FluidStack(MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getPlasma(), 1000)) .duration(8 * TICKS) .eut(TierEU.RECIPE_UV) .metadata(FUSION_THRESHOLD, 500_000_000) @@ -641,12 +643,12 @@ public class RecipeLoader_Nuclear { // UF4 uses solid rule due to item form even though item form currently is inaccessible because item form may be // accessible in future and must be consistent // UF4 solid rule also assumes 1:144 item:fluid ratio in this case - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getItemStackOfAmountFromOreDict("dustUranium233", 4), ItemUtils.getItemStackOfAmountFromOreDict("dustUranium235", 1)) .fluidInputs(FluidUtils.getFluidStack("hydrofluoricacid", 10000)) - .fluidOutputs(FLUORIDES.URANIUM_TETRAFLUORIDE.getFluidStack(3600)) + .fluidOutputs(MaterialsFluorides.URANIUM_TETRAFLUORIDE.getFluidStack(3600)) .duration(2 * MINUTES + 30 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(mixerRecipes); @@ -655,7 +657,7 @@ public class RecipeLoader_Nuclear { private static void sifter() { // Zirconium - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedIlmenite", 1)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1), @@ -668,7 +670,7 @@ public class RecipeLoader_Nuclear { .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedTin", 1)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), @@ -681,7 +683,7 @@ public class RecipeLoader_Nuclear { .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCassiterite", 1)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustCassiterite", 1), @@ -695,7 +697,7 @@ public class RecipeLoader_Nuclear { .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); // Radium - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedThorium", 1)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustThorium", 1), @@ -708,7 +710,7 @@ public class RecipeLoader_Nuclear { .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedUranium", 1)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustUranium", 1), @@ -721,7 +723,7 @@ public class RecipeLoader_Nuclear { .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedUraninite", 1)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustUraninite", 1), @@ -734,7 +736,7 @@ public class RecipeLoader_Nuclear { .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPitchblende", 1)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustPitchblende", 1), @@ -751,9 +753,9 @@ public class RecipeLoader_Nuclear { } private static void fluidHeater() { - GT_Values.RA.stdBuilder() - .itemInputs(FLUORIDES.SODIUM_FLUORIDE.getDust(1)) - .fluidOutputs(FLUORIDES.SODIUM_FLUORIDE.getFluidStack(144)) + GTValues.RA.stdBuilder() + .itemInputs(MaterialsFluorides.SODIUM_FLUORIDE.getDust(1)) + .fluidOutputs(MaterialsFluorides.SODIUM_FLUORIDE.getFluidStack(144)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(fluidHeaterRecipes); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderNuclearFuelProcessing.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderNuclearFuelProcessing.java new file mode 100644 index 0000000000..86e56b23af --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderNuclearFuelProcessing.java @@ -0,0 +1,261 @@ +package gtPlusPlus.xmod.gregtech.loaders.recipe; + +import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; +import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes; +import static gregtech.api.util.GTRecipeBuilder.HOURS; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; +import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalPlantRecipes; +import static gtPlusPlus.api.recipe.GTPPRecipeMaps.coldTrapRecipes; +import static gtPlusPlus.api.recipe.GTPPRecipeMaps.fissionFuelProcessingRecipes; +import static gtPlusPlus.api.recipe.GTPPRecipeMaps.reactorProcessingUnitRecipes; + +import net.minecraftforge.fluids.FluidStack; + +import gregtech.api.enums.GTValues; +import gregtech.api.enums.Materials; +import gregtech.api.enums.TierEU; +import gtPlusPlus.core.item.chemistry.NuclearChem; +import gtPlusPlus.core.material.MaterialsElements; +import gtPlusPlus.core.material.nuclear.MaterialsFluorides; +import gtPlusPlus.core.material.nuclear.MaterialsNuclides; +import gtPlusPlus.core.recipe.common.CI; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; + +public class RecipeLoaderNuclearFuelProcessing { + + public static void generate() { + + // Create Fuels + + final FluidStack aLithiumFluoride = MaterialsFluorides.LITHIUM_FLUORIDE.getFluidStack(100); + final FluidStack aBerylliumFluoride = MaterialsFluorides.BERYLLIUM_FLUORIDE.getFluidStack(100); + final FluidStack aThoriumFluoride = MaterialsFluorides.THORIUM_TETRAFLUORIDE.getFluidStack(100); + final FluidStack aZirconiumFluoride = MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(100); + final FluidStack aUraniumTetraFluoride = MaterialsFluorides.URANIUM_TETRAFLUORIDE.getFluidStack(100); + final FluidStack aUranium235 = MaterialsElements.getInstance().URANIUM235.getFluidStack(1000); + final FluidStack aLiFBeF2ZrF4U235 = MaterialsNuclides.LiFBeF2ZrF4U235.getFluidStack(100); + final FluidStack aLiFBeF2ZrF4UF4 = MaterialsNuclides.LiFBeF2ZrF4UF4.getFluidStack(100); + final FluidStack aLiFBeF2ThF4UF4 = MaterialsNuclides.LiFBeF2ThF4UF4.getFluidStack(100); + + // 7LiF - BeF2 - ZrF4 - U235 - 590C + GTValues.RA.stdBuilder() + .fluidInputs( + FluidUtils.getFluidStack(aLithiumFluoride, 550), + FluidUtils.getFluidStack(aBerylliumFluoride, 150), + FluidUtils.getFluidStack(aZirconiumFluoride, 60), + FluidUtils.getFluidStack(aUranium235, 240)) + .fluidOutputs(FluidUtils.getFluidStack(aLiFBeF2ZrF4U235, 1000)) + .duration(30 * MINUTES) + .eut(TierEU.RECIPE_EV) + .addTo(fissionFuelProcessingRecipes); + // 7LiF - BeF2 - ZrF4 - UF4 - 650C + GTValues.RA.stdBuilder() + .fluidInputs( + FluidUtils.getFluidStack(aLithiumFluoride, 600), + FluidUtils.getFluidStack(aBerylliumFluoride, 250), + FluidUtils.getFluidStack(aZirconiumFluoride, 80), + FluidUtils.getFluidStack(aUraniumTetraFluoride, 70)) + .fluidOutputs(FluidUtils.getFluidStack(aLiFBeF2ZrF4UF4, 1000)) + .duration(40 * MINUTES) + .eut(TierEU.RECIPE_IV) + .addTo(fissionFuelProcessingRecipes); + // 7liF - BeF2 - ThF4 - UF4 - 566C + GTValues.RA.stdBuilder() + .fluidInputs( + FluidUtils.getFluidStack(aLithiumFluoride, 580), + FluidUtils.getFluidStack(aBerylliumFluoride, 270), + FluidUtils.getFluidStack(aThoriumFluoride, 80), + FluidUtils.getFluidStack(aUraniumTetraFluoride, 70)) + .fluidOutputs(FluidUtils.getFluidStack(aLiFBeF2ThF4UF4, 1000)) + .duration(50 * MINUTES) + .eut(TierEU.RECIPE_IV) + .addTo(fissionFuelProcessingRecipes); + + // Reprocess Fuels + + // Reactor Blanket step 1 - Fluorination + GTValues.RA.stdBuilder() + .itemInputs(CI.getNumberedAdvancedCircuit(17), MaterialsElements.getInstance().FLUORINE.getCell(6)) + .itemOutputs( + CI.emptyCells(5), + MaterialsFluorides.LITHIUM_FLUORIDE.getCell(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1)) + .outputChances(10000, 10000, 500, 500, 500, 250, 250, 250) + .fluidInputs(MaterialsNuclides.LiFThF4.getFluidStack(10000)) + .fluidOutputs(MaterialsNuclides.UF6F2.getFluidStack(1500)) + .duration(10 * MINUTES) + .eut(TierEU.RECIPE_IV) + .addTo(reactorProcessingUnitRecipes); + GTValues.RA.stdBuilder() + .itemInputs(CI.getNumberedAdvancedCircuit(18), MaterialsElements.getInstance().FLUORINE.getCell(6)) + .itemOutputs( + CI.emptyCells(4), + MaterialsFluorides.LITHIUM_FLUORIDE.getCell(1), + MaterialsFluorides.BERYLLIUM_FLUORIDE.getCell(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1)) + .outputChances(10000, 10000, 10000, 1000, 1000, 1000, 500, 500, 500) + .fluidInputs(MaterialsNuclides.LiFBeF2ThF4.getFluidStack(10000)) + .fluidOutputs(MaterialsNuclides.UF6F2.getFluidStack(3000)) + .duration(10 * MINUTES) + .eut(TierEU.RECIPE_IV) + .addTo(reactorProcessingUnitRecipes); + // Reactor Blanket step 1 - Fluorination + GTValues.RA.stdBuilder() + .itemInputs(CI.getNumberedAdvancedCircuit(7), MaterialsElements.getInstance().FLUORINE.getCell(6)) + .itemOutputs( + CI.emptyCells(4), + MaterialsFluorides.LITHIUM_FLUORIDE.getCell(2), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1)) + .outputChances(10000, 10000, 1000, 1000, 1000, 1000, 1000, 1000) + .fluidInputs(MaterialsNuclides.Sparged_LiFThF4.getFluidStack(10000)) + .fluidOutputs(MaterialsNuclides.UF6F2.getFluidStack(3000)) + .duration(5 * MINUTES) + .eut(TierEU.RECIPE_IV) + .addTo(reactorProcessingUnitRecipes); + GTValues.RA.stdBuilder() + .itemInputs(CI.getNumberedAdvancedCircuit(8), MaterialsElements.getInstance().FLUORINE.getCell(6)) + .itemOutputs( + CI.emptyCells(2), + MaterialsFluorides.LITHIUM_FLUORIDE.getCell(2), + MaterialsFluorides.BERYLLIUM_FLUORIDE.getCell(2), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1), + MaterialsElements.getInstance().PROTACTINIUM.getDust(1)) + .outputChances(10000, 10000, 10000, 2000, 2000, 2000, 2000, 2000, 2000) + .fluidInputs(MaterialsNuclides.Sparged_LiFBeF2ThF4.getFluidStack(10000)) + .fluidOutputs(MaterialsNuclides.UF6F2.getFluidStack(6000)) + .duration(5 * MINUTES) + .eut(TierEU.RECIPE_IV) + .addTo(reactorProcessingUnitRecipes); + + // Reactor Blanket step 2 - Sorption + Cold Trap + GTValues.RA.stdBuilder() + .itemInputs(CI.getNumberedAdvancedCircuit(8), MaterialsFluorides.SODIUM_FLUORIDE.getCell(4)) + .itemOutputs( + MaterialsElements.getInstance().FLUORINE.getCell(2), + MaterialsFluorides.URANIUM_HEXAFLUORIDE.getCell(2), + MaterialsElements.getInstance().URANIUM233.getDust(1), + MaterialsElements.getInstance().URANIUM233.getDust(1), + MaterialsElements.getInstance().URANIUM233.getDust(1)) + .outputChances(10000, 10000, 3000, 2000, 1000) + .fluidInputs(MaterialsNuclides.UF6F2.getFluidStack(3000)) + .fluidOutputs(MaterialsFluorides.SODIUM_FLUORIDE.getFluidStack(2000)) + .duration(10 * MINUTES) + .eut(TierEU.RECIPE_HV) + .addTo(coldTrapRecipes); + + // LiBeF2UF4FP + F2 = LiFBeF2 & UF6F2FP + // Reactor Core step 1 - Process Burnt Salt + GTValues.RA.stdBuilder() + .itemInputs(CI.getNumberedAdvancedCircuit(1), MaterialsElements.getInstance().FLUORINE.getCell(1)) + .itemOutputs(MaterialsNuclides.UF6F2FP.getCell(1)) + .outputChances(10000) + .fluidInputs(MaterialsNuclides.LiFBeF2UF4FP.getFluidStack(1000)) + .fluidOutputs(FluidUtils.getFluidStack(NuclearChem.Impure_LiFBeF2, 1000)) + .duration(2 * HOURS) + .eut(TierEU.RECIPE_HV) + .addTo(reactorProcessingUnitRecipes); + // LiBeF2UF4FP + F2 = LiFBeF2 & UF6F2FP + // Reactor Core step 1 - Process Burnt Salt + GTValues.RA.stdBuilder() + .itemInputs(CI.getNumberedAdvancedCircuit(1), MaterialsElements.getInstance().FLUORINE.getCell(3)) + .itemOutputs(CI.emptyCells(1), MaterialsNuclides.UF6F2FP.getCell(2)) + .fluidInputs(MaterialsNuclides.Sparged_LiFBeF2UF4FP.getFluidStack(1000)) + .fluidOutputs(FluidUtils.getFluidStack(NuclearChem.Impure_LiFBeF2, 2000)) + .duration(60 * MINUTES) + .eut(TierEU.RECIPE_HV) + .addTo(reactorProcessingUnitRecipes); + + // Reactor Core step 2A - Sorption + Cold Trap + GTValues.RA.stdBuilder() + .itemInputs(CI.getNumberedAdvancedCircuit(8), MaterialsFluorides.SODIUM_FLUORIDE.getCell(3)) + .itemOutputs( + MaterialsElements.getInstance().FLUORINE.getCell(1), + MaterialsFluorides.URANIUM_HEXAFLUORIDE.getCell(2), + MaterialsElements.getInstance().PHOSPHORUS.getDust(1), + MaterialsElements.getInstance().PHOSPHORUS.getDust(1), + MaterialsElements.getInstance().PHOSPHORUS.getDust(1), + MaterialsElements.getInstance().PHOSPHORUS.getDust(1), + MaterialsElements.getInstance().PHOSPHORUS.getDust(1), + MaterialsElements.getInstance().PHOSPHORUS.getDust(1)) + .outputChances(10000, 10000, 5000, 5000, 5000, 5000, 5000, 5000) + .fluidInputs(MaterialsNuclides.UF6F2FP.getFluidStack(2000)) + .fluidOutputs(MaterialsFluorides.SODIUM_FLUORIDE.getFluidStack(2000)) + .duration(10 * MINUTES) + .eut(TierEU.RECIPE_EV) + .addTo(coldTrapRecipes); + + // Reactor Core step 2B - Distillation + GTValues.RA.stdBuilder() + .fluidInputs(FluidUtils.getFluidStack(NuclearChem.Impure_LiFBeF2, 1000)) + .fluidOutputs(MaterialsNuclides.LiFBeF2.getFluidStack(250)) + .duration(7 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(distillationTowerRecipes); + + // UF6 -> UF4 reduction + // UF6 + LiFBeF2 + H2 -> LiFBeF2UF4 + HF + GTValues.RA.stdBuilder() + .itemInputs(MaterialsFluorides.URANIUM_HEXAFLUORIDE.getCell(1), MaterialsNuclides.LiFBeF2.getCell(1)) + .fluidInputs(Materials.Hydrogen.getGas(2000L)) + .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2)) + .fluidOutputs(MaterialsNuclides.LiFBeF2UF4.getFluidStack(3000)) + .duration(2 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_IV) + .metadata(COIL_HEAT, 5400) + .addTo(blastFurnaceRecipes); + // Alternative recipe to the above, for chemplant, to not use cells + + GTValues.RA.stdBuilder() + .fluidInputs( + MaterialsFluorides.URANIUM_HEXAFLUORIDE.getFluidStack(1000), + MaterialsNuclides.LiFBeF2.getFluidStack(1000), + MaterialsElements.getInstance().HYDROGEN.getFluidStack(2000)) + .fluidOutputs( + MaterialsNuclides.LiFBeF2UF4.getFluidStack(3000), + FluidUtils.getFluidStack("hydrofluoricacid", 2000)) + .duration(2 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_IV) + .metadata(CHEMPLANT_CASING_TIER, 4) + .addTo(chemicalPlantRecipes); + + GTValues.RA.stdBuilder() + .fluidInputs( + MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(100), + MaterialsNuclides.LiFBeF2UF4.getFluidStack(900)) + .fluidOutputs(MaterialsNuclides.LiFBeF2ZrF4UF4.getFluidStack(1000)) + .duration(12 * MINUTES) + .eut(TierEU.RECIPE_IV) + .addTo(fissionFuelProcessingRecipes); + GTValues.RA.stdBuilder() + .fluidInputs( + MaterialsFluorides.THORIUM_TETRAFLUORIDE.getFluidStack(100), + MaterialsNuclides.LiFBeF2UF4.getFluidStack(900)) + .fluidOutputs(MaterialsNuclides.LiFBeF2ThF4UF4.getFluidStack(1000)) + .duration(15 * MINUTES) + .eut(TierEU.RECIPE_IV) + .addTo(fissionFuelProcessingRecipes); + } +} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderTreeFarm.java new file mode 100644 index 0000000000..7f5e885b94 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderTreeFarm.java @@ -0,0 +1,632 @@ +package gtPlusPlus.xmod.gregtech.loaders.recipe; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import gregtech.api.enums.Mods; +import gregtech.api.util.GTModHandler; +import gtPlusPlus.core.item.chemistry.AgriculturalChem; +import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator; +import gtPlusPlus.xmod.forestry.ForestryTreeHandler; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTETreeFarm; + +public class RecipeLoaderTreeFarm { + + public static void generateRecipes() { + generateVanillaTrees(); + + if (Mods.IndustrialCraft2.isModLoaded()) generateIC2Trees(); + if (Mods.TinkerConstruct.isModLoaded()) generateTinkersTrees(); + generateGTPPTrees(); + + if (Mods.TwilightForest.isModLoaded()) generateTwilightForestTrees(); + if (Mods.GalaxySpace.isModLoaded()) generateGalaxySpaceTrees(); + if (Mods.GalacticraftAmunRa.isModLoaded()) generateAmunRaTrees(); + + if (Mods.Thaumcraft.isModLoaded()) generateThaumcraftTrees(); + if (Mods.ThaumicBases.isModLoaded()) generateThaumicBasesTrees(); + if (Mods.TaintedMagic.isModLoaded()) generateTaintedMagicTrees(); + if (Mods.ForbiddenMagic.isModLoaded()) generateForbiddenMagicTrees(); + if (Mods.Witchery.isModLoaded()) generateWitcheryTrees(); + + if (Mods.Natura.isModLoaded()) generateNaturaTrees(); + if (Mods.BiomesOPlenty.isModLoaded()) generateBOPTrees(); + if (Mods.PamsHarvestCraft.isModLoaded()) generatePamsTrees(); + if (Mods.PamsHarvestTheNether.isModLoaded()) generatePamsNetherTrees(); + + if (Mods.Forestry.isModLoaded()) { + ForestryTreeHandler.generateForestryTrees(); + } + + if (Mods.Forestry.isModLoaded() && Mods.ExtraTrees.isModLoaded()) ForestryTreeHandler.generateExtraTreesTrees(); + } + + private static void generateVanillaTrees() { + MTETreeFarm.registerTreeProducts( // Oak + new ItemStack(Blocks.sapling, 1, 0), + new ItemStack(Blocks.log, 1, 0), + new ItemStack(Blocks.leaves, 1, 0), + new ItemStack(Items.apple, 1, 0)); + + MTETreeFarm.registerTreeProducts( // Spruce + new ItemStack(Blocks.sapling, 1, 1), + new ItemStack(Blocks.log, 2, 1), + new ItemStack(Blocks.leaves, 1, 1), + null); + + MTETreeFarm.registerTreeProducts( // Birch + new ItemStack(Blocks.sapling, 1, 2), + new ItemStack(Blocks.log, 1, 2), + new ItemStack(Blocks.leaves, 1, 2), + null); + + MTETreeFarm.registerTreeProducts( // Jungle + new ItemStack(Blocks.sapling, 1, 3), + new ItemStack(Blocks.log, 2, 3), + new ItemStack(Blocks.leaves, 1, 3), + new ItemStack(Items.dye, 1, 3)); + + MTETreeFarm.registerTreeProducts( // Acacia + new ItemStack(Blocks.sapling, 1, 4), + new ItemStack(Blocks.log2, 1, 0), + new ItemStack(Blocks.leaves2, 1, 0), + null); + + MTETreeFarm.registerTreeProducts( // Dark Oak + new ItemStack(Blocks.sapling, 1, 5), + new ItemStack(Blocks.log2, 1, 1), + new ItemStack(Blocks.leaves2, 1, 1), + new ItemStack(Items.apple, 1, 0)); + + MTETreeFarm.registerTreeProducts( // Brown Mushroom + new ItemStack(Blocks.brown_mushroom, 1, 0), + new ItemStack(Blocks.brown_mushroom_block, 1, 0), + null, + null); + + MTETreeFarm.registerTreeProducts( // Red Mushroom + new ItemStack(Blocks.red_mushroom, 1, 0), + new ItemStack(Blocks.red_mushroom_block, 1, 0), + null, + null); + } + + private static void generateIC2Trees() { + MTETreeFarm.registerTreeProducts( // Rubber Tree + GTModHandler.getModItem(Mods.IndustrialCraft2.ID, "blockRubSapling", 1, 0), + GTModHandler.getModItem(Mods.IndustrialCraft2.ID, "blockRubWood", 1, 0), + GTModHandler.getModItem(Mods.IndustrialCraft2.ID, "blockRubLeaves", 1, 0), + GTModHandler.getModItem(Mods.IndustrialCraft2.ID, "itemHarz", 1, 0)); + } + + private static void generateTinkersTrees() { + MTETreeFarm.registerTreeProducts( // Slimy + GTModHandler.getModItem(Mods.TinkerConstruct.ID, "slime.sapling", 1, 0), + GTModHandler.getModItem(Mods.TinkerConstruct.ID, "slime.gel", 1, 1), + GTModHandler.getModItem(Mods.TinkerConstruct.ID, "slime.leaves", 1, 0), + GTModHandler.getModItem(Mods.TinkerConstruct.ID, "strangeFood", 1, 0)); + } + + private static void generateGTPPTrees() { + MTETreeFarm.registerTreeProducts( // Rainforest Oak + new ItemStack(BOPBlockRegistrator.sapling_Rainforest, 1, 0), + new ItemStack(BOPBlockRegistrator.log_Rainforest, 3, 0), + new ItemStack(BOPBlockRegistrator.leaves_Rainforest, 1, 0), + new ItemStack(Items.apple, 1, 0)); + + MTETreeFarm.registerTreeProducts( // Pine + new ItemStack(BOPBlockRegistrator.sapling_Pine, 1, 0), + new ItemStack(BOPBlockRegistrator.log_Pine, 1, 0), + new ItemStack(BOPBlockRegistrator.leaves_Pine, 1, 0), + new ItemStack(AgriculturalChem.mAgrichemItem1, 1, 24)); + } + + private static void generateTwilightForestTrees() { + MTETreeFarm.registerTreeProducts( // Sickly Twilight Oak + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 0), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLog", 1, 0), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLeaves", 1, 0), + null); + + MTETreeFarm.registerTreeProducts( // Canopy Tree + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 1), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLog", 1, 1), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLeaves", 1, 1), + null); + + MTETreeFarm.registerTreeProducts( // Twilight Mangrove + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 2), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLog", 1, 2), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLeaves", 1, 2), + null); + + MTETreeFarm.registerTreeProducts( // Darkwood + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 3), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLog", 1, 3), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.DarkLeaves", 1, 0), + null); + + MTETreeFarm.registerTreeProducts( // Robust Twilight Oak + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 4), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLog", 4, 0), + // Does not drop more robust saplings normally: + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 0), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLeaves", 1, 0), + null); + + MTETreeFarm.registerTreeProducts( // Tree of Time + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 5), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFMagicLog", 1, 0), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFMagicLeaves", 1, 0), + // No I am not making this drop clocks. + null); + + MTETreeFarm.registerTreeProducts( // Tree of Transformation + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 6), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFMagicLog", 1, 1), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFMagicLeaves", 1, 1), + null); + + MTETreeFarm.registerTreeProducts( // Sorting Tree + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 8), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFMagicLog", 1, 3), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFMagicLeaves", 1, 3), + null); + + MTETreeFarm.registerTreeProducts( // Rainbow Oak + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 9), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLog", 1, 0), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLeaves", 1, 3), + null); + + MTETreeFarm.registerTreeProducts( // Thorns + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFThorns", 1, 0), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFThorns", 1, 0), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFThorns", 1, 1), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLeaves3", 1, 0), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFThornRose", 1, 0)); + + MTETreeFarm.registerTreeProducts( // Magic Beans + GTModHandler.getModItem(Mods.TwilightForest.ID, "item.magicBeans", 1, 0), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.HugeStalk", 5, 0), + GTModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLeaves3", 1, 1), + null); + } + + private static void generateGalaxySpaceTrees() { + MTETreeFarm.registerTreeProducts( // Barnarda C + GTModHandler.getModItem(Mods.GalaxySpace.ID, "barnardaCsapling", 1, 1), + GTModHandler.getModItem(Mods.GalaxySpace.ID, "barnardaClog", 1, 0), + GTModHandler.getModItem(Mods.GalaxySpace.ID, "barnardaCleaves", 1, 0), + null); + } + + private static void generateAmunRaTrees() { + MTETreeFarm.registerTreeProducts( // Virilig + GTModHandler.getModItem(Mods.GalacticraftAmunRa.ID, "tile.saplings", 1, 0), + GTModHandler.getModItem(Mods.GalacticraftAmunRa.ID, "tile.log1", 1, 0), + GTModHandler.getModItem(Mods.GalacticraftAmunRa.ID, "tile.null", 1, 0), + null); + + MTETreeFarm.registerTreeProducts( // Lumipod + GTModHandler.getModItem(Mods.GalacticraftAmunRa.ID, "tile.saplings", 1, 1), + GTModHandler.getModItem(Mods.GalacticraftAmunRa.ID, "tile.wood1", 1, 0), + null, + GTModHandler.getModItem(Mods.GalacticraftAmunRa.ID, "tile.wood1", 1, 1)); + } + + private static void generateNaturaTrees() { + MTETreeFarm.registerTreeProducts( // Redwood + GTModHandler.getModItem(Mods.Natura.ID, "florasapling", 1, 0), + GTModHandler.getModItem(Mods.Natura.ID, "redwood", 5, 1), + GTModHandler.getModItem(Mods.Natura.ID, "florasapling", 2, 0), + GTModHandler.getModItem(Mods.Natura.ID, "floraleaves", 2, 0), + GTModHandler.getModItem(Mods.Natura.ID, "redwood", 2, 0)); + + MTETreeFarm.registerTreeProducts( // Eucalyptus + GTModHandler.getModItem(Mods.Natura.ID, "florasapling", 1, 1), + GTModHandler.getModItem(Mods.Natura.ID, "tree", 1, 0), + GTModHandler.getModItem(Mods.Natura.ID, "floraleaves", 1, 1), + null); + + MTETreeFarm.registerTreeProducts( // Hopseed + GTModHandler.getModItem(Mods.Natura.ID, "florasapling", 1, 2), + GTModHandler.getModItem(Mods.Natura.ID, "tree", 1, 3), + GTModHandler.getModItem(Mods.Natura.ID, "floraleaves", 1, 2), + null); + + MTETreeFarm.registerTreeProducts( // Sakura + GTModHandler.getModItem(Mods.Natura.ID, "florasapling", 1, 3), + GTModHandler.getModItem(Mods.Natura.ID, "tree", 1, 1), + GTModHandler.getModItem(Mods.Natura.ID, "floraleavesnocolor", 1, 0), + null); + + MTETreeFarm.registerTreeProducts( // Ghostwood + GTModHandler.getModItem(Mods.Natura.ID, "florasapling", 1, 4), + GTModHandler.getModItem(Mods.Natura.ID, "tree", 1, 2), + GTModHandler.getModItem(Mods.Natura.ID, "floraleavesnocolor", 1, 1), + null); + + MTETreeFarm.registerTreeProducts( // Blood + GTModHandler.getModItem(Mods.Natura.ID, "florasapling", 1, 5), + GTModHandler.getModItem(Mods.Natura.ID, "bloodwood", 1, 0), + GTModHandler.getModItem(Mods.Natura.ID, "floraleavesnocolor", 1, 2), + new ItemStack(Items.redstone, 1, 0)); + + MTETreeFarm.registerTreeProducts( // Darkwood + GTModHandler.getModItem(Mods.Natura.ID, "florasapling", 1, 6), + GTModHandler.getModItem(Mods.Natura.ID, "Dark Tree", 1, 0), + GTModHandler.getModItem(Mods.Natura.ID, "Dark Leaves", 1, 0), + GTModHandler.getModItem(Mods.Natura.ID, "Natura.netherfood", 1, 0)); + + MTETreeFarm.registerTreeProducts( // Fusewood + GTModHandler.getModItem(Mods.Natura.ID, "florasapling", 1, 7), + GTModHandler.getModItem(Mods.Natura.ID, "Dark Tree", 1, 1), + GTModHandler.getModItem(Mods.Natura.ID, "Dark Leaves", 1, 3), + null); + + MTETreeFarm.registerTreeProducts( // Maple + GTModHandler.getModItem(Mods.Natura.ID, "Rare Sapling", 1, 0), + GTModHandler.getModItem(Mods.Natura.ID, "Rare Tree", 1, 0), + GTModHandler.getModItem(Mods.Natura.ID, "Rare Leaves", 1, 0), + null); + + MTETreeFarm.registerTreeProducts( // Silverbell + GTModHandler.getModItem(Mods.Natura.ID, "Rare Sapling", 1, 1), + GTModHandler.getModItem(Mods.Natura.ID, "Rare Tree", 1, 1), + GTModHandler.getModItem(Mods.Natura.ID, "Rare Leaves", 1, 1), + null); + + MTETreeFarm.registerTreeProducts( // Amaranth + GTModHandler.getModItem(Mods.Natura.ID, "Rare Sapling", 1, 2), + GTModHandler.getModItem(Mods.Natura.ID, "Rare Tree", 1, 2), + GTModHandler.getModItem(Mods.Natura.ID, "Rare Leaves", 1, 2), + null); + + MTETreeFarm.registerTreeProducts( // Tigerwood + GTModHandler.getModItem(Mods.Natura.ID, "Rare Sapling", 1, 3), + GTModHandler.getModItem(Mods.Natura.ID, "Rare Tree", 1, 3), + GTModHandler.getModItem(Mods.Natura.ID, "Rare Leaves", 1, 3), + null); + + MTETreeFarm.registerTreeProducts( // Willow + GTModHandler.getModItem(Mods.Natura.ID, "Rare Sapling", 1, 4), + GTModHandler.getModItem(Mods.Natura.ID, "willow", 1, 0), + GTModHandler.getModItem(Mods.Natura.ID, "floraleavesnocolor", 1, 3), + null); + + MTETreeFarm.registerTreeProducts( // Green Glowshroom + GTModHandler.getModItem(Mods.Natura.ID, "Glowshroom", 1, 0), + GTModHandler.getModItem(Mods.Natura.ID, "greenGlowshroom", 1, 0), + null, + null); + + MTETreeFarm.registerTreeProducts( // Purple Glowshroom + GTModHandler.getModItem(Mods.Natura.ID, "Glowshroom", 1, 1), + GTModHandler.getModItem(Mods.Natura.ID, "purpleGlowshroom", 1, 0), + null, + null); + + MTETreeFarm.registerTreeProducts( // Blue Glowshroom + GTModHandler.getModItem(Mods.Natura.ID, "Glowshroom", 1, 2), + GTModHandler.getModItem(Mods.Natura.ID, "blueGlowshroom", 1, 0), + null, + null); + } + + private static void generateBOPTrees() { + MTETreeFarm.registerTreeProducts( // Apple + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 0), + new ItemStack(Blocks.log, 1, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "appleLeaves", 1, 0), + new ItemStack(Items.apple, 2, 0)); + + MTETreeFarm.registerTreeProducts( // Yellow Autumn + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 1), + new ItemStack(Blocks.log, 1, 2), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves1", 1, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "food", 1, 8)); + + MTETreeFarm.registerTreeProducts( // Bamboo + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 2), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "bamboo", 1, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves1", 1, 9), + null); + + MTETreeFarm.registerTreeProducts( // Magic + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 3), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs2", 1, 1), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves1", 1, 2), + null); + + MTETreeFarm.registerTreeProducts( // Dark + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 4), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs1", 1, 2), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves1", 1, 3), + null); + + MTETreeFarm.registerTreeProducts( // Dying + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 5), + new ItemStack(Blocks.log, 1, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves2", 1, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "food", 1, 8)); + + MTETreeFarm.registerTreeProducts( // Fir + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 6), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs1", 1, 3), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves2", 1, 1), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "misc", 1, 13)); + + MTETreeFarm.registerTreeProducts( // Ethereal + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 7), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs2", 1, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves2", 1, 2), + null); + + MTETreeFarm.registerTreeProducts( // Orange Autumn + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 8), + new ItemStack(Blocks.log2, 1, 1), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves2", 1, 3), + null); + + MTETreeFarm.registerTreeProducts( // Origin + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 9), + new ItemStack(Blocks.log, 1, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves3", 1, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "food", 1, 8)); + + MTETreeFarm.registerTreeProducts( // Pink Cherry + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 10), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs1", 1, 1), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves3", 1, 1), + null); + + MTETreeFarm.registerTreeProducts( // Maple + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 11), + new ItemStack(Blocks.log, 1, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves3", 1, 2), + null); + + MTETreeFarm.registerTreeProducts( // White Cherry + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 12), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs1", 1, 1), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves3", 1, 3), + null); + + MTETreeFarm.registerTreeProducts( // Hellbark + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 13), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs4", 1, 1), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves4", 1, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "food", 1, 8)); + + MTETreeFarm.registerTreeProducts( // Jacaranda + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 14), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs4", 1, 2), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves4", 1, 1), + null); + + MTETreeFarm.registerTreeProducts( // Persimmon + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 15), + new ItemStack(Blocks.log, 1, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "persimmonLeaves", 1, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "food", 2, 8)); + + MTETreeFarm.registerTreeProducts( // Sacred Oak + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedSaplings", 1, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs1", 4, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedSaplings", 2, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedLeaves1", 2, 0), + null); + + MTETreeFarm.registerTreeProducts( // Mangrove + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedSaplings", 1, 1), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs2", 1, 2), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedLeaves1", 1, 1), + null); + + MTETreeFarm.registerTreeProducts( // Palm + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedSaplings", 1, 2), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs2", 1, 3), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedLeaves1", 1, 2), + null); + + MTETreeFarm.registerTreeProducts( // Redwood + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedSaplings", 1, 3), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs3", 2, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedLeaves1", 1, 3), + null); + + MTETreeFarm.registerTreeProducts( // Willow + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedSaplings", 1, 4), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs3", 1, 1), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedLeaves2", 1, 0), + null); + + MTETreeFarm.registerTreeProducts( // Pine + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedSaplings", 1, 5), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs4", 1, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedLeaves2", 1, 1), + null); + + MTETreeFarm.registerTreeProducts( // Mahogany + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedSaplings", 1, 6), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs4", 1, 3), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedLeaves2", 1, 2), + null); + + MTETreeFarm.registerTreeProducts( // Flowering Oak + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedSaplings", 1, 7), + new ItemStack(Blocks.log, 1, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedLeaves2", 1, 3), + null); + + MTETreeFarm.registerTreeProducts( // Red Flower Stem + new ItemStack(Blocks.red_flower, 1, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs3", 1, 3), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "petals", 1, 0), + null); + + MTETreeFarm.registerTreeProducts( // Yellow Flower Stem + new ItemStack(Blocks.yellow_flower, 1, 0), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs3", 1, 3), + GTModHandler.getModItem(Mods.BiomesOPlenty.ID, "petals", 1, 1), + null); + } + + private static void addPamTree(String name, int meta) { + MTETreeFarm.registerTreeProducts( + GTModHandler.getModItem(Mods.PamsHarvestCraft.ID, "pam" + name + "Sapling", 1, 0), + new ItemStack(Blocks.log, 1, meta), + new ItemStack(Blocks.leaves, 1, meta), + GTModHandler.getModItem(Mods.PamsHarvestCraft.ID, name + "Item", 2, 0)); + } + + private static void generatePamsTrees() { + MTETreeFarm.registerTreeProducts( // Cinnamon + GTModHandler.getModItem(Mods.PamsHarvestCraft.ID, "pamappleSapling", 1, 0), + new ItemStack(Blocks.log, 1, 0), + new ItemStack(Blocks.leaves, 1, 0), + new ItemStack(Items.apple, 2, 0)); + + addPamTree("almond", 3); + addPamTree("apricot", 3); + addPamTree("avocado", 0); + addPamTree("banana", 3); + addPamTree("cashew", 3); + addPamTree("cherry", 0); + addPamTree("chestnut", 0); + + MTETreeFarm.registerTreeProducts( // Cinnamon + GTModHandler.getModItem(Mods.PamsHarvestCraft.ID, "pamcinnamonSapling", 1, 0), + GTModHandler.getModItem(Mods.PamsHarvestCraft.ID, "pamCinnamon", 1, 0), + new ItemStack(Blocks.leaves, 1, 3), + GTModHandler.getModItem(Mods.PamsHarvestCraft.ID, "cinnamonItem", 2, 0)); + + addPamTree("coconut", 3); + addPamTree("date", 3); + addPamTree("dragonfruit", 3); + addPamTree("durian", 3); + addPamTree("fig", 3); + addPamTree("grapefruit", 3); + addPamTree("lemon", 3); + addPamTree("lime", 3); + + MTETreeFarm.registerTreeProducts( // Maple + GTModHandler.getModItem(Mods.PamsHarvestCraft.ID, "pammapleSapling", 1, 0), + GTModHandler.getModItem(Mods.PamsHarvestCraft.ID, "pamMaple", 1, 0), + new ItemStack(Blocks.leaves, 1, 1), + GTModHandler.getModItem(Mods.PamsHarvestCraft.ID, "maplesyrupItem", 2, 0)); + + addPamTree("mango", 3); + addPamTree("nutmeg", 0); + addPamTree("olive", 0); + addPamTree("orange", 3); + addPamTree("papaya", 3); + + MTETreeFarm.registerTreeProducts( // Paperbark + GTModHandler.getModItem(Mods.PamsHarvestCraft.ID, "pampaperbarkSapling", 1, 0), + GTModHandler.getModItem(Mods.PamsHarvestCraft.ID, "pamPaperbark", 1, 0), + new ItemStack(Blocks.leaves, 1, 3), + new ItemStack(Items.paper, 1, 0)); + + addPamTree("peach", 3); + addPamTree("pear", 0); + addPamTree("pecan", 3); + addPamTree("peppercorn", 3); + addPamTree("persimmon", 3); + addPamTree("pistachio", 3); + addPamTree("plum", 0); + addPamTree("pomegranate", 3); + addPamTree("starfruit", 3); + addPamTree("vanillabean", 3); + addPamTree("walnut", 0); + addPamTree("gooseberry", 0); + } + + private static void generatePamsNetherTrees() { + MTETreeFarm.registerTreeProducts( // Ignis Fruit + GTModHandler.getModItem(Mods.PamsHarvestTheNether.ID, "netherSapling", 1, 0), + GTModHandler.getModItem(Mods.PamsHarvestTheNether.ID, "netherLog", 1, 0), + GTModHandler.getModItem(Mods.PamsHarvestTheNether.ID, "netherLeaves", 1, 0), + GTModHandler.getModItem(Mods.PamsHarvestTheNether.ID, "ignisfruitItem", 2, 0)); + } + + private static void generateThaumcraftTrees() { + MTETreeFarm.registerTreeProducts( // Greatwood + GTModHandler.getModItem(Mods.Thaumcraft.ID, "blockCustomPlant", 1, 0), + GTModHandler.getModItem(Mods.Thaumcraft.ID, "blockMagicalLog", 2, 0), + GTModHandler.getModItem(Mods.Thaumcraft.ID, "blockMagicalLeaves", 1, 0), + null); + + MTETreeFarm.registerTreeProducts( // Silverwood + GTModHandler.getModItem(Mods.Thaumcraft.ID, "blockCustomPlant", 1, 1), + GTModHandler.getModItem(Mods.Thaumcraft.ID, "blockMagicalLog", 1, 1), + GTModHandler.getModItem(Mods.Thaumcraft.ID, "blockMagicalLeaves", 1, 1), + null); + } + + private static void generateThaumicBasesTrees() { + MTETreeFarm.registerTreeProducts( // Golden Oak + GTModHandler.getModItem(Mods.ThaumicBases.ID, "goldenOakSapling", 1, 0), + new ItemStack(Blocks.log, 1, 0), + GTModHandler.getModItem(Mods.ThaumicBases.ID, "genLeaves", 1, 0), + GTModHandler.getModItem(Mods.Thaumcraft.ID, "blockMagicalLeaves", 1, 0), + null); + + MTETreeFarm.registerTreeProducts( // Peaceful + GTModHandler.getModItem(Mods.ThaumicBases.ID, "goldenOakSapling", 1, 1), + GTModHandler.getModItem(Mods.ThaumicBases.ID, "genLogs", 1, 0), + GTModHandler.getModItem(Mods.ThaumicBases.ID, "genLeaves", 1, 1), + null); + + MTETreeFarm.registerTreeProducts( // Nether + GTModHandler.getModItem(Mods.ThaumicBases.ID, "goldenOakSapling", 1, 2), + GTModHandler.getModItem(Mods.ThaumicBases.ID, "genLogs", 1, 1), + GTModHandler.getModItem(Mods.ThaumicBases.ID, "genLeaves", 1, 2), + null); + + MTETreeFarm.registerTreeProducts( // Ender + GTModHandler.getModItem(Mods.ThaumicBases.ID, "goldenOakSapling", 1, 3), + GTModHandler.getModItem(Mods.ThaumicBases.ID, "genLogs", 1, 2), + GTModHandler.getModItem(Mods.ThaumicBases.ID, "genLeaves", 1, 3), + null); + } + + private static void generateTaintedMagicTrees() { + MTETreeFarm.registerTreeProducts( // Warpwood + GTModHandler.getModItem(Mods.TaintedMagic.ID, "BlockWarpwoodSapling", 1, 0), + GTModHandler.getModItem(Mods.TaintedMagic.ID, "BlockWarpwoodLog", 1, 0), + GTModHandler.getModItem(Mods.TaintedMagic.ID, "BlockWarpwoodLeaves", 1, 0), + null); + } + + private static void generateForbiddenMagicTrees() { + MTETreeFarm.registerTreeProducts( // Warpwood + GTModHandler.getModItem(Mods.ForbiddenMagic.ID, "TaintSapling", 1, 0), + GTModHandler.getModItem(Mods.ForbiddenMagic.ID, "TaintLog", 1, 0), + GTModHandler.getModItem(Mods.ForbiddenMagic.ID, "TaintLeaves", 1, 0), + GTModHandler.getModItem(Mods.ForbiddenMagic.ID, "TaintFruit", 1, 0)); + } + + private static void generateWitcheryTrees() { + MTETreeFarm.registerTreeProducts( // Rowan + GTModHandler.getModItem(Mods.Witchery.ID, "witchsapling", 1, 0), + GTModHandler.getModItem(Mods.Witchery.ID, "witchlog", 1, 0), + GTModHandler.getModItem(Mods.Witchery.ID, "witchleaves", 1, 0), + GTModHandler.getModItem(Mods.Witchery.ID, "ingredient", 1, 63)); + + MTETreeFarm.registerTreeProducts( // Alder + GTModHandler.getModItem(Mods.Witchery.ID, "witchsapling", 1, 1), + GTModHandler.getModItem(Mods.Witchery.ID, "witchlog", 1, 1), + GTModHandler.getModItem(Mods.Witchery.ID, "witchleaves", 1, 1), + null); + + MTETreeFarm.registerTreeProducts( // Hawthorn + GTModHandler.getModItem(Mods.Witchery.ID, "witchsapling", 1, 2), + GTModHandler.getModItem(Mods.Witchery.ID, "witchlog", 1, 2), + GTModHandler.getModItem(Mods.Witchery.ID, "witchleaves", 1, 2), + null); + } + +} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java deleted file mode 100644 index 30066acf66..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java +++ /dev/null @@ -1,255 +0,0 @@ -package gtPlusPlus.xmod.gregtech.loaders.recipe; - -import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; -import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.HOURS; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER; -import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; -import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalPlantRecipes; -import static gtPlusPlus.api.recipe.GTPPRecipeMaps.coldTrapRecipes; -import static gtPlusPlus.api.recipe.GTPPRecipeMaps.fissionFuelProcessingRecipes; -import static gtPlusPlus.api.recipe.GTPPRecipeMaps.reactorProcessingUnitRecipes; - -import net.minecraftforge.fluids.FluidStack; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; -import gregtech.api.enums.TierEU; -import gtPlusPlus.core.item.chemistry.NuclearChem; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.nuclear.FLUORIDES; -import gtPlusPlus.core.material.nuclear.NUCLIDE; -import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class RecipeLoader_NuclearFuelProcessing { - - public static void generate() { - - // Create Fuels - - final FluidStack aLithiumFluoride = FLUORIDES.LITHIUM_FLUORIDE.getFluidStack(100); - final FluidStack aBerylliumFluoride = FLUORIDES.BERYLLIUM_FLUORIDE.getFluidStack(100); - final FluidStack aThoriumFluoride = FLUORIDES.THORIUM_TETRAFLUORIDE.getFluidStack(100); - final FluidStack aZirconiumFluoride = FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(100); - final FluidStack aUraniumTetraFluoride = FLUORIDES.URANIUM_TETRAFLUORIDE.getFluidStack(100); - final FluidStack aUranium235 = ELEMENT.getInstance().URANIUM235.getFluidStack(1000); - final FluidStack aLiFBeF2ZrF4U235 = NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(100); - final FluidStack aLiFBeF2ZrF4UF4 = NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(100); - final FluidStack aLiFBeF2ThF4UF4 = NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(100); - - // 7LiF - BeF2 - ZrF4 - U235 - 590C - GT_Values.RA.stdBuilder() - .fluidInputs( - FluidUtils.getFluidStack(aLithiumFluoride, 550), - FluidUtils.getFluidStack(aBerylliumFluoride, 150), - FluidUtils.getFluidStack(aZirconiumFluoride, 60), - FluidUtils.getFluidStack(aUranium235, 240)) - .fluidOutputs(FluidUtils.getFluidStack(aLiFBeF2ZrF4U235, 1000)) - .duration(30 * MINUTES) - .eut(TierEU.RECIPE_EV) - .addTo(fissionFuelProcessingRecipes); - // 7LiF - BeF2 - ZrF4 - UF4 - 650C - GT_Values.RA.stdBuilder() - .fluidInputs( - FluidUtils.getFluidStack(aLithiumFluoride, 600), - FluidUtils.getFluidStack(aBerylliumFluoride, 250), - FluidUtils.getFluidStack(aZirconiumFluoride, 80), - FluidUtils.getFluidStack(aUraniumTetraFluoride, 70)) - .fluidOutputs(FluidUtils.getFluidStack(aLiFBeF2ZrF4UF4, 1000)) - .duration(40 * MINUTES) - .eut(TierEU.RECIPE_IV) - .addTo(fissionFuelProcessingRecipes); - // 7liF - BeF2 - ThF4 - UF4 - 566C - GT_Values.RA.stdBuilder() - .fluidInputs( - FluidUtils.getFluidStack(aLithiumFluoride, 580), - FluidUtils.getFluidStack(aBerylliumFluoride, 270), - FluidUtils.getFluidStack(aThoriumFluoride, 80), - FluidUtils.getFluidStack(aUraniumTetraFluoride, 70)) - .fluidOutputs(FluidUtils.getFluidStack(aLiFBeF2ThF4UF4, 1000)) - .duration(50 * MINUTES) - .eut(TierEU.RECIPE_IV) - .addTo(fissionFuelProcessingRecipes); - - // Reprocess Fuels - - // Reactor Blanket step 1 - Fluorination - GT_Values.RA.stdBuilder() - .itemInputs(CI.getNumberedAdvancedCircuit(17), ELEMENT.getInstance().FLUORINE.getCell(6)) - .itemOutputs( - CI.emptyCells(5), - FLUORIDES.LITHIUM_FLUORIDE.getCell(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1)) - .outputChances(10000, 10000, 500, 500, 500, 250, 250, 250) - .fluidInputs(NUCLIDE.LiFThF4.getFluidStack(10000)) - .fluidOutputs(NUCLIDE.UF6F2.getFluidStack(1500)) - .duration(10 * MINUTES) - .eut(TierEU.RECIPE_IV) - .addTo(reactorProcessingUnitRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(CI.getNumberedAdvancedCircuit(18), ELEMENT.getInstance().FLUORINE.getCell(6)) - .itemOutputs( - CI.emptyCells(4), - FLUORIDES.LITHIUM_FLUORIDE.getCell(1), - FLUORIDES.BERYLLIUM_FLUORIDE.getCell(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1)) - .outputChances(10000, 10000, 10000, 1000, 1000, 1000, 500, 500, 500) - .fluidInputs(NUCLIDE.LiFBeF2ThF4.getFluidStack(10000)) - .fluidOutputs(NUCLIDE.UF6F2.getFluidStack(3000)) - .duration(10 * MINUTES) - .eut(TierEU.RECIPE_IV) - .addTo(reactorProcessingUnitRecipes); - // Reactor Blanket step 1 - Fluorination - GT_Values.RA.stdBuilder() - .itemInputs(CI.getNumberedAdvancedCircuit(7), ELEMENT.getInstance().FLUORINE.getCell(6)) - .itemOutputs( - CI.emptyCells(4), - FLUORIDES.LITHIUM_FLUORIDE.getCell(2), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1)) - .outputChances(10000, 10000, 1000, 1000, 1000, 1000, 1000, 1000) - .fluidInputs(NUCLIDE.Sparged_LiFThF4.getFluidStack(10000)) - .fluidOutputs(NUCLIDE.UF6F2.getFluidStack(3000)) - .duration(5 * MINUTES) - .eut(TierEU.RECIPE_IV) - .addTo(reactorProcessingUnitRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(CI.getNumberedAdvancedCircuit(8), ELEMENT.getInstance().FLUORINE.getCell(6)) - .itemOutputs( - CI.emptyCells(2), - FLUORIDES.LITHIUM_FLUORIDE.getCell(2), - FLUORIDES.BERYLLIUM_FLUORIDE.getCell(2), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1), - ELEMENT.getInstance().PROTACTINIUM.getDust(1)) - .outputChances(10000, 10000, 10000, 2000, 2000, 2000, 2000, 2000, 2000) - .fluidInputs(NUCLIDE.Sparged_LiFBeF2ThF4.getFluidStack(10000)) - .fluidOutputs(NUCLIDE.UF6F2.getFluidStack(6000)) - .duration(5 * MINUTES) - .eut(TierEU.RECIPE_IV) - .addTo(reactorProcessingUnitRecipes); - - // Reactor Blanket step 2 - Sorption + Cold Trap - GT_Values.RA.stdBuilder() - .itemInputs(CI.getNumberedAdvancedCircuit(8), FLUORIDES.SODIUM_FLUORIDE.getCell(4)) - .itemOutputs( - ELEMENT.getInstance().FLUORINE.getCell(2), - FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(2), - ELEMENT.getInstance().URANIUM233.getDust(1), - ELEMENT.getInstance().URANIUM233.getDust(1), - ELEMENT.getInstance().URANIUM233.getDust(1)) - .outputChances(10000, 10000, 3000, 2000, 1000) - .fluidInputs(NUCLIDE.UF6F2.getFluidStack(3000)) - .fluidOutputs(FLUORIDES.SODIUM_FLUORIDE.getFluidStack(2000)) - .duration(10 * MINUTES) - .eut(TierEU.RECIPE_HV) - .addTo(coldTrapRecipes); - - // LiBeF2UF4FP + F2 = LiFBeF2 & UF6F2FP - // Reactor Core step 1 - Process Burnt Salt - GT_Values.RA.stdBuilder() - .itemInputs(CI.getNumberedAdvancedCircuit(1), ELEMENT.getInstance().FLUORINE.getCell(1)) - .itemOutputs(NUCLIDE.UF6F2FP.getCell(1)) - .outputChances(10000) - .fluidInputs(NUCLIDE.LiFBeF2UF4FP.getFluidStack(1000)) - .fluidOutputs(FluidUtils.getFluidStack(NuclearChem.Impure_LiFBeF2, 1000)) - .duration(2 * HOURS) - .eut(TierEU.RECIPE_HV) - .addTo(reactorProcessingUnitRecipes); - // LiBeF2UF4FP + F2 = LiFBeF2 & UF6F2FP - // Reactor Core step 1 - Process Burnt Salt - GT_Values.RA.stdBuilder() - .itemInputs(CI.getNumberedAdvancedCircuit(1), ELEMENT.getInstance().FLUORINE.getCell(3)) - .itemOutputs(CI.emptyCells(1), NUCLIDE.UF6F2FP.getCell(2)) - .fluidInputs(NUCLIDE.Sparged_LiFBeF2UF4FP.getFluidStack(1000)) - .fluidOutputs(FluidUtils.getFluidStack(NuclearChem.Impure_LiFBeF2, 2000)) - .duration(60 * MINUTES) - .eut(TierEU.RECIPE_HV) - .addTo(reactorProcessingUnitRecipes); - - // Reactor Core step 2A - Sorption + Cold Trap - GT_Values.RA.stdBuilder() - .itemInputs(CI.getNumberedAdvancedCircuit(8), FLUORIDES.SODIUM_FLUORIDE.getCell(3)) - .itemOutputs( - ELEMENT.getInstance().FLUORINE.getCell(1), - FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(2), - ELEMENT.getInstance().PHOSPHORUS.getDust(1), - ELEMENT.getInstance().PHOSPHORUS.getDust(1), - ELEMENT.getInstance().PHOSPHORUS.getDust(1), - ELEMENT.getInstance().PHOSPHORUS.getDust(1), - ELEMENT.getInstance().PHOSPHORUS.getDust(1), - ELEMENT.getInstance().PHOSPHORUS.getDust(1)) - .outputChances(10000, 10000, 5000, 5000, 5000, 5000, 5000, 5000) - .fluidInputs(NUCLIDE.UF6F2FP.getFluidStack(2000)) - .fluidOutputs(FLUORIDES.SODIUM_FLUORIDE.getFluidStack(2000)) - .duration(10 * MINUTES) - .eut(TierEU.RECIPE_EV) - .addTo(coldTrapRecipes); - - // Reactor Core step 2B - Distillation - GT_Values.RA.stdBuilder() - .fluidInputs(FluidUtils.getFluidStack(NuclearChem.Impure_LiFBeF2, 1000)) - .fluidOutputs(NUCLIDE.LiFBeF2.getFluidStack(250)) - .duration(7 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_IV) - .addTo(distillationTowerRecipes); - - // UF6 -> UF4 reduction - // UF6 + LiFBeF2 + H2 -> LiFBeF2UF4 + HF - GT_Values.RA.stdBuilder() - .itemInputs(FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(1), NUCLIDE.LiFBeF2.getCell(1)) - .fluidInputs(Materials.Hydrogen.getGas(2000L)) - .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2)) - .fluidOutputs(NUCLIDE.LiFBeF2UF4.getFluidStack(3000)) - .duration(2 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_IV) - .metadata(COIL_HEAT, 5400) - .addTo(blastFurnaceRecipes); - // Alternative recipe to the above, for chemplant, to not use cells - - GT_Values.RA.stdBuilder() - .fluidInputs( - FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(1000), - NUCLIDE.LiFBeF2.getFluidStack(1000), - ELEMENT.getInstance().HYDROGEN.getFluidStack(2000)) - .fluidOutputs(NUCLIDE.LiFBeF2UF4.getFluidStack(3000), FluidUtils.getFluidStack("hydrofluoricacid", 2000)) - .duration(2 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_IV) - .metadata(CHEMPLANT_CASING_TIER, 4) - .addTo(chemicalPlantRecipes); - - GT_Values.RA.stdBuilder() - .fluidInputs(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(100), NUCLIDE.LiFBeF2UF4.getFluidStack(900)) - .fluidOutputs(NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(1000)) - .duration(12 * MINUTES) - .eut(TierEU.RECIPE_IV) - .addTo(fissionFuelProcessingRecipes); - GT_Values.RA.stdBuilder() - .fluidInputs(FLUORIDES.THORIUM_TETRAFLUORIDE.getFluidStack(100), NUCLIDE.LiFBeF2UF4.getFluidStack(900)) - .fluidOutputs(NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(1000)) - .duration(15 * MINUTES) - .eut(TierEU.RECIPE_IV) - .addTo(fissionFuelProcessingRecipes); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_TreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_TreeFarm.java deleted file mode 100644 index f3d596fb9e..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_TreeFarm.java +++ /dev/null @@ -1,632 +0,0 @@ -package gtPlusPlus.xmod.gregtech.loaders.recipe; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.Mods; -import gregtech.api.util.GT_ModHandler; -import gtPlusPlus.core.item.chemistry.AgriculturalChem; -import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; -import gtPlusPlus.xmod.forestry.ForestryTreeHandler; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntityTreeFarm; - -public class RecipeLoader_TreeFarm { - - public static void generateRecipes() { - generateVanillaTrees(); - - if (Mods.IndustrialCraft2.isModLoaded()) generateIC2Trees(); - if (Mods.TinkerConstruct.isModLoaded()) generateTinkersTrees(); - generateGTPPTrees(); - - if (Mods.TwilightForest.isModLoaded()) generateTwilightForestTrees(); - if (Mods.GalaxySpace.isModLoaded()) generateGalaxySpaceTrees(); - if (Mods.GalacticraftAmunRa.isModLoaded()) generateAmunRaTrees(); - - if (Mods.Thaumcraft.isModLoaded()) generateThaumcraftTrees(); - if (Mods.ThaumicBases.isModLoaded()) generateThaumicBasesTrees(); - if (Mods.TaintedMagic.isModLoaded()) generateTaintedMagicTrees(); - if (Mods.ForbiddenMagic.isModLoaded()) generateForbiddenMagicTrees(); - if (Mods.Witchery.isModLoaded()) generateWitcheryTrees(); - - if (Mods.Natura.isModLoaded()) generateNaturaTrees(); - if (Mods.BiomesOPlenty.isModLoaded()) generateBOPTrees(); - if (Mods.PamsHarvestCraft.isModLoaded()) generatePamsTrees(); - if (Mods.PamsHarvestTheNether.isModLoaded()) generatePamsNetherTrees(); - - if (Mods.Forestry.isModLoaded()) { - ForestryTreeHandler.generateForestryTrees(); - } - - if (Mods.Forestry.isModLoaded() && Mods.ExtraTrees.isModLoaded()) ForestryTreeHandler.generateExtraTreesTrees(); - } - - private static void generateVanillaTrees() { - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Oak - new ItemStack(Blocks.sapling, 1, 0), - new ItemStack(Blocks.log, 1, 0), - new ItemStack(Blocks.leaves, 1, 0), - new ItemStack(Items.apple, 1, 0)); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Spruce - new ItemStack(Blocks.sapling, 1, 1), - new ItemStack(Blocks.log, 2, 1), - new ItemStack(Blocks.leaves, 1, 1), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Birch - new ItemStack(Blocks.sapling, 1, 2), - new ItemStack(Blocks.log, 1, 2), - new ItemStack(Blocks.leaves, 1, 2), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Jungle - new ItemStack(Blocks.sapling, 1, 3), - new ItemStack(Blocks.log, 2, 3), - new ItemStack(Blocks.leaves, 1, 3), - new ItemStack(Items.dye, 1, 3)); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Acacia - new ItemStack(Blocks.sapling, 1, 4), - new ItemStack(Blocks.log2, 1, 0), - new ItemStack(Blocks.leaves2, 1, 0), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Dark Oak - new ItemStack(Blocks.sapling, 1, 5), - new ItemStack(Blocks.log2, 1, 1), - new ItemStack(Blocks.leaves2, 1, 1), - new ItemStack(Items.apple, 1, 0)); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Brown Mushroom - new ItemStack(Blocks.brown_mushroom, 1, 0), - new ItemStack(Blocks.brown_mushroom_block, 1, 0), - null, - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Red Mushroom - new ItemStack(Blocks.red_mushroom, 1, 0), - new ItemStack(Blocks.red_mushroom_block, 1, 0), - null, - null); - } - - private static void generateIC2Trees() { - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Rubber Tree - GT_ModHandler.getModItem(Mods.IndustrialCraft2.ID, "blockRubSapling", 1, 0), - GT_ModHandler.getModItem(Mods.IndustrialCraft2.ID, "blockRubWood", 1, 0), - GT_ModHandler.getModItem(Mods.IndustrialCraft2.ID, "blockRubLeaves", 1, 0), - GT_ModHandler.getModItem(Mods.IndustrialCraft2.ID, "itemHarz", 1, 0)); - } - - private static void generateTinkersTrees() { - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Slimy - GT_ModHandler.getModItem(Mods.TinkerConstruct.ID, "slime.sapling", 1, 0), - GT_ModHandler.getModItem(Mods.TinkerConstruct.ID, "slime.gel", 1, 1), - GT_ModHandler.getModItem(Mods.TinkerConstruct.ID, "slime.leaves", 1, 0), - GT_ModHandler.getModItem(Mods.TinkerConstruct.ID, "strangeFood", 1, 0)); - } - - private static void generateGTPPTrees() { - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Rainforest Oak - new ItemStack(BOP_Block_Registrator.sapling_Rainforest, 1, 0), - new ItemStack(BOP_Block_Registrator.log_Rainforest, 3, 0), - new ItemStack(BOP_Block_Registrator.leaves_Rainforest, 1, 0), - new ItemStack(Items.apple, 1, 0)); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Pine - new ItemStack(BOP_Block_Registrator.sapling_Pine, 1, 0), - new ItemStack(BOP_Block_Registrator.log_Pine, 1, 0), - new ItemStack(BOP_Block_Registrator.leaves_Pine, 1, 0), - new ItemStack(AgriculturalChem.mAgrichemItem1, 1, 24)); - } - - private static void generateTwilightForestTrees() { - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Sickly Twilight Oak - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 0), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLog", 1, 0), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLeaves", 1, 0), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Canopy Tree - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 1), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLog", 1, 1), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLeaves", 1, 1), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Twilight Mangrove - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 2), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLog", 1, 2), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLeaves", 1, 2), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Darkwood - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 3), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLog", 1, 3), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.DarkLeaves", 1, 0), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Robust Twilight Oak - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 4), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLog", 4, 0), - // Does not drop more robust saplings normally: - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 0), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLeaves", 1, 0), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Tree of Time - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 5), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFMagicLog", 1, 0), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFMagicLeaves", 1, 0), - // No I am not making this drop clocks. - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Tree of Transformation - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 6), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFMagicLog", 1, 1), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFMagicLeaves", 1, 1), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Sorting Tree - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 8), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFMagicLog", 1, 3), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFMagicLeaves", 1, 3), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Rainbow Oak - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFSapling", 1, 9), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLog", 1, 0), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLeaves", 1, 3), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Thorns - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFThorns", 1, 0), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFThorns", 1, 0), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFThorns", 1, 1), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLeaves3", 1, 0), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFThornRose", 1, 0)); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Magic Beans - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "item.magicBeans", 1, 0), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.HugeStalk", 5, 0), - GT_ModHandler.getModItem(Mods.TwilightForest.ID, "tile.TFLeaves3", 1, 1), - null); - } - - private static void generateGalaxySpaceTrees() { - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Barnarda C - GT_ModHandler.getModItem(Mods.GalaxySpace.ID, "barnardaCsapling", 1, 1), - GT_ModHandler.getModItem(Mods.GalaxySpace.ID, "barnardaClog", 1, 0), - GT_ModHandler.getModItem(Mods.GalaxySpace.ID, "barnardaCleaves", 1, 0), - null); - } - - private static void generateAmunRaTrees() { - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Virilig - GT_ModHandler.getModItem(Mods.GalacticraftAmunRa.ID, "tile.saplings", 1, 0), - GT_ModHandler.getModItem(Mods.GalacticraftAmunRa.ID, "tile.log1", 1, 0), - GT_ModHandler.getModItem(Mods.GalacticraftAmunRa.ID, "tile.null", 1, 0), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Lumipod - GT_ModHandler.getModItem(Mods.GalacticraftAmunRa.ID, "tile.saplings", 1, 1), - GT_ModHandler.getModItem(Mods.GalacticraftAmunRa.ID, "tile.wood1", 1, 0), - null, - GT_ModHandler.getModItem(Mods.GalacticraftAmunRa.ID, "tile.wood1", 1, 1)); - } - - private static void generateNaturaTrees() { - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Redwood - GT_ModHandler.getModItem(Mods.Natura.ID, "florasapling", 1, 0), - GT_ModHandler.getModItem(Mods.Natura.ID, "redwood", 5, 1), - GT_ModHandler.getModItem(Mods.Natura.ID, "florasapling", 2, 0), - GT_ModHandler.getModItem(Mods.Natura.ID, "floraleaves", 2, 0), - GT_ModHandler.getModItem(Mods.Natura.ID, "redwood", 2, 0)); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Eucalyptus - GT_ModHandler.getModItem(Mods.Natura.ID, "florasapling", 1, 1), - GT_ModHandler.getModItem(Mods.Natura.ID, "tree", 1, 0), - GT_ModHandler.getModItem(Mods.Natura.ID, "floraleaves", 1, 1), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Hopseed - GT_ModHandler.getModItem(Mods.Natura.ID, "florasapling", 1, 2), - GT_ModHandler.getModItem(Mods.Natura.ID, "tree", 1, 3), - GT_ModHandler.getModItem(Mods.Natura.ID, "floraleaves", 1, 2), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Sakura - GT_ModHandler.getModItem(Mods.Natura.ID, "florasapling", 1, 3), - GT_ModHandler.getModItem(Mods.Natura.ID, "tree", 1, 1), - GT_ModHandler.getModItem(Mods.Natura.ID, "floraleavesnocolor", 1, 0), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Ghostwood - GT_ModHandler.getModItem(Mods.Natura.ID, "florasapling", 1, 4), - GT_ModHandler.getModItem(Mods.Natura.ID, "tree", 1, 2), - GT_ModHandler.getModItem(Mods.Natura.ID, "floraleavesnocolor", 1, 1), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Blood - GT_ModHandler.getModItem(Mods.Natura.ID, "florasapling", 1, 5), - GT_ModHandler.getModItem(Mods.Natura.ID, "bloodwood", 1, 0), - GT_ModHandler.getModItem(Mods.Natura.ID, "floraleavesnocolor", 1, 2), - new ItemStack(Items.redstone, 1, 0)); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Darkwood - GT_ModHandler.getModItem(Mods.Natura.ID, "florasapling", 1, 6), - GT_ModHandler.getModItem(Mods.Natura.ID, "Dark Tree", 1, 0), - GT_ModHandler.getModItem(Mods.Natura.ID, "Dark Leaves", 1, 0), - GT_ModHandler.getModItem(Mods.Natura.ID, "Natura.netherfood", 1, 0)); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Fusewood - GT_ModHandler.getModItem(Mods.Natura.ID, "florasapling", 1, 7), - GT_ModHandler.getModItem(Mods.Natura.ID, "Dark Tree", 1, 1), - GT_ModHandler.getModItem(Mods.Natura.ID, "Dark Leaves", 1, 3), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Maple - GT_ModHandler.getModItem(Mods.Natura.ID, "Rare Sapling", 1, 0), - GT_ModHandler.getModItem(Mods.Natura.ID, "Rare Tree", 1, 0), - GT_ModHandler.getModItem(Mods.Natura.ID, "Rare Leaves", 1, 0), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Silverbell - GT_ModHandler.getModItem(Mods.Natura.ID, "Rare Sapling", 1, 1), - GT_ModHandler.getModItem(Mods.Natura.ID, "Rare Tree", 1, 1), - GT_ModHandler.getModItem(Mods.Natura.ID, "Rare Leaves", 1, 1), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Amaranth - GT_ModHandler.getModItem(Mods.Natura.ID, "Rare Sapling", 1, 2), - GT_ModHandler.getModItem(Mods.Natura.ID, "Rare Tree", 1, 2), - GT_ModHandler.getModItem(Mods.Natura.ID, "Rare Leaves", 1, 2), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Tigerwood - GT_ModHandler.getModItem(Mods.Natura.ID, "Rare Sapling", 1, 3), - GT_ModHandler.getModItem(Mods.Natura.ID, "Rare Tree", 1, 3), - GT_ModHandler.getModItem(Mods.Natura.ID, "Rare Leaves", 1, 3), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Willow - GT_ModHandler.getModItem(Mods.Natura.ID, "Rare Sapling", 1, 4), - GT_ModHandler.getModItem(Mods.Natura.ID, "willow", 1, 0), - GT_ModHandler.getModItem(Mods.Natura.ID, "floraleavesnocolor", 1, 3), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Green Glowshroom - GT_ModHandler.getModItem(Mods.Natura.ID, "Glowshroom", 1, 0), - GT_ModHandler.getModItem(Mods.Natura.ID, "greenGlowshroom", 1, 0), - null, - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Purple Glowshroom - GT_ModHandler.getModItem(Mods.Natura.ID, "Glowshroom", 1, 1), - GT_ModHandler.getModItem(Mods.Natura.ID, "purpleGlowshroom", 1, 0), - null, - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Blue Glowshroom - GT_ModHandler.getModItem(Mods.Natura.ID, "Glowshroom", 1, 2), - GT_ModHandler.getModItem(Mods.Natura.ID, "blueGlowshroom", 1, 0), - null, - null); - } - - private static void generateBOPTrees() { - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Apple - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 0), - new ItemStack(Blocks.log, 1, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "appleLeaves", 1, 0), - new ItemStack(Items.apple, 2, 0)); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Yellow Autumn - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 1), - new ItemStack(Blocks.log, 1, 2), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves1", 1, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "food", 1, 8)); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Bamboo - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 2), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "bamboo", 1, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves1", 1, 9), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Magic - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 3), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs2", 1, 1), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves1", 1, 2), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Dark - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 4), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs1", 1, 2), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves1", 1, 3), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Dying - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 5), - new ItemStack(Blocks.log, 1, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves2", 1, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "food", 1, 8)); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Fir - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 6), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs1", 1, 3), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves2", 1, 1), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "misc", 1, 13)); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Ethereal - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 7), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs2", 1, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves2", 1, 2), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Orange Autumn - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 8), - new ItemStack(Blocks.log2, 1, 1), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves2", 1, 3), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Origin - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 9), - new ItemStack(Blocks.log, 1, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves3", 1, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "food", 1, 8)); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Pink Cherry - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 10), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs1", 1, 1), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves3", 1, 1), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Maple - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 11), - new ItemStack(Blocks.log, 1, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves3", 1, 2), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // White Cherry - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 12), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs1", 1, 1), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves3", 1, 3), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Hellbark - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 13), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs4", 1, 1), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves4", 1, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "food", 1, 8)); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Jacaranda - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 14), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs4", 1, 2), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "leaves4", 1, 1), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Persimmon - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "saplings", 1, 15), - new ItemStack(Blocks.log, 1, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "persimmonLeaves", 1, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "food", 2, 8)); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Sacred Oak - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedSaplings", 1, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs1", 4, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedSaplings", 2, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedLeaves1", 2, 0), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Mangrove - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedSaplings", 1, 1), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs2", 1, 2), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedLeaves1", 1, 1), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Palm - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedSaplings", 1, 2), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs2", 1, 3), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedLeaves1", 1, 2), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Redwood - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedSaplings", 1, 3), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs3", 2, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedLeaves1", 1, 3), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Willow - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedSaplings", 1, 4), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs3", 1, 1), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedLeaves2", 1, 0), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Pine - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedSaplings", 1, 5), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs4", 1, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedLeaves2", 1, 1), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Mahogany - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedSaplings", 1, 6), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs4", 1, 3), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedLeaves2", 1, 2), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Flowering Oak - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedSaplings", 1, 7), - new ItemStack(Blocks.log, 1, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "colorizedLeaves2", 1, 3), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Red Flower Stem - new ItemStack(Blocks.red_flower, 1, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs3", 1, 3), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "petals", 1, 0), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Yellow Flower Stem - new ItemStack(Blocks.yellow_flower, 1, 0), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "logs3", 1, 3), - GT_ModHandler.getModItem(Mods.BiomesOPlenty.ID, "petals", 1, 1), - null); - } - - private static void addPamTree(String name, int meta) { - GregtechMetaTileEntityTreeFarm.registerTreeProducts( - GT_ModHandler.getModItem(Mods.PamsHarvestCraft.ID, "pam" + name + "Sapling", 1, 0), - new ItemStack(Blocks.log, 1, meta), - new ItemStack(Blocks.leaves, 1, meta), - GT_ModHandler.getModItem(Mods.PamsHarvestCraft.ID, name + "Item", 2, 0)); - } - - private static void generatePamsTrees() { - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Cinnamon - GT_ModHandler.getModItem(Mods.PamsHarvestCraft.ID, "pamappleSapling", 1, 0), - new ItemStack(Blocks.log, 1, 0), - new ItemStack(Blocks.leaves, 1, 0), - new ItemStack(Items.apple, 2, 0)); - - addPamTree("almond", 3); - addPamTree("apricot", 3); - addPamTree("avocado", 0); - addPamTree("banana", 3); - addPamTree("cashew", 3); - addPamTree("cherry", 0); - addPamTree("chestnut", 0); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Cinnamon - GT_ModHandler.getModItem(Mods.PamsHarvestCraft.ID, "pamcinnamonSapling", 1, 0), - GT_ModHandler.getModItem(Mods.PamsHarvestCraft.ID, "pamCinnamon", 1, 0), - new ItemStack(Blocks.leaves, 1, 3), - GT_ModHandler.getModItem(Mods.PamsHarvestCraft.ID, "cinnamonItem", 2, 0)); - - addPamTree("coconut", 3); - addPamTree("date", 3); - addPamTree("dragonfruit", 3); - addPamTree("durian", 3); - addPamTree("fig", 3); - addPamTree("grapefruit", 3); - addPamTree("lemon", 3); - addPamTree("lime", 3); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Maple - GT_ModHandler.getModItem(Mods.PamsHarvestCraft.ID, "pammapleSapling", 1, 0), - GT_ModHandler.getModItem(Mods.PamsHarvestCraft.ID, "pamMaple", 1, 0), - new ItemStack(Blocks.leaves, 1, 1), - GT_ModHandler.getModItem(Mods.PamsHarvestCraft.ID, "maplesyrupItem", 2, 0)); - - addPamTree("mango", 3); - addPamTree("nutmeg", 0); - addPamTree("olive", 0); - addPamTree("orange", 3); - addPamTree("papaya", 3); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Paperbark - GT_ModHandler.getModItem(Mods.PamsHarvestCraft.ID, "pampaperbarkSapling", 1, 0), - GT_ModHandler.getModItem(Mods.PamsHarvestCraft.ID, "pamPaperbark", 1, 0), - new ItemStack(Blocks.leaves, 1, 3), - new ItemStack(Items.paper, 1, 0)); - - addPamTree("peach", 3); - addPamTree("pear", 0); - addPamTree("pecan", 3); - addPamTree("peppercorn", 3); - addPamTree("persimmon", 3); - addPamTree("pistachio", 3); - addPamTree("plum", 0); - addPamTree("pomegranate", 3); - addPamTree("starfruit", 3); - addPamTree("vanillabean", 3); - addPamTree("walnut", 0); - addPamTree("gooseberry", 0); - } - - private static void generatePamsNetherTrees() { - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Ignis Fruit - GT_ModHandler.getModItem(Mods.PamsHarvestTheNether.ID, "netherSapling", 1, 0), - GT_ModHandler.getModItem(Mods.PamsHarvestTheNether.ID, "netherLog", 1, 0), - GT_ModHandler.getModItem(Mods.PamsHarvestTheNether.ID, "netherLeaves", 1, 0), - GT_ModHandler.getModItem(Mods.PamsHarvestTheNether.ID, "ignisfruitItem", 2, 0)); - } - - private static void generateThaumcraftTrees() { - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Greatwood - GT_ModHandler.getModItem(Mods.Thaumcraft.ID, "blockCustomPlant", 1, 0), - GT_ModHandler.getModItem(Mods.Thaumcraft.ID, "blockMagicalLog", 2, 0), - GT_ModHandler.getModItem(Mods.Thaumcraft.ID, "blockMagicalLeaves", 1, 0), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Silverwood - GT_ModHandler.getModItem(Mods.Thaumcraft.ID, "blockCustomPlant", 1, 1), - GT_ModHandler.getModItem(Mods.Thaumcraft.ID, "blockMagicalLog", 1, 1), - GT_ModHandler.getModItem(Mods.Thaumcraft.ID, "blockMagicalLeaves", 1, 1), - null); - } - - private static void generateThaumicBasesTrees() { - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Golden Oak - GT_ModHandler.getModItem(Mods.ThaumicBases.ID, "goldenOakSapling", 1, 0), - new ItemStack(Blocks.log, 1, 0), - GT_ModHandler.getModItem(Mods.ThaumicBases.ID, "genLeaves", 1, 0), - GT_ModHandler.getModItem(Mods.Thaumcraft.ID, "blockMagicalLeaves", 1, 0), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Peaceful - GT_ModHandler.getModItem(Mods.ThaumicBases.ID, "goldenOakSapling", 1, 1), - GT_ModHandler.getModItem(Mods.ThaumicBases.ID, "genLogs", 1, 0), - GT_ModHandler.getModItem(Mods.ThaumicBases.ID, "genLeaves", 1, 1), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Nether - GT_ModHandler.getModItem(Mods.ThaumicBases.ID, "goldenOakSapling", 1, 2), - GT_ModHandler.getModItem(Mods.ThaumicBases.ID, "genLogs", 1, 1), - GT_ModHandler.getModItem(Mods.ThaumicBases.ID, "genLeaves", 1, 2), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Ender - GT_ModHandler.getModItem(Mods.ThaumicBases.ID, "goldenOakSapling", 1, 3), - GT_ModHandler.getModItem(Mods.ThaumicBases.ID, "genLogs", 1, 2), - GT_ModHandler.getModItem(Mods.ThaumicBases.ID, "genLeaves", 1, 3), - null); - } - - private static void generateTaintedMagicTrees() { - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Warpwood - GT_ModHandler.getModItem(Mods.TaintedMagic.ID, "BlockWarpwoodSapling", 1, 0), - GT_ModHandler.getModItem(Mods.TaintedMagic.ID, "BlockWarpwoodLog", 1, 0), - GT_ModHandler.getModItem(Mods.TaintedMagic.ID, "BlockWarpwoodLeaves", 1, 0), - null); - } - - private static void generateForbiddenMagicTrees() { - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Warpwood - GT_ModHandler.getModItem(Mods.ForbiddenMagic.ID, "TaintSapling", 1, 0), - GT_ModHandler.getModItem(Mods.ForbiddenMagic.ID, "TaintLog", 1, 0), - GT_ModHandler.getModItem(Mods.ForbiddenMagic.ID, "TaintLeaves", 1, 0), - GT_ModHandler.getModItem(Mods.ForbiddenMagic.ID, "TaintFruit", 1, 0)); - } - - private static void generateWitcheryTrees() { - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Rowan - GT_ModHandler.getModItem(Mods.Witchery.ID, "witchsapling", 1, 0), - GT_ModHandler.getModItem(Mods.Witchery.ID, "witchlog", 1, 0), - GT_ModHandler.getModItem(Mods.Witchery.ID, "witchleaves", 1, 0), - GT_ModHandler.getModItem(Mods.Witchery.ID, "ingredient", 1, 63)); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Alder - GT_ModHandler.getModItem(Mods.Witchery.ID, "witchsapling", 1, 1), - GT_ModHandler.getModItem(Mods.Witchery.ID, "witchlog", 1, 1), - GT_ModHandler.getModItem(Mods.Witchery.ID, "witchleaves", 1, 1), - null); - - GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Hawthorn - GT_ModHandler.getModItem(Mods.Witchery.ID, "witchsapling", 1, 2), - GT_ModHandler.getModItem(Mods.Witchery.ID, "witchlog", 1, 2), - GT_ModHandler.getModItem(Mods.Witchery.ID, "witchleaves", 1, 2), - null); - } - -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java index fe61fd608d..02141388bb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java @@ -21,23 +21,23 @@ import static gregtech.api.enums.MetaTileEntityIDs.GT4_Tesseract_Generator; import static gregtech.api.enums.MetaTileEntityIDs.GT4_Tesseract_Terminal; import static gregtech.api.enums.MetaTileEntityIDs.GT4_Thermal_Boiler; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_ElectricAutoWorkbench; -import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator; -import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_CropHarvestor; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_AutoCrafter; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_ThermalBoiler; +import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTEElectricAutoWorkbench; +import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractGenerator; +import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractTerminal; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTECropHarvestor; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEAutoCrafter; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEThermalBoiler; public class Gregtech4Content { // ID Range 828, 829, 833 - 850 public static void run() { - Logger.INFO("Max MTE: " + GregTech_API.METATILEENTITIES.length + " | " + GregTech_API.MAXIMUM_METATILE_IDS); + Logger.INFO("Max MTE: " + GregTechAPI.METATILEENTITIES.length + " | " + GregTechAPI.MAXIMUM_METATILE_IDS); thermalBoiler(); multiCrafter(); tesseracts(); @@ -48,73 +48,57 @@ public class Gregtech4Content { private static void automation() { Logger.INFO("Gregtech 4 Content | Registering Auto Workbenches."); GregtechItemList.GT4_Electric_Auto_Workbench_LV.set( - new GT_MetaTileEntity_ElectricAutoWorkbench( - GT4_Electric_Auto_Workbench_LV.ID, - 1, - "Automatic crafting machine").getStackForm(1L)); + new MTEElectricAutoWorkbench(GT4_Electric_Auto_Workbench_LV.ID, 1, "Automatic crafting machine") + .getStackForm(1L)); GregtechItemList.GT4_Electric_Auto_Workbench_MV.set( - new GT_MetaTileEntity_ElectricAutoWorkbench( - GT4_Electric_Auto_Workbench_MV.ID, - 2, - "Automatic crafting machine").getStackForm(1L)); + new MTEElectricAutoWorkbench(GT4_Electric_Auto_Workbench_MV.ID, 2, "Automatic crafting machine") + .getStackForm(1L)); GregtechItemList.GT4_Electric_Auto_Workbench_HV.set( - new GT_MetaTileEntity_ElectricAutoWorkbench( - GT4_Electric_Auto_Workbench_HV.ID, - 3, - "Automatic crafting machine").getStackForm(1L)); + new MTEElectricAutoWorkbench(GT4_Electric_Auto_Workbench_HV.ID, 3, "Automatic crafting machine") + .getStackForm(1L)); GregtechItemList.GT4_Electric_Auto_Workbench_EV.set( - new GT_MetaTileEntity_ElectricAutoWorkbench( - GT4_Electric_Auto_Workbench_EV.ID, - 4, - "Automatic crafting machine").getStackForm(1L)); + new MTEElectricAutoWorkbench(GT4_Electric_Auto_Workbench_EV.ID, 4, "Automatic crafting machine") + .getStackForm(1L)); GregtechItemList.GT4_Electric_Auto_Workbench_IV.set( - new GT_MetaTileEntity_ElectricAutoWorkbench( - GT4_Electric_Auto_Workbench_IV.ID, - 5, - "Automatic crafting machine").getStackForm(1L)); + new MTEElectricAutoWorkbench(GT4_Electric_Auto_Workbench_IV.ID, 5, "Automatic crafting machine") + .getStackForm(1L)); GregtechItemList.GT4_Electric_Auto_Workbench_LuV.set( - new GT_MetaTileEntity_ElectricAutoWorkbench( - GT4_Electric_Auto_Workbench_LuV.ID, - 6, - "Automatic crafting machine").getStackForm(1L)); + new MTEElectricAutoWorkbench(GT4_Electric_Auto_Workbench_LuV.ID, 6, "Automatic crafting machine") + .getStackForm(1L)); GregtechItemList.GT4_Electric_Auto_Workbench_ZPM.set( - new GT_MetaTileEntity_ElectricAutoWorkbench( - GT4_Electric_Auto_Workbench_ZPM.ID, - 7, - "Automatic crafting machine").getStackForm(1L)); + new MTEElectricAutoWorkbench(GT4_Electric_Auto_Workbench_ZPM.ID, 7, "Automatic crafting machine") + .getStackForm(1L)); GregtechItemList.GT4_Electric_Auto_Workbench_UV.set( - new GT_MetaTileEntity_ElectricAutoWorkbench( - GT4_Electric_Auto_Workbench_UV.ID, - 8, - "Automatic crafting machine").getStackForm(1L)); + new MTEElectricAutoWorkbench(GT4_Electric_Auto_Workbench_UV.ID, 8, "Automatic crafting machine") + .getStackForm(1L)); } private static void basic() { Logger.INFO("Gregtech 4 Content | Registering Crop Managers."); GregtechItemList.GT4_Crop_Harvester_LV.set( - new GT_MetaTileEntity_CropHarvestor(GT4_Crop_Harvester_LV.ID, 1, "Harvests the Cropsticks in front of it") + new MTECropHarvestor(GT4_Crop_Harvester_LV.ID, 1, "Harvests the Cropsticks in front of it") .getStackForm(1L)); GregtechItemList.GT4_Crop_Harvester_MV.set( - new GT_MetaTileEntity_CropHarvestor(GT4_Crop_Harvester_MV.ID, 2, "Harvests the Cropsticks in front of it") + new MTECropHarvestor(GT4_Crop_Harvester_MV.ID, 2, "Harvests the Cropsticks in front of it") .getStackForm(1L)); GregtechItemList.GT4_Crop_Harvester_HV.set( - new GT_MetaTileEntity_CropHarvestor(GT4_Crop_Harvester_HV.ID, 3, "Harvests the Cropsticks in front of it") + new MTECropHarvestor(GT4_Crop_Harvester_HV.ID, 3, "Harvests the Cropsticks in front of it") .getStackForm(1L)); GregtechItemList.GT4_Crop_Harvester_EV.set( - new GT_MetaTileEntity_CropHarvestor(GT4_Crop_Harvester_EV.ID, 4, "Harvests the Cropsticks in front of it") + new MTECropHarvestor(GT4_Crop_Harvester_EV.ID, 4, "Harvests the Cropsticks in front of it") .getStackForm(1L)); GregtechItemList.GT4_Crop_Harvester_IV.set( - new GT_MetaTileEntity_CropHarvestor(GT4_Crop_Harvester_IV.ID, 5, "Harvests the Cropsticks in front of it") + new MTECropHarvestor(GT4_Crop_Harvester_IV.ID, 5, "Harvests the Cropsticks in front of it") .getStackForm(1L)); GregtechItemList.GT4_Crop_Harvester_LuV.set( - new GT_MetaTileEntity_CropHarvestor(GT4_Crop_Harvester_LuV.ID, 6, "Harvests the Cropsticks in front of it") + new MTECropHarvestor(GT4_Crop_Harvester_LuV.ID, 6, "Harvests the Cropsticks in front of it") .getStackForm(1L)); GregtechItemList.GT4_Crop_Harvester_ZPM.set( - new GT_MetaTileEntity_CropHarvestor(GT4_Crop_Harvester_ZPM.ID, 7, "Harvests the Cropsticks in front of it") + new MTECropHarvestor(GT4_Crop_Harvester_ZPM.ID, 7, "Harvests the Cropsticks in front of it") .getStackForm(1L)); GregtechItemList.GT4_Crop_Harvester_UV.set( - new GT_MetaTileEntity_CropHarvestor(GT4_Crop_Harvester_UV.ID, 8, "Harvests the Cropsticks in front of it") + new MTECropHarvestor(GT4_Crop_Harvester_UV.ID, 8, "Harvests the Cropsticks in front of it") .getStackForm(1L)); } @@ -122,25 +106,19 @@ public class Gregtech4Content { // Gregtech 4 Tesseracts Logger.INFO("Gregtech 4 Content | Registering Tesseracts."); GregtechItemList.GT4_Tesseract_Generator.set( - new GT_MetaTileEntity_TesseractGenerator( - GT4_Tesseract_Generator.ID, - "tesseract.generator", - "Tesseract Generator", - 4).getStackForm(1L)); + new MTETesseractGenerator(GT4_Tesseract_Generator.ID, "tesseract.generator", "Tesseract Generator", 4) + .getStackForm(1L)); GregtechItemList.GT4_Tesseract_Terminal.set( - new GT_MetaTileEntity_TesseractTerminal( - GT4_Tesseract_Terminal.ID, - "tesseract.terminal", - "Tesseract Terminal", - 4).getStackForm(1L)); + new MTETesseractTerminal(GT4_Tesseract_Terminal.ID, "tesseract.terminal", "Tesseract Terminal", 4) + .getStackForm(1L)); } private static void thermalBoiler() { // Gregtech 4 Thermal Boiler - if (CORE.ConfigSwitches.enableMultiblock_ThermalBoiler) { + if (GTPPCore.ConfigSwitches.enableMultiblock_ThermalBoiler) { Logger.INFO("Gregtech 4 Content | Registering Thermal Boiler."); GregtechItemList.GT4_Thermal_Boiler.set( - new GT4Entity_ThermalBoiler(GT4_Thermal_Boiler.ID, "gtplusplus.thermal.boiler", "Thermal Boiler") + new MTEThermalBoiler(GT4_Thermal_Boiler.ID, "gtplusplus.thermal.boiler", "Thermal Boiler") .getStackForm(1L)); } } @@ -149,9 +127,7 @@ public class Gregtech4Content { // Gregtech 4 Multiblock Auto-Crafter Logger.INFO("Gregtech 4 Content | Registering Multiblock Crafter."); GregtechItemList.GT4_Multi_Crafter.set( - new GT4Entity_AutoCrafter( - GT4_Multi_Crafter.ID, - "gtplusplus.autocrafter.multi", - "Large Scale Auto-Assembler v1.01").getStackForm(1L)); + new MTEAutoCrafter(GT4_Multi_Crafter.ID, "gtplusplus.autocrafter.multi", "Large Scale Auto-Assembler v1.01") + .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java index 7d031dfeff..2e076e7fbe 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java @@ -9,15 +9,15 @@ import net.minecraft.item.ItemStack; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GTModHandler; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.recipe.RECIPES_MachineComponents; +import gtPlusPlus.core.material.MaterialsAlloy; +import gtPlusPlus.core.recipe.RecipesMachineComponents; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_Boiler_HV; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_Boiler_LV; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_Boiler_MV; +import gtPlusPlus.xmod.gregtech.common.tileentities.generators.MTEBoilerHV; +import gtPlusPlus.xmod.gregtech.common.tileentities.generators.MTEBoilerLV; +import gtPlusPlus.xmod.gregtech.common.tileentities.generators.MTEBoilerMV; public class GregtechAdvancedBoilers { @@ -29,11 +29,11 @@ public class GregtechAdvancedBoilers { private static void run1() { // Boilers GregtechItemList.Boiler_Advanced_LV - .set(new GT_MetaTileEntity_Boiler_LV(Boiler_Advanced_LV.ID, "Advanced Boiler [LV]", 1).getStackForm(1L)); + .set(new MTEBoilerLV(Boiler_Advanced_LV.ID, "Advanced Boiler [LV]", 1).getStackForm(1L)); GregtechItemList.Boiler_Advanced_MV - .set(new GT_MetaTileEntity_Boiler_MV(Boiler_Advanced_MV.ID, "Advanced Boiler [MV]", 2).getStackForm(1L)); + .set(new MTEBoilerMV(Boiler_Advanced_MV.ID, "Advanced Boiler [MV]", 2).getStackForm(1L)); GregtechItemList.Boiler_Advanced_HV - .set(new GT_MetaTileEntity_Boiler_HV(Boiler_Advanced_HV.ID, "Advanced Boiler [HV]", 3).getStackForm(1L)); + .set(new MTEBoilerHV(Boiler_Advanced_HV.ID, "Advanced Boiler [HV]", 3).getStackForm(1L)); ItemStack chassisT1 = ItemUtils .getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 0, 1); @@ -45,60 +45,62 @@ public class GregtechAdvancedBoilers { // Make the Coil in each following recipe a hammer and a Screwdriver. // Chassis Recipes - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( chassisT1, - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WCW", "GMG", "WPW", 'M', ItemList.Hull_ULV, 'P', OrePrefixes.pipeLarge.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.ULV), 'W', OrePrefixes.plate.get(Materials.Lead), 'G', OrePrefixes.pipeSmall.get(Materials.Copper) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( chassisT2, - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WCW", "GMG", "WPW", 'M', ItemList.Hull_LV, 'P', OrePrefixes.pipeLarge.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.LV), 'W', OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.pipeSmall.get(Materials.Bronze) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( chassisT3, - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WCW", "GMG", "WPW", 'M', ItemList.Hull_MV, 'P', OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.plate.get(Materials.Aluminium), 'G', OrePrefixes.pipeSmall.get(Materials.Steel) }); - ItemStack pipeTier1 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier7, 1); - ItemStack pipeTier2 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier8, 1); - ItemStack pipeTier3 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier9, 1); + ItemStack pipeTier1 = ItemUtils.getItemStackOfAmountFromOreDict(RecipesMachineComponents.pipeTier7, 1); + ItemStack pipeTier2 = ItemUtils.getItemStackOfAmountFromOreDict(RecipesMachineComponents.pipeTier8, 1); + ItemStack pipeTier3 = ItemUtils.getItemStackOfAmountFromOreDict(RecipesMachineComponents.pipeTier9, 1); // Boiler Recipes - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Boiler_Advanced_LV.get(1L), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "dCw", "WMW", "GPG", 'M', ItemList.Hull_LV, 'P', pipeTier1, 'C', OrePrefixes.circuit.get(Materials.LV), 'W', chassisT1, 'G', OrePrefixes.gear.get(Materials.Steel) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Boiler_Advanced_MV.get(1L), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "dCw", "WMW", "GPG", 'M', ItemList.Hull_MV, 'P', pipeTier2, 'C', - OrePrefixes.circuit.get(Materials.MV), 'W', chassisT2, 'G', ALLOY.SILICON_CARBIDE.getGear(1) }); + OrePrefixes.circuit.get(Materials.MV), 'W', chassisT2, 'G', + MaterialsAlloy.SILICON_CARBIDE.getGear(1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Boiler_Advanced_HV.get(1L), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "dCw", "WMW", "GPG", 'M', ItemList.Hull_HV, 'P', pipeTier3, 'C', - OrePrefixes.circuit.get(Materials.HV), 'W', chassisT3, 'G', ALLOY.SILICON_CARBIDE.getGear(1) }); + OrePrefixes.circuit.get(Materials.HV), 'W', chassisT3, 'G', + MaterialsAlloy.SILICON_CARBIDE.getGear(1) }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java index 4666357f4c..f543286fbe 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java @@ -4,13 +4,13 @@ import static gregtech.api.enums.MetaTileEntityIDs.AlgaeFarm_Controller; import static gregtech.api.enums.MetaTileEntityIDs.Bus_Catalysts; import static gregtech.api.enums.MetaTileEntityIDs.ChemicalPlant_Controller; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.GT_MetaTileEntity_Hatch_Catalysts; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.algae.GregtechMTE_AlgaePondBase; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.chemplant.GregtechMTE_ChemicalPlant; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.MTEHatchCatalysts; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.algae.MTEAlgaePondBase; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.chemplant.MTEChemicalPlant; public class GregtechAlgaeContent { @@ -23,35 +23,34 @@ public class GregtechAlgaeContent { // Algae Pond GregtechItemList.AlgaeFarm_Controller.set( - new GregtechMTE_AlgaePondBase(AlgaeFarm_Controller.ID, "algaefarm.controller.tier.single", "Algae Farm") + new MTEAlgaePondBase(AlgaeFarm_Controller.ID, "algaefarm.controller.tier.single", "Algae Farm") .getStackForm(1L)); // Chemical Plant GregtechItemList.ChemicalPlant_Controller.set( - new GregtechMTE_ChemicalPlant( + new MTEChemicalPlant( ChemicalPlant_Controller.ID, "chemicalplant.controller.tier.single", "ExxonMobil Chemical Plant").getStackForm(1L)); - GregtechItemList.Bus_Catalysts.set( - (new GT_MetaTileEntity_Hatch_Catalysts(Bus_Catalysts.ID, "hatch.catalysts", "Catalyst Housing")) - .getStackForm(1L)); + GregtechItemList.Bus_Catalysts + .set((new MTEHatchCatalysts(Bus_Catalysts.ID, "hatch.catalysts", "Catalyst Housing")).getStackForm(1L)); // Bronze - GregtechMTE_ChemicalPlant.registerMachineCasingForTier(0, ModBlocks.blockCustomMachineCasings, 0, 10); + MTEChemicalPlant.registerMachineCasingForTier(0, ModBlocks.blockCustomMachineCasings, 0, 10); // Steel - GregtechMTE_ChemicalPlant.registerMachineCasingForTier(1, GregTech_API.sBlockCasings2, 0, 16); + MTEChemicalPlant.registerMachineCasingForTier(1, GregTechAPI.sBlockCasings2, 0, 16); // Aluminium - GregtechMTE_ChemicalPlant.registerMachineCasingForTier(2, ModBlocks.blockCustomMachineCasings, 1, 17); + MTEChemicalPlant.registerMachineCasingForTier(2, ModBlocks.blockCustomMachineCasings, 1, 17); // Stainless - GregtechMTE_ChemicalPlant.registerMachineCasingForTier(3, GregTech_API.sBlockCasings4, 1, 49); + MTEChemicalPlant.registerMachineCasingForTier(3, GregTechAPI.sBlockCasings4, 1, 49); // Titanium - GregtechMTE_ChemicalPlant.registerMachineCasingForTier(4, GregTech_API.sBlockCasings4, 2, 50); + MTEChemicalPlant.registerMachineCasingForTier(4, GregTechAPI.sBlockCasings4, 2, 50); // Tungsten - GregtechMTE_ChemicalPlant.registerMachineCasingForTier(5, GregTech_API.sBlockCasings4, 0, 48); + MTEChemicalPlant.registerMachineCasingForTier(5, GregTechAPI.sBlockCasings4, 0, 48); // Laurenium - GregtechMTE_ChemicalPlant.registerMachineCasingForTier(6, ModBlocks.blockCustomMachineCasings, 2, 84); + MTEChemicalPlant.registerMachineCasingForTier(6, ModBlocks.blockCustomMachineCasings, 2, 84); // Botmium - GregtechMTE_ChemicalPlant.registerMachineCasingForTier(7, ModBlocks.blockCustomMachineCasings, 3, 11); + MTEChemicalPlant.registerMachineCasingForTier(7, ModBlocks.blockCustomMachineCasings, 3, 11); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java index 1800ee9440..f3201d9973 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.Amazon_Warehouse_Controller; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.misc.GMTE_AmazonPackager; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.misc.MTEAmazonPackager; public class GregtechAmazonWarehouse { @@ -16,7 +16,7 @@ public class GregtechAmazonWarehouse { private static void run1() { // Amazon packager multiblock GregtechItemList.Amazon_Warehouse_Controller.set( - new GMTE_AmazonPackager( + new MTEAmazonPackager( Amazon_Warehouse_Controller.ID, "amazonprime.controller.tier.single", "Amazon Warehousing Depot.").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java index 7ec4897482..9e2e29a7fc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java @@ -15,10 +15,10 @@ import static gtPlusPlus.core.recipe.common.CI.bitsd; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GTModHandler; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_DynamoBuffer; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchDynamoBuffer; public class GregtechBufferDynamos { @@ -28,111 +28,111 @@ public class GregtechBufferDynamos { private static void run2() { GregtechItemList.Hatch_Buffer_Dynamo_ULV.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_ULV.ID, "hatch.dynamo.buffer.tier.00", "ULV Dynamo Hatch [Buffered]", 0).getStackForm(1L)); GregtechItemList.Hatch_Buffer_Dynamo_LV.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_LV.ID, "hatch.dynamo.buffer.tier.01", "LV Dynamo Hatch [Buffered]", 1).getStackForm(1L)); GregtechItemList.Hatch_Buffer_Dynamo_MV.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_MV.ID, "hatch.dynamo.buffer.tier.02", "MV Dynamo Hatch [Buffered]", 2).getStackForm(1L)); GregtechItemList.Hatch_Buffer_Dynamo_HV.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_HV.ID, "hatch.dynamo.buffer.tier.03", "HV Dynamo Hatch [Buffered]", 3).getStackForm(1L)); GregtechItemList.Hatch_Buffer_Dynamo_EV.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_EV.ID, "hatch.dynamo.buffer.tier.04", "EV Dynamo Hatch [Buffered]", 4).getStackForm(1L)); GregtechItemList.Hatch_Buffer_Dynamo_IV.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_IV.ID, "hatch.dynamo.buffer.tier.05", "IV Dynamo Hatch [Buffered]", 5).getStackForm(1L)); GregtechItemList.Hatch_Buffer_Dynamo_LuV.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_LuV.ID, "hatch.dynamo.buffer.tier.06", "LuV Dynamo Hatch [Buffered]", 6).getStackForm(1L)); GregtechItemList.Hatch_Buffer_Dynamo_ZPM.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_ZPM.ID, "hatch.dynamo.buffer.tier.07", "ZPM Dynamo Hatch [Buffered]", 7).getStackForm(1L)); GregtechItemList.Hatch_Buffer_Dynamo_UV.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_UV.ID, "hatch.dynamo.buffer.tier.08", "UV Dynamo Hatch [Buffered]", 8).getStackForm(1L)); GregtechItemList.Hatch_Buffer_Dynamo_MAX.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_MAX.ID, "hatch.dynamo.buffer.tier.09", "UHV Dynamo Hatch [Buffered]", 9).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_ULV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_ULV, 'T', CI.getTieredCircuit(0), 'C', OrePrefixes.cableGt04.get((Object) Materials.Lead) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_LV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_LV, 'T', CI.getTieredCircuit(1), 'C', OrePrefixes.cableGt04.get((Object) Materials.Tin) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_MV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_MV, 'T', CI.getTieredCircuit(2), 'C', OrePrefixes.cableGt04.get((Object) Materials.AnyCopper) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_HV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_HV, 'T', CI.getTieredCircuit(3), 'C', OrePrefixes.cableGt04.get((Object) Materials.Gold) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_EV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_EV, 'T', CI.getTieredCircuit(4), 'C', OrePrefixes.cableGt04.get((Object) Materials.Aluminium) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_IV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_IV, 'T', CI.getTieredCircuit(5), 'C', OrePrefixes.cableGt04.get((Object) Materials.Tungsten) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_LuV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_LuV, 'T', CI.getTieredCircuit(6), 'C', OrePrefixes.cableGt04.get((Object) Materials.VanadiumGallium) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_ZPM.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_ZPM, 'T', CI.getTieredCircuit(7), 'C', OrePrefixes.cableGt04.get((Object) Materials.Naquadah) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_UV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_UV, 'T', CI.getTieredCircuit(8), 'C', OrePrefixes.wireGt12.get((Object) Materials.NaquadahAlloy) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_MAX.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_UHV, 'T', CI.getTieredCircuit(9), 'C', diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index 9b12d4ca11..f08457f807 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -6,8 +6,8 @@ import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.extruderRecipes; import static gregtech.api.recipe.RecipeMaps.unpackagerRecipes; import static gregtech.api.recipe.RecipeMaps.wiremillRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -16,18 +16,18 @@ import java.util.ArrayList; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.metatileentity.implementations.MTEFluid; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialsAlloy; +import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -35,8 +35,8 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntityFluid; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_Cable; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GTPPMTECable; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GTPPMTEFluid; public class GregtechConduits { @@ -48,10 +48,10 @@ public class GregtechConduits { public static void run() { Logger.INFO("Gregtech5u Content | Registering Custom Cables/Wires/Pipes."); - if (CORE.ConfigSwitches.enableCustom_Cables) { + if (GTPPCore.ConfigSwitches.enableCustom_Cables) { run1(); } - if (CORE.ConfigSwitches.enableCustom_Pipes) { + if (GTPPCore.ConfigSwitches.enableCustom_Pipes) { run2(); run3(); } @@ -60,8 +60,8 @@ public class GregtechConduits { private static void run3() { try { - Class<GT_MetaPipeEntity_Fluid> aPipeEntity = GT_MetaPipeEntity_Fluid.class; - Constructor<GT_MetaPipeEntity_Fluid> constructor = aPipeEntity.getConstructor( + Class<MTEFluid> aPipeEntity = MTEFluid.class; + Constructor<MTEFluid> constructor = aPipeEntity.getConstructor( int.class, String.class, String.class, @@ -159,9 +159,9 @@ public class GregtechConduits { } } - private static void generateFluidMultiPipes(Constructor<GT_MetaPipeEntity_Fluid> aClazz, Materials aMaterial, - String name, String displayName, int startID, int transferRatePerSec, int heatCapacity, boolean gasProof) { - GT_MetaPipeEntity_Fluid aPipe; + private static void generateFluidMultiPipes(Constructor<MTEFluid> aClazz, Materials aMaterial, String name, + String displayName, int startID, int transferRatePerSec, int heatCapacity, boolean gasProof) { + MTEFluid aPipe; final int transferRatePerTick = transferRatePerSec / 20; try { aPipe = aClazz.newInstance( @@ -178,7 +178,7 @@ public class GregtechConduits { Logger.INFO("Failed to Generate " + aMaterial + " Hexadecuple pipes."); } else { Logger.INFO("Generated " + aMaterial + " Hexadecuple pipes."); - GT_OreDictUnificator.registerOre("pipeHexadecuple" + aMaterial, aPipe.getStackForm(1L)); + GTOreDictUnificator.registerOre("pipeHexadecuple" + aMaterial, aPipe.getStackForm(1L)); } } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { @@ -192,24 +192,66 @@ public class GregtechConduits { wireFactory("RedstoneAlloy", 32, BaseWireID + 45, 0, 2, 1, new short[] { 178, 34, 34, 0 }); // need to go back id because fluid pipes already occupy - makeCustomWires(ELEMENT.STANDALONE.HYPOGEN, BaseWireID - 15, 0, 0, 8, GT_Values.V[11], false, true); + makeCustomWires(MaterialsElements.STANDALONE.HYPOGEN, BaseWireID - 15, 0, 0, 8, GTValues.V[11], false, true); } private static void run2() { - generateNonGTFluidPipes(GT_Materials.Staballoy, ALLOY.STABALLOY, BasePipeID, 12500, 7500, true); - generateNonGTFluidPipes(GT_Materials.Tantalloy60, ALLOY.TANTALLOY_60, BasePipeID + 5, 10000, 4250, true); - generateNonGTFluidPipes(GT_Materials.Tantalloy61, ALLOY.TANTALLOY_61, BasePipeID + 10, 12000, 5800, true); + generateNonGTFluidPipes(GT_Materials.Staballoy, MaterialsAlloy.STABALLOY, BasePipeID, 12500, 7500, true); + generateNonGTFluidPipes( + GT_Materials.Tantalloy60, + MaterialsAlloy.TANTALLOY_60, + BasePipeID + 5, + 10000, + 4250, + true); + generateNonGTFluidPipes( + GT_Materials.Tantalloy61, + MaterialsAlloy.TANTALLOY_61, + BasePipeID + 10, + 12000, + 5800, + true); if (Thaumcraft.isModLoaded()) { generateNonGTFluidPipes(GT_Materials.Void, null, BasePipeID + 15, 1600, 25000, true); } generateGTFluidPipes(Materials.Europium, BasePipeID + 20, 12000, 7500, true); - generateNonGTFluidPipes(GT_Materials.Potin, ALLOY.POTIN, BasePipeID + 25, 500, 2000, true); - generateNonGTFluidPipes(GT_Materials.MaragingSteel300, ALLOY.MARAGING300, BasePipeID + 30, 14000, 2500, true); - generateNonGTFluidPipes(GT_Materials.MaragingSteel350, ALLOY.MARAGING350, BasePipeID + 35, 16000, 2500, true); - generateNonGTFluidPipes(GT_Materials.Inconel690, ALLOY.INCONEL_690, BasePipeID + 40, 15000, 4800, true); - generateNonGTFluidPipes(GT_Materials.Inconel792, ALLOY.INCONEL_792, BasePipeID + 45, 16000, 5500, true); - generateNonGTFluidPipes(GT_Materials.HastelloyX, ALLOY.HASTELLOY_X, BasePipeID + 50, 20000, 4200, true); + generateNonGTFluidPipes(GT_Materials.Potin, MaterialsAlloy.POTIN, BasePipeID + 25, 500, 2000, true); + generateNonGTFluidPipes( + GT_Materials.MaragingSteel300, + MaterialsAlloy.MARAGING300, + BasePipeID + 30, + 14000, + 2500, + true); + generateNonGTFluidPipes( + GT_Materials.MaragingSteel350, + MaterialsAlloy.MARAGING350, + BasePipeID + 35, + 16000, + 2500, + true); + generateNonGTFluidPipes( + GT_Materials.Inconel690, + MaterialsAlloy.INCONEL_690, + BasePipeID + 40, + 15000, + 4800, + true); + generateNonGTFluidPipes( + GT_Materials.Inconel792, + MaterialsAlloy.INCONEL_792, + BasePipeID + 45, + 16000, + 5500, + true); + generateNonGTFluidPipes( + GT_Materials.HastelloyX, + MaterialsAlloy.HASTELLOY_X, + BasePipeID + 50, + 20000, + 4200, + true); generateGTFluidPipes(Materials.Tungsten, BasePipeID + 55, 4320, 7200, true); if (EnderIO.isModLoaded()) { @@ -220,7 +262,7 @@ public class GregtechConduits { generateNonGTFluidPipes( GT_Materials.TriniumNaquadahCarbonite, - ALLOY.TRINIUM_NAQUADAH_CARBON, + MaterialsAlloy.TRINIUM_NAQUADAH_CARBON, 30500, 20, 250000, @@ -230,23 +272,23 @@ public class GregtechConduits { private static void wireFactory(final String Material, final int Voltage, final int ID, final long insulatedLoss, final long uninsulatedLoss, final long Amps, final short[] rgb) { final Materials T = Materials.get(Material); - int V = GT_Utility.getTier(Voltage); + int V = GTUtility.getTier(Voltage); if (V == -1) { Logger.ERROR("Failed to set voltage on " + Material + ". Invalid voltage of " + Voltage + "V set."); Logger.ERROR(Material + " has defaulted to 8v."); V = 0; } - makeWires(T, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false, rgb); + makeWires(T, ID, insulatedLoss, uninsulatedLoss, Amps, GTValues.V[V], true, false, rgb); } private static void makeWires(final Materials aMaterial, final int aStartID, final long aLossInsulated, final long aLoss, final long aAmperage, final long aVoltage, final boolean aInsulatable, final boolean aAutoInsulated, final short[] aRGB) { Logger.WARNING("Gregtech5u Content | Registered " + aMaterial.mName + " as a new material for Wire & Cable."); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt01, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 0, "wire." + aMaterial.mName.toLowerCase() + ".01", "1x " + aMaterial.mDefaultLocalName + " Wire", @@ -258,10 +300,10 @@ public class GregtechConduits { false, !aAutoInsulated, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt02, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 1, "wire." + aMaterial.mName.toLowerCase() + ".02", "2x " + aMaterial.mDefaultLocalName + " Wire", @@ -273,10 +315,10 @@ public class GregtechConduits { false, !aAutoInsulated, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt04, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 2, "wire." + aMaterial.mName.toLowerCase() + ".04", "4x " + aMaterial.mDefaultLocalName + " Wire", @@ -288,10 +330,10 @@ public class GregtechConduits { false, !aAutoInsulated, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt08, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 3, "wire." + aMaterial.mName.toLowerCase() + ".08", "8x " + aMaterial.mDefaultLocalName + " Wire", @@ -303,10 +345,10 @@ public class GregtechConduits { false, !aAutoInsulated, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt12, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 4, "wire." + aMaterial.mName.toLowerCase() + ".12", "12x " + aMaterial.mDefaultLocalName + " Wire", @@ -318,10 +360,10 @@ public class GregtechConduits { false, !aAutoInsulated, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt16, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 5, "wire." + aMaterial.mName.toLowerCase() + ".16", "16x " + aMaterial.mDefaultLocalName + " Wire", @@ -334,10 +376,10 @@ public class GregtechConduits { !aAutoInsulated, aRGB).getStackForm(1L)); if (aInsulatable) { - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt01, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 6, "cable." + aMaterial.mName.toLowerCase() + ".01", "1x " + aMaterial.mDefaultLocalName + " Cable", @@ -349,10 +391,10 @@ public class GregtechConduits { true, false, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt02, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 7, "cable." + aMaterial.mName.toLowerCase() + ".02", "2x " + aMaterial.mDefaultLocalName + " Cable", @@ -364,10 +406,10 @@ public class GregtechConduits { true, false, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt04, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 8, "cable." + aMaterial.mName.toLowerCase() + ".04", "4x " + aMaterial.mDefaultLocalName + " Cable", @@ -379,10 +421,10 @@ public class GregtechConduits { true, false, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt08, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 9, "cable." + aMaterial.mName.toLowerCase() + ".08", "8x " + aMaterial.mDefaultLocalName + " Cable", @@ -394,10 +436,10 @@ public class GregtechConduits { true, false, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt12, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 10, "cable." + aMaterial.mName.toLowerCase() + ".12", "12x " + aMaterial.mDefaultLocalName + " Cable", @@ -409,10 +451,10 @@ public class GregtechConduits { true, false, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt16, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 11, "cable." + aMaterial.mName.toLowerCase() + ".16", "16x " + aMaterial.mDefaultLocalName + " Cable", @@ -429,13 +471,13 @@ public class GregtechConduits { private static void customWireFactory(final Material Material, final int Voltage, final int ID, final long insulatedLoss, final long uninsulatedLoss, final long Amps) { - int V = GT_Utility.getTier(Voltage); + int V = GTUtility.getTier(Voltage); if (V == -1) { Logger.ERROR("Failed to set voltage on " + Material + ". Invalid voltage of " + Voltage + "V set."); Logger.ERROR(Material + " has defaulted to 8v."); V = 0; } - makeCustomWires(Material, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false); + makeCustomWires(Material, ID, insulatedLoss, uninsulatedLoss, Amps, GTValues.V[V], true, false); } private static void makeCustomWires(final Material aMaterial, final int aStartID, final long aLossInsulated, @@ -446,7 +488,7 @@ public class GregtechConduits { registerOre( OrePrefixes.wireGt01, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 0, "wire." + aMaterial.getLocalizedName() .toLowerCase() + ".01", @@ -461,7 +503,7 @@ public class GregtechConduits { registerOre( OrePrefixes.wireGt02, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 1, "wire." + aMaterial.getLocalizedName() .toLowerCase() + ".02", @@ -476,7 +518,7 @@ public class GregtechConduits { registerOre( OrePrefixes.wireGt04, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 2, "wire." + aMaterial.getLocalizedName() .toLowerCase() + ".04", @@ -491,7 +533,7 @@ public class GregtechConduits { registerOre( OrePrefixes.wireGt08, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 3, "wire." + aMaterial.getLocalizedName() .toLowerCase() + ".08", @@ -506,7 +548,7 @@ public class GregtechConduits { registerOre( OrePrefixes.wireGt12, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 4, "wire." + aMaterial.getLocalizedName() .toLowerCase() + ".12", @@ -521,7 +563,7 @@ public class GregtechConduits { registerOre( OrePrefixes.wireGt16, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 5, "wire." + aMaterial.getLocalizedName() .toLowerCase() + ".16", @@ -537,7 +579,7 @@ public class GregtechConduits { registerOre( OrePrefixes.cableGt01, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 6, "cable." + aMaterial.getLocalizedName() .toLowerCase() + ".01", @@ -552,7 +594,7 @@ public class GregtechConduits { registerOre( OrePrefixes.cableGt02, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 7, "cable." + aMaterial.getLocalizedName() .toLowerCase() + ".02", @@ -567,7 +609,7 @@ public class GregtechConduits { registerOre( OrePrefixes.cableGt04, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 8, "cable." + aMaterial.getLocalizedName() .toLowerCase() + ".04", @@ -582,7 +624,7 @@ public class GregtechConduits { registerOre( OrePrefixes.cableGt08, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 9, "cable." + aMaterial.getLocalizedName() .toLowerCase() + ".08", @@ -597,7 +639,7 @@ public class GregtechConduits { registerOre( OrePrefixes.cableGt12, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 10, "cable." + aMaterial.getLocalizedName() .toLowerCase() + ".12", @@ -612,7 +654,7 @@ public class GregtechConduits { registerOre( OrePrefixes.cableGt16, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 11, "cable." + aMaterial.getLocalizedName() .toLowerCase() + ".16", @@ -632,9 +674,9 @@ public class GregtechConduits { final int transferRatePerTick = transferRatePerSec / 20; final long mass = material.getMass(); final long voltage = material.mMeltingPoint >= 2800 ? 64 : 16; - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeTiny.get(material), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( startID, "GT_Pipe_" + material.mDefaultLocalName + "_Tiny", "Tiny " + material.mDefaultLocalName + " Fluid Pipe", @@ -643,9 +685,9 @@ public class GregtechConduits { transferRatePerTick * 2, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(material), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( startID + 1, "GT_Pipe_" + material.mDefaultLocalName + "_Small", "Small " + material.mDefaultLocalName + " Fluid Pipe", @@ -654,9 +696,9 @@ public class GregtechConduits { transferRatePerTick * 4, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(material), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( startID + 2, "GT_Pipe_" + material.mDefaultLocalName + "", "" + material.mDefaultLocalName + " Fluid Pipe", @@ -665,9 +707,9 @@ public class GregtechConduits { transferRatePerTick * 12, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(material), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( startID + 3, "GT_Pipe_" + material.mDefaultLocalName + "_Large", "Large " + material.mDefaultLocalName + " Fluid Pipe", @@ -676,9 +718,9 @@ public class GregtechConduits { transferRatePerTick * 24, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeHuge.get(material), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( startID + 4, "GT_Pipe_" + material.mDefaultLocalName + "_Huge", "Huge " + material.mDefaultLocalName + " Fluid Pipe", @@ -689,13 +731,13 @@ public class GregtechConduits { isGasProof).getStackForm(1L)); } - private static void generateNonGTFluidPipes(final GT_Materials material, final Material myMaterial, + private static void generateNonGTFluidPipes(final GT_Materials material, final Material GGMaterial, final int startID, final int transferRatePerSec, final int heatResistance, final boolean isGasProof) { final int transferRatePerTick = transferRatePerSec / 20; - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeTiny.get(material), - new GregtechMetaPipeEntityFluid( + new GTPPMTEFluid( startID, "GT_Pipe_" + material.mDefaultLocalName + "_Tiny", "Tiny " + material.mDefaultLocalName + " Fluid Pipe", @@ -704,9 +746,9 @@ public class GregtechConduits { transferRatePerTick * 2, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(material), - new GregtechMetaPipeEntityFluid( + new GTPPMTEFluid( startID + 1, "GT_Pipe_" + material.mDefaultLocalName + "_Small", "Small " + material.mDefaultLocalName + " Fluid Pipe", @@ -715,9 +757,9 @@ public class GregtechConduits { transferRatePerTick * 4, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(material), - new GregtechMetaPipeEntityFluid( + new GTPPMTEFluid( startID + 2, "GT_Pipe_" + material.mDefaultLocalName + "", "" + material.mDefaultLocalName + " Fluid Pipe", @@ -726,9 +768,9 @@ public class GregtechConduits { transferRatePerTick * 12, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(material), - new GregtechMetaPipeEntityFluid( + new GTPPMTEFluid( startID + 3, "GT_Pipe_" + material.mDefaultLocalName + "_Large", "Large " + material.mDefaultLocalName + " Fluid Pipe", @@ -737,9 +779,9 @@ public class GregtechConduits { transferRatePerTick * 24, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeHuge.get(material), - new GregtechMetaPipeEntityFluid( + new GTPPMTEFluid( startID + 4, "GT_Pipe_" + material.mDefaultLocalName + "_Huge", "Huge " + material.mDefaultLocalName + " Fluid Pipe", @@ -836,7 +878,7 @@ public class GregtechConduits { if (pipeIngot != null && ItemUtils.checkForInvalidItems(pipeIngot)) { // 1 Clay Plate = 1 Clay Dust = 2 Clay Ball int inputMultiplier = materialName.equals("Clay") ? 2 : 1; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(pipeIngot, 1 * inputMultiplier), ItemList.Shape_Extruder_Pipe_Tiny.get(0)) @@ -844,7 +886,7 @@ public class GregtechConduits { .duration(5 * TICKS) .eut(eut) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(pipeIngot, 1 * inputMultiplier), ItemList.Shape_Extruder_Pipe_Small.get(0)) @@ -852,7 +894,7 @@ public class GregtechConduits { .duration(10 * TICKS) .eut(eut) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(pipeIngot, 3 * inputMultiplier), ItemList.Shape_Extruder_Pipe_Medium.get(0)) @@ -860,7 +902,7 @@ public class GregtechConduits { .duration(20 * TICKS) .eut(eut) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(pipeIngot, 6 * inputMultiplier), ItemList.Shape_Extruder_Pipe_Large.get(0)) @@ -868,7 +910,7 @@ public class GregtechConduits { .duration(2 * SECONDS) .eut(eut) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(pipeIngot, 12 * inputMultiplier), ItemList.Shape_Extruder_Pipe_Huge.get(0)) @@ -911,13 +953,13 @@ public class GregtechConduits { } public static boolean registerOre(Object aName, ItemStack aStack) { - if ((aName == null) || (GT_Utility.isStackInvalid(aStack))) return false; + if ((aName == null) || (GTUtility.isStackInvalid(aStack))) return false; String tName = aName.toString(); - if (GT_Utility.isStringInvalid(tName)) return false; - ArrayList<ItemStack> tList = GT_OreDictUnificator.getOres(tName); + if (GTUtility.isStringInvalid(tName)) return false; + ArrayList<ItemStack> tList = GTOreDictUnificator.getOres(tName); for (ItemStack itemStack : tList) - if (GT_Utility.areStacksEqual((ItemStack) itemStack, aStack, true)) return false; - OreDictionary.registerOre(tName, GT_Utility.copyAmount(1L, new Object[] { aStack })); + if (GTUtility.areStacksEqual((ItemStack) itemStack, aStack, true)) return false; + OreDictionary.registerOre(tName, GTUtility.copyAmount(1L, new Object[] { aStack })); return true; } @@ -949,38 +991,38 @@ public class GregtechConduits { // Wire mill if (ItemUtils .checkForInvalidItems(new ItemStack[] { aIngot, aWire01, aWire02, aWire04, aWire08, aWire12, aWire16 })) { - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getIngot(1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getIngot(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(aMaterial.getWire01(2)) .duration(5 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getIngot(1), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getIngot(1), GTUtility.getIntegratedCircuit(2)) .itemOutputs(aMaterial.getWire02(1)) .duration(7 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getIngot(2), GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getIngot(2), GTUtility.getIntegratedCircuit(4)) .itemOutputs(aMaterial.getWire04(1)) .duration(10 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getIngot(4), GT_Utility.getIntegratedCircuit(8)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getIngot(4), GTUtility.getIntegratedCircuit(8)) .itemOutputs(aMaterial.getWire08(1)) .duration(12 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getIngot(6), GT_Utility.getIntegratedCircuit(12)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getIngot(6), GTUtility.getIntegratedCircuit(12)) .itemOutputs(aMaterial.getWire12(1)) .duration(15 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getIngot(8), GT_Utility.getIntegratedCircuit(16)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getIngot(8), GTUtility.getIntegratedCircuit(16)) .itemOutputs(aMaterial.getWire16(1)) .duration(17 * SECONDS + 10 * TICKS) .eut(4) @@ -990,38 +1032,38 @@ public class GregtechConduits { if (ItemUtils .checkForInvalidItems(new ItemStack[] { aRod, aWire01, aWire02, aWire04, aWire08, aWire12, aWire16 })) { - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getRod(1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getRod(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(aMaterial.getWire01(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getRod(2), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getRod(2), GTUtility.getIntegratedCircuit(2)) .itemOutputs(aMaterial.getWire02(1)) .duration(5 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getRod(4), GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getRod(4), GTUtility.getIntegratedCircuit(4)) .itemOutputs(aMaterial.getWire04(1)) .duration(7 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getRod(8), GT_Utility.getIntegratedCircuit(8)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getRod(8), GTUtility.getIntegratedCircuit(8)) .itemOutputs(aMaterial.getWire08(1)) .duration(10 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getRod(12), GT_Utility.getIntegratedCircuit(12)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getRod(12), GTUtility.getIntegratedCircuit(12)) .itemOutputs(aMaterial.getWire12(1)) .duration(12 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getRod(16), GT_Utility.getIntegratedCircuit(16)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getRod(16), GTUtility.getIntegratedCircuit(16)) .itemOutputs(aMaterial.getWire16(1)) .duration(15 * SECONDS) .eut(4) @@ -1030,8 +1072,8 @@ public class GregtechConduits { } if (ItemUtils.checkForInvalidItems(new ItemStack[] { aIngot, aFineWire })) { - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getIngot(1), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getIngot(1), GTUtility.getIntegratedCircuit(3)) .itemOutputs(aMaterial.getFineWire(8)) .duration(5 * SECONDS) .eut(4) @@ -1040,8 +1082,8 @@ public class GregtechConduits { } if (ItemUtils.checkForInvalidItems(new ItemStack[] { aRod, aFineWire })) { - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getRod(1), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getRod(1), GTUtility.getIntegratedCircuit(3)) .itemOutputs(aMaterial.getFineWire(4)) .duration(2 * SECONDS + 10 * TICKS) .eut(4) @@ -1050,8 +1092,8 @@ public class GregtechConduits { } if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aFineWire })) { - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getWire01(1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getWire01(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(aMaterial.getFineWire(4)) .duration(10 * SECONDS) .eut(8) @@ -1061,7 +1103,7 @@ public class GregtechConduits { // Extruder if (ItemUtils.checkForInvalidItems(new ItemStack[] { aIngot, aWire01 })) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aIngot, ItemList.Shape_Extruder_Wire.get(0)) .itemOutputs(aMaterial.getWire01(2)) .duration(9 * SECONDS + 16 * TICKS) @@ -1070,7 +1112,7 @@ public class GregtechConduits { } if (ItemUtils.checkForInvalidItems(new ItemStack[] { aCable01, aWire01 })) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aCable01) .itemOutputs(aWire01) .duration(5 * SECONDS) @@ -1149,8 +1191,8 @@ public class GregtechConduits { // Wire to Cable // 1x if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aCable01 })) { - GT_Values.RA.stdBuilder() - .itemInputs(aWire01, GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(aWire01, GTUtility.getIntegratedCircuit(24)) .itemOutputs(aCable01) .fluidInputs(FluidUtils.getFluidStack("molten.rubber", 144)) .duration(5 * SECONDS) @@ -1161,8 +1203,8 @@ public class GregtechConduits { // 2x if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire02, aCable02 })) { - GT_Values.RA.stdBuilder() - .itemInputs(aWire02, GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(aWire02, GTUtility.getIntegratedCircuit(24)) .itemOutputs(aCable02) .fluidInputs(FluidUtils.getFluidStack("molten.rubber", 144)) .duration(5 * SECONDS) @@ -1173,8 +1215,8 @@ public class GregtechConduits { // 4x if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire04, aCable04 })) { - GT_Values.RA.stdBuilder() - .itemInputs(aWire04, GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(aWire04, GTUtility.getIntegratedCircuit(24)) .itemOutputs(aCable04) .fluidInputs(FluidUtils.getFluidStack("molten.rubber", 288)) .duration(5 * SECONDS) @@ -1185,8 +1227,8 @@ public class GregtechConduits { // 8x if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire08, aCable08 })) { - GT_Values.RA.stdBuilder() - .itemInputs(aWire08, GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(aWire08, GTUtility.getIntegratedCircuit(24)) .itemOutputs(aCable08) .fluidInputs(FluidUtils.getFluidStack("molten.rubber", 432)) .duration(5 * SECONDS) @@ -1197,8 +1239,8 @@ public class GregtechConduits { // 12x if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire12, aCable12 })) { - GT_Values.RA.stdBuilder() - .itemInputs(aWire12, GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(aWire12, GTUtility.getIntegratedCircuit(24)) .itemOutputs(aCable12) .fluidInputs(FluidUtils.getFluidStack("molten.rubber", 576)) .duration(5 * SECONDS) @@ -1209,8 +1251,8 @@ public class GregtechConduits { // 16x if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire16, aCable16 })) { - GT_Values.RA.stdBuilder() - .itemInputs(aWire16, GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(aWire16, GTUtility.getIntegratedCircuit(24)) .itemOutputs(aCable16) .fluidInputs(FluidUtils.getFluidStack("molten.rubber", 720)) .duration(5 * SECONDS) @@ -1221,32 +1263,32 @@ public class GregtechConduits { // Assemble small wires into bigger wires if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire02 })) { - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getWire01(2), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getWire01(2), GTUtility.getIntegratedCircuit(2)) .itemOutputs(aWire02) .duration(5 * SECONDS) .eut(8) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getWire01(4), GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getWire01(4), GTUtility.getIntegratedCircuit(4)) .itemOutputs(aWire04) .duration(5 * SECONDS) .eut(8) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getWire01(8), GT_Utility.getIntegratedCircuit(8)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getWire01(8), GTUtility.getIntegratedCircuit(8)) .itemOutputs(aWire08) .duration(5 * SECONDS) .eut(8) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getWire01(12), GT_Utility.getIntegratedCircuit(12)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getWire01(12), GTUtility.getIntegratedCircuit(12)) .itemOutputs(aWire12) .duration(5 * SECONDS) .eut(8) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getWire01(16), GT_Utility.getIntegratedCircuit(16)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getWire01(16), GTUtility.getIntegratedCircuit(16)) .itemOutputs(aWire16) .duration(5 * SECONDS) .eut(8) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java index 35b5c6719e..2781730229 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java @@ -22,17 +22,17 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ChiselBus; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_AirIntake; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_AirIntake_Extreme; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler_Adv; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Naquadah; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Reservoir; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Solidifier; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_TurbineProvider; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_SuperBus_Input; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_SuperBus_Output; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GT_MetaTileEntity_Hatch_CustomFluidBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.METHatchAirIntake; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchAirIntakeExtreme; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchChiselBus; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchMufflerAdvanced; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchNaquadah; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchReservoir; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchSolidifier; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchSuperBusInput; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchTurbineProvider; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTESuperBusOutput; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTEHatchCustomFluidBase; public class GregtechCustomHatches { @@ -50,7 +50,7 @@ public class GregtechCustomHatches { private static void run1() { GregtechItemList.Hatch_Input_Cryotheum.set( - new GT_MetaTileEntity_Hatch_CustomFluidBase( + new MTEHatchCustomFluidBase( FluidUtils.getFluidStack("cryotheum", 1) .getFluid(), // Fluid to restrict hatch to 128000, // Capacity @@ -61,7 +61,7 @@ public class GregtechCustomHatches { ).getStackForm(1L)); GregtechItemList.Hatch_Input_Pyrotheum.set( - new GT_MetaTileEntity_Hatch_CustomFluidBase( + new MTEHatchCustomFluidBase( FluidUtils.getFluidStack("pyrotheum", 1) .getFluid(), // Fluid to restrict hatch to 128000, // Capacity @@ -72,14 +72,14 @@ public class GregtechCustomHatches { ).getStackForm(1L)); GregtechItemList.Hatch_Input_Naquadah.set( - new GT_MetaTileEntity_Hatch_Naquadah( + new MTEHatchNaquadah( Hatch_Input_Naquadah.ID, // ID "hatch.naquadah.input.tier.00", // unlocal name "Naquadah Reactor Input hatch" // Local name ).getStackForm(1L)); GregtechItemList.Hatch_Input_TurbineHousing.set( - new GT_MetaTileEntity_Hatch_TurbineProvider( + new MTEHatchTurbineProvider( Hatch_Input_TurbineHousing.ID, // ID "hatch.turbine.input.tier.00", // unlocal name "Turbine Housing", // Local name @@ -87,13 +87,10 @@ public class GregtechCustomHatches { // Multiblock Air Intake Hatch GregtechItemList.Hatch_Air_Intake.set( - new GT_MetaTileEntity_Hatch_AirIntake( - Hatch_Air_Intake.ID, - "hatch.air.intake.tier.00", - "Air Intake Hatch", - 5).getStackForm(1L)); + new METHatchAirIntake(Hatch_Air_Intake.ID, "hatch.air.intake.tier.00", "Air Intake Hatch", 5) + .getStackForm(1L)); GregtechItemList.Hatch_Air_Intake_Extreme.set( - new GT_MetaTileEntity_Hatch_AirIntake_Extreme( + new MTEHatchAirIntakeExtreme( Hatch_Air_Intake_Extreme.ID, "hatch.air.intake.tier.01", "Extreme Air Intake Hatch", @@ -101,15 +98,12 @@ public class GregtechCustomHatches { // Multiblock Reservoir Hatch GregtechItemList.Hatch_Reservoir.set( - new GT_MetaTileEntity_Hatch_Reservoir( - Hatch_Reservoir.ID, - "hatch.water.intake.tier.00", - "Reservoir Hatch", - 4).getStackForm(1L)); + new MTEHatchReservoir(Hatch_Reservoir.ID, "hatch.water.intake.tier.00", "Reservoir Hatch", 4) + .getStackForm(1L)); // Steam Hatch GregtechItemList.Hatch_Input_Steam.set( - new GT_MetaTileEntity_Hatch_CustomFluidBase( + new MTEHatchCustomFluidBase( FluidUtils.getSteam(1) .getFluid(), // Fluid to restrict hatch to 64000, // Capacity @@ -122,55 +116,52 @@ public class GregtechCustomHatches { private static void run2() { GregtechItemList.Hatch_Muffler_Adv_LV.set( - (new GT_MetaTileEntity_Hatch_Muffler_Adv( - 30001, - "hatch.muffler.adv.tier.01", - "Advanced Muffler Hatch (LV)", - 1)).getStackForm(1L)); + (new MTEHatchMufflerAdvanced(30001, "hatch.muffler.adv.tier.01", "Advanced Muffler Hatch (LV)", 1)) + .getStackForm(1L)); GregtechItemList.Hatch_Muffler_Adv_MV.set( - (new GT_MetaTileEntity_Hatch_Muffler_Adv( + (new MTEHatchMufflerAdvanced( Hatch_Muffler_Adv_MV.ID, "hatch.muffler.adv.tier.02", "Advanced Muffler Hatch (MV)", 2)).getStackForm(1L)); GregtechItemList.Hatch_Muffler_Adv_HV.set( - (new GT_MetaTileEntity_Hatch_Muffler_Adv( + (new MTEHatchMufflerAdvanced( Hatch_Muffler_Adv_HV.ID, "hatch.muffler.adv.tier.03", "Advanced Muffler Hatch (HV)", 3)).getStackForm(1L)); GregtechItemList.Hatch_Muffler_Adv_EV.set( - (new GT_MetaTileEntity_Hatch_Muffler_Adv( + (new MTEHatchMufflerAdvanced( Hatch_Muffler_Adv_EV.ID, "hatch.muffler.adv.tier.04", "Advanced Muffler Hatch (EV)", 4)).getStackForm(1L)); GregtechItemList.Hatch_Muffler_Adv_IV.set( - (new GT_MetaTileEntity_Hatch_Muffler_Adv( + (new MTEHatchMufflerAdvanced( Hatch_Muffler_Adv_IV.ID, "hatch.muffler.adv.tier.05", "Advanced Muffler Hatch (IV)", 5)).getStackForm(1L)); GregtechItemList.Hatch_Muffler_Adv_LuV.set( - (new GT_MetaTileEntity_Hatch_Muffler_Adv( + (new MTEHatchMufflerAdvanced( Hatch_Muffler_Adv_LuV.ID, "hatch.muffler.adv.tier.06", "Advanced Muffler Hatch (LuV)", 6)).getStackForm(1L)); GregtechItemList.Hatch_Muffler_Adv_ZPM.set( - (new GT_MetaTileEntity_Hatch_Muffler_Adv( + (new MTEHatchMufflerAdvanced( Hatch_Muffler_Adv_ZPM.ID, "hatch.muffler.adv.tier.07", "Advanced Muffler Hatch (ZPM)", 7)).getStackForm(1L)); GregtechItemList.Hatch_Muffler_Adv_UV.set( - (new GT_MetaTileEntity_Hatch_Muffler_Adv( + (new MTEHatchMufflerAdvanced( Hatch_Muffler_Adv_UV.ID, "hatch.muffler.adv.tier.08", "Advanced Muffler Hatch (UV)", 8)).getStackForm(1L)); GregtechItemList.Hatch_Muffler_Adv_MAX.set( - (new GT_MetaTileEntity_Hatch_Muffler_Adv( + (new MTEHatchMufflerAdvanced( Hatch_Muffler_Adv_MAX.ID, "hatch.muffler.adv.tier.09", "Advanced Muffler Hatch (UHV)", @@ -245,19 +236,16 @@ public class GregtechCustomHatches { .getStackForm(1L)); } - private static GT_MetaTileEntity_SuperBus_Input makeInputBus(int id, String unlocalizedName, String localizedName, - int tier) { - return new GT_MetaTileEntity_SuperBus_Input(id, unlocalizedName, localizedName, tier); + private static MTEHatchSuperBusInput makeInputBus(int id, String unlocalizedName, String localizedName, int tier) { + return new MTEHatchSuperBusInput(id, unlocalizedName, localizedName, tier); } - private static GT_MetaTileEntity_SuperBus_Output makeOutputBus(int id, String unlocalizedName, String localizedName, - int tier) { - return new GT_MetaTileEntity_SuperBus_Output(id, unlocalizedName, localizedName, tier); + private static MTESuperBusOutput makeOutputBus(int id, String unlocalizedName, String localizedName, int tier) { + return new MTESuperBusOutput(id, unlocalizedName, localizedName, tier); } - private static GT_MetaTileEntity_ChiselBus makeChiselBus(int id, String unlocalizedName, String localizedName, - int tier) { - return new GT_MetaTileEntity_ChiselBus(id, unlocalizedName, localizedName, tier); + private static MTEHatchChiselBus makeChiselBus(int id, String unlocalizedName, String localizedName, int tier) { + return new MTEHatchChiselBus(id, unlocalizedName, localizedName, tier); } private static void run4() { @@ -275,18 +263,14 @@ public class GregtechCustomHatches { private static void run6() { int aID = 31781; // 31781-31784 - GregtechItemList.GT_MetaTileEntity_Solidifier_I.set( - new GT_MetaTileEntity_Hatch_Solidifier(aID++, "hatch.solidifier.tier.05", "Solidifier Hatch I", 5) - .getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_Solidifier_II.set( - new GT_MetaTileEntity_Hatch_Solidifier(aID++, "hatch.solidifier.tier.06", "Solidifier Hatch II", 6) - .getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_Solidifier_III.set( - new GT_MetaTileEntity_Hatch_Solidifier(aID++, "hatch.solidifier.tier.07", "Solidifier Hatch III", 7) - .getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_Solidifier_IV.set( - new GT_MetaTileEntity_Hatch_Solidifier(aID, "hatch.solidifier.tier.08", "Solidifier Hatch IV", 8) - .getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_Solidifier_I + .set(new MTEHatchSolidifier(aID++, "hatch.solidifier.tier.05", "Solidifier Hatch I", 5).getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_Solidifier_II + .set(new MTEHatchSolidifier(aID++, "hatch.solidifier.tier.06", "Solidifier Hatch II", 6).getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_Solidifier_III + .set(new MTEHatchSolidifier(aID++, "hatch.solidifier.tier.07", "Solidifier Hatch III", 7).getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_Solidifier_IV + .set(new MTEHatchSolidifier(aID, "hatch.solidifier.tier.08", "Solidifier Hatch IV", 8).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java index 500bc1c57c..014257ff98 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.COMET_Cyclotron; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_Cyclotron; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTECyclotron; public class GregtechCyclotron { @@ -15,10 +15,7 @@ public class GregtechCyclotron { private static void run1() { GregtechItemList.COMET_Cyclotron.set( - new GregtechMetaTileEntity_Cyclotron( - COMET_Cyclotron.ID, - "cyclotron.tier.single", - "COMET - Compact Cyclotron", - 6).getStackForm(1L)); + new MTECyclotron(COMET_Cyclotron.ID, "cyclotron.tier.single", "COMET - Compact Cyclotron", 6) + .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java index 94c669c4e9..85d87cb706 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java @@ -7,35 +7,35 @@ import static gregtech.api.enums.MetaTileEntityIDs.GT_Dehydrator_IV; import static gregtech.api.enums.MetaTileEntityIDs.GT_Dehydrator_LuV; import static gregtech.api.enums.MetaTileEntityIDs.GT_Dehydrator_MV; import static gregtech.api.enums.MetaTileEntityIDs.GT_Dehydrator_ZPM; -import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT; -import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL; -import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM; +import static gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe.X.CIRCUIT; +import static gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe.X.HULL; +import static gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe.X.ROBOT_ARM; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SoundResource; import gregtech.api.enums.TierEU; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe; +import gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe.SpecialEffects; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.ALLOY; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialDehydrator; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialDehydrator; public class GregtechDehydrator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Chemical Dehydrators."); - if (CORE.ConfigSwitches.enableMachine_Dehydrators) { + if (GTPPCore.ConfigSwitches.enableMachine_Dehydrators) { run1(); } } @@ -47,34 +47,34 @@ public class GregtechDehydrator { ItemStack coilT4 = new ItemStack(ModItems.itemDehydratorCoil, 1, 3); // Make some coils by wrapping wire around a spool. - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(ModItems.itemDehydratorCoilWire, 4, 0), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Bronze, 1)) + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Bronze, 1)) .itemOutputs(coilT1) .duration(8 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(ModItems.itemDehydratorCoilWire, 4, 1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Steel, 1)) + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Steel, 1)) .itemOutputs(coilT2) .duration(8 * SECONDS) .eut(TierEU.RECIPE_HV / 2) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(ModItems.itemDehydratorCoilWire, 4, 2), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1)) + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1)) .itemOutputs(coilT3) .duration(8 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(ModItems.itemDehydratorCoilWire, 4, 3), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1)) + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1)) .itemOutputs(coilT4) .duration(8 * SECONDS) .eut(TierEU.RECIPE_EV / 2) @@ -82,12 +82,12 @@ public class GregtechDehydrator { // Basic GregtechItemList.GT_Dehydrator_MV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( GT_Dehydrator_MV.ID, "machine.dehydrator.tier.00", "Basic Dehydrator I", 2, - new String[] { "This dehydrates your Grapes into Raisins.", CORE.GT_Tooltip.get() }, + new String[] { "This dehydrates your Grapes into Raisins.", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.chemicalDehydratorRecipes, 2, 9, @@ -102,12 +102,12 @@ public class GregtechDehydrator { .getStackForm(1L)); GregtechItemList.GT_Dehydrator_HV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( GT_Dehydrator_HV.ID, "machine.dehydrator.tier.01", "Basic Dehydrator II", 3, - new String[] { "This dehydrates your Grapes into Raisins.", CORE.GT_Tooltip.get() }, + new String[] { "This dehydrates your Grapes into Raisins.", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.chemicalDehydratorRecipes, 2, 9, @@ -117,18 +117,18 @@ public class GregtechDehydrator { "DEHYDRATOR", new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', OrePrefixes.wireFine.get(Materials.Electrum), 'C', CIRCUIT, 'W', - OrePrefixes.cableGt04.get(Materials.Silver), 'G', ALLOY.POTIN.getGear(1) }) + OrePrefixes.cableGt04.get(Materials.Silver), 'G', MaterialsAlloy.POTIN.getGear(1) }) .setRecipeCatalystPriority(5) .getStackForm(1L)); // Chemical GregtechItemList.GT_Dehydrator_EV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( GT_Dehydrator_EV.ID, "advancedmachine.dehydrator.tier.01", "Chemical Dehydrator I", 4, - new String[] { "A hangover is the way your body reacts to dehydration.", CORE.GT_Tooltip.get() }, + new String[] { "A hangover is the way your body reacts to dehydration.", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.chemicalDehydratorRecipes, 2, 9, @@ -137,17 +137,17 @@ public class GregtechDehydrator { SpecialEffects.NONE, "DEHYDRATOR", new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT1, 'C', CIRCUIT, 'W', - OrePrefixes.cableGt04.get(Materials.Aluminium), 'G', ALLOY.TUMBAGA.getGear(1) }) + OrePrefixes.cableGt04.get(Materials.Aluminium), 'G', MaterialsAlloy.TUMBAGA.getGear(1) }) .setRecipeCatalystPriority(4) .getStackForm(1L)); GregtechItemList.GT_Dehydrator_IV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( GT_Dehydrator_IV.ID, "advancedmachine.dehydrator.tier.02", "Chemical Dehydrator II", 5, - new String[] { "A hangover is the way your body reacts to dehydration.", CORE.GT_Tooltip.get() }, + new String[] { "A hangover is the way your body reacts to dehydration.", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.chemicalDehydratorRecipes, 2, 9, @@ -156,17 +156,17 @@ public class GregtechDehydrator { SpecialEffects.NONE, "DEHYDRATOR", new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT2, 'C', CIRCUIT, 'W', - OrePrefixes.cableGt04.get(Materials.Tungsten), 'G', ALLOY.INCONEL_690.getGear(1) }) + OrePrefixes.cableGt04.get(Materials.Tungsten), 'G', MaterialsAlloy.INCONEL_690.getGear(1) }) .setRecipeCatalystPriority(3) .getStackForm(1L)); GregtechItemList.GT_Dehydrator_LuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( GT_Dehydrator_LuV.ID, "advancedmachine.dehydrator.tier.03", "Chemical Dehydrator III", 6, - new String[] { "You could probably make space icecream with this..", CORE.GT_Tooltip.get() }, + new String[] { "You could probably make space icecream with this..", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.chemicalDehydratorRecipes, 2, 9, @@ -175,17 +175,17 @@ public class GregtechDehydrator { SpecialEffects.NONE, "DEHYDRATOR", new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT3, 'C', CIRCUIT, 'W', - OrePrefixes.cableGt04.get(Materials.Naquadah), 'G', ALLOY.HASTELLOY_N.getGear(1) }) + OrePrefixes.cableGt04.get(Materials.Naquadah), 'G', MaterialsAlloy.HASTELLOY_N.getGear(1) }) .setRecipeCatalystPriority(2) .getStackForm(1L)); GregtechItemList.GT_Dehydrator_ZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( GT_Dehydrator_ZPM.ID, "advancedmachine.dehydrator.tier.04", "Chemical Dehydrator IV", 7, - new String[] { "You can definitely make space icecream with this..", CORE.GT_Tooltip.get() }, + new String[] { "You can definitely make space icecream with this..", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.chemicalDehydratorRecipes, 2, 9, @@ -194,15 +194,13 @@ public class GregtechDehydrator { SpecialEffects.NONE, "DEHYDRATOR", new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT4, 'C', CIRCUIT, 'W', - OrePrefixes.cableGt04.get(Materials.Osmium), 'G', ALLOY.ZERON_100.getGear(1) }) + OrePrefixes.cableGt04.get(Materials.Osmium), 'G', MaterialsAlloy.ZERON_100.getGear(1) }) .setRecipeCatalystPriority(1) .getStackForm(1L)); // Advanced GregtechItemList.Controller_Vacuum_Furnace.set( - new GregtechMetaTileEntity_IndustrialDehydrator( - Controller_Vacuum_Furnace.ID, - "multimachine.adv.vacuumfurnace", - "Utupu-Tanuri").getStackForm(1L)); + new MTEIndustrialDehydrator(Controller_Vacuum_Furnace.ID, "multimachine.adv.vacuumfurnace", "Utupu-Tanuri") + .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java index 4b43158f54..528efc5712 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java @@ -14,11 +14,11 @@ import static gregtech.api.enums.MetaTileEntityIDs.Energy_Buffer_1by1_ZPM; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GTModHandler; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOreDictNames; -import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaEnergyBuffer; +import gtPlusPlus.xmod.gregtech.common.tileentities.storage.MTEEnergyBuffer; public class GregtechEnergyBuffer { @@ -34,7 +34,7 @@ public class GregtechEnergyBuffer { // Energy Buffers GregtechItemList.Energy_Buffer_1by1_ULV.set( - new GregtechMetaEnergyBuffer( + new MTEEnergyBuffer( Energy_Buffer_1by1_ULV.ID, "energybuffer.tier.00", "Ultra Low Voltage Energy Buffer", @@ -42,15 +42,10 @@ public class GregtechEnergyBuffer { "", 1).getStackForm(1L)); GregtechItemList.Energy_Buffer_1by1_LV.set( - new GregtechMetaEnergyBuffer( - Energy_Buffer_1by1_LV.ID, - "energybuffer.tier.01", - "Low Voltage Energy Buffer", - 1, - "", - 1).getStackForm(1L)); + new MTEEnergyBuffer(Energy_Buffer_1by1_LV.ID, "energybuffer.tier.01", "Low Voltage Energy Buffer", 1, "", 1) + .getStackForm(1L)); GregtechItemList.Energy_Buffer_1by1_MV.set( - new GregtechMetaEnergyBuffer( + new MTEEnergyBuffer( Energy_Buffer_1by1_MV.ID, "energybuffer.tier.02", "Medium Voltage Energy Buffer", @@ -58,7 +53,7 @@ public class GregtechEnergyBuffer { "", 1).getStackForm(1L)); GregtechItemList.Energy_Buffer_1by1_HV.set( - new GregtechMetaEnergyBuffer( + new MTEEnergyBuffer( Energy_Buffer_1by1_HV.ID, "energybuffer.tier.03", "High Voltage Energy Buffer", @@ -66,7 +61,7 @@ public class GregtechEnergyBuffer { "", 1).getStackForm(1L)); GregtechItemList.Energy_Buffer_1by1_EV.set( - new GregtechMetaEnergyBuffer( + new MTEEnergyBuffer( Energy_Buffer_1by1_EV.ID, "energybuffer.tier.04", "Extreme Voltage Energy Buffer", @@ -74,7 +69,7 @@ public class GregtechEnergyBuffer { "", 1).getStackForm(1L)); GregtechItemList.Energy_Buffer_1by1_IV.set( - new GregtechMetaEnergyBuffer( + new MTEEnergyBuffer( Energy_Buffer_1by1_IV.ID, "energybuffer.tier.05", "Insane Voltage Energy Buffer", @@ -82,7 +77,7 @@ public class GregtechEnergyBuffer { "", 1).getStackForm(1L)); GregtechItemList.Energy_Buffer_1by1_LuV.set( - new GregtechMetaEnergyBuffer( + new MTEEnergyBuffer( Energy_Buffer_1by1_LuV.ID, "energybuffer.tier.06", "Ludicrous Voltage Energy Buffer", @@ -90,7 +85,7 @@ public class GregtechEnergyBuffer { "", 1).getStackForm(1L)); GregtechItemList.Energy_Buffer_1by1_ZPM.set( - new GregtechMetaEnergyBuffer( + new MTEEnergyBuffer( Energy_Buffer_1by1_ZPM.ID, "energybuffer.tier.07", "ZPM Voltage Energy Buffer", @@ -98,7 +93,7 @@ public class GregtechEnergyBuffer { "", 1).getStackForm(1L)); GregtechItemList.Energy_Buffer_1by1_UV.set( - new GregtechMetaEnergyBuffer( + new MTEEnergyBuffer( Energy_Buffer_1by1_UV.ID, "energybuffer.tier.08", "Ultimate Voltage Energy Buffer", @@ -106,7 +101,7 @@ public class GregtechEnergyBuffer { "", 1).getStackForm(1L)); GregtechItemList.Energy_Buffer_1by1_MAX.set( - new GregtechMetaEnergyBuffer( + new MTEEnergyBuffer( Energy_Buffer_1by1_MAX.ID, "energybuffer.tier.09", "MAX Voltage Energy Buffer", @@ -114,80 +109,80 @@ public class GregtechEnergyBuffer { "", 1).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_ULV.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_ULV, 'W', OrePrefixes.wireGt08.get(Materials.Lead), 'T', GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_LV.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_LV, 'W', OrePrefixes.wireGt08.get(Materials.Tin), 'T', GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_MV.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_MV, 'W', OrePrefixes.wireGt08.get(Materials.AnyCopper), 'T', GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_HV.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_HV, 'W', OrePrefixes.wireGt08.get(Materials.Gold), 'T', GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_EV.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_EV, 'W', OrePrefixes.wireGt08.get(Materials.Aluminium), 'T', GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_IV.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_IV, 'W', OrePrefixes.wireGt08.get(Materials.Tungsten), 'T', GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_LuV.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_LuV, 'W', OrePrefixes.wireGt08.get(Materials.Osmium), 'T', GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_ZPM.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_ZPM, 'W', OrePrefixes.wireGt08.get(Materials.Osmium), 'T', GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_UV.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt08.get(Materials.Osmium), 'T', GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt08.get(Materials.SuperconductorUHV), 'T', GregtechOreDictNames.buffer_core }); /* - * GT_ModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), - * GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | - * GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", + * GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), + * GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE | + * GTModHandler.RecipeBits.REVERSIBLE | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", * Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'), * OrePrefixes.wireGt08.get(Materials.Superconductor), Character.valueOf('T'), GregtechOreDictNames.buffer_core * }); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java index deaefb3e9d..0f284446fe 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java @@ -9,12 +9,12 @@ import static gregtech.api.enums.MetaTileEntityIDs.Machine_Adv_ImplosionCompress import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialVacuumFreezer; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_DistillationTower; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_EBF; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_Fusion_MK4; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_Fusion_MK5; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_Implosion; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialVacuumFreezer; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.MTEAdvDistillationTower; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.MTEAdvEBF; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.MTEAdvFusionMk4; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.MTEAdvFusionMk5; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.MTEAdvImplosionCompressor; public class GregtechFactoryGradeReplacementMultis { @@ -25,32 +25,25 @@ public class GregtechFactoryGradeReplacementMultis { private static void run1() { Logger.INFO("Gregtech 5 Content | Registering Advanced GT Multiblock replacements."); GregtechItemList.Machine_Adv_BlastFurnace.set( - new GregtechMetaTileEntity_Adv_EBF(Machine_Adv_BlastFurnace.ID, "multimachine.adv.blastfurnace", "Volcanus") - .getStackForm(1L)); + new MTEAdvEBF(Machine_Adv_BlastFurnace.ID, "multimachine.adv.blastfurnace", "Volcanus").getStackForm(1L)); GregtechItemList.Machine_Adv_ImplosionCompressor.set( - new GregtechMetaTileEntity_Adv_Implosion( + new MTEAdvImplosionCompressor( Machine_Adv_ImplosionCompressor.ID, "multimachine.adv.implosioncompressor", "Density^2").getStackForm(1L)); GregtechItemList.Industrial_Cryogenic_Freezer.set( - new GregtechMetaTileEntity_IndustrialVacuumFreezer( + new MTEIndustrialVacuumFreezer( Industrial_Cryogenic_Freezer.ID, "multimachine.adv.industrialfreezer", "Cryogenic Freezer").getStackForm(1L)); GregtechItemList.FusionComputer_UV2.set( - new GregtechMetaTileEntity_Adv_Fusion_MK4( - FusionComputer_UV2.ID, - "fusioncomputer.tier.09", - "FusionTech MK IV").getStackForm(1L)); + new MTEAdvFusionMk4(FusionComputer_UV2.ID, "fusioncomputer.tier.09", "FusionTech MK IV").getStackForm(1L)); GregtechItemList.FusionComputer_UV3.set( - new GregtechMetaTileEntity_Adv_Fusion_MK5( - FusionComputer_UV3.ID, - "fusioncomputer.tier.10", - "FusionTech MK V").getStackForm(1L)); + new MTEAdvFusionMk5(FusionComputer_UV3.ID, "fusioncomputer.tier.10", "FusionTech MK V").getStackForm(1L)); // 31021 GregtechItemList.Machine_Adv_DistillationTower.set( - new GregtechMetaTileEntity_Adv_DistillationTower( + new MTEAdvDistillationTower( Machine_Adv_DistillationTower.ID, "multimachine.adv.distillationtower", "Dangote Distillus").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java index ed577a1551..0be94d63c9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java @@ -9,70 +9,70 @@ import net.minecraft.item.ItemStack; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GTModHandler; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.ALLOY; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityGeothermalGenerator; +import gtPlusPlus.xmod.gregtech.common.tileentities.generators.MTEGeothermalGenerator; public class GregtechGeothermalThermalGenerator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Geothermal Engines."); - if (CORE.ConfigSwitches.enableMachine_GeothermalEngines) { + if (GTPPCore.ConfigSwitches.enableMachine_GeothermalEngines) { run1(); } } private static void run1() { GregtechItemList.Geothermal_Engine_EV.set( - new GregtechMetaTileEntityGeothermalGenerator( + new MTEGeothermalGenerator( Geothermal_Engine_EV.ID, "advancedgenerator.geothermalFuel.tier.01", "Basic Geothermal Engine", 4).getStackForm(1L)); GregtechItemList.Geothermal_Engine_IV.set( - new GregtechMetaTileEntityGeothermalGenerator( + new MTEGeothermalGenerator( Geothermal_Engine_IV.ID, "advancedgenerator.geothermalFuel.tier.02", "Turbo Geothermal Engine", 5).getStackForm(1L)); GregtechItemList.Geothermal_Engine_LuV.set( - new GregtechMetaTileEntityGeothermalGenerator( + new MTEGeothermalGenerator( Geothermal_Engine_LuV.ID, "advancedgenerator.geothermalFuel.tier.03", "Vulcan Geothermal Engine", 6).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Geothermal_Engine_EV.get(1L), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "CEC", "GMG", "PWP", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E', ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.ZPM), 'W', - OrePrefixes.cableGt04.get(Materials.Aluminium), 'G', ALLOY.TANTALLOY_61.getGear(1) }); + OrePrefixes.cableGt04.get(Materials.Aluminium), 'G', MaterialsAlloy.TANTALLOY_61.getGear(1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Geothermal_Engine_IV.get(1L), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "CEC", "GMG", "PWP", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Piston_IV, 'E', ItemList.Electric_Motor_IV, 'C', OrePrefixes.circuit.get(Materials.UV), 'W', - OrePrefixes.cableGt04.get(Materials.Platinum), 'G', ALLOY.STELLITE.getGear(1) }); + OrePrefixes.cableGt04.get(Materials.Platinum), 'G', MaterialsAlloy.STELLITE.getGear(1) }); final ItemStack INGREDIENT_1 = CI.electricPiston_LuV; final ItemStack INGREDIENT_2 = CI.electricMotor_LuV; - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Geothermal_Engine_LuV.get(1L), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "CEC", "GMG", "PWP", 'M', ItemList.Hull_LuV, 'P', INGREDIENT_1, 'E', INGREDIENT_2, 'C', OrePrefixes.circuit.get(Materials.UHV), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten), 'G', - ALLOY.ZERON_100.getGear(1) }); + MaterialsAlloy.ZERON_100.getGear(1) }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java index 8c452cbca4..7d5d6b5169 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java @@ -12,83 +12,83 @@ import static gregtech.api.enums.MetaTileEntityIDs.Transformer_HA_ZPM_LuV; import net.minecraft.item.ItemStack; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GTModHandler; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTransformerHiAmp; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTETransformerHiAmp; public class GregtechHiAmpTransformer { public static void run() { - long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED; + long bitsd = GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED; String mHammerName = "Mallet"; GregtechItemList.Transformer_HA_LV_ULV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( Transformer_HA_LV_ULV.ID, "transformer.ha.tier.00", "ULV Hi-Amp Transformer", 0, "LV -> ULV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_MV_LV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( Transformer_HA_MV_LV.ID, "transformer.ha.tier.01", "LV Hi-Amp Transformer", 1, "MV -> LV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_HV_MV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( Transformer_HA_HV_MV.ID, "transformer.ha.tier.02", "MV Hi-Amp Transformer", 2, "HV -> MV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_EV_HV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( Transformer_HA_EV_HV.ID, "transformer.ha.tier.03", "HV Hi-Amp Transformer", 3, "EV -> HV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_IV_EV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( Transformer_HA_IV_EV.ID, "transformer.ha.tier.04", "EV Hi-Amp Transformer", 4, "IV -> EV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_LuV_IV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( Transformer_HA_LuV_IV.ID, "transformer.ha.tier.05", "IV Hi-Amp Transformer", 5, "LuV -> IV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_ZPM_LuV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( Transformer_HA_ZPM_LuV.ID, "transformer.ha.tier.06", "LuV Hi-Amp Transformer", 6, "ZPM -> LuV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_UV_ZPM.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( Transformer_HA_UV_ZPM.ID, "transformer.ha.tier.07", "ZPM Hi-Amp Transformer", 7, "UV -> ZPM (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_MAX_UV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( Transformer_HA_MAX_UV.ID, "transformer.ha.tier.08", "UV Hi-Amp Transformer", @@ -99,67 +99,67 @@ public class GregtechHiAmpTransformer { ItemStack mItem_3; mItem_1 = ItemUtils.simpleMetaStack( - ItemUtils.getSimpleStack(GregTech_API.sBlockCasings5) + ItemUtils.getSimpleStack(GregTechAPI.sBlockCasings5) .getItem(), 3, 1); mItem_2 = ItemUtils.simpleMetaStack( - ItemUtils.getSimpleStack(GregTech_API.sBlockCasings5) + ItemUtils.getSimpleStack(GregTechAPI.sBlockCasings5) .getItem(), 4, 1); mItem_3 = ItemUtils.simpleMetaStack( - ItemUtils.getSimpleStack(GregTech_API.sBlockCasings5) + ItemUtils.getSimpleStack(GregTechAPI.sBlockCasings5) .getItem(), 9, 1); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Transformer_HA_LV_ULV.get(1L), bitsd, new Object[] { " BB", "CM ", " BB", 'M', ItemList.Transformer_LV_ULV, 'C', OrePrefixes.wireGt04.get(Materials.Tin), 'B', OrePrefixes.wireGt04.get(Materials.Lead) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Transformer_HA_MV_LV.get(1L), bitsd, new Object[] { " BB", "CM ", " BB", 'M', ItemList.Transformer_MV_LV, 'C', OrePrefixes.wireGt04.get(Materials.AnyCopper), 'B', OrePrefixes.wireGt04.get(Materials.Tin) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Transformer_HA_HV_MV.get(1L), bitsd, new Object[] { " BB", "CM ", " BB", 'M', ItemList.Transformer_HV_MV, 'C', OrePrefixes.wireGt04.get(Materials.Gold), 'B', OrePrefixes.wireGt04.get(Materials.AnyCopper) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Transformer_HA_EV_HV.get(1L), bitsd, new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Transformer_EV_HV, 'C', OrePrefixes.wireGt04.get(Materials.Aluminium), 'B', OrePrefixes.wireGt04.get(Materials.Gold), 'K', ItemList.Casing_Coil_Cupronickel }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Transformer_HA_IV_EV.get(1L), bitsd, new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Transformer_IV_EV, 'C', OrePrefixes.wireGt04.get(Materials.Tungsten), 'B', OrePrefixes.wireGt04.get(Materials.Aluminium), 'K', ItemList.Casing_Coil_Kanthal }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Transformer_HA_LuV_IV.get(1L), bitsd, new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Transformer_LuV_IV, 'C', OrePrefixes.wireGt04.get(Materials.VanadiumGallium), 'B', OrePrefixes.wireGt04.get(Materials.Tungsten), 'K', ItemList.Casing_Coil_Nichrome }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Transformer_HA_ZPM_LuV.get(1L), bitsd, new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Transformer_ZPM_LuV, 'C', OrePrefixes.wireGt04.get(Materials.Naquadah), 'B', OrePrefixes.wireGt04.get(Materials.VanadiumGallium), 'K', mItem_1 }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Transformer_HA_UV_ZPM.get(1L), bitsd, new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Transformer_UV_ZPM, 'C', OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), 'B', OrePrefixes.wireGt04.get(Materials.Naquadah), 'K', mItem_2 }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Transformer_HA_MAX_UV.get(1L), bitsd, new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Transformer_MAX_UV, 'C', diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java index e40a2ad86b..dc2a5a552e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.Industrial_AlloySmelter; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialAlloySmelter; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialAlloySmelter; public class GregtechIndustrialAlloySmelter { @@ -15,7 +15,7 @@ public class GregtechIndustrialAlloySmelter { private static void run1() { GregtechItemList.Industrial_AlloySmelter.set( - new GregtechMetaTileEntity_IndustrialAlloySmelter( + new MTEIndustrialAlloySmelter( Industrial_AlloySmelter.ID, "industrialalloysmelter.controller.tier.single", "Zyngen").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java index 85ea33917a..af2b911bdd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Arc_Furnace; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialArcFurnace; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialArcFurnace; public class GregtechIndustrialArcFurnace { @@ -16,7 +16,7 @@ public class GregtechIndustrialArcFurnace { private static void run1() { // Industrial Arc Furnace Multiblock GregtechItemList.Industrial_Arc_Furnace.set( - new GregtechMetaTileEntity_IndustrialArcFurnace( + new MTEIndustrialArcFurnace( Industrial_Arc_Furnace.ID, "industrialarcfurnace.controller.tier.single", "High Current Industrial Arc Furnace").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java index 498b504eb1..956193bef2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java @@ -4,16 +4,16 @@ import static gregtech.api.enums.MetaTileEntityIDs.Industrial_AlloyBlastSmelter; import static gregtech.api.enums.MetaTileEntityIDs.Mega_AlloyBlastSmelter; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_AlloyBlastSmelter; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.mega.GregTechMetaTileEntity_MegaAlloyBlastSmelter; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEAlloyBlastSmelter; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.mega.MTEMegaAlloyBlastSmelter; public class GregtechIndustrialBlastSmelter { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Alloy Blast Smelter Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) { + if (GTPPCore.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) { run1(); } } @@ -21,12 +21,12 @@ public class GregtechIndustrialBlastSmelter { private static void run1() { // Industrial Alloy Blast Smelter Multiblock GregtechItemList.Industrial_AlloyBlastSmelter.set( - new GregtechMetaTileEntity_AlloyBlastSmelter( + new MTEAlloyBlastSmelter( Industrial_AlloyBlastSmelter.ID, "industrialsalloyamelter.controller.tier.single", "Alloy Blast Smelter").getStackForm(1L)); GregtechItemList.Mega_AlloyBlastSmelter.set( - new GregTechMetaTileEntity_MegaAlloyBlastSmelter( + new MTEMegaAlloyBlastSmelter( Mega_AlloyBlastSmelter.ID, "industrialsalloyamelter.controller.tier.mega", "Mega Alloy Blast Smelter").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java index 4dab825902..4a0da61dbd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Centrifuge; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialCentrifuge; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialCentrifuge; public class GregtechIndustrialCentrifuge { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Centrifuge Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialCentrifuge { private static void run1() { // Industrial Centrifuge Multiblock GregtechItemList.Industrial_Centrifuge.set( - new GregtechMetaTileEntity_IndustrialCentrifuge( + new MTEIndustrialCentrifuge( Industrial_Centrifuge.ID, "industrialcentrifuge.controller.tier.single", "Industrial Centrifuge").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java index 23bd4565fc..2fd0517895 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java @@ -6,24 +6,21 @@ import static gregtech.api.enums.MetaTileEntityIDs.GT_Chisel_LV; import static gregtech.api.enums.MetaTileEntityIDs.GT_Chisel_MV; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntity_AutoChisel; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialChisel; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEAutoChisel; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialChisel; public class GregtechIndustrialChisel { public static void run() { - GregtechItemList.GT_Chisel_LV.set( - new GregtechMetaTileEntity_AutoChisel(GT_Chisel_LV.ID, "chisel.tier.01", "Basic Auto-Chisel", 1) - .getStackForm(1L)); - GregtechItemList.GT_Chisel_MV.set( - new GregtechMetaTileEntity_AutoChisel(GT_Chisel_MV.ID, "chisel.tier.02", "Advanced Auto-Chisel", 2) - .getStackForm(1L)); - GregtechItemList.GT_Chisel_HV.set( - new GregtechMetaTileEntity_AutoChisel(GT_Chisel_HV.ID, "chisel.tier.03", "Precision Auto-Chisel", 3) - .getStackForm(1L)); + GregtechItemList.GT_Chisel_LV + .set(new MTEAutoChisel(GT_Chisel_LV.ID, "chisel.tier.01", "Basic Auto-Chisel", 1).getStackForm(1L)); + GregtechItemList.GT_Chisel_MV + .set(new MTEAutoChisel(GT_Chisel_MV.ID, "chisel.tier.02", "Advanced Auto-Chisel", 2).getStackForm(1L)); + GregtechItemList.GT_Chisel_HV + .set(new MTEAutoChisel(GT_Chisel_HV.ID, "chisel.tier.03", "Precision Auto-Chisel", 3).getStackForm(1L)); GregtechItemList.Controller_IndustrialAutoChisel.set( - new GregtechMetaTileEntity_IndustrialChisel( + new MTEIndustrialChisel( Controller_IndustrialAutoChisel.ID, "multimachine.adv.chisel", "Industrial 3D Copying Machine").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java index de8b253534..219b5ee196 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_CokeOven; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialCokeOven; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialCokeOven; public class GregtechIndustrialCokeOven { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Coke Oven Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialCokeOven { private static void run1() { // Industrial Centrifuge Multiblock GregtechItemList.Industrial_CokeOven.set( - new GregtechMetaTileEntity_IndustrialCokeOven( + new MTEIndustrialCokeOven( Industrial_CokeOven.ID, "industrialcokeoven.controller.tier.single", "Industrial Coke Oven").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java index 69a449c70b..c05614827d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_CuttingFactoryController; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialCuttingMachine; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialCuttingMachine; public class GregtechIndustrialCuttingFactory { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Cutting Factory Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialCuttingFactory { private static void run1() { // Industrial Wire Factory Multiblock GregtechItemList.Industrial_CuttingFactoryController.set( - new GregtechMetaTileEntity_IndustrialCuttingMachine( + new MTEIndustrialCuttingMachine( Industrial_CuttingFactoryController.ID, "industrialcuttingmachine.controller.tier.01", "Cutting Factory Controller").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java index 0493662f85..34f736e0f7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Electrolyzer; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialElectrolyzer; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEndustrialElectrolyzer; public class GregtechIndustrialElectrolyzer { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Electrolyzer Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialElectrolyzer { private static void run1() { // Industrial Electrolyzer Multiblock GregtechItemList.Industrial_Electrolyzer.set( - new GregtechMetaTileEntity_IndustrialElectrolyzer( + new MTEndustrialElectrolyzer( Industrial_Electrolyzer.ID, "industrialelectrolyzer.controller.tier.single", "Industrial Electrolyzer").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java index c3f86d8e2e..527e1549e6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java @@ -5,8 +5,8 @@ import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Input_Elemental_Duplica import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_ElementalDataOrbHolder; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMTE_ElementalDuplicator; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchElementalDataOrbHolder; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEElementalDuplicator; public class GregtechIndustrialElementDuplicator { @@ -15,12 +15,12 @@ public class GregtechIndustrialElementDuplicator { Logger.INFO("Gregtech5u Content | Registering Elemental Duplicator Multiblock."); GregtechItemList.Controller_ElementalDuplicator.set( - new GregtechMTE_ElementalDuplicator( + new MTEElementalDuplicator( Controller_ElementalDuplicator.ID, "gtpp.multimachine.replicator", "Elemental Duplicator").getStackForm(1L)); GregtechItemList.Hatch_Input_Elemental_Duplicator.set( - new GT_MetaTileEntity_Hatch_ElementalDataOrbHolder( + new MTEHatchElementalDataOrbHolder( Hatch_Input_Elemental_Duplicator.ID, "hatch.input_bus.elementalorbholder", "Data Orb Repository", diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java index ad9d267b3b..1af1b8dec1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Extruder; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialExtruder; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialExtruder; public class GregtechIndustrialExtruder { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Extrusion Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialExtruder { private static void run1() { // Industrial Presser Multiblock GregtechItemList.Industrial_Extruder.set( - new GregtechMetaTileEntity_IndustrialExtruder( + new MTEIndustrialExtruder( Industrial_Extruder.ID, "industrialextruder.controller.tier.single", "Industrial Extrusion Machine").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java index 0bba25461e..489ad334f5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.Industrial_FishingPond; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_IndustrialFishingPond; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEIndustrialFishingPond; public class GregtechIndustrialFishPond { @@ -15,7 +15,7 @@ public class GregtechIndustrialFishPond { private static void run1() { GregtechItemList.Industrial_FishingPond.set( - new GregtechMetaTileEntity_IndustrialFishingPond( + new MTEIndustrialFishingPond( Industrial_FishingPond.ID, "industrial.fishpond.controller.tier.single", "Zhuhai - Fishing Port").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java index 23bb34e16e..11a3013882 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.Controller_IndustrialFluidHea import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialFluidHeater; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialFluidHeater; public class GregtechIndustrialFluidHeater { @@ -15,7 +15,7 @@ public class GregtechIndustrialFluidHeater { private static void run1() { GregtechItemList.Controller_IndustrialFluidHeater.set( - new GregtechMetaTileEntity_IndustrialFluidHeater( + new MTEIndustrialFluidHeater( Controller_IndustrialFluidHeater.ID, "industrialfluidheater.controller.tier.single", "Thermic Heating Device").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java index f55e5e2a97..9b24118b85 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.Controller_IndustrialForgeHam import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialForgeHammer; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialForgeHammer; public class GregtechIndustrialForgeHammer { @@ -15,7 +15,7 @@ public class GregtechIndustrialForgeHammer { private static void run1() { GregtechItemList.Controller_IndustrialForgeHammer.set( - new GregtechMetaTileEntity_IndustrialForgeHammer( + new MTEIndustrialForgeHammer( Controller_IndustrialForgeHammer.ID, "industrialhammer.controller.tier.single", "Industrial Sledgehammer").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java index e7b3d700ad..96883ac3c2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_FuelRefinery; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_Refinery; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTERefinery; public class GregtechIndustrialFuelRefinery { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Fuel Processing and Refinery Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_NuclearFuelRefinery) { + if (GTPPCore.ConfigSwitches.enableMultiblock_NuclearFuelRefinery) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialFuelRefinery { private static void run1() { // Industrial Maceration Stack Multiblock GregtechItemList.Industrial_FuelRefinery.set( - new GregtechMetaTileEntity_Refinery( + new MTERefinery( Industrial_FuelRefinery.ID, "industrialrefinery.controller.tier.single", "Reactor Fuel Processing Plant").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java index f9cb57f504..6d9d17c987 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_MacerationStack; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialMacerator; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialMacerator; public class GregtechIndustrialMacerator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Maceration Stack Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialMacerator { private static void run1() { // Industrial Maceration Stack Multiblock GregtechItemList.Industrial_MacerationStack.set( - new GregtechMetaTileEntity_IndustrialMacerator( + new MTEIndustrialMacerator( Industrial_MacerationStack.ID, "industrialmacerator.controller.tier.single", "Maceration Stack Controller").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java index 9bf1a3746f..9d680127dd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java @@ -1,25 +1,25 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_MassFab; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.multiblockMassFabricatorRecipes; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_MassFabricator; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEMassFabricator; public class GregtechIndustrialMassFabricator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Matter Fabricator Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_MatterFabricator) { + if (GTPPCore.ConfigSwitches.enableMultiblock_MatterFabricator) { generateRecipes(); run1(); } @@ -28,7 +28,7 @@ public class GregtechIndustrialMassFabricator { private static void run1() { // Industrial Matter Fabricator Multiblock GregtechItemList.Industrial_MassFab.set( - new GregtechMetaTileEntity_MassFabricator( + new MTEMassFabricator( Industrial_MassFab.ID, "industrialmassfab.controller.tier.single", "Matter Fabrication CPU").getStackForm(1L)); @@ -39,9 +39,9 @@ public class GregtechIndustrialMassFabricator { // Generate Scrap->UUA Recipes // Basic UUA1 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(9), + GTUtility.getIntegratedCircuit(9), ItemUtils.getSimpleStack(ItemUtils.getItemFromFQRN("IC2:itemScrap"), 9)) .fluidOutputs(Materials.UUAmplifier.getFluid(1)) .duration(9 * SECONDS) @@ -50,9 +50,9 @@ public class GregtechIndustrialMassFabricator { .addTo(multiblockMassFabricatorRecipes); // Basic UUA2 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(19), + GTUtility.getIntegratedCircuit(19), ItemUtils.getSimpleStack(ItemUtils.getItemFromFQRN("IC2:itemScrapbox"))) .fluidOutputs(Materials.UUAmplifier.getFluid(1)) .duration(9 * SECONDS) @@ -61,8 +61,8 @@ public class GregtechIndustrialMassFabricator { .addTo(multiblockMassFabricatorRecipes); // Basic UUM - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) .fluidOutputs(Materials.UUMatter.getFluid(16)) .duration(2 * MINUTES + 40 * SECONDS) .eut(4096) @@ -70,8 +70,8 @@ public class GregtechIndustrialMassFabricator { .addTo(multiblockMassFabricatorRecipes); // Basic UUM - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(2)) .fluidInputs(Materials.UUAmplifier.getFluid(16)) .fluidOutputs(Materials.UUMatter.getFluid(16)) .duration(40 * SECONDS) @@ -80,8 +80,8 @@ public class GregtechIndustrialMassFabricator { .addTo(multiblockMassFabricatorRecipes); // Advanced UUM - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(3)) .fluidOutputs(Materials.UUMatter.getFluid(256)) .duration(2 * MINUTES + 40 * SECONDS) .eut(65536) @@ -89,8 +89,8 @@ public class GregtechIndustrialMassFabricator { .addTo(multiblockMassFabricatorRecipes); // Advanced UUM - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(4)) .fluidInputs(Materials.UUAmplifier.getFluid(256)) .fluidOutputs(Materials.UUMatter.getFluid(256)) .duration(40 * SECONDS) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java index 7da9e59425..9508061d6f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Mixer; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialMixer; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialMixer; public class GregtechIndustrialMixer { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Mixer Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialMixer { private static void run1() { // Industrial Mixer Multiblock GregtechItemList.Industrial_Mixer.set( - new GregtechMetaTileEntity_IndustrialMixer( + new MTEIndustrialMixer( Industrial_Mixer.ID, "industrialmixer.controller.tier.single", "Industrial Mixing Machine").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java index ae9dae1773..051569195a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java @@ -3,22 +3,22 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_MultiMachine; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialMultiMachine; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialMultiMachine; public class GregtechIndustrialMultiMachine { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Multi-Machine Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialMultiMachine) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialMultiMachine) { run1(); } } private static void run1() { GregtechItemList.Industrial_MultiMachine.set( - new GregtechMetaTileEntity_IndustrialMultiMachine( + new MTEIndustrialMultiMachine( Industrial_MultiMachine.ID, "industrialmultimachine.controller.tier.single", "Large Processing Factory").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java index 96446b4380..de6bab91d0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_PlatePress; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialPlatePress; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialPlatePress; public class GregtechIndustrialPlatePress { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Press Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialPlatePress { private static void run1() { // Industrial Presser Multiblock GregtechItemList.Industrial_PlatePress.set( - new GregtechMetaTileEntity_IndustrialPlatePress( + new MTEIndustrialPlatePress( Industrial_PlatePress.ID, "industrialbender.controller.tier.single", "Industrial Material Press").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java index 5523103d18..1c59ad421f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java @@ -3,13 +3,13 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Controller_IndustrialRockBreaker; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_IndustrialRockBreaker; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEIndustrialRockBreaker; public class GregtechIndustrialRockBreaker { public static void run() { GregtechItemList.Controller_IndustrialRockBreaker.set( - new GregtechMetaTileEntity_IndustrialRockBreaker( + new MTEIndustrialRockBreaker( Controller_IndustrialRockBreaker.ID, "industrialrockcrusher.controller.tier.single", "Boldarnator").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java index 12ff0a281e..e82a9f2027 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java @@ -3,22 +3,22 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Sifter; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialSifter; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialSifter; public class GregtechIndustrialSifter { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Sifter Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialSifter) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialSifter) { run1(); } } private static void run1() { GregtechItemList.Industrial_Sifter.set( - new GregtechMetaTileEntity_IndustrialSifter( + new MTEIndustrialSifter( Industrial_Sifter.ID, "industrialsifter.controller.tier.single", "Large Sifter Control Block").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java index 74b2d26e35..7ee3452d34 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java @@ -3,22 +3,22 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_ThermalCentrifuge; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialThermalCentrifuge; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialThermalCentrifuge; public class GregtechIndustrialThermalCentrifuge { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Thermal Centrifuge Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge) { run1(); } } private static void run1() { GregtechItemList.Industrial_ThermalCentrifuge.set( - new GregtechMetaTileEntity_IndustrialThermalCentrifuge( + new MTEIndustrialThermalCentrifuge( Industrial_ThermalCentrifuge.ID, "industrialthermalcentrifuge.controller.tier.single", "Large Thermal Refinery").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java index 6327c424ce..5c43c70fc3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java @@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_TreeFarm; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntityTreeFarm; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTETreeFarm; public class GregtechIndustrialTreeFarm { public static void run() { - if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) { + if (GTPPCore.ConfigSwitches.enableMultiblock_TreeFarmer) { Logger.INFO("Gregtech5u Content | Registering Tree Farm Multiblock."); run1(); } @@ -18,9 +18,7 @@ public class GregtechIndustrialTreeFarm { private static void run1() { GregtechItemList.Industrial_TreeFarm.set( - new GregtechMetaTileEntityTreeFarm( - Industrial_TreeFarm.ID, - "treefarm.controller.tier.single", - "Tree Growth Simulator").getStackForm(1L)); + new MTETreeFarm(Industrial_TreeFarm.ID, "treefarm.controller.tier.single", "Tree Growth Simulator") + .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java index 20804a9138..2ae9795b0d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java @@ -3,22 +3,22 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_WashPlant; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialWashPlant; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialWashPlant; public class GregtechIndustrialWashPlant { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Wash Plant Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialWashPlant) { run1(); } } private static void run1() { GregtechItemList.Industrial_WashPlant.set( - new GregtechMetaTileEntity_IndustrialWashPlant( + new MTEIndustrialWashPlant( Industrial_WashPlant.ID, "industrialwashplant.controller.tier.single", "Ore Washing Plant").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java index 51bb20a6f6..39920a4553 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_WireFactory; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialWireMill; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialWireMill; public class GregtechIndustrialWiremill { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Wire Factory Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialWireMill) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialWiremill { private static void run1() { // Industrial Wire Factory Multiblock GregtechItemList.Industrial_WireFactory.set( - new GregtechMetaTileEntity_IndustrialWireMill( + new MTEIndustrialWireMill( Industrial_WireFactory.ID, "industrialwiremill.controller.tier.single", "Wire Factory Controller").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIsaMill.java index 1fae804b7d..90a107de32 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIsaMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIsaMill.java @@ -6,9 +6,9 @@ import static gregtech.api.enums.MetaTileEntityIDs.Controller_IsaMill; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.GT_MetaTileEntity_Hatch_MillingBalls; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IsaMill; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMTE_FrothFlotationCell; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.MTEHatchMillingBalls; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIsaMill; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEFrothFlotationCell; public class GregtechIsaMill { @@ -17,19 +17,16 @@ public class GregtechIsaMill { Logger.INFO("Gregtech5u Content | Registering Milling Content."); GregtechItemList.Controller_IsaMill.set( - new GregtechMetaTileEntity_IsaMill( - Controller_IsaMill.ID, - "gtpp.multimachine.isamill", - "IsaMill Grinding Machine").getStackForm(1L)); + new MTEIsaMill(Controller_IsaMill.ID, "gtpp.multimachine.isamill", "IsaMill Grinding Machine") + .getStackForm(1L)); GregtechItemList.Controller_Flotation_Cell.set( - new GregtechMTE_FrothFlotationCell( + new MTEFrothFlotationCell( Controller_Flotation_Cell.ID, "gtpp.multimachine.flotationcell", "Flotation Cell Regulator").getStackForm(1L)); // Milling Ball Bus - GregtechItemList.Bus_Milling_Balls.set( - (new GT_MetaTileEntity_Hatch_MillingBalls(Bus_Milling_Balls.ID, "hatch.milling", "Ball Housing")) - .getStackForm(1L)); + GregtechItemList.Bus_Milling_Balls + .set((new MTEHatchMillingBalls(Bus_Milling_Balls.ID, "hatch.milling", "Ball Housing")).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java index f4d6eae1b8..71bc6937bc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java @@ -8,20 +8,20 @@ import static gregtech.api.enums.MetaTileEntityIDs.ReactorProcessingUnit_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.ThoriumReactor; import gregtech.api.enums.SoundResource; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects; +import gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe; +import gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe.SpecialEffects; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_SpargeTower; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMTE_NuclearReactor; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTESpargeTower; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTENuclearReactor; public class GregtechLFTR { public static void run() { Logger.INFO("Gregtech5u Content | Registering Liquid Fluorine Thorium Reactor [LFTR]."); - if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) { + if (GTPPCore.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) { run1(); } } @@ -29,16 +29,16 @@ public class GregtechLFTR { private static void run1() { // LFTR GregtechItemList.ThoriumReactor.set( - new GregtechMTE_NuclearReactor(ThoriumReactor.ID, "lftr.controller.single", "Thorium Reactor [LFTR]") + new MTENuclearReactor(ThoriumReactor.ID, "lftr.controller.single", "Thorium Reactor [LFTR]") .getStackForm(1L)); // Reactor Processing Units GregtechItemList.ReactorProcessingUnit_IV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ReactorProcessingUnit_IV.ID, "rpu.tier.01", "Reactor Processing Unit I", 5, - new String[] { "Processes Nuclear things", CORE.GT_Tooltip.get() }, + new String[] { "Processes Nuclear things", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.reactorProcessingUnitRecipes, 2, 9, @@ -48,12 +48,12 @@ public class GregtechLFTR { "REACTOR_PROCESSING_UNIT", null).getStackForm(1L)); GregtechItemList.ReactorProcessingUnit_ZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ReactorProcessingUnit_ZPM.ID, "rpu.tier.02", "Reactor Processing Unit II", 7, - new String[] { "Processes Nuclear things", CORE.GT_Tooltip.get() }, + new String[] { "Processes Nuclear things", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.reactorProcessingUnitRecipes, 2, 9, @@ -64,12 +64,12 @@ public class GregtechLFTR { null).getStackForm(1L)); // Cold Traps GregtechItemList.ColdTrap_IV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ColdTrap_IV.ID, "coldtrap.tier.01", "Cold Trap I", 5, - new String[] { "Just like the Arctic", "Does not require ice cubes", CORE.GT_Tooltip.get() }, + new String[] { "Just like the Arctic", "Does not require ice cubes", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.coldTrapRecipes, 2, 9, @@ -79,12 +79,12 @@ public class GregtechLFTR { "COLD_TRAP", null).getStackForm(1L)); GregtechItemList.ColdTrap_ZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ColdTrap_ZPM.ID, "coldtrap.tier.02", "Cold Trap II", 7, - new String[] { "Just like the Arctic", "Does not require ice cubes", CORE.GT_Tooltip.get() }, + new String[] { "Just like the Arctic", "Does not require ice cubes", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.coldTrapRecipes, 2, 9, @@ -95,9 +95,7 @@ public class GregtechLFTR { null).getStackForm(1L)); // Sparge Tower GregtechItemList.Controller_Sparge_Tower.set( - new GregtechMetaTileEntity_SpargeTower( - Controller_Sparge_Tower.ID, - "sparge.controller.single", - "Sparge Tower Controller").getStackForm(1L)); + new MTESpargeTower(Controller_Sparge_Tower.ID, "sparge.controller.single", "Sparge Tower Controller") + .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java index a367ac009c..580be58352 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java @@ -10,13 +10,13 @@ import static gregtech.api.enums.MetaTileEntityIDs.XL_HeatExchanger; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Turbine; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_HeatExchanger; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GT_MTE_LargeTurbine_Gas; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GT_MTE_LargeTurbine_Plasma; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GT_MTE_LargeTurbine_SCSteam; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GT_MTE_LargeTurbine_SHSteam; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GT_MTE_LargeTurbine_Steam; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchTurbine; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.MTEAdvHeatExchanger; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.MTELargeTurbineGas; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.MTELargeTurbinePlasma; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.MTELargeTurbineSCSteam; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.MTELargeTurbineSHSteam; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.MTELargeTurbineSteam; public class GregtechLargeTurbinesAndHeatExchanger { @@ -27,35 +27,30 @@ public class GregtechLargeTurbinesAndHeatExchanger { private static void run1() { GregtechItemList.Large_Steam_Turbine.set( - new GT_MTE_LargeTurbine_Steam( - Large_Steam_Turbine.ID, - "multimachine.largerturbine", - "XL Turbo Steam Turbine").getStackForm(1L)); + new MTELargeTurbineSteam(Large_Steam_Turbine.ID, "multimachine.largerturbine", "XL Turbo Steam Turbine") + .getStackForm(1L)); GregtechItemList.Large_HPSteam_Turbine.set( - new GT_MTE_LargeTurbine_SHSteam( + new MTELargeTurbineSHSteam( Large_HPSteam_Turbine.ID, "multimachine.largerhpturbine", "XL Turbo HP Steam Turbine").getStackForm(1L)); GregtechItemList.Large_Gas_Turbine.set( - new GT_MTE_LargeTurbine_Gas(Large_Gas_Turbine.ID, "multimachine.largergasturbine", "XL Turbo Gas Turbine") + new MTELargeTurbineGas(Large_Gas_Turbine.ID, "multimachine.largergasturbine", "XL Turbo Gas Turbine") .getStackForm(1L)); GregtechItemList.Large_Plasma_Turbine.set( - new GT_MTE_LargeTurbine_Plasma( + new MTELargeTurbinePlasma( Large_Plasma_Turbine.ID, "multimachine.largerplasmaturbine", "XL Turbo Plasma Turbine").getStackForm(1L)); GregtechItemList.Large_SCSteam_Turbine.set( - new GT_MTE_LargeTurbine_SCSteam( + new MTELargeTurbineSCSteam( Large_SCSteam_Turbine.ID, "multimachine.largerscturbine", "XL Turbo SC Steam Turbine").getStackForm(1L)); - GregtechItemList.Hatch_Turbine_Rotor.set( - new GT_MetaTileEntity_Hatch_Turbine(Hatch_Turbine_Rotor.ID, "hatch.turbine", "Rotor Assembly", 8) - .getStackForm(1L)); + GregtechItemList.Hatch_Turbine_Rotor + .set(new MTEHatchTurbine(Hatch_Turbine_Rotor.ID, "hatch.turbine", "Rotor Assembly", 8).getStackForm(1L)); GregtechItemList.XL_HeatExchanger.set( - new GregtechMetaTileEntity_Adv_HeatExchanger( - XL_HeatExchanger.ID, - "multimachine.reallybigheatexchanger", - "Whakawhiti Wera XL").getStackForm(1L)); + new MTEAdvHeatExchanger(XL_HeatExchanger.ID, "multimachine.reallybigheatexchanger", "Whakawhiti Wera XL") + .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java index f7014c4cbb..e09d056ceb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.Controller_MolecularTransform import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialMolecularTransformer; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialMolecularTransformer; public class GregtechMolecularTransformer { @@ -15,7 +15,7 @@ public class GregtechMolecularTransformer { private static void run1() { GregtechItemList.Controller_MolecularTransformer.set( - new GregtechMetaTileEntity_IndustrialMolecularTransformer( + new MTEIndustrialMolecularTransformer( Controller_MolecularTransformer.ID, "moleculartransformer.controller.tier.single", "Molecular Transformer").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java index c4aee9bd19..2121dde7a9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java @@ -3,18 +3,18 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Nuclear_Salt_Processing_Plant; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_NuclearSaltProcessingPlant; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTENuclearSaltProcessingPlant; public class GregtechNuclearSaltProcessingPlant { public static void run() { Logger.INFO("Gregtech5u Content | Registering Nuclear Salt Processing Plant Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_NuclearSaltProcessingPlant) { + if (GTPPCore.ConfigSwitches.enableMultiblock_NuclearSaltProcessingPlant) { // Nuclear Salt Processing Plant Multiblock GregtechItemList.Nuclear_Salt_Processing_Plant.set( - new GregtechMetaTileEntity_NuclearSaltProcessingPlant( + new MTENuclearSaltProcessingPlant( Nuclear_Salt_Processing_Plant.ID, "nuclearsaltprocessingplant.controller.tier.single", "Nuclear Salt Processing Plant").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java index 5f902c05d9..d554a6dc8e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java @@ -13,12 +13,12 @@ import static gregtech.api.enums.MetaTileEntityIDs.Pollution_Creator; import static gregtech.api.enums.MetaTileEntityIDs.Pollution_Detector; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaAtmosphericReconditioner; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaPollutionCreator; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaPollutionDetector; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEAtmosphericReconditioner; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEPollutionCreator; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEPollutionDetector; public class GregtechPollutionDevices { @@ -30,10 +30,10 @@ public class GregtechPollutionDevices { } private static void run1() { - if (CORE.ConfigSwitches.enableMachine_Pollution) { + if (GTPPCore.ConfigSwitches.enableMachine_Pollution) { // 759 GregtechItemList.Pollution_Detector.set( - new GregtechMetaPollutionDetector( + new MTEPollutionDetector( Pollution_Detector.ID, "pollutiondetector.01.tier.single", "Pollution Detection Device", @@ -41,7 +41,7 @@ public class GregtechPollutionDevices { "Tells you if you're living in Gwalior yet.", 0).getStackForm(1L)); GregtechItemList.Pollution_Creator.set( - new GregtechMetaPollutionCreator( + new MTEPollutionCreator( Pollution_Creator.ID, "pollutioncreator.01.tier.single", "Smog Device", @@ -50,55 +50,55 @@ public class GregtechPollutionDevices { 0).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_LV.set( - new GregtechMetaAtmosphericReconditioner( + new MTEAtmosphericReconditioner( Pollution_Cleaner_LV.ID, "pollutioncleaner.02.tier.single", "Upgraded Pollution Scrubber", 1).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_MV.set( - new GregtechMetaAtmosphericReconditioner( + new MTEAtmosphericReconditioner( Pollution_Cleaner_MV.ID, "pollutioncleaner.03.tier.single", "Advanced Pollution Scrubber", 2).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_HV.set( - new GregtechMetaAtmosphericReconditioner( + new MTEAtmosphericReconditioner( Pollution_Cleaner_HV.ID, "pollutioncleaner.04.tier.single", "Precision Pollution Scrubber", 3).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_EV.set( - new GregtechMetaAtmosphericReconditioner( + new MTEAtmosphericReconditioner( Pollution_Cleaner_EV.ID, "pollutioncleaner.05.tier.single", "Air Recycler", 4).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_IV.set( - new GregtechMetaAtmosphericReconditioner( + new MTEAtmosphericReconditioner( Pollution_Cleaner_IV.ID, "pollutioncleaner.06.tier.single", "Upgraded Air Recycler", 5).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_LuV.set( - new GregtechMetaAtmosphericReconditioner( + new MTEAtmosphericReconditioner( Pollution_Cleaner_LuV.ID, "pollutioncleaner.07.tier.single", "Advanced Air Recycler", 6).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_ZPM.set( - new GregtechMetaAtmosphericReconditioner( + new MTEAtmosphericReconditioner( Pollution_Cleaner_ZPM.ID, "pollutioncleaner.08.tier.single", "Precision Air Recycler", 7).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_UV.set( - new GregtechMetaAtmosphericReconditioner( + new MTEAtmosphericReconditioner( Pollution_Cleaner_UV.ID, "pollutioncleaner.09.tier.single", "Atmospheric Cleaner", 8).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_MAX.set( - new GregtechMetaAtmosphericReconditioner( + new MTEAtmosphericReconditioner( Pollution_Cleaner_MAX.ID, "pollutioncleaner.10.tier.single", "Biosphere Cleanser", diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java index ed02264afe..76bde9c81d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java @@ -7,20 +7,20 @@ import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Output_Battery_MV; import static gregtech.api.enums.MetaTileEntityIDs.PowerSubStation; import gregtech.api.enums.ItemList; -import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GTModHandler; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBattery; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBattery; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchInputBattery; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchOutputBattery; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage.GregtechMetaTileEntity_PowerSubStationController; public class GregtechPowerSubStation { public static void run() { Logger.INFO("Gregtech5u Content | Registering Power Substation Node."); - if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation) { + if (GTPPCore.ConfigSwitches.enableMultiblock_PowerSubstation) { run1(); } } @@ -34,44 +34,38 @@ public class GregtechPowerSubStation { "Power Station Control Node").getStackForm(1L)); int tID = 886; GregtechItemList.Hatch_Input_Battery_MV.set( - new GT_MetaTileEntity_Hatch_InputBattery( - Hatch_Input_Battery_MV.ID, - "hatch.input_battery.tier.00", - "Charging Bus (MV)", - 2).getStackForm(1L)); + new MTEHatchInputBattery(Hatch_Input_Battery_MV.ID, "hatch.input_battery.tier.00", "Charging Bus (MV)", 2) + .getStackForm(1L)); GregtechItemList.Hatch_Input_Battery_EV.set( - new GT_MetaTileEntity_Hatch_InputBattery( - Hatch_Input_Battery_EV.ID, - "hatch.input_battery.tier.01", - "Charging Bus (EV)", - 4).getStackForm(1L)); + new MTEHatchInputBattery(Hatch_Input_Battery_EV.ID, "hatch.input_battery.tier.01", "Charging Bus (EV)", 4) + .getStackForm(1L)); GregtechItemList.Hatch_Output_Battery_MV.set( - new GT_MetaTileEntity_Hatch_OutputBattery( + new MTEHatchOutputBattery( Hatch_Output_Battery_MV.ID, "hatch.output_battery.tier.00", "Discharging Bus (MV)", 2).getStackForm(1L)); GregtechItemList.Hatch_Output_Battery_EV.set( - new GT_MetaTileEntity_Hatch_OutputBattery( + new MTEHatchOutputBattery( Hatch_Output_Battery_EV.ID, "hatch.output_battery.tier.01", "Discharging Bus (EV)", 4).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Input_Battery_MV.get(1L), CI.bitsd, new Object[] { "C", "M", 'M', ItemList.Hull_MV, 'C', ItemList.Battery_Buffer_2by2_MV }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Input_Battery_EV.get(1L), CI.bitsd, new Object[] { "C", "M", 'M', ItemList.Hull_EV, 'C', ItemList.Battery_Buffer_4by4_EV }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Output_Battery_MV.get(1L), CI.bitsd, new Object[] { "M", "C", 'M', ItemList.Hull_MV, 'C', ItemList.Battery_Buffer_2by2_MV }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Output_Battery_EV.get(1L), CI.bitsd, new Object[] { "M", "C", 'M', ItemList.Hull_EV, 'C', ItemList.Battery_Buffer_4by4_EV }); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java index f923afc733..77385f6790 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java @@ -3,17 +3,17 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.QuantumForceTransformer; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_QuantumForceTransformer; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEQuantumForceTransformer; public class GregtechQuantumForceTransformer { public static void run() { Logger.INFO("Gregtech5u Content | Registering Quantum Force Transformer Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_QuantumForceTransformer) { + if (GTPPCore.ConfigSwitches.enableMultiblock_QuantumForceTransformer) { GregtechItemList.QuantumForceTransformer.set( - new GregtechMetaTileEntity_QuantumForceTransformer( + new MTEQuantumForceTransformer( QuantumForceTransformer.ID, "quantumforcetransformer.controller.tier.single", "Quantum Force Transformer").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java index 60f7b4b0e0..dc11c31c55 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.RTG; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntity_RTG; +import gtPlusPlus.xmod.gregtech.common.tileentities.generators.MTERTGenerator; public class GregtechRTG { @@ -15,10 +15,7 @@ public class GregtechRTG { private static void run1() { GregtechItemList.RTG.set( - new GregtechMetaTileEntity_RTG( - RTG.ID, - "basicgenerator.rtg.tier.01", - "Radioisotope Thermoelectric Generator", - 3).getStackForm(1L)); + new MTERTGenerator(RTG.ID, "basicgenerator.rtg.tier.01", "Radioisotope Thermoelectric Generator", 3) + .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneButtonPanel.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneButtonPanel.java index c999a7cd08..e7b313d851 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneButtonPanel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneButtonPanel.java @@ -1,16 +1,16 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneButtonPanel; +import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneButtonPanel; public class GregtechRedstoneButtonPanel { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Button Panel."); - if (CORE.ConfigSwitches.enableMachine_RedstoneBlocks) { - GregtechItemList.RedstoneButtonPanel.set(new GT_MetaTileEntity_RedstoneButtonPanel(31800).getStackForm(1L)); + if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { + GregtechItemList.RedstoneButtonPanel.set(new MTERedstoneButtonPanel(31800).getStackForm(1L)); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneCircuitBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneCircuitBlock.java index 106ee48fba..1d92f61c4a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneCircuitBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneCircuitBlock.java @@ -1,17 +1,16 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneCircuitBlock; +import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneCircuitBlock; public class GregtechRedstoneCircuitBlock { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Circuit Block."); - if (CORE.ConfigSwitches.enableMachine_RedstoneBlocks) { - GregtechItemList.RedstoneCircuitBlock - .set(new GT_MetaTileEntity_RedstoneCircuitBlock(31801).getStackForm(1L)); + if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { + GregtechItemList.RedstoneCircuitBlock.set(new MTERedstoneCircuitBlock(31801).getStackForm(1L)); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneLamp.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneLamp.java index 81c2a0469d..e6fcbb4cb2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneLamp.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneLamp.java @@ -1,16 +1,16 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneLamp; +import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneLamp; public class GregtechRedstoneLamp { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Lamp."); - if (CORE.ConfigSwitches.enableMachine_RedstoneBlocks) { - GregtechItemList.RedstoneLamp.set(new GT_MetaTileEntity_RedstoneLamp(31803).getStackForm(1L)); + if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { + GregtechItemList.RedstoneLamp.set(new MTERedstoneLamp(31803).getStackForm(1L)); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthDisplay.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthDisplay.java index c8bee5c5c1..7c3cea0213 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthDisplay.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthDisplay.java @@ -1,17 +1,17 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneStrengthDisplay; +import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneStrengthDisplay; public class GregtechRedstoneStrengthDisplay { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Strength Display."); - if (CORE.ConfigSwitches.enableMachine_RedstoneBlocks) { + if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { GregtechItemList.RedstoneStrengthDisplay.set( - new GT_MetaTileEntity_RedstoneStrengthDisplay( + new MTERedstoneStrengthDisplay( 31804, "redstone.display", "Redstone Strength Display", diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthScale.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthScale.java index e08a489216..149b9647ed 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthScale.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthScale.java @@ -1,17 +1,16 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneStrengthScale; +import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneStrengthScale; public class GregtechRedstoneStrengthScale { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Strength Scale."); - if (CORE.ConfigSwitches.enableMachine_RedstoneBlocks) { - GregtechItemList.RedstoneStrengthScale - .set(new GT_MetaTileEntity_RedstoneStrengthScale(31805).getStackForm(1L)); + if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { + GregtechItemList.RedstoneStrengthScale.set(new MTERedstoneStrengthScale(31805).getStackForm(1L)); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java index 2e18957716..06328a7e30 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java @@ -10,90 +10,90 @@ import net.minecraft.item.ItemStack; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GTModHandler; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.ALLOY; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_LargeRocketEngine; +import gtPlusPlus.xmod.gregtech.common.tileentities.generators.MTERocketFuelGenerator; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTELargeRocketEngine; public class GregtechRocketFuelGenerator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Rocket Engines."); - if (CORE.ConfigSwitches.enableMachine_RocketEngines) { + if (GTPPCore.ConfigSwitches.enableMachine_RocketEngines) { run1(); } } private static void run1() { GregtechItemList.Controller_RocketEngine.set( - new GregtechMetaTileEntity_LargeRocketEngine( + new MTELargeRocketEngine( Controller_RocketEngine.ID, "gtpp.multimachine.rocketengine", "Rocketdyne F-1A Engine").getStackForm(1L)); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Controller_RocketEngine.get(1L), CI.bitsd, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Machine_Multi_DieselEngine.get(1), 'P', ItemList.Electric_Piston_IV, 'E', ItemList.Field_Generator_EV, 'C', OrePrefixes.circuit.get(Materials.LuV), 'W', OrePrefixes.cableGt08.get(Materials.Platinum), 'G', - ALLOY.MARAGING350.getGear(1) }); + MaterialsAlloy.MARAGING350.getGear(1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Casing_RocketEngine.get(1L), CI.bitsd, new Object[] { "PhP", "RFR", "PWP", 'R', OrePrefixes.pipeMedium.get(Materials.TungstenSteel), 'F', - ItemList.Casing_RobustTungstenSteel, 'P', ALLOY.NITINOL_60.getGear(1), 'W', + ItemList.Casing_RobustTungstenSteel, 'P', MaterialsAlloy.NITINOL_60.getGear(1), 'W', OrePrefixes.stickLong.get(Materials.TungstenSteel) }); GregtechItemList.Rocket_Engine_EV.set( - new GregtechMetaTileEntityRocketFuelGenerator( + new MTERocketFuelGenerator( Rocket_Engine_EV.ID, "advancedgenerator.rocketFuel.tier.01", "Basic Rocket Engine", 4).getStackForm(1L)); GregtechItemList.Rocket_Engine_IV.set( - new GregtechMetaTileEntityRocketFuelGenerator( + new MTERocketFuelGenerator( Rocket_Engine_IV.ID, "advancedgenerator.rocketFuel.tier.02", "Advanced Rocket Engine", 5).getStackForm(1L)); GregtechItemList.Rocket_Engine_LuV.set( - new GregtechMetaTileEntityRocketFuelGenerator( + new MTERocketFuelGenerator( Rocket_Engine_LuV.ID, "advancedgenerator.rocketFuel.tier.03", "Turbo Rocket Engine", 6).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Rocket_Engine_EV.get(1L), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E', ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.IV), 'W', - OrePrefixes.cableGt02.get(Materials.Aluminium), 'G', ALLOY.TANTALLOY_61.getGear(1) }); + OrePrefixes.cableGt02.get(Materials.Aluminium), 'G', MaterialsAlloy.TANTALLOY_61.getGear(1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Rocket_Engine_IV.get(1L), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Piston_IV, 'E', ItemList.Electric_Motor_IV, 'C', OrePrefixes.circuit.get(Materials.LuV), 'W', - OrePrefixes.cableGt02.get(Materials.Platinum), 'G', ALLOY.STELLITE.getGear(1) }); + OrePrefixes.cableGt02.get(Materials.Platinum), 'G', MaterialsAlloy.STELLITE.getGear(1) }); final ItemStack INGREDIENT_1 = CI.electricPiston_LuV; final ItemStack INGREDIENT_2 = CI.electricMotor_LuV; - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Rocket_Engine_LuV.get(1L), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_LuV, 'P', INGREDIENT_1, 'E', INGREDIENT_2, 'C', OrePrefixes.circuit.get(Materials.ZPM), 'W', OrePrefixes.cableGt02.get(Materials.Tungsten), 'G', - ALLOY.ZERON_100.getGear(1) }); + MaterialsAlloy.ZERON_100.getGear(1) }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java index 6e41bc67f2..adc7517d78 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java @@ -8,44 +8,44 @@ import static gregtech.api.enums.MetaTileEntityIDs.Generator_SemiFluid_LV; import static gregtech.api.enums.MetaTileEntityIDs.Generator_SemiFluid_MV; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_SemiFluidGenerator; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_LargeSemifluidGenerator; +import gtPlusPlus.xmod.gregtech.common.tileentities.generators.MTESemiFluidGenerator; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTELargeSemifluidGenerator; public class GregtechSemiFluidgenerators { public static void run() { GregtechItemList.Generator_SemiFluid_LV.set( - new GT_MetaTileEntity_SemiFluidGenerator( + new MTESemiFluidGenerator( Generator_SemiFluid_LV.ID, "basicgenerator.semifluid.tier.01", "Basic Semi-Fluid Generator", 1).getStackForm(1L)); GregtechItemList.Generator_SemiFluid_MV.set( - new GT_MetaTileEntity_SemiFluidGenerator( + new MTESemiFluidGenerator( Generator_SemiFluid_MV.ID, "basicgenerator.semifluid.tier.02", "Advanced Semi-Fluid Generator", 2).getStackForm(1L)); GregtechItemList.Generator_SemiFluid_HV.set( - new GT_MetaTileEntity_SemiFluidGenerator( + new MTESemiFluidGenerator( Generator_SemiFluid_HV.ID, "basicgenerator.semifluid.tier.03", "Turbo Semi-Fluid Generator", 3).getStackForm(1L)); GregtechItemList.Generator_SemiFluid_EV.set( - new GT_MetaTileEntity_SemiFluidGenerator( + new MTESemiFluidGenerator( Generator_SemiFluid_EV.ID, "basicgenerator.semifluid.tier.04", "Turbo Semi-Fluid Generator II", 4).getStackForm(1L)); GregtechItemList.Generator_SemiFluid_IV.set( - new GT_MetaTileEntity_SemiFluidGenerator( + new MTESemiFluidGenerator( Generator_SemiFluid_IV.ID, "basicgenerator.semifluid.tier.05", "Turbo Semi-Fluid Generator III", 5).getStackForm(1L)); GregtechItemList.Controller_LargeSemifluidGenerator.set( - new GregtechMetaTileEntity_LargeSemifluidGenerator( + new MTELargeSemifluidGenerator( Controller_LargeSemifluidGenerator.ID, "gtpp.multimachine.semifluidgenerator", "Large Semifluid Burner").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java index d0f9cdd6f4..4c6de56d94 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java @@ -9,32 +9,32 @@ import static gregtech.api.enums.MetaTileEntityIDs.SimpleDustWasher_MV; import static gregtech.api.enums.MetaTileEntityIDs.SimpleDustWasher_ULV; import static gregtech.api.enums.MetaTileEntityIDs.SimpleDustWasher_UV; import static gregtech.api.enums.MetaTileEntityIDs.SimpleDustWasher_ZPM; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.simpleWasherRecipes; import java.util.List; import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.google.common.collect.ImmutableList; -import gregtech.api.enums.GT_Values; +import bartworks.system.material.Werkstoff; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SoundResource; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe; +import gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe.SpecialEffects; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.data.Quad; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class GregtechSimpleWasher { public static void run() { - if (CORE.ConfigSwitches.enableMachine_SimpleWasher) { + if (GTPPCore.ConfigSwitches.enableMachine_SimpleWasher) { generateDirtyDustRecipes(); generateDirtyCrushedRecipes(); // Register the Simple Washer Entity. @@ -85,13 +85,13 @@ public class GregtechSimpleWasher { "Simple Washer VIII")); GregtechItemList.SimpleDustWasher_ULV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SimpleDustWasher_ULV.ID, "simplewasher.01.tier.01", "Deprecated ULV Simple Washer", 0, new String[] { "It's like an automatic Cauldron for washing dusts.", - "§cDEPRECATED: No recipe.§r Make a Simple Washer I.", CORE.GT_Tooltip.get() }, + "§cDEPRECATED: No recipe.§r Make a Simple Washer I.", GTPPCore.GT_Tooltip.get() }, simpleWasherRecipes, 1, 1, @@ -107,13 +107,13 @@ public class GregtechSimpleWasher { int tier = i + 1; washer.getKey() .set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( washer.getValue_1(), washer.getValue_2(), washer.getValue_3(), tier, new String[] { "It's like an automatic Cauldron for washing dusts.", - CORE.GT_Tooltip.get() }, + GTPPCore.GT_Tooltip.get() }, simpleWasherRecipes, 1, 1, @@ -140,9 +140,9 @@ public class GregtechSimpleWasher { continue; } - dustClean = GT_OreDictUnificator.get(OrePrefixes.dust, v, 1L); - dustDirty = GT_OreDictUnificator.get(OrePrefixes.dustImpure, v, 1L); - dustPure = GT_OreDictUnificator.get(OrePrefixes.dustPure, v, 1L); + dustClean = GTOreDictUnificator.get(OrePrefixes.dust, v, 1L); + dustDirty = GTOreDictUnificator.get(OrePrefixes.dustImpure, v, 1L); + dustPure = GTOreDictUnificator.get(OrePrefixes.dustPure, v, 1L); addSimpleWashRecipe(dustDirty, dustClean); addSimpleWashRecipe(dustPure, dustClean); } @@ -166,8 +166,8 @@ public class GregtechSimpleWasher { ItemStack crushedClean; ItemStack crushedDirty; for (Materials v : Materials.values()) { - crushedClean = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, v, 1L); - crushedDirty = GT_OreDictUnificator.get(OrePrefixes.crushed, v, 1L); + crushedClean = GTOreDictUnificator.get(OrePrefixes.crushedPurified, v, 1L); + crushedDirty = GTOreDictUnificator.get(OrePrefixes.crushed, v, 1L); addSimpleWashRecipe(crushedDirty, crushedClean); } @@ -183,7 +183,7 @@ public class GregtechSimpleWasher { private static void addSimpleWashRecipe(ItemStack aInput, ItemStack aOutput) { if (aInput != null && aOutput != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aInput) .itemOutputs(aOutput) .fluidInputs(FluidUtils.getFluidStack("water", 100)) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java index 232f3d60e5..d9672bf812 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java @@ -3,13 +3,13 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Solar_Tower; import static gregtech.api.enums.MetaTileEntityIDs.Solar_Tower_Reflector; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; -import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.material.MaterialMisc; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_SolarTower; -import gtPlusPlus.xmod.gregtech.common.tileentities.misc.TileEntitySolarHeater; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTESolarTower; +import gtPlusPlus.xmod.gregtech.common.tileentities.misc.MTESolarHeater; public class GregtechSolarTower { @@ -21,12 +21,10 @@ public class GregtechSolarTower { private static void run1() { // Solar Tower GregtechItemList.Industrial_Solar_Tower.set( - new GregtechMetaTileEntity_SolarTower( - Industrial_Solar_Tower.ID, - "solartower.controller.tier.single", - "Solar Tower").getStackForm(1L)); + new MTESolarTower(Industrial_Solar_Tower.ID, "solartower.controller.tier.single", "Solar Tower") + .getStackForm(1L)); GregtechItemList.Solar_Tower_Reflector.set( - new TileEntitySolarHeater( + new MTESolarHeater( Solar_Tower_Reflector.ID, "solarreflector.simple.single", "Solar Reflector", @@ -35,9 +33,9 @@ public class GregtechSolarTower { 0).getStackForm(1L)); // NEI recipe - GT_Values.RA.stdBuilder() - .fluidInputs(MISC_MATERIALS.SOLAR_SALT_COLD.getFluidStack(1000)) - .fluidOutputs(MISC_MATERIALS.SOLAR_SALT_HOT.getFluidStack(1000)) + GTValues.RA.stdBuilder() + .fluidInputs(MaterialMisc.SOLAR_SALT_COLD.getFluidStack(1000)) + .fluidOutputs(MaterialMisc.SOLAR_SALT_HOT.getFluidStack(1000)) .duration(0) .eut(0) .noOptimize() diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java index f2ef67157a..3808b6683d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java @@ -11,14 +11,14 @@ import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Output_Bus_Steam; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusInput; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusOutput; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.GregtechMetaTileEntity_SteamCentrifuge; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.GregtechMetaTileEntity_SteamCompressor; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.GregtechMetaTileEntity_SteamForgeHammer; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.GregtechMetaTileEntity_SteamMacerator; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.GregtechMetaTileEntity_SteamMixer; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.GregtechMetaTileEntity_SteamWasher; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchSteamBusOutput; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MteHatchSteamBusInput; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.MTESteamCentrifuge; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.MTESteamCompressor; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.MTESteamForgeHammer; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.MTESteamMacerator; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.MTESteamMixer; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.MTESteamWasher; public class GregtechSteamMultis { @@ -27,44 +27,37 @@ public class GregtechSteamMultis { Logger.INFO("Gregtech5u Content | Registering Steam Multiblocks."); GregtechItemList.Controller_SteamMaceratorMulti.set( - new GregtechMetaTileEntity_SteamMacerator( + new MTESteamMacerator( Controller_SteamMaceratorMulti.ID, "gtpp.multimachine.steam.macerator", "Steam Grinder").getStackForm(1L)); GregtechItemList.Controller_SteamCompressorMulti.set( - new GregtechMetaTileEntity_SteamCompressor( + new MTESteamCompressor( Controller_SteamCompressorMulti.ID, "gtpp.multimachine.steam.compressor", "Steam Squasher").getStackForm(1L)); GregtechItemList.Controller_SteamCentrifugeMulti.set( - new GregtechMetaTileEntity_SteamCentrifuge( + new MTESteamCentrifuge( Controller_SteamCentrifugeMulti.ID, "gtpp.multimachine.steam.centrifuge", "Steam Centrifuge").getStackForm(1)); GregtechItemList.Controller_SteamWasherMulti.set( - new GregtechMetaTileEntity_SteamWasher( - Controller_SteamWasherMulti.ID, - "gtpp.multimachine.steam.washer", - "Steam Washer").getStackForm(1)); + new MTESteamWasher(Controller_SteamWasherMulti.ID, "gtpp.multimachine.steam.washer", "Steam Washer") + .getStackForm(1)); GregtechItemList.Controller_SteamForgeHammerMulti.set( - new GregtechMetaTileEntity_SteamForgeHammer( + new MTESteamForgeHammer( Controller_SteamForgeHammer.ID, "gtpp.multimachine.steam.forge.hammer", "Steam Forge Hammer").getStackForm(1)); GregtechItemList.Controller_SteamMixerMulti.set( - new GregtechMetaTileEntity_SteamMixer( - Controller_SteamMixerMulti.ID, - "gtpp.multimachine.steam.mixer", - "Steam Mixer").getStackForm(1)); + new MTESteamMixer(Controller_SteamMixerMulti.ID, "gtpp.multimachine.steam.mixer", "Steam Mixer") + .getStackForm(1)); GregtechItemList.Hatch_Input_Bus_Steam.set( - new GT_MetaTileEntity_Hatch_Steam_BusInput( - Hatch_Input_Bus_Steam.ID, - "hatch.input_bus.tier.steam", - "Input Bus (Steam)", - 0).getStackForm(1L)); + new MteHatchSteamBusInput(Hatch_Input_Bus_Steam.ID, "hatch.input_bus.tier.steam", "Input Bus (Steam)", 0) + .getStackForm(1L)); GregtechItemList.Hatch_Output_Bus_Steam.set( - new GT_MetaTileEntity_Hatch_Steam_BusOutput( + new MTEHatchSteamBusOutput( Hatch_Output_Bus_Steam.ID, "hatch.output_bus.tier.steam", "Output Bus (Steam)", diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java index b9c92c4241..531eff4c1a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java @@ -7,7 +7,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.Super_Chest_LV; import static gregtech.api.enums.MetaTileEntityIDs.Super_Chest_MV; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest; +import gtPlusPlus.xmod.gregtech.common.tileentities.storage.MTETieredChest; public class GregtechSuperChests { @@ -15,35 +15,20 @@ public class GregtechSuperChests { String aSuffix = " [Disabled]"; GregtechItemList.Super_Chest_LV.set( - (new GT_MetaTileEntity_TieredChest( - Super_Chest_LV.ID, - "super.chest.gtpp.tier.01", - "Super Chest I" + aSuffix, - 1)).getStackForm(1L)); + (new MTETieredChest(Super_Chest_LV.ID, "super.chest.gtpp.tier.01", "Super Chest I" + aSuffix, 1)) + .getStackForm(1L)); GregtechItemList.Super_Chest_MV.set( - (new GT_MetaTileEntity_TieredChest( - Super_Chest_MV.ID, - "super.chest.gtpp.tier.02", - "Super Chest II" + aSuffix, - 2)).getStackForm(1L)); + (new MTETieredChest(Super_Chest_MV.ID, "super.chest.gtpp.tier.02", "Super Chest II" + aSuffix, 2)) + .getStackForm(1L)); GregtechItemList.Super_Chest_HV.set( - (new GT_MetaTileEntity_TieredChest( - Super_Chest_HV.ID, - "super.chest.gtpp.tier.03", - "Super Chest III" + aSuffix, - 3)).getStackForm(1L)); + (new MTETieredChest(Super_Chest_HV.ID, "super.chest.gtpp.tier.03", "Super Chest III" + aSuffix, 3)) + .getStackForm(1L)); GregtechItemList.Super_Chest_EV.set( - (new GT_MetaTileEntity_TieredChest( - Super_Chest_EV.ID, - "super.chest.gtpp.tier.04", - "Super Chest IV" + aSuffix, - 4)).getStackForm(1L)); + (new MTETieredChest(Super_Chest_EV.ID, "super.chest.gtpp.tier.04", "Super Chest IV" + aSuffix, 4)) + .getStackForm(1L)); GregtechItemList.Super_Chest_IV.set( - (new GT_MetaTileEntity_TieredChest( - Super_Chest_IV.ID, - "super.chest.gtpp.tier.05", - "Super Chest V" + aSuffix, - 5)).getStackForm(1L)); + (new MTETieredChest(Super_Chest_IV.ID, "super.chest.gtpp.tier.05", "Super Chest V" + aSuffix, 5)) + .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java index 4acd1ab060..b730da2dcc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java @@ -5,7 +5,7 @@ import static gregtech.api.enums.Mods.Thaumcraft; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaPollutionCreator; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEPollutionCreator; public class GregtechThaumcraftDevices { @@ -19,7 +19,7 @@ public class GregtechThaumcraftDevices { private static void run1() { // 956-960 GregtechItemList.Thaumcraft_Researcher.set( - new GregtechMetaPollutionCreator( + new MTEPollutionCreator( Thaumcraft_Researcher.ID, "thaumcraft.gtpp.machine.01", "Arcane Researcher", diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java index c1427a333f..4ef223c48e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java @@ -3,16 +3,13 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Infinite_Item_Chest; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.storage.creative.GT_MetaTileEntity_InfiniteItemHolder; +import gtPlusPlus.xmod.gregtech.common.tileentities.storage.creative.MTEInfiniteItemHolder; public class GregtechThreadedBuffers { public static void run() { GregtechItemList.Infinite_Item_Chest.set( - (new GT_MetaTileEntity_InfiniteItemHolder( - Infinite_Item_Chest.ID, - "infinite.chest.tier.01", - "Infinite Item Chest", - 1)).getStackForm(1L)); + (new MTEInfiniteItemHolder(Infinite_Item_Chest.ID, "infinite.chest.tier.01", "Infinite Item Chest", 1)) + .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java index ea86481c46..77f169ef1c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java @@ -1,40 +1,34 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gregtech.api.enums.MetaTileEntityIDs.GT_FluidTank_HV; -import static gregtech.api.enums.MetaTileEntityIDs.GT_FluidTank_LV; -import static gregtech.api.enums.MetaTileEntityIDs.GT_FluidTank_MV; -import static gregtech.api.enums.MetaTileEntityIDs.GT_FluidTank_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.GTFluidTank_HV; +import static gregtech.api.enums.MetaTileEntityIDs.GTFluidTank_LV; +import static gregtech.api.enums.MetaTileEntityIDs.GTFluidTank_MV; +import static gregtech.api.enums.MetaTileEntityIDs.GTFluidTank_ULV; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredTank; +import gtPlusPlus.xmod.gregtech.common.tileentities.storage.MTETieredTank; public class GregtechTieredFluidTanks { public static void run() { Logger.INFO("Gregtech5u Content | Registering Portable Fluid Tanks."); - if (CORE.ConfigSwitches.enableMachine_FluidTanks) { + if (GTPPCore.ConfigSwitches.enableMachine_FluidTanks) { run1(); } } private static void run1() { Logger.INFO("Only loading ULV-IV tier tanks for New Horizons Modpack."); - GregtechItemList.GT_FluidTank_ULV.set( - new GT_MetaTileEntity_TieredTank( - GT_FluidTank_ULV.ID, - "fluidtank.tier.00", - "Ultra Low Voltage Fluid Tank", - 0).getStackForm(1L)); - GregtechItemList.GT_FluidTank_LV.set( - new GT_MetaTileEntity_TieredTank(GT_FluidTank_LV.ID, "fluidtank.tier.01", "Low Voltage Fluid Tank", 1) - .getStackForm(1L)); - GregtechItemList.GT_FluidTank_MV.set( - new GT_MetaTileEntity_TieredTank(GT_FluidTank_MV.ID, "fluidtank.tier.02", "Medium Voltage Fluid Tank", 2) - .getStackForm(1L)); - GregtechItemList.GT_FluidTank_HV.set( - new GT_MetaTileEntity_TieredTank(GT_FluidTank_HV.ID, "fluidtank.tier.03", "High Voltage Fluid Tank", 3) + GregtechItemList.GTFluidTank_ULV.set( + new MTETieredTank(GTFluidTank_ULV.ID, "fluidtank.tier.00", "Ultra Low Voltage Fluid Tank", 0) .getStackForm(1L)); + GregtechItemList.GTFluidTank_LV.set( + new MTETieredTank(GTFluidTank_LV.ID, "fluidtank.tier.01", "Low Voltage Fluid Tank", 1).getStackForm(1L)); + GregtechItemList.GTFluidTank_MV.set( + new MTETieredTank(GTFluidTank_MV.ID, "fluidtank.tier.02", "Medium Voltage Fluid Tank", 2).getStackForm(1L)); + GregtechItemList.GTFluidTank_HV.set( + new MTETieredTank(GTFluidTank_HV.ID, "fluidtank.tier.03", "High Voltage Fluid Tank", 3).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java index 7de699fc22..b848ef1e61 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java @@ -3,22 +3,22 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.TreeFarmer_Structural; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaTreeFarmerStructural; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTETreeFarmerStructural; public class GregtechTreeFarmerTE { public static void run() { Logger.INFO("Gregtech5u Content | Registering Tree Farmer Structural Block."); - if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) { + if (GTPPCore.ConfigSwitches.enableMultiblock_TreeFarmer) { run1(); } } private static void run1() { GregtechItemList.TreeFarmer_Structural.set( - new GregtechMetaTreeFarmerStructural(TreeFarmer_Structural.ID, "treefarmer.structural", "Farm Keeper", 0) + new MTETreeFarmerStructural(TreeFarmer_Structural.ID, "treefarmer.structural", "Farm Keeper", 0) .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWaterPump.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWaterPump.java index 476e13bd15..9854921dd4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWaterPump.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWaterPump.java @@ -1,14 +1,13 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.GregtechMetaTileEntity_SteamWaterPump; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.MTESteamWaterPump; public class GregtechWaterPump { public static void run() { // Water Pump Multiblock - GregtechItemList.WaterPump.set( - new GregtechMetaTileEntity_SteamWaterPump(31085, "waterpump.controller.tier.single", "Water Pump") - .getStackForm(1L)); + GregtechItemList.WaterPump + .set(new MTESteamWaterPump(31085, "waterpump.controller.tier.single", "Water Pump").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java index 3d615f97a0..c66d2b574a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java @@ -14,7 +14,7 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaWirelessCharger; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEWirelessCharger; public class GregtechWirelessChargers { @@ -25,7 +25,7 @@ public class GregtechWirelessChargers { Utils.registerEvent(new ChargingHelper()); GregtechItemList.Charger_LV.set( - new GregtechMetaWirelessCharger( + new MTEWirelessCharger( Charger_LV.ID, "wificharger.01.tier.single", "Wireless Charger MK I", @@ -33,7 +33,7 @@ public class GregtechWirelessChargers { "Hopefully won't give you cancer.", 0).getStackForm(1L)); GregtechItemList.Charger_MV.set( - new GregtechMetaWirelessCharger( + new MTEWirelessCharger( Charger_MV.ID, "wificharger.02.tier.single", "Wireless Charger MK II", @@ -41,7 +41,7 @@ public class GregtechWirelessChargers { "Hopefully won't give you cancer.", 0).getStackForm(1L)); GregtechItemList.Charger_HV.set( - new GregtechMetaWirelessCharger( + new MTEWirelessCharger( Charger_HV.ID, "wificharger.03.tier.single", "Wireless Charger MK III", @@ -49,7 +49,7 @@ public class GregtechWirelessChargers { "Hopefully won't give you cancer.", 0).getStackForm(1L)); GregtechItemList.Charger_EV.set( - new GregtechMetaWirelessCharger( + new MTEWirelessCharger( Charger_EV.ID, "wificharger.04.tier.single", "Wireless Charger MK IV", @@ -57,7 +57,7 @@ public class GregtechWirelessChargers { "Hopefully won't give you cancer.", 0).getStackForm(1L)); GregtechItemList.Charger_IV.set( - new GregtechMetaWirelessCharger( + new MTEWirelessCharger( Charger_IV.ID, "wificharger.05.tier.single", "Wireless Charger MK V", @@ -65,7 +65,7 @@ public class GregtechWirelessChargers { "Hopefully won't give you cancer.", 0).getStackForm(1L)); GregtechItemList.Charger_LuV.set( - new GregtechMetaWirelessCharger( + new MTEWirelessCharger( Charger_LuV.ID, "wificharger.06.tier.single", "Wireless Charger MK VI", @@ -73,7 +73,7 @@ public class GregtechWirelessChargers { "Hopefully won't give you cancer.", 0).getStackForm(1L)); GregtechItemList.Charger_ZPM.set( - new GregtechMetaWirelessCharger( + new MTEWirelessCharger( Charger_ZPM.ID, "wificharger.07.tier.single", "Wireless Charger MK VII", @@ -81,7 +81,7 @@ public class GregtechWirelessChargers { "Hopefully won't give you cancer.", 0).getStackForm(1L)); GregtechItemList.Charger_UV.set( - new GregtechMetaWirelessCharger( + new MTEWirelessCharger( Charger_UV.ID, "wificharger.08.tier.single", "Wireless Charger MK VIII", @@ -89,7 +89,7 @@ public class GregtechWirelessChargers { "Hopefully won't give you cancer.", 0).getStackForm(1L)); GregtechItemList.Charger_UHV.set( - new GregtechMetaWirelessCharger( + new MTEWirelessCharger( Charger_UHV.ID, "wificharger.09.tier.single", "Wireless Charger MK IX", diff --git a/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java deleted file mode 100644 index 475d8d5feb..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java +++ /dev/null @@ -1,15 +0,0 @@ -package gtPlusPlus.xmod.ic2; - -import gtPlusPlus.xmod.ic2.item.IC2_Items; -import gtPlusPlus.xmod.ic2.recipe.RECIPE_IC2; - -public class HANDLER_IC2 { - - public static void preInit() { - IC2_Items.register(); - } - - public static void postInit() { - RECIPE_IC2.initRecipes(); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/HandlerIC2.java b/src/main/java/gtPlusPlus/xmod/ic2/HandlerIC2.java new file mode 100644 index 0000000000..ba3c1ae0de --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/ic2/HandlerIC2.java @@ -0,0 +1,15 @@ +package gtPlusPlus.xmod.ic2; + +import gtPlusPlus.xmod.ic2.item.IC2Items; +import gtPlusPlus.xmod.ic2.recipe.RecipeIC2; + +public class HandlerIC2 { + + public static void preInit() { + IC2Items.register(); + } + + public static void postInit() { + RecipeIC2.initRecipes(); + } +} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2Items.java index 3dacc657de..7b6dbe5908 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2Items.java @@ -8,7 +8,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; import gtPlusPlus.core.item.wearable.hazmat.ItemArmorHazmatEx; -public class IC2_Items { +public class IC2Items { public static ItemStack rotor_Material_1; // Energetic Alloy public static ItemStack rotor_Material_2; // TungstenSteel diff --git a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RecipeIC2.java index dddcab86e6..dc7a87d4dd 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RecipeIC2.java @@ -3,49 +3,49 @@ package gtPlusPlus.xmod.ic2.recipe; import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.extruderRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gtPlusPlus.core.recipe.RECIPES_Tools.craftingToolHardHammer; -import static gtPlusPlus.core.recipe.RECIPES_Tools.craftingToolWrench; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gtPlusPlus.core.recipe.RecipesTools.craftingToolHardHammer; +import static gtPlusPlus.core.recipe.RecipesTools.craftingToolWrench; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.ic2.item.IC2_Items; +import gtPlusPlus.xmod.ic2.item.IC2Items; import ic2.core.Ic2Items; -public class RECIPE_IC2 { +public class RecipeIC2 { public static String plate_T1 = "plateEnergeticAlloy"; public static String plate_T2 = "plateTungstenSteel"; public static String plate_T3 = "plateVibrantAlloy"; public static String plate_T4 = "plateAlloyIridium"; - public static ItemStack block_T1 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.EnergeticAlloy, 1L); - public static ItemStack block_T2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L); - public static ItemStack block_T3 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.VibrantAlloy, 1L); - public static ItemStack block_T4 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 1L); + public static ItemStack block_T1 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.EnergeticAlloy, 1L); + public static ItemStack block_T2 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L); + public static ItemStack block_T3 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.VibrantAlloy, 1L); + public static ItemStack block_T4 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 1L); - public static ItemStack shaft_block_T1 = GT_OreDictUnificator.get(OrePrefixes.block, Materials.EnergeticAlloy, 1L); - public static ItemStack shaft_block_T2 = GT_OreDictUnificator.get(OrePrefixes.block, Materials.TungstenSteel, 1L); - public static ItemStack shaft_block_T3 = GT_OreDictUnificator.get(OrePrefixes.block, Materials.VibrantAlloy, 1L); - public static ItemStack shaft_block_T4 = GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iridium, 1L); + public static ItemStack shaft_block_T1 = GTOreDictUnificator.get(OrePrefixes.block, Materials.EnergeticAlloy, 1L); + public static ItemStack shaft_block_T2 = GTOreDictUnificator.get(OrePrefixes.block, Materials.TungstenSteel, 1L); + public static ItemStack shaft_block_T3 = GTOreDictUnificator.get(OrePrefixes.block, Materials.VibrantAlloy, 1L); + public static ItemStack shaft_block_T4 = GTOreDictUnificator.get(OrePrefixes.block, Materials.Iridium, 1L); public static String ingot_T1 = "ingotEnergeticAlloy"; public static String ingot_T2 = "ingotTungstenSteel"; @@ -57,20 +57,20 @@ public class RECIPE_IC2 { public static String ring_T3 = "ringChrome"; public static String ring_T4 = "ringOsmiridium"; - private static ItemStack rotor_blade_T1 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_1.getItem()); - private static ItemStack rotor_blade_T2 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_2.getItem()); - private static ItemStack rotor_blade_T3 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_3.getItem()); - private static ItemStack rotor_blade_T4 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_4.getItem()); + private static ItemStack rotor_blade_T1 = ItemUtils.getSimpleStack(IC2Items.rotor_Blade_Material_1.getItem()); + private static ItemStack rotor_blade_T2 = ItemUtils.getSimpleStack(IC2Items.rotor_Blade_Material_2.getItem()); + private static ItemStack rotor_blade_T3 = ItemUtils.getSimpleStack(IC2Items.rotor_Blade_Material_3.getItem()); + private static ItemStack rotor_blade_T4 = ItemUtils.getSimpleStack(IC2Items.rotor_Blade_Material_4.getItem()); - private static ItemStack shaft_T1 = ItemUtils.getSimpleStack(IC2_Items.shaft_Material_1.getItem()); - private static ItemStack shaft_T2 = ItemUtils.getSimpleStack(IC2_Items.shaft_Material_2.getItem()); - private static ItemStack shaft_T3 = ItemUtils.getSimpleStack(IC2_Items.shaft_Material_3.getItem()); - private static ItemStack shaft_T4 = ItemUtils.getSimpleStack(IC2_Items.shaft_Material_4.getItem()); + private static ItemStack shaft_T1 = ItemUtils.getSimpleStack(IC2Items.shaft_Material_1.getItem()); + private static ItemStack shaft_T2 = ItemUtils.getSimpleStack(IC2Items.shaft_Material_2.getItem()); + private static ItemStack shaft_T3 = ItemUtils.getSimpleStack(IC2Items.shaft_Material_3.getItem()); + private static ItemStack shaft_T4 = ItemUtils.getSimpleStack(IC2Items.shaft_Material_4.getItem()); - private static ItemStack rotor_T1 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_1.getItem()); - private static ItemStack rotor_T2 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_2.getItem()); - private static ItemStack rotor_T3 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_3.getItem()); - private static ItemStack rotor_T4 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_4.getItem()); + private static ItemStack rotor_T1 = ItemUtils.getSimpleStack(IC2Items.rotor_Material_1.getItem()); + private static ItemStack rotor_T2 = ItemUtils.getSimpleStack(IC2Items.rotor_Material_2.getItem()); + private static ItemStack rotor_T3 = ItemUtils.getSimpleStack(IC2Items.rotor_Material_3.getItem()); + private static ItemStack rotor_T4 = ItemUtils.getSimpleStack(IC2Items.rotor_Material_4.getItem()); private static boolean checkForEnderIO() { if (!EnderIO.isModLoaded()) { @@ -79,10 +79,10 @@ public class RECIPE_IC2 { plate_T3 = "plateUltimet"; plate_T4 = "plateAlloyIridium"; - block_T1 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Magnalium, 1L); - block_T2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L); - block_T3 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Ultimet, 1L); - block_T4 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 1L); + block_T1 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Magnalium, 1L); + block_T2 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L); + block_T3 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Ultimet, 1L); + block_T4 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 1L); ingot_T1 = "ingotMagnalium"; ingot_T2 = "ingotTungstenSteel"; @@ -147,88 +147,80 @@ public class RECIPE_IC2 { rotor_blade_T4); // Shaft Extruder Recipe - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Shape_Extruder_WindmillShaft.get(1L), - GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE, + GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE, new Object[] { "hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod, Character.valueOf('X'), OrePrefixes.plate.get(Materials.DarkSteel), Character.valueOf('S'), OrePrefixes.screw.get(Materials.DarkSteel) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Shape_Extruder_WindmillShaft.get(1L), - GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE, + GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE, new Object[] { "hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod, Character.valueOf('X'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('S'), OrePrefixes.screw.get(Materials.TungstenSteel) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Shape_Extruder_WindmillShaft.get(1L), - GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE, + GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE, new Object[] { "hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod, Character.valueOf('X'), OrePrefixes.plate.get(Materials.Molybdenum), Character.valueOf('S'), OrePrefixes.screw.get(Materials.Molybdenum) }); Logger.INFO("Added recipe item for GT5 Extruder: Shaft Shape"); // Shaft Recipes - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9L, block_T1), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9L, block_T1), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) .itemOutputs(shaft_T1) .duration(2 * MINUTES + 8 * SECONDS) .eut(250) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(1L, shaft_block_T1), - GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1L, shaft_block_T1), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) .itemOutputs(shaft_T1) .duration(2 * MINUTES + 8 * SECONDS) .eut(250) .addTo(extruderRecipes); Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Energetic]"); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9L, block_T2), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9L, block_T2), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) .itemOutputs(shaft_T2) .duration(4 * MINUTES + 16 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(1L, shaft_block_T2), - GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1L, shaft_block_T2), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) .itemOutputs(shaft_T2) .duration(4 * MINUTES + 16 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(extruderRecipes); Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [TungstenSteel]"); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9L, block_T3), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9L, block_T3), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) .itemOutputs(shaft_T3) .duration(8 * MINUTES + 32 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(1L, shaft_block_T3), - GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1L, shaft_block_T3), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) .itemOutputs(shaft_T3) .duration(8 * MINUTES + 32 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(extruderRecipes); Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Vibrant]"); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9L, block_T4), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9L, block_T4), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) .itemOutputs(shaft_T4) .duration(17 * MINUTES + 4 * SECONDS) .eut(4000) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(1L, shaft_block_T4), - GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1L, shaft_block_T4), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) .itemOutputs(shaft_T4) .duration(17 * MINUTES + 4 * SECONDS) .eut(4000) @@ -297,10 +289,10 @@ public class RECIPE_IC2 { ItemStack aGearSmallSteel = CI.getTieredComponentOfMaterial(Materials.Steel, OrePrefixes.gearGtSmall, 1); ItemStack aGearSmallAluminium = CI .getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.gearGtSmall, 1); - ItemStack aGearPotin = ALLOY.TUMBAGA.getGear(1); - ItemStack aGearSiliconCarbide = ALLOY.SILICON_CARBIDE.getGear(1); + ItemStack aGearPotin = MaterialsAlloy.TUMBAGA.getGear(1); + ItemStack aGearSiliconCarbide = MaterialsAlloy.SILICON_CARBIDE.getGear(1); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(2), aBasicHazmatPieces[0], @@ -313,7 +305,7 @@ public class RECIPE_IC2 { .duration(30 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(2), aBasicHazmatPieces[1], @@ -326,7 +318,7 @@ public class RECIPE_IC2 { .duration(1 * MINUTES + 30 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(2), aBasicHazmatPieces[2], @@ -339,7 +331,7 @@ public class RECIPE_IC2 { .duration(1 * MINUTES + 15 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(2), aBasicHazmatPieces[3], diff --git a/src/main/java/gtPlusPlus/xmod/pamsharvest/fishtrap/FishTrapHandler.java b/src/main/java/gtPlusPlus/xmod/pamsharvest/fishtrap/FishTrapHandler.java index ee51f28eaa..79a2d61e86 100644 --- a/src/main/java/gtPlusPlus/xmod/pamsharvest/fishtrap/FishTrapHandler.java +++ b/src/main/java/gtPlusPlus/xmod/pamsharvest/fishtrap/FishTrapHandler.java @@ -3,10 +3,10 @@ package gtPlusPlus.xmod.pamsharvest.fishtrap; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -23,7 +23,7 @@ public class FishTrapHandler { for (String fish : harvestcraftFish) { final String itemName = prefix + fish + suffix; if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken(itemName, 1) != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 1), @@ -32,13 +32,13 @@ public class FishTrapHandler { .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1)) .fluidOutputs(FluidUtils.getFluidStack("methane", 48)) .duration(19 * SECONDS + 4 * TICKS) .eut(5) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1)) .fluidOutputs(FluidUtils.getFluidStack("fishoil", 50)) .duration(16 * TICKS) @@ -47,7 +47,7 @@ public class FishTrapHandler { } } if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken(greenheartFish, 1) != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1)) .itemOutputs( ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 1), @@ -56,13 +56,13 @@ public class FishTrapHandler { .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1)) .fluidOutputs(FluidUtils.getFluidStack("methane", 48)) .duration(19 * SECONDS + 4 * TICKS) .eut(5) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1)) .fluidOutputs(FluidUtils.getFluidStack("fishoil", 50)) .duration(16 * TICKS) diff --git a/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java b/src/main/java/gtPlusPlus/xmod/railcraft/HandlerRailcraft.java index 7e920565e8..4587a86a10 100644 --- a/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java +++ b/src/main/java/gtPlusPlus/xmod/railcraft/HandlerRailcraft.java @@ -4,9 +4,9 @@ import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.cokeOvenRecipes; import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc; @@ -14,18 +14,18 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.base.BaseItemBurnable; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.railcraft.utils.RailcraftUtils; -public class HANDLER_Railcraft { +public class HandlerRailcraft { public static void preInit() { // Register Custom Coal Coke @@ -102,16 +102,16 @@ public class HANDLER_Railcraft { for (int i = 0; i < aOutputs.length; i++) { // Recipes for the Charcoals and Cokes, outputting either Creosote or Charcoal Byproducts depending on the // fluid input - GT_Values.RA.stdBuilder() - .itemInputs(aInputs1[i], GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(aInputs1[i], GTUtility.getIntegratedCircuit(3)) .itemOutputs(aInputs2[i]) .fluidOutputs(FluidUtils.getFluidStack("creosote", 100)) .eut(16) .duration(1 * SECONDS) .addTo(cokeOvenRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aInputs1[i], GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(aInputs1[i], GTUtility.getIntegratedCircuit(4)) .itemOutputs(aInputs2[i]) .fluidInputs(FluidUtils.getFluidStack("nitrogen", 100)) .fluidOutputs(FluidUtils.getFluidStack("charcoal_byproducts", 200)) @@ -119,16 +119,16 @@ public class HANDLER_Railcraft { .duration(10 * TICKS) .addTo(cokeOvenRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aInputs2[i], GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(aInputs2[i], GTUtility.getIntegratedCircuit(3)) .itemOutputs(aOutputs[i]) .fluidOutputs(FluidUtils.getFluidStack("creosote", 200)) .eut(16) .duration(2 * SECONDS) .addTo(cokeOvenRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aInputs2[i], GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(aInputs2[i], GTUtility.getIntegratedCircuit(4)) .itemOutputs(aOutputs[i]) .fluidInputs(FluidUtils.getFluidStack("nitrogen", 50)) .fluidOutputs(FluidUtils.getFluidStack("charcoal_byproducts", 100)) @@ -137,8 +137,8 @@ public class HANDLER_Railcraft { .addTo(cokeOvenRecipes); // Generate Wood Tar and Wood Gas from these Cokes - GT_Values.RA.stdBuilder() - .itemInputs(aOutputs[i], GT_Utility.getIntegratedCircuit(5)) + GTValues.RA.stdBuilder() + .itemInputs(aOutputs[i], GTUtility.getIntegratedCircuit(5)) .itemOutputs(Materials.Ash.getDustSmall(1)) .fluidInputs(FluidUtils.getFluidStack("steam", 100)) .fluidOutputs(Materials.WoodTar.getFluid(200)) @@ -146,8 +146,8 @@ public class HANDLER_Railcraft { .duration(3 * SECONDS) .addTo(cokeOvenRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aOutputs[i], GT_Utility.getIntegratedCircuit(6)) + GTValues.RA.stdBuilder() + .itemInputs(aOutputs[i], GTUtility.getIntegratedCircuit(6)) .itemOutputs(Materials.Ash.getDustSmall(1)) .fluidInputs(FluidUtils.getFluidStack("steam", 100)) .fluidOutputs(Materials.WoodGas.getGas(300)) @@ -156,9 +156,9 @@ public class HANDLER_Railcraft { .addTo(cokeOvenRecipes); // Fluid Extracting the Charcoals for Wood Tar - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aInputs2[i]) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1L)) .outputChances(1000) .fluidOutputs(Materials.WoodTar.getFluid(50L)) .duration(1 * SECONDS + 10 * TICKS) @@ -167,8 +167,8 @@ public class HANDLER_Railcraft { // Processing the Charcoals with Oxygen to get CO and CO2 // C + O = CO - GT_Values.RA.stdBuilder() - .itemInputs(aInputs2[i], GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(aInputs2[i], GTUtility.getIntegratedCircuit(1)) .itemOutputs(Materials.Ash.getDustTiny(1)) .fluidInputs(Materials.Oxygen.getGas(500)) .fluidOutputs(Materials.CarbonMonoxide.getGas(500)) @@ -176,8 +176,8 @@ public class HANDLER_Railcraft { .eut(8) .addTo(UniversalChemical); // C + 2O = CO2 - GT_Values.RA.stdBuilder() - .itemInputs(aInputs2[i], GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(aInputs2[i], GTUtility.getIntegratedCircuit(2)) .itemOutputs(Materials.Ash.getDustTiny(1)) .fluidInputs(Materials.Oxygen.getGas(2000)) .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java deleted file mode 100644 index 460a5e9fbe..0000000000 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java +++ /dev/null @@ -1,36 +0,0 @@ -package gtPlusPlus.xmod.thermalfoundation; - -import static gregtech.api.enums.Mods.COFHCore; - -import gtPlusPlus.xmod.thermalfoundation.block.TF_Blocks; -import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; -import gtPlusPlus.xmod.thermalfoundation.item.TF_Items; -import gtPlusPlus.xmod.thermalfoundation.recipe.TF_Gregtech_Recipes; - -public class HANDLER_TF { - - public static void preInit() { - if (COFHCore.isModLoaded()) { - TF_Fluids.preInit(); - TF_Items.preInit(); - TF_Blocks.preInit(); - } - } - - public static void init() { - if (COFHCore.isModLoaded()) { - TF_Fluids.init(); - TF_Blocks.init(); - TF_Items.init(); - } - } - - public static void postInit() { - if (COFHCore.isModLoaded()) { - TF_Fluids.postInit(); - TF_Items.postInit(); - TF_Blocks.postInit(); - TF_Gregtech_Recipes.run(); - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/HandlerTF.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/HandlerTF.java new file mode 100644 index 0000000000..cb8b2c38c3 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/HandlerTF.java @@ -0,0 +1,36 @@ +package gtPlusPlus.xmod.thermalfoundation; + +import static gregtech.api.enums.Mods.COFHCore; + +import gtPlusPlus.xmod.thermalfoundation.block.TFBlocks; +import gtPlusPlus.xmod.thermalfoundation.fluid.TFFluids; +import gtPlusPlus.xmod.thermalfoundation.item.TFItems; +import gtPlusPlus.xmod.thermalfoundation.recipe.TFGregtechRecipes; + +public class HandlerTF { + + public static void preInit() { + if (COFHCore.isModLoaded()) { + TFFluids.preInit(); + TFItems.preInit(); + TFBlocks.preInit(); + } + } + + public static void init() { + if (COFHCore.isModLoaded()) { + TFFluids.init(); + TFBlocks.init(); + TFItems.init(); + } + } + + public static void postInit() { + if (COFHCore.isModLoaded()) { + TFFluids.postInit(); + TFItems.postInit(); + TFBlocks.postInit(); + TFGregtechRecipes.run(); + } + } +} diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidCryotheum.java index b48be445e5..0fefa79686 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidCryotheum.java @@ -26,16 +26,16 @@ import cofh.lib.util.BlockWrapper; import cofh.lib.util.helpers.DamageHelper; import cofh.lib.util.helpers.ServerHelper; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; +import gtPlusPlus.xmod.thermalfoundation.fluid.TFFluids; -public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive { +public class TFBlockFluidCryotheum extends BlockFluidInteractive { public static final Material materialFluidCryotheum = new MaterialLiquid(MapColor.iceColor); private static boolean enableSourceFall = true; private static boolean effect = true; - public TF_Block_Fluid_Cryotheum() { - super(GTPlusPlus.ID, TF_Fluids.fluidCryotheum, materialFluidCryotheum, "cryotheum"); + public TFBlockFluidCryotheum() { + super(GTPlusPlus.ID, TFFluids.fluidCryotheum, materialFluidCryotheum, "cryotheum"); this.setQuantaPerBlock(5); this.setTickRate(15); @@ -116,7 +116,7 @@ public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive { @Override public int getLightValue(final IBlockAccess paramIBlockAccess, final int paramInt1, final int paramInt2, final int paramInt3) { - return TF_Fluids.fluidCryotheum.getLuminosity(); + return TFFluids.fluidCryotheum.getLuminosity(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidEnder.java index 9f89d01250..1f7c1fec93 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidEnder.java @@ -12,15 +12,15 @@ import net.minecraft.world.World; import cofh.core.fluid.BlockFluidCoFHBase; import cofh.core.util.CoreUtils; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; +import gtPlusPlus.xmod.thermalfoundation.fluid.TFFluids; -public class TF_Block_Fluid_Ender extends BlockFluidCoFHBase { +public class TFBlockFluidEnder extends BlockFluidCoFHBase { public static final Material materialFluidEnder = new MaterialLiquid(MapColor.greenColor); private static boolean effect = true; - public TF_Block_Fluid_Ender() { - super(GTPlusPlus.ID, TF_Fluids.fluidEnder, materialFluidEnder, "ender"); + public TFBlockFluidEnder() { + super(GTPlusPlus.ID, TFFluids.fluidEnder, materialFluidEnder, "ender"); setQuantaPerBlock(4); setTickRate(20); @@ -56,6 +56,6 @@ public class TF_Block_Fluid_Ender extends BlockFluidCoFHBase { @Override public int getLightValue(IBlockAccess paramIBlockAccess, int paramInt1, int paramInt2, int paramInt3) { - return TF_Fluids.fluidEnder.getLuminosity(); + return TFFluids.fluidEnder.getLuminosity(); } } diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidPyrotheum.java index 90c8be8bf7..1014667355 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidPyrotheum.java @@ -18,16 +18,16 @@ import cofh.core.fluid.BlockFluidInteractive; import cofh.lib.util.BlockWrapper; import cofh.lib.util.helpers.ServerHelper; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; +import gtPlusPlus.xmod.thermalfoundation.fluid.TFFluids; -public class TF_Block_Fluid_Pyrotheum extends BlockFluidInteractive { +public class TFBlockFluidPyrotheum extends BlockFluidInteractive { Random random = new Random(); private static boolean effect = true; private static boolean enableSourceFall = true; - public TF_Block_Fluid_Pyrotheum() { - super(GTPlusPlus.ID, TF_Fluids.fluidPyrotheum, Material.lava, "pyrotheum"); + public TFBlockFluidPyrotheum() { + super(GTPlusPlus.ID, TFFluids.fluidPyrotheum, Material.lava, "pyrotheum"); this.setQuantaPerBlock(5); this.setTickRate(10); @@ -89,7 +89,7 @@ public class TF_Block_Fluid_Pyrotheum extends BlockFluidInteractive { @Override public int getLightValue(final IBlockAccess paramIBlockAccess, final int paramInt1, final int paramInt2, final int paramInt3) { - return TF_Fluids.fluidPyrotheum.getLuminosity(); + return TFFluids.fluidPyrotheum.getLuminosity(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlocks.java index 38fed4c137..4e238ae5f5 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlocks.java @@ -2,16 +2,16 @@ package gtPlusPlus.xmod.thermalfoundation.block; import cofh.core.fluid.BlockFluidCoFHBase; -public class TF_Blocks { +public class TFBlocks { public static BlockFluidCoFHBase blockFluidPyrotheum; public static BlockFluidCoFHBase blockFluidCryotheum; public static BlockFluidCoFHBase blockFluidEnder; public static void preInit() { - blockFluidPyrotheum = new TF_Block_Fluid_Pyrotheum(); - blockFluidCryotheum = new TF_Block_Fluid_Cryotheum(); - blockFluidEnder = new TF_Block_Fluid_Ender(); + blockFluidPyrotheum = new TFBlockFluidPyrotheum(); + blockFluidCryotheum = new TFBlockFluidCryotheum(); + blockFluidEnder = new TFBlockFluidEnder(); blockFluidPyrotheum.preInit(); blockFluidCryotheum.preInit(); blockFluidEnder.preInit(); diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TFFluids.java index 63d0c49b2f..61832d630d 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TFFluids.java @@ -5,7 +5,7 @@ import net.minecraftforge.fluids.FluidRegistry; import gtPlusPlus.api.objects.Logger; -public class TF_Fluids { +public class TFFluids { public static Fluid fluidPyrotheum; public static Fluid fluidCryotheum; diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TFItems.java index d2ea7ea2d1..556b11483f 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TFItems.java @@ -10,10 +10,10 @@ import cofh.core.util.fluid.BucketHandler; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.thermalfoundation.block.TF_Blocks; -import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; +import gtPlusPlus.xmod.thermalfoundation.block.TFBlocks; +import gtPlusPlus.xmod.thermalfoundation.fluid.TFFluids; -public class TF_Items { +public class TFItems { public static ItemBase itemMaterial; public static ItemStack rodBlizz; @@ -60,15 +60,15 @@ public class TF_Items { public static void init() { - BucketHandler.registerBucket(TF_Blocks.blockFluidPyrotheum, 0, bucketPyrotheum); - BucketHandler.registerBucket(TF_Blocks.blockFluidCryotheum, 0, bucketCryotheum); - BucketHandler.registerBucket(TF_Blocks.blockFluidEnder, 0, bucketEnder); + BucketHandler.registerBucket(TFBlocks.blockFluidPyrotheum, 0, bucketPyrotheum); + BucketHandler.registerBucket(TFBlocks.blockFluidCryotheum, 0, bucketCryotheum); + BucketHandler.registerBucket(TFBlocks.blockFluidEnder, 0, bucketEnder); FluidContainerRegistry - .registerFluidContainer(TF_Fluids.fluidPyrotheum, bucketPyrotheum, FluidContainerRegistry.EMPTY_BUCKET); + .registerFluidContainer(TFFluids.fluidPyrotheum, bucketPyrotheum, FluidContainerRegistry.EMPTY_BUCKET); FluidContainerRegistry - .registerFluidContainer(TF_Fluids.fluidCryotheum, bucketCryotheum, FluidContainerRegistry.EMPTY_BUCKET); + .registerFluidContainer(TFFluids.fluidCryotheum, bucketCryotheum, FluidContainerRegistry.EMPTY_BUCKET); FluidContainerRegistry - .registerFluidContainer(TF_Fluids.fluidEnder, bucketEnder, FluidContainerRegistry.EMPTY_BUCKET); + .registerFluidContainer(TFFluids.fluidEnder, bucketEnder, FluidContainerRegistry.EMPTY_BUCKET); } public static void postInit() {} diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TFGregtechRecipes.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TFGregtechRecipes.java new file mode 100644 index 0000000000..52b85d6a19 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TFGregtechRecipes.java @@ -0,0 +1,93 @@ +package gtPlusPlus.xmod.thermalfoundation.recipe; + +import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes; +import static gregtech.api.recipe.RecipeMaps.mixerRecipes; +import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +import gregtech.api.enums.GTValues; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; +import gregtech.api.util.GTOreDictUnificator; +import gtPlusPlus.core.util.minecraft.FluidUtils; + +public class TFGregtechRecipes { + + public static void run() { + start(); + } + + private static void start() { + + final FluidStack moltenBlaze = getFluidStack("molten.blaze", 1440); + + // Gelid Cryotheum + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.ore, Materials.Cinnabar, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cinnabar, 3L)) + .fluidInputs(getFluidStack("cryotheum", 144)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(chemicalBathRecipes); + + // Blizz Powder + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(Items.snowball, 4)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Blizz, 1L)) + .fluidInputs(moltenBlaze) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV / 2) + .addTo(chemicalBathRecipes); + + // Blizz Rod + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(Items.blaze_rod)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stick, Materials.Blizz, 1L)) + .duration(((int) Math.max((Materials.Blaze.getMass() * 4) * 3L, 1L)) * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(vacuumFreezerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Pyrotheum, 1L)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(mixerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Snow, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Blizz, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cryotheum, 1L)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(mixerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Niter, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Snow, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Blizz, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cryotheum, 1L)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(mixerRecipes); + } + + private static FluidStack getFluidStack(final String fluidName, final int amount) { + return FluidUtils.getFluidStack(fluidName, amount); + } +} diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java deleted file mode 100644 index cd48964d37..0000000000 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java +++ /dev/null @@ -1,93 +0,0 @@ -package gtPlusPlus.xmod.thermalfoundation.recipe; - -import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes; -import static gregtech.api.recipe.RecipeMaps.mixerRecipes; -import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; - -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; -import gtPlusPlus.core.util.minecraft.FluidUtils; - -public class TF_Gregtech_Recipes { - - public static void run() { - start(); - } - - private static void start() { - - final FluidStack moltenBlaze = getFluidStack("molten.blaze", 1440); - - // Gelid Cryotheum - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ore, Materials.Cinnabar, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cinnabar, 3L)) - .fluidInputs(getFluidStack("cryotheum", 144)) - .duration(20 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(chemicalBathRecipes); - - // Blizz Powder - GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.snowball, 4)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blizz, 1L)) - .fluidInputs(moltenBlaze) - .duration(20 * SECONDS) - .eut(TierEU.RECIPE_HV / 2) - .addTo(chemicalBathRecipes); - - // Blizz Rod - GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.blaze_rod)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Blizz, 1L)) - .duration(((int) Math.max((Materials.Blaze.getMass() * 4) * 3L, 1L)) * TICKS) - .eut(TierEU.RECIPE_MV) - .addTo(vacuumFreezerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Pyrotheum, 1L)) - .duration(8 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(mixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Snow, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blizz, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cryotheum, 1L)) - .duration(8 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(mixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Niter, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Snow, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blizz, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cryotheum, 1L)) - .duration(8 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(mixerRecipes); - } - - private static FluidStack getFluidStack(final String fluidName, final int amount) { - return FluidUtils.getFluidStack(fluidName, amount); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java b/src/main/java/gtPlusPlus/xmod/tinkers/HandlerTinkers.java index 1023d0325f..5dbde33493 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/HandlerTinkers.java @@ -10,7 +10,7 @@ import gtPlusPlus.xmod.tinkers.material.BaseTinkersMaterial; import gtPlusPlus.xmod.tinkers.util.TinkersDryingRecipe; import gtPlusPlus.xmod.tinkers.util.TinkersUtils; -public class HANDLER_Tinkers { +public class HandlerTinkers { public static AutoMap<BaseTinkersMaterial> mTinkerMaterials = new AutoMap<>(); diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java b/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java index f57aa64263..5a4984a898 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java @@ -15,7 +15,7 @@ import cpw.mods.fml.common.event.FMLInterModComms; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.xmod.tinkers.HANDLER_Tinkers; +import gtPlusPlus.xmod.tinkers.HandlerTinkers; import gtPlusPlus.xmod.tinkers.util.TinkersUtils; public class BaseTinkersMaterial { @@ -40,7 +40,7 @@ public class BaseTinkersMaterial { mID = aNextFreeID++; Logger.INFO("[TiCon] Assigning ID " + mID + " to " + mLocalName + "."); aInternalMaterialIdMap.put(mUnlocalName, mID); - HANDLER_Tinkers.mTinkerMaterials.put(this); + HandlerTinkers.mTinkerMaterials.put(this); } public String getUnlocalName() { diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java index 44fb9d12b7..4adac363e8 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java @@ -9,9 +9,9 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -42,8 +42,8 @@ public class TinkersDryingRecipe { if (!recipes.isEmpty()) { Logger.INFO("Adding " + recipes.size() + " drying rack recipes to the dehydrator."); for (TinkersDryingRecipe r : recipes) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(16), r.input) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(16), r.input) .itemOutputs(r.result) .eut(TierEU.RECIPE_LV) .duration(r.time / 10) |