From 45ca80fa77d081c500cc6df0799a2e824912fd62 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Tue, 14 Apr 2020 19:35:14 +0100 Subject: $ Added recipe hashing to prevent unwanted recipe changes. $ Made certain TileEntities blacklisted against the World accelerator in both GT++ & GTNH. --- src/Java/gtPlusPlus/GTplusplus.java | 21 +++--- .../api/interfaces/IComparableRecipe.java | 2 +- .../core/item/chemistry/RocketFuels.java | 20 +++--- .../core/slots/SlotChemicalPlantInput.java | 8 +-- .../core/tileentities/ModTileEntities.java | 7 ++ .../gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java | 6 +- .../gtPlusPlus/nei/GTPP_NEI_DefaultHandlerEx.java | 6 +- src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java | 14 ++-- src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java | 18 ++--- src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java | 16 ++--- .../gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java | 20 +++--- src/Java/gtPlusPlus/nei/GT_NEI_VacFurnace.java | 14 ++-- src/Java/gtPlusPlus/nei/NEI_GT_Config.java | 16 ++--- .../xmod/gregtech/common/Meta_GT_Proxy.java | 56 ++++++++++++---- .../common/items/MetaGeneratedGregtechItems.java | 10 +-- .../GT_MetaTileEntity_SemiFluidGenerator.java | 4 +- .../GregtechMetaTileEntityRocketFuelGenerator.java | 4 +- .../generators/GregtechMetaTileEntity_RTG.java | 4 +- .../basic/GregtechMetaTileEntity_BasicWasher.java | 4 +- .../GregtechMetaTileEntity_ChemicalReactor.java | 2 +- ...regtechMetaTileEntity_CompactFusionReactor.java | 4 +- .../basic/GregtechMetaTileEntity_PocketFusion.java | 4 +- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 4 +- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 4 +- ...regtechMetaTileEntity_IndustrialDehydrator.java | 4 +- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 2 +- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 8 +-- .../processing/GregtechMetaTileEntity_IsaMill.java | 4 +- .../multi/production/GT4Entity_ThermalBoiler.java | 4 +- .../production/GregtechMTE_FrothFlotationCell.java | 4 +- .../production/GregtechMTE_MiniFusionPlant.java | 4 +- .../production/GregtechMTE_NuclearReactor.java | 4 +- .../GregtechMetaTileEntityGeneratorArray.java | 10 +-- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 6 +- .../GregtechMetaTileEntity_Cyclotron.java | 4 +- ...egtechMetaTileEntity_IndustrialFishingPond.java | 4 +- .../GregtechMetaTileEntity_LargeRocketEngine.java | 4 +- ...techMetaTileEntity_LargeSemifluidGenerator.java | 4 +- .../GregtechMetaTileEntity_MassFabricator.java | 6 +- .../chemplant/GregtechMTE_ChemicalPlant.java | 8 +-- .../gregtech/loaders/RecipeGen_FluidCanning.java | 4 +- .../xmod/gregtech/loaders/RecipeGen_Plates.java | 13 +--- .../loaders/misc/AddCustomMachineToPA.java | 6 +- .../loaders/recipe/RecipeLoader_AlgaeFarm.java | 4 +- .../gregtech/loaders/recipe/RecipeLoader_LFTR.java | 14 ++-- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 78 +++++++++++----------- .../xmod/gregtech/recipes/RecipesToRemove.java | 6 +- .../gregtech/GregtechAdvancedMixer.java | 10 +-- .../gregtech/GregtechComponentAssembler.java | 18 ++--- .../registration/gregtech/GregtechDehydrator.java | 14 ++-- .../gregtech/GregtechIndustrialMassFabricator.java | 60 ++++++++--------- .../gregtech/GregtechMiniRaFusion.java | 6 +- .../gregtech/GregtechSimpleWasher.java | 12 ++-- 53 files changed, 313 insertions(+), 280 deletions(-) (limited to 'src/Java/gtPlusPlus') diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index 6a0de88b05..339c0125fb 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -19,6 +19,7 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; import gregtech.api.enums.Textures.BlockIcons; import gregtech.api.util.*; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map_Internal; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.chunkloading.GTPP_ChunkManager; @@ -197,7 +198,7 @@ public class GTplusplus implements ActionListener { //SprinklerHandler.registerModFerts(); BlockEventHandler.init(); - Recipe_GT.reInit(); + GTPP_Recipe.reInit(); Logger.INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"); Logger.INFO("| Recipes succesfully Loaded: " + RegistrationHandler.recipesSuccess + " | Failed: " @@ -249,11 +250,15 @@ public class GTplusplus implements ActionListener { public void onLoadComplete(FMLLoadCompleteEvent event) { proxy.onLoadComplete(event); generateGregtechRecipeMaps(); + // Check our maps ar euntouched + Logger.INFO("Making sure that all GT++ recipes are untouched."); + GTPP_Recipe.checkRecipeModifications(); + Logger.INFO("Passed verification checks."); } @Mod.EventHandler public void onIDChangingEvent(FMLModIdMappingEvent aEvent) { - Recipe_GT.reInit(); + GTPP_Recipe.reInit(); } public static void tryPatchTurbineTextures() { @@ -313,9 +318,9 @@ public class GTplusplus implements ActionListener { } } - if (Recipe_GT.Gregtech_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList.size() < 1) { - for (GT_Recipe a : Recipe_GT.Gregtech_Recipe_Map.sMultiblockCentrifugeRecipes.mRecipeList) { - Recipe_GT.Gregtech_Recipe_Map.sMultiblockCentrifugeRecipes_GT.add(a); + if (GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList.size() < 1) { + for (GT_Recipe a : GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes.mRecipeList) { + GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.add(a); } } @@ -344,9 +349,9 @@ public class GTplusplus implements ActionListener { } } - if (Recipe_GT.Gregtech_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.mRecipeList.size() < 1) { - for (GT_Recipe a : Recipe_GT.Gregtech_Recipe_Map.sMultiblockElectrolyzerRecipes.mRecipeList) { - Recipe_GT.Gregtech_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.add(a); + if (GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.mRecipeList.size() < 1) { + for (GT_Recipe a : GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes.mRecipeList) { + GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.add(a); } } diff --git a/src/Java/gtPlusPlus/api/interfaces/IComparableRecipe.java b/src/Java/gtPlusPlus/api/interfaces/IComparableRecipe.java index 5d79fd8a51..ddbf9f38bb 100644 --- a/src/Java/gtPlusPlus/api/interfaces/IComparableRecipe.java +++ b/src/Java/gtPlusPlus/api/interfaces/IComparableRecipe.java @@ -1,7 +1,7 @@ package gtPlusPlus.api.interfaces; import gregtech.api.util.GT_Recipe; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; public interface IComparableRecipe extends Comparable{ diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java index 7745f50010..719e5145e9 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -9,7 +9,7 @@ import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.ItemPackage; @@ -281,8 +281,8 @@ public class RocketFuels extends ItemPackage { } private static void addRocketFuelsToMap() { - HashMap mRocketFuels = new LinkedHashMap(); - mRocketFuels.put(0, new Recipe_GT( + HashMap mRocketFuels = new LinkedHashMap(); + mRocketFuels.put(0, new GTPP_Recipe( true, new ItemStack[] {}, new ItemStack[] {}, @@ -294,7 +294,7 @@ public class RocketFuels extends ItemPackage { 0, 256)); //Fuel Value - mRocketFuels.put(1, new Recipe_GT( + mRocketFuels.put(1, new GTPP_Recipe( true, new ItemStack[] {}, new ItemStack[] {}, @@ -306,7 +306,7 @@ public class RocketFuels extends ItemPackage { 0, 512)); //Fuel Value - mRocketFuels.put(2, new Recipe_GT( + mRocketFuels.put(2, new GTPP_Recipe( true, new ItemStack[] {}, new ItemStack[] {}, @@ -318,7 +318,7 @@ public class RocketFuels extends ItemPackage { 0, 768)); //Fuel Value - mRocketFuels.put(3, new Recipe_GT( + mRocketFuels.put(3, new GTPP_Recipe( true, new ItemStack[] {}, new ItemStack[] {}, @@ -336,11 +336,11 @@ public class RocketFuels extends ItemPackage { mValidRocketFuelNames.add(FluidRegistry.getFluidName(Diesel)); for (int mID : mRocketFuels.keySet()) { - Recipe_GT aFuelRecipe = mRocketFuels.get(mID); + GTPP_Recipe aFuelRecipe = mRocketFuels.get(mID); if (aFuelRecipe != null) { mValidRocketFuelNames.add(FluidRegistry.getFluidName(aFuelRecipe.mFluidInputs[0].getFluid())); mValidRocketFuels.put(mID, aFuelRecipe.mFluidInputs[0].getFluid()); - Recipe_GT.Gregtech_Recipe_Map.sRocketFuels.add(aFuelRecipe); + GTPP_Recipe.GTPP_Recipe_Map.sRocketFuels.add(aFuelRecipe); } } @@ -1007,8 +1007,8 @@ public class RocketFuels extends ItemPackage { return true; } - private static Recipe_GT getHalfBakedRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, int aEU) { - return new Recipe_GT(false, aInputs, null, null, null, aFluidInputs, null, 0, aEU, 0); + private static GTPP_Recipe getHalfBakedRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, int aEU) { + return new GTPP_Recipe(false, aInputs, null, null, null, aFluidInputs, null, 0, aEU, 0); } diff --git a/src/Java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java b/src/Java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java index add55b8d27..4b9cda0b9b 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java +++ b/src/Java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java @@ -1,7 +1,7 @@ package gtPlusPlus.core.slots; -import gregtech.api.util.Recipe_GT; -import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -20,9 +20,9 @@ public class SlotChemicalPlantInput extends Slot { } public static boolean isItemValidForChemicalPlantSlot(ItemStack aStack) { - boolean validItem = Gregtech_Recipe_Map.sChemicalPlantRecipes.containsInput(aStack); + boolean validItem = GTPP_Recipe_Map.sChemicalPlantRecipes.containsInput(aStack); if (!validItem) { - for (Recipe_GT f : Gregtech_Recipe_Map.sChemicalPlantRecipes.mRecipeList) { + for (GTPP_Recipe f : GTPP_Recipe_Map.sChemicalPlantRecipes.mRecipeList) { if (f.mFluidInputs.length > 0) { for (FluidStack g : f.mFluidInputs) { if (g != null) { diff --git a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java index e7b7c46e7b..2d389d8bb2 100644 --- a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java +++ b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java @@ -22,6 +22,7 @@ import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable; import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench; import gtPlusPlus.core.tileentities.machines.TileEntityWorkbenchAdvanced; import gtPlusPlus.plugin.villagers.tile.TileEntityGenericSpawner; +import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; public class ModTileEntities { @@ -52,6 +53,12 @@ public class ModTileEntities { if (LoadedMods.Thaumcraft){ } + blacklistTilesFromAcceleration(); + } + + private static void blacklistTilesFromAcceleration() { + Meta_GT_Proxy.setTileEntityClassAsBlacklistedInWorldAccelerator("gtPlusPlus.core.tileentities.general.TileEntityFishTrap"); + Meta_GT_Proxy.setTileEntityClassAsBlacklistedInWorldAccelerator("gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest"); } } diff --git a/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java b/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java index 279f45f756..12c1b501bd 100644 --- a/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java +++ b/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java @@ -19,7 +19,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.gui.GT_GUIContainer_BasicMachine; import gregtech.api.objects.ItemData; import gregtech.api.util.*; -import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; import gregtech.common.gui.GT_GUIContainer_FusionReactor; import gregtech.common.gui.GT_GUIContainer_PrimitiveBlastFurnace; import net.minecraft.client.Minecraft; @@ -39,9 +39,9 @@ public class GTPP_NEI_DefaultHandler GuiContainerManager.addTooltipHandler(new GT_RectHandler()); } - protected final Gregtech_Recipe_Map mRecipeMap; + protected final GTPP_Recipe_Map mRecipeMap; - public GTPP_NEI_DefaultHandler(Gregtech_Recipe_Map tMap) { + public GTPP_NEI_DefaultHandler(GTPP_Recipe_Map tMap) { this.mRecipeMap = tMap; this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), getOverlayIdentifier(), new Object[0])); if (!NEI_GT_Config.sIsAdded) { diff --git a/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandlerEx.java b/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandlerEx.java index 8bf048730a..0d9fc52943 100644 --- a/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandlerEx.java +++ b/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandlerEx.java @@ -19,7 +19,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.gui.GT_GUIContainer_BasicMachine; import gregtech.api.objects.ItemData; import gregtech.api.util.*; -import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; import gregtech.common.gui.GT_GUIContainer_FusionReactor; import gregtech.common.gui.GT_GUIContainer_PrimitiveBlastFurnace; import net.minecraft.client.Minecraft; @@ -39,9 +39,9 @@ public class GTPP_NEI_DefaultHandlerEx GuiContainerManager.addTooltipHandler(new GT_RectHandler()); } - protected final Gregtech_Recipe_Map mRecipeMap; + protected final GTPP_Recipe_Map mRecipeMap; - public GTPP_NEI_DefaultHandlerEx(Gregtech_Recipe_Map tMap) { + public GTPP_NEI_DefaultHandlerEx(GTPP_Recipe_Map tMap) { this.mRecipeMap = tMap; this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), getOverlayIdentifier(), new Object[0])); if (!NEI_GT_Config.sIsAdded) { diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java b/src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java index 0d4e84b4b7..c4eff20a27 100644 --- a/src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java +++ b/src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java @@ -19,7 +19,7 @@ import gregtech.api.gui.GT_GUIContainer_BasicMachine; import gregtech.api.objects.ItemData; import gregtech.api.util.*; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; -import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; @@ -41,7 +41,7 @@ extends TemplateRecipeHandler { protected GT_Recipe_Map mRecipeMap; public GT_NEI_FlotationCell() { - this.mRecipeMap = Gregtech_Recipe_Map.sFlotationCellRecipes; + this.mRecipeMap = GTPP_Recipe_Map.sFlotationCellRecipes; this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getRecipeMapName(), new Object[0])); if (!NEI_GT_Config.sIsAdded) { FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getRecipeMapName()); @@ -50,8 +50,8 @@ extends TemplateRecipeHandler { } } - public List getSortedRecipes() { - List result = new ArrayList(this.mRecipeMap.mRecipeList); + public List getSortedRecipes() { + List result = new ArrayList(this.mRecipeMap.mRecipeList); Collections.sort(result); return result; } @@ -68,7 +68,7 @@ extends TemplateRecipeHandler { @Override public void loadCraftingRecipes(final String outputId, final Object... results) { if (outputId.equals(getRecipeMapName())) { - for (Recipe_GT tRecipe : getSortedRecipes()) { + for (GTPP_Recipe tRecipe : getSortedRecipes()) { if (!tRecipe.mHidden) { this.arecipes.add(new CachedDefaultRecipe(tRecipe)); } @@ -99,7 +99,7 @@ extends TemplateRecipeHandler { } } } - for (Recipe_GT tRecipe : getSortedRecipes()) { + for (GTPP_Recipe tRecipe : getSortedRecipes()) { if (!tRecipe.mHidden) { CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); for (ItemStack tStack : tResults) { @@ -133,7 +133,7 @@ extends TemplateRecipeHandler { } } } - for (Recipe_GT tRecipe : getSortedRecipes()) { + for (GTPP_Recipe tRecipe : getSortedRecipes()) { if (!tRecipe.mHidden) { CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); for (ItemStack tStack : tInputs) { diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java b/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java index 29c3cecb6f..57e6e1a899 100644 --- a/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java +++ b/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java @@ -26,8 +26,8 @@ import gregtech.api.objects.ItemData; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; -import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.client.Minecraft; @@ -47,10 +47,10 @@ extends TemplateRecipeHandler { GuiContainerManager.addTooltipHandler(new GT_RectHandler()); } - protected Gregtech_Recipe_Map mRecipeMap; + protected GTPP_Recipe_Map mRecipeMap; public GT_NEI_FluidReactor() { - this.mRecipeMap = Gregtech_Recipe_Map.sChemicalPlantRecipes; + this.mRecipeMap = GTPP_Recipe_Map.sChemicalPlantRecipes; this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getRecipeMapName(), new Object[0])); if (!NEI_GT_Config.sIsAdded) { FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getRecipeMapName()); @@ -59,8 +59,8 @@ extends TemplateRecipeHandler { } } - public List getSortedRecipes() { - List result = new ArrayList(this.mRecipeMap.mRecipeList); + public List getSortedRecipes() { + List result = new ArrayList(this.mRecipeMap.mRecipeList); Collections.sort(result); return result; } @@ -77,7 +77,7 @@ extends TemplateRecipeHandler { @Override public void loadCraftingRecipes(final String outputId, final Object... results) { if (outputId.equals(getRecipeMapName())) { - for (Recipe_GT tRecipe : getSortedRecipes()) { + for (GTPP_Recipe tRecipe : getSortedRecipes()) { if (!tRecipe.mHidden) { this.arecipes.add(new CachedDefaultRecipe(tRecipe)); } @@ -108,7 +108,7 @@ extends TemplateRecipeHandler { } } } - for (Recipe_GT tRecipe : getSortedRecipes()) { + for (GTPP_Recipe tRecipe : getSortedRecipes()) { if (!tRecipe.mHidden) { CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); for (ItemStack tStack : tResults) { @@ -142,7 +142,7 @@ extends TemplateRecipeHandler { } } } - for (Recipe_GT tRecipe : getSortedRecipes()) { + for (GTPP_Recipe tRecipe : getSortedRecipes()) { if (!tRecipe.mHidden) { CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); for (ItemStack tStack : tInputs) { diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java b/src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java index b868c2422c..8aea87b6d4 100644 --- a/src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java +++ b/src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java @@ -28,8 +28,8 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; -import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; @@ -51,7 +51,7 @@ extends TemplateRecipeHandler { protected GT_Recipe_Map mRecipeMap; public GT_NEI_MillingMachine() { - this.mRecipeMap = Gregtech_Recipe_Map.sOreMillRecipes; + this.mRecipeMap = GTPP_Recipe_Map.sOreMillRecipes; this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getRecipeMapName(), new Object[0])); if (!NEI_GT_Config.sIsAdded) { FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getRecipeMapName()); @@ -60,8 +60,8 @@ extends TemplateRecipeHandler { } } - public List getSortedRecipes() { - List result = new ArrayList(this.mRecipeMap.mRecipeList); + public List getSortedRecipes() { + List result = new ArrayList(this.mRecipeMap.mRecipeList); Collections.sort(result); return result; } @@ -78,7 +78,7 @@ extends TemplateRecipeHandler { @Override public void loadCraftingRecipes(final String outputId, final Object... results) { if (outputId.equals(getRecipeMapName())) { - for (Recipe_GT tRecipe : getSortedRecipes()) { + for (GTPP_Recipe tRecipe : getSortedRecipes()) { if (!tRecipe.mHidden) { this.arecipes.add(new CachedDefaultRecipe(tRecipe)); } @@ -109,7 +109,7 @@ extends TemplateRecipeHandler { } } } - for (Recipe_GT tRecipe : getSortedRecipes()) { + for (GTPP_Recipe tRecipe : getSortedRecipes()) { if (!tRecipe.mHidden) { CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); for (ItemStack tStack : tResults) { @@ -143,7 +143,7 @@ extends TemplateRecipeHandler { } } } - for (Recipe_GT tRecipe : getSortedRecipes()) { + for (GTPP_Recipe tRecipe : getSortedRecipes()) { if (!tRecipe.mHidden) { CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); for (ItemStack tStack : tInputs) { diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java b/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java index e3c980e6a4..e5bee4979f 100644 --- a/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java +++ b/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java @@ -19,7 +19,7 @@ import gregtech.api.gui.GT_GUIContainer_BasicMachine; import gregtech.api.objects.GT_ItemStack; import gregtech.api.objects.ItemData; import gregtech.api.util.*; -import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; @@ -46,9 +46,9 @@ extends TemplateRecipeHandler { GuiContainerManager.addTooltipHandler(new GT_RectHandler()); } - protected final Recipe_GT.Gregtech_Recipe_Map mRecipeMap; + protected final GTPP_Recipe.GTPP_Recipe_Map mRecipeMap; - public GT_NEI_MultiBlockHandler(Gregtech_Recipe_Map aRecipeMap) { + public GT_NEI_MultiBlockHandler(GTPP_Recipe_Map aRecipeMap) { this.mRecipeMap = aRecipeMap; this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), getOverlayIdentifier(), new Object[0])); if (!NEI_GT_Config.sIsAdded) { @@ -58,8 +58,8 @@ extends TemplateRecipeHandler { } } - public List getSortedRecipes() { - List result = new ArrayList<>(this.mRecipeMap.mRecipeList); + public List getSortedRecipes() { + List result = new ArrayList<>(this.mRecipeMap.mRecipeList); //List resultReal = new ArrayList(); /*for (Recipe_GT g : this.mRecipeMap.mRecipeList) { @@ -80,7 +80,7 @@ extends TemplateRecipeHandler { public void loadCraftingRecipes(String outputId, Object... results) { if (outputId.equals(getOverlayIdentifier())) { - for (Recipe_GT tRecipe : getSortedRecipes()) { + for (GTPP_Recipe tRecipe : getSortedRecipes()) { if (!tRecipe.mHidden) { this.arecipes.add(new CachedDefaultRecipe(tRecipe)); } @@ -110,7 +110,7 @@ extends TemplateRecipeHandler { } } } - for (Recipe_GT tRecipe : getSortedRecipes()) { + for (GTPP_Recipe tRecipe : getSortedRecipes()) { if (!tRecipe.mHidden) { CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); for (ItemStack tStack : tResults) { @@ -144,7 +144,7 @@ extends TemplateRecipeHandler { } } } - for (Recipe_GT tRecipe : getSortedRecipes()) { + for (GTPP_Recipe tRecipe : getSortedRecipes()) { if (!tRecipe.mHidden) { CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); for (ItemStack tStack : tInputs) { @@ -359,11 +359,11 @@ extends TemplateRecipeHandler { } public class CachedDefaultRecipe extends TemplateRecipeHandler.CachedRecipe { - public final Recipe_GT mRecipe; + public final GTPP_Recipe mRecipe; public final List mOutputs; public final List mInputs; - public CachedDefaultRecipe(Recipe_GT aRecipe) { + public CachedDefaultRecipe(GTPP_Recipe aRecipe) { super(); this.mRecipe = aRecipe; diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_VacFurnace.java b/src/Java/gtPlusPlus/nei/GT_NEI_VacFurnace.java index 571ee79ee6..fd07d66fed 100644 --- a/src/Java/gtPlusPlus/nei/GT_NEI_VacFurnace.java +++ b/src/Java/gtPlusPlus/nei/GT_NEI_VacFurnace.java @@ -19,7 +19,7 @@ import gregtech.api.gui.GT_GUIContainer_BasicMachine; import gregtech.api.objects.ItemData; import gregtech.api.util.*; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; -import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.nei.GT_NEI_MultiBlockHandler.FixedPositionedStack; import net.minecraft.client.Minecraft; @@ -42,7 +42,7 @@ extends TemplateRecipeHandler { protected GT_Recipe_Map mRecipeMap; public GT_NEI_VacFurnace() { - this.mRecipeMap = Gregtech_Recipe_Map.sVacuumFurnaceRecipes; + this.mRecipeMap = GTPP_Recipe_Map.sVacuumFurnaceRecipes; this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getRecipeMapName(), new Object[0])); if (!NEI_GT_Config.sIsAdded) { FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getRecipeMapName()); @@ -51,8 +51,8 @@ extends TemplateRecipeHandler { } } - public List getSortedRecipes() { - List result = new ArrayList(this.mRecipeMap.mRecipeList); + public List getSortedRecipes() { + List result = new ArrayList(this.mRecipeMap.mRecipeList); Collections.sort(result); return result; } @@ -69,7 +69,7 @@ extends TemplateRecipeHandler { @Override public void loadCraftingRecipes(final String outputId, final Object... results) { if (outputId.equals(getRecipeMapName())) { - for (Recipe_GT tRecipe : getSortedRecipes()) { + for (GTPP_Recipe tRecipe : getSortedRecipes()) { if (!tRecipe.mHidden) { this.arecipes.add(new CachedDefaultRecipe(tRecipe)); } @@ -100,7 +100,7 @@ extends TemplateRecipeHandler { } } } - for (Recipe_GT tRecipe : getSortedRecipes()) { + for (GTPP_Recipe tRecipe : getSortedRecipes()) { if (!tRecipe.mHidden) { CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); for (ItemStack tStack : tResults) { @@ -134,7 +134,7 @@ extends TemplateRecipeHandler { } } } - for (Recipe_GT tRecipe : getSortedRecipes()) { + for (GTPP_Recipe tRecipe : getSortedRecipes()) { if (!tRecipe.mHidden) { CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); for (ItemStack tStack : tInputs) { diff --git a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java b/src/Java/gtPlusPlus/nei/NEI_GT_Config.java index 0a0ba9b9e8..514612752d 100644 --- a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java +++ b/src/Java/gtPlusPlus/nei/NEI_GT_Config.java @@ -4,8 +4,8 @@ import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; import gregtech.api.util.CustomRecipeMap; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; -import gregtech.api.util.Recipe_GT; -import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; import gregtech.nei.GT_NEI_DefaultHandler; import gtPlusPlus.api.objects.data.AutoMap; @@ -19,10 +19,10 @@ implements IConfigureNEI { public synchronized void loadConfig() { sIsAdded = false; - mUniqueRecipeMapHandling.add(Gregtech_Recipe_Map.sChemicalPlantRecipes.mUnlocalizedName); - mUniqueRecipeMapHandling.add(Gregtech_Recipe_Map.sOreMillRecipes.mUnlocalizedName); - mUniqueRecipeMapHandling.add(Gregtech_Recipe_Map.sFlotationCellRecipes.mUnlocalizedName); - mUniqueRecipeMapHandling.add(Gregtech_Recipe_Map.sVacuumFurnaceRecipes.mUnlocalizedName); + mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sChemicalPlantRecipes.mUnlocalizedName); + mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sOreMillRecipes.mUnlocalizedName); + mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sFlotationCellRecipes.mUnlocalizedName); + mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sVacuumFurnaceRecipes.mUnlocalizedName); // Custom Recipe Maps for (final CustomRecipeMap tMap : CustomRecipeMap.sMappings) { @@ -32,7 +32,7 @@ implements IConfigureNEI { } // Custom Recipe maps - for (final Gregtech_Recipe_Map tMap : Recipe_GT.Gregtech_Recipe_Map.sMappings) { + for (final GTPP_Recipe_Map tMap : GTPP_Recipe.GTPP_Recipe_Map.sMappings) { if (tMap.mNEIAllowed) { if (!mUniqueRecipeMapHandling.contains(tMap.mUnlocalizedName)) { new GTPP_NEI_DefaultHandler(tMap); @@ -41,7 +41,7 @@ implements IConfigureNEI { } // Standard GT Recipe Maps - for (final GT_Recipe_Map tMap : Recipe_GT.GTPP_Recipe_Map.sMappingsEx) { + for (final GT_Recipe_Map tMap : GTPP_Recipe.GTPP_Recipe_Map_Internal.sMappingsEx) { if (tMap.mNEIAllowed) { if (!mUniqueRecipeMapHandling.contains(tMap.mUnlocalizedName)) { new GT_NEI_DefaultHandler(tMap); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java index 76100df0de..63f5043954 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java @@ -1,12 +1,15 @@ package gtPlusPlus.xmod.gregtech.common; import java.lang.reflect.Constructor; +import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import org.apache.commons.lang3.ArrayUtils; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; @@ -21,7 +24,7 @@ import gregtech.api.metatileentity.BaseMetaTileEntity; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import gregtech.common.GT_Proxy; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; @@ -38,6 +41,7 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.BaseCustomTileEntity; import gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power.BaseCustomPower_MTE; import gtPlusPlus.xmod.gregtech.common.covers.CoverManager; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_WorldAccelerator; import ic2.core.init.BlocksItems; import ic2.core.init.InternalName; import net.minecraft.block.Block; @@ -120,7 +124,7 @@ public class Meta_GT_Proxy { public static void postInit() { mAssemblyAchievements = new AchievementHandler(); fixIC2FluidNames(); - + // Finalise TAE TAE.finalizeTAE(); } @@ -212,11 +216,11 @@ public class Meta_GT_Proxy { public static boolean generatePlasmaRecipesForAdvVacFreezer() { - AutoMap aFreezerMapRebaked = new AutoMap(); - AutoMap aRemovedRecipes = new AutoMap(); + AutoMap aFreezerMapRebaked = new AutoMap(); + AutoMap aRemovedRecipes = new AutoMap(); //Find recipes containing Plasma and map them - for (Recipe_GT y : Recipe_GT.Gregtech_Recipe_Map.sAdvFreezerRecipes.mRecipeList) { + for (GTPP_Recipe y : GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes.mRecipeList) { if (y.mFluidInputs.length > 0) { for (FluidStack r : y.mFluidInputs) { if (r.getUnlocalizedName().toLowerCase().contains("plasma")) { @@ -228,7 +232,7 @@ public class Meta_GT_Proxy { } } - AutoMap aNewRecipes = new AutoMap(); + AutoMap aNewRecipes = new AutoMap(); int aAtomicMass = 0; int aAtomicTier = 0; @@ -275,7 +279,7 @@ public class Meta_GT_Proxy { else { //Build a new plasma recipe int aTotalTickTime = (20 * 1 + (aAtomicMass)); - Recipe_GT aTempRecipe = new Recipe_GT(true, + GTPP_Recipe aTempRecipe = new GTPP_Recipe(true, new ItemStack[] {}, new ItemStack[] {}, null, @@ -301,24 +305,24 @@ public class Meta_GT_Proxy { //Add the new recipes to the map we will rebake over the original - for (Recipe_GT w : aNewRecipes) { + for (GTPP_Recipe w : aNewRecipes) { aFreezerMapRebaked.put(w); } //Best not touch the original map if we don't have a valid map to override it with. if (aFreezerMapRebaked.size() > 0) { - int aOriginalCount = Recipe_GT.Gregtech_Recipe_Map.sAdvFreezerRecipes.mRecipeList.size(); + int aOriginalCount = GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes.mRecipeList.size(); //Empty the original map - Recipe_GT.Gregtech_Recipe_Map.sAdvFreezerRecipes.mRecipeList.clear(); + GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes.mRecipeList.clear(); //Rebake the real map - for (Recipe_GT w : aFreezerMapRebaked) { - Recipe_GT.Gregtech_Recipe_Map.sAdvFreezerRecipes.mRecipeList.add(w); + for (GTPP_Recipe w : aFreezerMapRebaked) { + GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes.mRecipeList.add(w); } - return Recipe_GT.Gregtech_Recipe_Map.sAdvFreezerRecipes.mRecipeList.size() >= aOriginalCount; + return GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes.mRecipeList.size() >= aOriginalCount; } return false; @@ -405,6 +409,32 @@ public class Meta_GT_Proxy { + public static boolean setTileEntityClassAsBlacklistedInWorldAccelerator(String aClassName) { + if (CORE.GTNH) { + Class aMainModClass = ReflectionUtils.getClass("com.dreammaster.main.MainRegistry"); + Class aCoreModConfig = ReflectionUtils.getClass("com.dreammaster.config"); + if (aMainModClass != null && aCoreModConfig != null) { + Field aCoreConfig = ReflectionUtils.getField(aMainModClass, "CoreConfig"); + if (aCoreConfig != null) { + Field aBlackList = ReflectionUtils.getField(aCoreModConfig, "BlacklistedTileEntiyClassNames"); + Object aInstance = ReflectionUtils.getFieldValue(aCoreConfig); + if (aBlackList != null && aInstance != null) { + String[] aBlackListValue = (String[]) ReflectionUtils.getFieldValue(aBlackList, aInstance); + if (aBlackListValue != null) { + aBlackListValue = ArrayUtils.add(aBlackListValue, aClassName); + ReflectionUtils.setField(aInstance, aBlackList, aBlackListValue); + return true; + } + } + } + } + } + else { + GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames = ArrayUtils.add(GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames, aClassName); + return true; + } + return false; + } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index 232d4e2cd7..1472ff9f23 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -16,7 +16,7 @@ import gregtech.api.objects.ItemData; import gregtech.api.objects.MaterialStack; import gregtech.api.util.GT_FoodStat; import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import gregtech.common.covers.GT_Cover_Arm; import gregtech.common.covers.GT_Cover_Conveyor; import gregtech.common.covers.GT_Cover_Pump; @@ -200,7 +200,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { GregtechItemList.Pellet_RTG_SR90.set(this.addItem(42, StringUtils.superscript("90")+"Sr Pellet", "", new Object[]{getTcAspectStack(TC_Aspects.RADIO, 4L), getTcAspectStack(TC_Aspects.POTENTIA, 2L), getTcAspectStack(TC_Aspects.METALLUM, 2L)})); GregtechItemList.Pellet_RTG_PO210.set(this.addItem(43, StringUtils.superscript("210")+"Po Pellet", "", new Object[]{getTcAspectStack(TC_Aspects.RADIO, 4L), getTcAspectStack(TC_Aspects.POTENTIA, 2L), getTcAspectStack(TC_Aspects.METALLUM, 2L)})); GregtechItemList.Pellet_RTG_AM241.set(this.addItem(44, StringUtils.superscript("241")+"Am Pellet", "", new Object[]{getTcAspectStack(TC_Aspects.RADIO, 4L), getTcAspectStack(TC_Aspects.POTENTIA, 2L), getTcAspectStack(TC_Aspects.METALLUM, 2L)})); - Recipe_GT.Gregtech_Recipe_Map.sRTGFuels.addRecipe( + GTPP_Recipe.GTPP_Recipe_Map.sRTGFuels.addRecipe( true, new ItemStack[]{GregtechItemList.Pellet_RTG_PU238.get(1)}, new ItemStack[]{}, @@ -210,7 +210,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { 0, 64, MathUtils.roundToClosestInt(87.7f)); - Recipe_GT.Gregtech_Recipe_Map.sRTGFuels.addRecipe( + GTPP_Recipe.GTPP_Recipe_Map.sRTGFuels.addRecipe( true, new ItemStack[]{GregtechItemList.Pellet_RTG_SR90.get(1)}, new ItemStack[]{}, @@ -220,7 +220,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { 0, 32, MathUtils.roundToClosestInt(28.8f)); - Recipe_GT.Gregtech_Recipe_Map.sRTGFuels.addRecipe( + GTPP_Recipe.GTPP_Recipe_Map.sRTGFuels.addRecipe( true, new ItemStack[]{GregtechItemList.Pellet_RTG_PO210.get(1)}, new ItemStack[]{}, @@ -230,7 +230,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { 0, 512, MathUtils.roundToClosestInt(1f)); - Recipe_GT.Gregtech_Recipe_Map.sRTGFuels.addRecipe( + GTPP_Recipe.GTPP_Recipe_Map.sRTGFuels.addRecipe( true, new ItemStack[]{GregtechItemList.Pellet_RTG_AM241.get(1)}, new ItemStack[]{}, diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java index bd9708108b..d5a1d8d355 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java @@ -14,7 +14,7 @@ import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; import gtPlusPlus.api.objects.Logger; import net.minecraft.item.ItemStack; @@ -62,7 +62,7 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi @Override public GT_Recipe.GT_Recipe_Map getRecipes() { //Logger.WARNING("Fuel Count: "+Gregtech_Recipe_Map.sSemiFluidLiquidFuels.mRecipeList.size()); - return Gregtech_Recipe_Map.sSemiFluidLiquidFuels; + return GTPP_Recipe_Map.sSemiFluidLiquidFuels; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java index 7d20f1eb59..f9bf116362 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java @@ -11,7 +11,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechRocketFuelGeneratorBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -45,7 +45,7 @@ extends GregtechRocketFuelGeneratorBase { @Override public GT_Recipe.GT_Recipe_Map getRecipes() { - return Recipe_GT.Gregtech_Recipe_Map.sRocketFuels; + return GTPP_Recipe.GTPP_Recipe_Map.sRocketFuels; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java index 6f18b89c53..14417cb921 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java @@ -13,7 +13,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenera import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; @@ -215,7 +215,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator @Override public GT_Recipe.GT_Recipe_Map getRecipes() { - return Recipe_GT.Gregtech_Recipe_Map.sRTGFuels; + return GTPP_Recipe.GTPP_Recipe_Map.sRTGFuels; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java index c07fa2e927..01944c6ce5 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java @@ -7,7 +7,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -49,7 +49,7 @@ public class GregtechMetaTileEntity_BasicWasher extends GT_MetaTileEntity_BasicM @Override public GT_Recipe.GT_Recipe_Map getRecipeList() { - return Recipe_GT.Gregtech_Recipe_Map.sSimpleWasherRecipes; + return GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java index 79d256909d..7505c721f4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java @@ -17,7 +17,7 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.random.XSTR; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.slots.SlotChemicalPlantInput; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java index 477848a90f..2197ce193d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java @@ -17,7 +17,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; @@ -104,7 +104,7 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti @Override public GT_Recipe.GT_Recipe_Map getRecipeList() { - return Recipe_GT.Gregtech_Recipe_Map.sSlowFusionRecipes; + return GTPP_Recipe.GTPP_Recipe_Map.sSlowFusionRecipes; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java index 8b3ada610d..cf9ab2b7e3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java @@ -17,7 +17,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; @@ -104,7 +104,7 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux @Override public GT_Recipe.GT_Recipe_Map getRecipeList() { - return Recipe_GT.Gregtech_Recipe_Map.sSlowFusionRecipes; + return GTPP_Recipe.GTPP_Recipe_Map.sSlowFusionRecipes; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java index 9490fc678b..1601137c87 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java @@ -8,7 +8,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -88,7 +88,7 @@ extends GregtechMeta_MultiBlockBase { @Override public GT_Recipe.GT_Recipe_Map getRecipeMap() { - return Recipe_GT.Gregtech_Recipe_Map.sMultiblockCentrifugeRecipes_GT; + return GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java index b8517533e6..cafeddee24 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java @@ -9,7 +9,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; @@ -83,7 +83,7 @@ extends GregtechMeta_MultiBlockBase { @Override public GT_Recipe.GT_Recipe_Map getRecipeMap() { - return Recipe_GT.Gregtech_Recipe_Map.sCokeOvenRecipes; + return GTPP_Recipe.GTPP_Recipe_Map.sCokeOvenRecipes; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java index b5cfff10e4..5a8dcc0df6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java @@ -15,7 +15,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.util.Utils; @@ -83,7 +83,7 @@ public class GregtechMetaTileEntity_IndustrialDehydrator extends GregtechMeta_Mu } public GT_Recipe.GT_Recipe_Map getRecipeMap() { - return mDehydratorMode ? Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes : Recipe_GT.Gregtech_Recipe_Map.sVacuumFurnaceRecipes; + return mDehydratorMode ? GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes : GTPP_Recipe.GTPP_Recipe_Map.sVacuumFurnaceRecipes; } public boolean isCorrectMachinePart(ItemStack aStack) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java index aca635fa84..ecbfb3d7de 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java @@ -75,7 +75,7 @@ extends GregtechMeta_MultiBlockBase { @Override public GT_Recipe.GT_Recipe_Map getRecipeMap() { - return gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map.sMultiblockElectrolyzerRecipes_GT; + return gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java index 82de41f186..4cf8c55005 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; -import static gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map.sAdvFreezerRecipes; -import static gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map.sAdvFreezerRecipes_GT; +import static gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes; +import static gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes_GT; import gregtech.api.GregTech_API; import gregtech.api.enums.TAE; @@ -12,7 +12,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -112,7 +112,7 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends GregtechMeta sAdvFreezerRecipes_GT.add(a); } } - return Recipe_GT.Gregtech_Recipe_Map.sAdvFreezerRecipes_GT; + return GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes_GT; } public boolean isCorrectMachinePart(final ItemStack aStack) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java index 9dca082807..561dbc1a52 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java @@ -17,7 +17,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.BlockPos; @@ -116,7 +116,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase @Override public GT_Recipe.GT_Recipe_Map getRecipeMap() { - return Recipe_GT.Gregtech_Recipe_Map.sOreMillRecipes; + return GTPP_Recipe.GTPP_Recipe_Map.sOreMillRecipes; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java index 45077f4cf7..9f239d233a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java @@ -12,7 +12,7 @@ import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.general.ItemLavaFilter; @@ -94,7 +94,7 @@ extends GregtechMeta_MultiBlockBase } - for (GT_Recipe tRecipe : Recipe_GT.Gregtech_Recipe_Map.sThermalFuels.mRecipeList) { + for (GT_Recipe tRecipe : GTPP_Recipe.GTPP_Recipe_Map.sThermalFuels.mRecipeList) { FluidStack tFluid = tRecipe.mFluidInputs[0]; if (tFluid != null) { if (depleteInput(tFluid)) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java index 1ceb6bd93f..cdb15b45c9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java @@ -16,7 +16,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.helpers.GregtechPlusPlus_API.Multiblock_API; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.multi.SpecialMultiBehaviour; @@ -94,7 +94,7 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase @Override public GT_Recipe.GT_Recipe_Map getRecipeMap() { - return Recipe_GT.Gregtech_Recipe_Map.sFlotationCellRecipes; + return GTPP_Recipe.GTPP_Recipe_Map.sFlotationCellRecipes; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java index 579a26dc16..d19d0810d8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java @@ -14,7 +14,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Outpu import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; @@ -104,7 +104,7 @@ public class GregtechMTE_MiniFusionPlant extends GregtechMeta_MultiBlockBase { @Override public GT_Recipe.GT_Recipe_Map getRecipeMap() { - return Recipe_GT.Gregtech_Recipe_Map.sSlowFusionRecipes; + return GTPP_Recipe.GTPP_Recipe_Map.sSlowFusionRecipes; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java index 8d8e50df83..1518053015 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java @@ -19,7 +19,7 @@ import gregtech.api.objects.GT_ItemStack; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.material.ELEMENT; @@ -394,7 +394,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { @Override public boolean checkRecipe(final ItemStack aStack) { final ArrayList tFluids = this.getStoredFluids(); - final Collection tRecipeList = Recipe_GT.Gregtech_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.mRecipeList; + final Collection tRecipeList = GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.mRecipeList; if((tFluids.size() > 0) && (tRecipeList != null)) { //Does input hatch have a LFTR fuel? Logger.WARNING("Found more than one input fluid and a list of valid recipes."); for (final FluidStack hatchFluid1 : tFluids) { //Loops through hatches diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java index 6f9080673f..4d3ee87025 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java @@ -16,7 +16,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; @@ -91,7 +91,7 @@ public class GregtechMetaTileEntityGeneratorArray extends GregtechMeta_MultiBloc return null; } else if (this.mMode == MODE_STEAM) { - return Recipe_GT.Gregtech_Recipe_Map.sSteamTurbineFuels; + return GTPP_Recipe.GTPP_Recipe_Map.sSteamTurbineFuels; } else if (this.mMode == MODE_DIESEL) { return GT_Recipe.GT_Recipe_Map.sDieselFuels; @@ -100,13 +100,13 @@ public class GregtechMetaTileEntityGeneratorArray extends GregtechMeta_MultiBloc return GT_Recipe.GT_Recipe_Map.sTurbineFuels; } else if (this.mMode == MODE_SEMIFLUID) { - return Recipe_GT.Gregtech_Recipe_Map.sSemiFluidLiquidFuels; + return GTPP_Recipe.GTPP_Recipe_Map.sSemiFluidLiquidFuels; } else if (this.mMode == MODE_GEOTHERMAL) { - return Recipe_GT.Gregtech_Recipe_Map.sThermalFuels; + return GTPP_Recipe.GTPP_Recipe_Map.sThermalFuels; } else if (this.mMode == MODE_ROCKETFUEL) { - return Recipe_GT.Gregtech_Recipe_Map.sRocketFuels; + return GTPP_Recipe.GTPP_Recipe_Map.sRocketFuels; } else if (this.mMode == MODE_MAGIC_A) { return GT_Recipe.GT_Recipe_Map.sMagicFuels; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java index 3592475a5c..98344abb1c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java @@ -13,7 +13,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.api.util.Recipe_GT; +import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.recipe.common.CI; @@ -99,7 +99,7 @@ extends GregtechMeta_MultiBlockBase { @Override public GT_Recipe.GT_Recipe_Map getRecipeMap() { - return Recipe_GT.Gregtech_Recipe_Map.sAlloyBlastSmelterRecipes; + return GTPP_Recipe.GTPP_Recipe_Map.sAlloyBlastSmelterRecipes; } @Override @@ -181,7 +181,7 @@ extends GregtechMeta_MultiBlockBase { if (tIn