From 1b820de08a05070909a267e17f033fcf58ac8710 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Mon, 2 Sep 2024 23:17:17 +0200 Subject: The Great Renaming (#3014) * move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names --- .../core/handler/AchievementHandler.java | 34 ++- .../java/gtPlusPlus/core/handler/BookHandler.java | 36 +-- .../core/handler/BurnableFuelHandler.java | 4 +- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 311 --------------------- .../core/handler/COMPAT_IntermodStaging.java | 50 ---- .../gtPlusPlus/core/handler/CompatHandler.java | 311 +++++++++++++++++++++ .../core/handler/CompatIntermodStaging.java | 50 ++++ .../java/gtPlusPlus/core/handler/GuiHandler.java | 58 ++-- .../gtPlusPlus/core/handler/PacketHandler.java | 8 +- .../core/handler/Recipes/DecayableRecipe.java | 6 +- .../handler/Recipes/LateRegistrationHandler.java | 4 +- .../core/handler/Recipes/RegistrationHandler.java | 16 +- .../handler/events/EnderDragonDeathHandler.java | 17 +- .../handler/events/PlayerSleepEventHandler.java | 4 +- .../workbench/WorkbenchCraftingHandler.java | 161 +++++++++++ .../workbench/Workbench_CraftingHandler.java | 161 ----------- 16 files changed, 620 insertions(+), 611 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java create mode 100644 src/main/java/gtPlusPlus/core/handler/CompatHandler.java create mode 100644 src/main/java/gtPlusPlus/core/handler/CompatIntermodStaging.java create mode 100644 src/main/java/gtPlusPlus/core/handler/workbench/WorkbenchCraftingHandler.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java (limited to 'src/main/java/gtPlusPlus/core/handler') 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 temp : CORE.burnables) { + for (Pair 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_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java deleted file mode 100644 index 8e780c724e..0000000000 --- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ /dev/null @@ -1,311 +0,0 @@ -package gtPlusPlus.core.handler; - -import static gregtech.api.enums.Mods.ExtraUtilities; -import static gregtech.api.enums.Mods.PamsHarvestCraft; -import static gregtech.api.enums.Mods.Thaumcraft; -import static gregtech.api.enums.Mods.Witchery; - -import java.util.LinkedList; -import java.util.Queue; -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 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.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.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.registration.gregtech.Gregtech4Content; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAdvancedBoilers; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAlgaeContent; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAmazonWarehouse; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechBufferDynamos; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechCustomHatches; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechCyclotron; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechDehydrator; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechEnergyBuffer; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechFactoryGradeReplacementMultis; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechGeothermalThermalGenerator; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechHiAmpTransformer; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialAlloySmelter; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialArcFurnace; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialBlastSmelter; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCentrifuge; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialChisel; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCokeOven; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCuttingFactory; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialElectrolyzer; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialElementDuplicator; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialExtruder; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialFishPond; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialFluidHeater; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialForgeHammer; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialFuelRefinery; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMacerator; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMassFabricator; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMixer; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMultiMachine; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialPlatePress; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialRockBreaker; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialSifter; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialThermalCentrifuge; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialTreeFarm; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialWashPlant; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialWiremill; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIsaMill; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechLFTR; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechLargeTurbinesAndHeatExchanger; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechMolecularTransformer; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechNuclearSaltProcessingPlant; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPollutionDevices; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPowerSubStation; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechQuantumForceTransformer; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRTG; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRedstoneButtonPanel; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRedstoneCircuitBlock; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRedstoneLamp; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRedstoneStrengthDisplay; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRedstoneStrengthScale; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRocketFuelGenerator; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSemiFluidgenerators; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSimpleWasher; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSolarTower; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSteamMultis; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSuperChests; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechThaumcraftDevices; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechThreadedBuffers; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTieredFluidTanks; -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 static Queue RemoveRecipeQueue = new LinkedList<>(); - public static Queue AddRecipeQueue = new LinkedList<>(); - public static Boolean areInitItemsLoaded = false; - - public static void registerMyModsOreDictEntries() { - - Logger.INFO("Registering Materials with OreDict."); - // In-house - - for (int i = 1; i <= 10; i++) { - GT_OreDictUnificator.registerOre( - "bufferCore_" + GT_Values.VN[i - 1], - new ItemStack(ItemUtils.getItemFromFQRN("miscutils:item.itemBufferCore" + i))); - } - } - - public static void registerGregtechMachines() { - // Free IDs - /* - * --- 859 to 868 --- 911 to 940 - */ - - new RECIPES_LaserEngraver(); - GregtechEnergyBuffer.run(); - GregtechLFTR.run(); - GregtechNuclearSaltProcessingPlant.run(); - GregtechIndustrialCentrifuge.run(); - GregtechIndustrialCokeOven.run(); - GregtechIndustrialPlatePress.run(); - GregtechRocketFuelGenerator.run(); - GregtechIndustrialElectrolyzer.run(); - GregtechIndustrialMacerator.run(); - GregtechIndustrialWiremill.run(); - GregtechIndustrialMassFabricator.run(); - GregtechWaterPump.run(); - GregtechIndustrialBlastSmelter.run(); - GregtechQuantumForceTransformer.run(); - GregtechPowerSubStation.run(); - GregtechDehydrator.run(); - GregtechAdvancedBoilers.run(); - GregtechPollutionDevices.run(); - GregtechTieredFluidTanks.run(); - GregtechGeothermalThermalGenerator.run(); - Gregtech4Content.run(); - GregtechIndustrialFuelRefinery.run(); - GregtechTreeFarmerTE.run(); - GregtechIndustrialTreeFarm.run(); - GregtechIndustrialSifter.run(); - GregtechSimpleWasher.run(); - GregtechRTG.run(); - GregtechCyclotron.run(); - GregtechHiAmpTransformer.run(); - GregtechIndustrialThermalCentrifuge.run(); - GregtechIndustrialWashPlant.run(); - GregtechSemiFluidgenerators.run(); - GregtechWirelessChargers.run(); - GregtechIndustrialCuttingFactory.run(); - GregtechSuperChests.run(); - GregtechIndustrialFishPond.run(); - GregtechIndustrialExtruder.run(); - GregtechIndustrialMultiMachine.run(); - GregtechBufferDynamos.run(); - GregtechAmazonWarehouse.run(); - GregtechFactoryGradeReplacementMultis.run(); - GregtechThaumcraftDevices.run(); - GregtechThreadedBuffers.run(); - GregtechIndustrialMixer.run(); - GregtechCustomHatches.run(); - GregtechIndustrialArcFurnace.run(); - GregtechSolarTower.run(); - GregtechLargeTurbinesAndHeatExchanger.run(); - GregtechAlgaeContent.run(); - GregtechIndustrialAlloySmelter.run(); - GregtechIsaMill.run(); - GregtechSteamMultis.run(); - GregtechIndustrialForgeHammer.run(); - GregtechMolecularTransformer.run(); - GregtechIndustrialElementDuplicator.run(); - GregtechIndustrialRockBreaker.run(); - GregtechIndustrialChisel.run(); - GregtechIndustrialFluidHeater.run(); - GregtechRedstoneButtonPanel.run(); - GregtechRedstoneCircuitBlock.run(); - GregtechRedstoneLamp.run(); - GregtechRedstoneStrengthDisplay.run(); - GregtechRedstoneStrengthScale.run(); - } - - // InterMod - public static void intermodOreDictionarySupport() { - if (Thaumcraft.isModLoaded()) { - COMPAT_Thaumcraft.OreDict(); - } - if (ExtraUtilities.isModLoaded()) { - COMPAT_ExtraUtils.OreDict(); - } - if (PamsHarvestCraft.isModLoaded()) { - COMPAT_HarvestCraft.OreDict(); - } - COMPAT_IC2.OreDict(); - if (Witchery.isModLoaded()) { - COMPAT_Witchery.OreDict(); - } - } - - public static void RemoveRecipesFromOtherMods() { - // Removal of Recipes - for (final Object item : RemoveRecipeQueue) { - RecipeUtils.removeCraftingRecipe(item); - } - } - - public static void InitialiseHandlerThenAddRecipes() { - RegistrationHandler.run(); - } - - public static void InitialiseLateHandlerThenAddRecipes() { - LateRegistrationHandler.run(); - } - - public static void startLoadingGregAPIBasedRecipes() { - // Add hand-made recipes - RECIPES_GREGTECH.run(); - RecipeLoader_GTNH.generate(); - RecipeLoader_Nuclear.generate(); - RecipeLoader_GlueLine.generate(); - RecipeLoader_ChemicalSkips.generate(); - // Add autogenerated Recipes from Item Components - for (Set> m : MaterialGenerator.mRecipeMapsToGenerate) { - for (RunnableWithInfo r : m) { - try { - r.run(); - Logger.INFO( - "[FIND] " + r.getInfoData() - .getLocalizedName() + " recipes generated."); - } catch (Throwable t) { - t.printStackTrace(); - Logger.INFO( - "[ERROR] " + r.getInfoData() - .getLocalizedName() + " recipes failed to generated."); - } - } - } - RecipeGen_Recycling.executeGenerators(); - runQueuedMisc(); - - // Do Fluid Canning Last, because they're not executed on demand, but rather queued. - RecipeGen_FluidCanning.init(); - } - - public static void onLoadComplete(FMLLoadCompleteEvent event) { - runQueuedOnLoadComplete(event); - } - - public static final AutoMap> mRecipesToGenerate = new AutoMap<>(); - public static final AutoMap> mGtRecipesToGenerate = new AutoMap<>(); - - public static final AutoMap> mObjectsToRunInPostInit = new AutoMap<>(); - public static final AutoMap mObjectsToRunInOnLoadComplete = new AutoMap<>(); - - public static void runQueuedRecipes() { - // Add autogenerated Recipes from Item Components - for (RunnableWithInfo m : mRecipesToGenerate) { - try { - m.run(); - } catch (Throwable t) { - t.printStackTrace(); - Logger.INFO("[ERROR] " + m.getInfoData() + " recipe failed to generated."); - } - } - for (RunnableWithInfo m : mGtRecipesToGenerate) { - try { - m.run(); - } catch (Throwable t) { - t.printStackTrace(); - Logger.INFO("[ERROR] " + m.getInfoData() + " recipe failed to generated."); - } - } - } - - public static void runQueuedMisc() { - for (RunnableWithInfo m : mObjectsToRunInPostInit) { - try { - m.run(); - } catch (Throwable t) { - t.printStackTrace(); - Logger.INFO("[ERROR] " + m.getInfoData()); - } - } - } - - /** - * Generally used to register GT recipe map changes after they've been populated. - */ - public static void runQueuedOnLoadComplete(FMLLoadCompleteEvent event) { - for (ItemPackage m : mObjectsToRunInOnLoadComplete) { - try { - m.onLoadComplete(event); - } catch (Throwable t) { - t.printStackTrace(); - Logger.INFO("[ERROR] " + m.getInfoData()); - } - } - } -} 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/CompatHandler.java b/src/main/java/gtPlusPlus/core/handler/CompatHandler.java new file mode 100644 index 0000000000..83426c18c4 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/handler/CompatHandler.java @@ -0,0 +1,311 @@ +package gtPlusPlus.core.handler; + +import static gregtech.api.enums.Mods.ExtraUtilities; +import static gregtech.api.enums.Mods.PamsHarvestCraft; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.Mods.Witchery; + +import java.util.LinkedList; +import java.util.Queue; +import java.util.Set; + +import net.minecraft.item.ItemStack; + +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; +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.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.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.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; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAmazonWarehouse; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechBufferDynamos; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechCustomHatches; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechCyclotron; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechDehydrator; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechEnergyBuffer; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechFactoryGradeReplacementMultis; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechGeothermalThermalGenerator; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechHiAmpTransformer; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialAlloySmelter; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialArcFurnace; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialBlastSmelter; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCentrifuge; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialChisel; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCokeOven; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCuttingFactory; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialElectrolyzer; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialElementDuplicator; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialExtruder; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialFishPond; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialFluidHeater; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialForgeHammer; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialFuelRefinery; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMacerator; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMassFabricator; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMixer; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMultiMachine; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialPlatePress; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialRockBreaker; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialSifter; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialThermalCentrifuge; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialTreeFarm; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialWashPlant; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialWiremill; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIsaMill; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechLFTR; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechLargeTurbinesAndHeatExchanger; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechMolecularTransformer; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechNuclearSaltProcessingPlant; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPollutionDevices; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPowerSubStation; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechQuantumForceTransformer; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRTG; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRedstoneButtonPanel; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRedstoneCircuitBlock; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRedstoneLamp; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRedstoneStrengthDisplay; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRedstoneStrengthScale; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRocketFuelGenerator; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSemiFluidgenerators; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSimpleWasher; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSolarTower; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSteamMultis; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSuperChests; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechThaumcraftDevices; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechThreadedBuffers; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTieredFluidTanks; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTreeFarmerTE; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechWaterPump; +import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechWirelessChargers; + +public class CompatHandler { + + public static Queue RemoveRecipeQueue = new LinkedList<>(); + public static Queue AddRecipeQueue = new LinkedList<>(); + public static Boolean areInitItemsLoaded = false; + + public static void registerMyModsOreDictEntries() { + + Logger.INFO("Registering Materials with OreDict."); + // In-house + + for (int i = 1; i <= 10; i++) { + GTOreDictUnificator.registerOre( + "bufferCore_" + GTValues.VN[i - 1], + new ItemStack(ItemUtils.getItemFromFQRN("miscutils:item.itemBufferCore" + i))); + } + } + + public static void registerGregtechMachines() { + // Free IDs + /* + * --- 859 to 868 --- 911 to 940 + */ + + new RecipesLaserEngraver(); + GregtechEnergyBuffer.run(); + GregtechLFTR.run(); + GregtechNuclearSaltProcessingPlant.run(); + GregtechIndustrialCentrifuge.run(); + GregtechIndustrialCokeOven.run(); + GregtechIndustrialPlatePress.run(); + GregtechRocketFuelGenerator.run(); + GregtechIndustrialElectrolyzer.run(); + GregtechIndustrialMacerator.run(); + GregtechIndustrialWiremill.run(); + GregtechIndustrialMassFabricator.run(); + GregtechWaterPump.run(); + GregtechIndustrialBlastSmelter.run(); + GregtechQuantumForceTransformer.run(); + GregtechPowerSubStation.run(); + GregtechDehydrator.run(); + GregtechAdvancedBoilers.run(); + GregtechPollutionDevices.run(); + GregtechTieredFluidTanks.run(); + GregtechGeothermalThermalGenerator.run(); + Gregtech4Content.run(); + GregtechIndustrialFuelRefinery.run(); + GregtechTreeFarmerTE.run(); + GregtechIndustrialTreeFarm.run(); + GregtechIndustrialSifter.run(); + GregtechSimpleWasher.run(); + GregtechRTG.run(); + GregtechCyclotron.run(); + GregtechHiAmpTransformer.run(); + GregtechIndustrialThermalCentrifuge.run(); + GregtechIndustrialWashPlant.run(); + GregtechSemiFluidgenerators.run(); + GregtechWirelessChargers.run(); + GregtechIndustrialCuttingFactory.run(); + GregtechSuperChests.run(); + GregtechIndustrialFishPond.run(); + GregtechIndustrialExtruder.run(); + GregtechIndustrialMultiMachine.run(); + GregtechBufferDynamos.run(); + GregtechAmazonWarehouse.run(); + GregtechFactoryGradeReplacementMultis.run(); + GregtechThaumcraftDevices.run(); + GregtechThreadedBuffers.run(); + GregtechIndustrialMixer.run(); + GregtechCustomHatches.run(); + GregtechIndustrialArcFurnace.run(); + GregtechSolarTower.run(); + GregtechLargeTurbinesAndHeatExchanger.run(); + GregtechAlgaeContent.run(); + GregtechIndustrialAlloySmelter.run(); + GregtechIsaMill.run(); + GregtechSteamMultis.run(); + GregtechIndustrialForgeHammer.run(); + GregtechMolecularTransformer.run(); + GregtechIndustrialElementDuplicator.run(); + GregtechIndustrialRockBreaker.run(); + GregtechIndustrialChisel.run(); + GregtechIndustrialFluidHeater.run(); + GregtechRedstoneButtonPanel.run(); + GregtechRedstoneCircuitBlock.run(); + GregtechRedstoneLamp.run(); + GregtechRedstoneStrengthDisplay.run(); + GregtechRedstoneStrengthScale.run(); + } + + // InterMod + public static void intermodOreDictionarySupport() { + if (Thaumcraft.isModLoaded()) { + CompatThaumcraft.OreDict(); + } + if (ExtraUtilities.isModLoaded()) { + CompatExtraUtils.OreDict(); + } + if (PamsHarvestCraft.isModLoaded()) { + CompatHarvestCraft.OreDict(); + } + CompatIC2.OreDict(); + if (Witchery.isModLoaded()) { + CompatWitchery.OreDict(); + } + } + + public static void RemoveRecipesFromOtherMods() { + // Removal of Recipes + for (final Object item : RemoveRecipeQueue) { + RecipeUtils.removeCraftingRecipe(item); + } + } + + public static void InitialiseHandlerThenAddRecipes() { + RegistrationHandler.run(); + } + + public static void InitialiseLateHandlerThenAddRecipes() { + LateRegistrationHandler.run(); + } + + public static void startLoadingGregAPIBasedRecipes() { + // Add hand-made recipes + RecipesGregTech.run(); + RecipeLoaderGTNH.generate(); + RecipeLoaderNuclear.generate(); + RecipeLoaderGlueLine.generate(); + RecipeLoaderChemicalSkips.generate(); + // Add autogenerated Recipes from Item Components + for (Set> m : MaterialGenerator.mRecipeMapsToGenerate) { + for (RunnableWithInfo r : m) { + try { + r.run(); + Logger.INFO( + "[FIND] " + r.getInfoData() + .getLocalizedName() + " recipes generated."); + } catch (Throwable t) { + t.printStackTrace(); + Logger.INFO( + "[ERROR] " + r.getInfoData() + .getLocalizedName() + " recipes failed to generated."); + } + } + } + RecipeGenRecycling.executeGenerators(); + runQueuedMisc(); + + // Do Fluid Canning Last, because they're not executed on demand, but rather queued. + RecipeGenFluidCanning.init(); + } + + public static void onLoadComplete(FMLLoadCompleteEvent event) { + runQueuedOnLoadComplete(event); + } + + public static final AutoMap> mRecipesToGenerate = new AutoMap<>(); + public static final AutoMap> mGtRecipesToGenerate = new AutoMap<>(); + + public static final AutoMap> mObjectsToRunInPostInit = new AutoMap<>(); + public static final AutoMap mObjectsToRunInOnLoadComplete = new AutoMap<>(); + + public static void runQueuedRecipes() { + // Add autogenerated Recipes from Item Components + for (RunnableWithInfo m : mRecipesToGenerate) { + try { + m.run(); + } catch (Throwable t) { + t.printStackTrace(); + Logger.INFO("[ERROR] " + m.getInfoData() + " recipe failed to generated."); + } + } + for (RunnableWithInfo m : mGtRecipesToGenerate) { + try { + m.run(); + } catch (Throwable t) { + t.printStackTrace(); + Logger.INFO("[ERROR] " + m.getInfoData() + " recipe failed to generated."); + } + } + } + + public static void runQueuedMisc() { + for (RunnableWithInfo m : mObjectsToRunInPostInit) { + try { + m.run(); + } catch (Throwable t) { + t.printStackTrace(); + Logger.INFO("[ERROR] " + m.getInfoData()); + } + } + } + + /** + * Generally used to register GT recipe map changes after they've been populated. + */ + public static void runQueuedOnLoadComplete(FMLLoadCompleteEvent event) { + for (ItemPackage m : mObjectsToRunInOnLoadComplete) { + try { + m.onLoadComplete(event); + } catch (Throwable t) { + t.printStackTrace(); + Logger.INFO("[ERROR] " + m.getInfoData()); + } + } + } +} 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 sPositiveEffects = new ArrayList<>(); private static ArrayList sNegativeEffects = new ArrayList<>(); diff --git a/src/main/java/gtPlusPlus/core/handler/workbench/WorkbenchCraftingHandler.java b/src/main/java/gtPlusPlus/core/handler/workbench/WorkbenchCraftingHandler.java new file mode 100644 index 0000000000..1d8b2ed68d --- /dev/null +++ b/src/main/java/gtPlusPlus/core/handler/workbench/WorkbenchCraftingHandler.java @@ -0,0 +1,161 @@ +package gtPlusPlus.core.handler.workbench; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.item.crafting.ShapelessRecipes; +import net.minecraft.world.World; + +public class WorkbenchCraftingHandler { + + private static final WorkbenchCraftingHandler instance = new WorkbenchCraftingHandler(); + private final List recipes = new ArrayList<>(); + + public static final WorkbenchCraftingHandler getInstance() { + return instance; + } + + public WorkbenchCraftingHandler() { + + // just a example recipe so you know how to add them + this.addRecipe( + new ItemStack(Blocks.iron_block), + new Object[] { "###", "###", "###", Character.valueOf('#'), Items.iron_ingot }); + + // another example Recipe, but shapeless + this.addShapelessRecipe(new ItemStack(Items.cake), new Object[] { Items.stick }); + } + + void addRecipe(final ItemStack par1ItemStack, final Object par2ArrayOfObj[]) { + String s = ""; + int i = 0; + int j = 0; + int k = 0; + + if (par2ArrayOfObj[i] instanceof String[]) { + final String as[] = (String[]) par2ArrayOfObj[i++]; + + for (final String s2 : as) { + k++; + j = s2.length(); + s = (new StringBuilder()).append(s) + .append(s2) + .toString(); + } + } else { + while (par2ArrayOfObj[i] instanceof String) { + final String s1 = (String) par2ArrayOfObj[i++]; + k++; + j = s1.length(); + s = (new StringBuilder()).append(s) + .append(s1) + .toString(); + } + } + + final HashMap hashmap = new HashMap<>(); + + for (; i < par2ArrayOfObj.length; i += 2) { + final Character character = (Character) par2ArrayOfObj[i]; + ItemStack itemstack = null; + + if (par2ArrayOfObj[i + 1] instanceof Item) { + itemstack = new ItemStack((Item) par2ArrayOfObj[i + 1]); + } else if (par2ArrayOfObj[i + 1] instanceof Block) { + itemstack = new ItemStack((Block) par2ArrayOfObj[i + 1], 1, -1); + } else if (par2ArrayOfObj[i + 1] instanceof ItemStack) { + itemstack = (ItemStack) par2ArrayOfObj[i + 1]; + } + + hashmap.put(character, itemstack); + } + + final ItemStack aitemstack[] = new ItemStack[j * k]; + + for (int i1 = 0; i1 < (j * k); i1++) { + final char c = s.charAt(i1); + + if (hashmap.containsKey(Character.valueOf(c))) { + aitemstack[i1] = hashmap.get(Character.valueOf(c)) + .copy(); + } else { + aitemstack[i1] = null; + } + } + + this.recipes.add(new ShapedRecipes(j, k, aitemstack, par1ItemStack)); + } + + public void addShapelessRecipe(final ItemStack par1ItemStack, final Object par2ArrayOfObj[]) { + final ArrayList arraylist = new ArrayList<>(); + final Object aobj[] = par2ArrayOfObj; + final int i = aobj.length; + + for (final Object obj : aobj) { + if (obj instanceof ItemStack) { + arraylist.add(((ItemStack) obj).copy()); + continue; + } + + if (obj instanceof Item) { + arraylist.add(new ItemStack((Item) obj)); + continue; + } + + if (obj instanceof Block) { +