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 --- .../java/gtPlusPlus/core/common/CommonProxy.java | 38 +++++++------- .../core/common/compat/COMPAT_Baubles.java | 58 ---------------------- .../core/common/compat/COMPAT_ExtraUtils.java | 18 ------- .../core/common/compat/COMPAT_HarvestCraft.java | 14 ------ .../gtPlusPlus/core/common/compat/COMPAT_IC2.java | 58 ---------------------- .../core/common/compat/COMPAT_Thaumcraft.java | 47 ------------------ .../core/common/compat/COMPAT_Witchery.java | 28 ----------- .../core/common/compat/CompatBaubles.java | 58 ++++++++++++++++++++++ .../core/common/compat/CompatExtraUtils.java | 18 +++++++ .../core/common/compat/CompatHarvestCraft.java | 14 ++++++ .../gtPlusPlus/core/common/compat/CompatIC2.java | 58 ++++++++++++++++++++++ .../core/common/compat/CompatThaumcraft.java | 46 +++++++++++++++++ .../core/common/compat/CompatWitchery.java | 28 +++++++++++ 13 files changed, 241 insertions(+), 242 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java delete mode 100644 src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java delete mode 100644 src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java delete mode 100644 src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java delete mode 100644 src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java delete mode 100644 src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java create mode 100644 src/main/java/gtPlusPlus/core/common/compat/CompatBaubles.java create mode 100644 src/main/java/gtPlusPlus/core/common/compat/CompatExtraUtils.java create mode 100644 src/main/java/gtPlusPlus/core/common/compat/CompatHarvestCraft.java create mode 100644 src/main/java/gtPlusPlus/core/common/compat/CompatIC2.java create mode 100644 src/main/java/gtPlusPlus/core/common/compat/CompatThaumcraft.java create mode 100644 src/main/java/gtPlusPlus/core/common/compat/CompatWitchery.java (limited to 'src/main/java/gtPlusPlus/core/common') diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java index 90b4c99ed8..b358548e15 100644 --- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java @@ -27,8 +27,8 @@ import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.entity.InternalEntityRegistry; import gtPlusPlus.core.handler.BookHandler; import gtPlusPlus.core.handler.BurnableFuelHandler; -import gtPlusPlus.core.handler.COMPAT_HANDLER; -import gtPlusPlus.core.handler.COMPAT_IntermodStaging; +import gtPlusPlus.core.handler.CompatHandler; +import gtPlusPlus.core.handler.CompatIntermodStaging; import gtPlusPlus.core.handler.GuiHandler; import gtPlusPlus.core.handler.events.EnderDragonDeathHandler; import gtPlusPlus.core.handler.events.EntityDeathHandler; @@ -36,14 +36,14 @@ import gtPlusPlus.core.handler.events.GeneralTooltipEventHandler; import gtPlusPlus.core.handler.events.PlayerSleepEventHandler; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.bauble.BaseBauble; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.tileentities.ModTileEntities; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.CORE_Preloader; +import gtPlusPlus.preloader.PreloaderCore; import gtPlusPlus.xmod.gregtech.api.util.SpecialBehaviourTooltipHandler; import gtPlusPlus.xmod.ic2.CustomInternalName; @@ -56,9 +56,9 @@ public class CommonProxy { public void preInit(final FMLPreInitializationEvent e) { Logger.INFO("Doing some house cleaning."); - if (!CORE_Preloader.DEBUG_MODE) { + if (!PreloaderCore.DEBUG_MODE) { Logger.WARNING("Development mode not enabled."); - } else if (CORE_Preloader.DEBUG_MODE) { + } else if (PreloaderCore.DEBUG_MODE) { Logger.INFO("Development mode enabled."); } else { Logger.WARNING("Development mode not set."); @@ -70,7 +70,7 @@ public class CommonProxy { ModItems.init(); ModBlocks.init(); CI.preInit(); - COMPAT_IntermodStaging.preInit(e); + CompatIntermodStaging.preInit(e); BookHandler.run(); // Registration of entities and renderers Logger.INFO("[Proxy] Calling Entity registration."); @@ -97,15 +97,15 @@ public class CommonProxy { Utils.registerEvent(new EntityDeathHandler()); // Compat Handling - COMPAT_HANDLER.registerMyModsOreDictEntries(); - COMPAT_HANDLER.intermodOreDictionarySupport(); - COMPAT_IntermodStaging.init(e); + CompatHandler.registerMyModsOreDictEntries(); + CompatHandler.intermodOreDictionarySupport(); + CompatIntermodStaging.init(e); } public void postInit(final FMLPostInitializationEvent e) { // Make Burnables burnable - if (!CORE.burnables.isEmpty()) { + if (!GTPPCore.burnables.isEmpty()) { BurnableFuelHandler fuelHandler = new BurnableFuelHandler(); GameRegistry.registerFuelHandler(fuelHandler); Logger.INFO( @@ -115,28 +115,28 @@ public class CommonProxy { // Compat Handling Logger.INFO("Removing recipes from other mods."); - COMPAT_HANDLER.RemoveRecipesFromOtherMods(); + CompatHandler.RemoveRecipesFromOtherMods(); Logger.INFO("Initialising Handler, Then Adding Recipes"); - COMPAT_HANDLER.InitialiseHandlerThenAddRecipes(); + CompatHandler.InitialiseHandlerThenAddRecipes(); Logger.INFO("Loading Intermod staging."); - COMPAT_IntermodStaging.postInit(e); + CompatIntermodStaging.postInit(e); Logger.INFO("Loading queued recipes."); - COMPAT_HANDLER.runQueuedRecipes(); + CompatHandler.runQueuedRecipes(); Logger.INFO("Registering custom mob drops."); registerCustomMobDrops(); // Moved last, to prevent recipes being generated post initialisation. Logger.INFO("Loading Gregtech API recipes."); - COMPAT_HANDLER.startLoadingGregAPIBasedRecipes(); + CompatHandler.startLoadingGregAPIBasedRecipes(); } public void serverStarting(final FMLServerStartingEvent e) { - COMPAT_HANDLER.InitialiseLateHandlerThenAddRecipes(); + CompatHandler.InitialiseLateHandlerThenAddRecipes(); } public void onLoadComplete(FMLLoadCompleteEvent event) { - COMPAT_IntermodStaging.onLoadComplete(event); - COMPAT_HANDLER.onLoadComplete(event); + CompatIntermodStaging.onLoadComplete(event); + CompatHandler.onLoadComplete(event); } public void registerNetworkStuff() { diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java deleted file mode 100644 index e90596c876..0000000000 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java +++ /dev/null @@ -1,58 +0,0 @@ -package gtPlusPlus.core.common.compat; - -import static gregtech.api.enums.Mods.Baubles; -import static gregtech.client.GT_TooltipHandler.Tier.EV; -import static gregtech.client.GT_TooltipHandler.Tier.HV; -import static gregtech.client.GT_TooltipHandler.Tier.IV; -import static gregtech.client.GT_TooltipHandler.Tier.LV; -import static gregtech.client.GT_TooltipHandler.Tier.LuV; -import static gregtech.client.GT_TooltipHandler.Tier.MV; -import static gregtech.client.GT_TooltipHandler.Tier.UHV; -import static gregtech.client.GT_TooltipHandler.Tier.UV; -import static gregtech.client.GT_TooltipHandler.Tier.ZPM; -import static gregtech.client.GT_TooltipHandler.registerTieredTooltip; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.item.bauble.BatteryPackBaseBauble; -import gtPlusPlus.core.item.bauble.FireProtectionBauble; -import gtPlusPlus.core.item.general.ItemCloakingDevice; -import gtPlusPlus.core.item.general.ItemHealingDevice; - -public class COMPAT_Baubles { - - public static void run() { - if (Baubles.isModLoaded()) { - baublesLoaded(); - } - } - - public static void baublesLoaded() { - Logger.INFO("Baubles Found - Loading Wearables."); - ModItems.itemPersonalCloakingDevice = new ItemCloakingDevice(0); - ModItems.itemPersonalHealingDevice = new ItemHealingDevice(); - ModItems.itemSupremePizzaGloves = new FireProtectionBauble(); - - ModItems.itemChargePack_Low_1 = new BatteryPackBaseBauble(1); - registerTieredTooltip(new ItemStack(ModItems.itemChargePack_Low_1, 1, OreDictionary.WILDCARD_VALUE), LV); - ModItems.itemChargePack_Low_2 = new BatteryPackBaseBauble(2); - registerTieredTooltip(new ItemStack(ModItems.itemChargePack_Low_2, 1, OreDictionary.WILDCARD_VALUE), MV); - ModItems.itemChargePack_Low_3 = new BatteryPackBaseBauble(3); - registerTieredTooltip(new ItemStack(ModItems.itemChargePack_Low_3, 1, OreDictionary.WILDCARD_VALUE), HV); - ModItems.itemChargePack_Low_4 = new BatteryPackBaseBauble(4); - registerTieredTooltip(new ItemStack(ModItems.itemChargePack_Low_4, 1, OreDictionary.WILDCARD_VALUE), EV); - ModItems.itemChargePack_Low_5 = new BatteryPackBaseBauble(5); - registerTieredTooltip(new ItemStack(ModItems.itemChargePack_Low_5, 1, OreDictionary.WILDCARD_VALUE), IV); - ModItems.itemChargePack_High_1 = new BatteryPackBaseBauble(6); - registerTieredTooltip(new ItemStack(ModItems.itemChargePack_High_1, 1, OreDictionary.WILDCARD_VALUE), LuV); - ModItems.itemChargePack_High_2 = new BatteryPackBaseBauble(7); - registerTieredTooltip(new ItemStack(ModItems.itemChargePack_High_2, 1, OreDictionary.WILDCARD_VALUE), ZPM); - ModItems.itemChargePack_High_3 = new BatteryPackBaseBauble(8); - registerTieredTooltip(new ItemStack(ModItems.itemChargePack_High_3, 1, OreDictionary.WILDCARD_VALUE), UV); - ModItems.itemChargePack_High_4 = new BatteryPackBaseBauble(9); - registerTieredTooltip(new ItemStack(ModItems.itemChargePack_High_4, 1, OreDictionary.WILDCARD_VALUE), UHV); - } -} diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java deleted file mode 100644 index f61c70ab5b..0000000000 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java +++ /dev/null @@ -1,18 +0,0 @@ -package gtPlusPlus.core.common.compat; - -import net.minecraft.item.ItemStack; - -import gtPlusPlus.core.recipe.RECIPES_Tools; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class COMPAT_ExtraUtils { - - public static void OreDict() { - RECIPES_Tools.RECIPE_DivisionSigil = new ItemStack(ItemUtils.getItemFromFQRN("ExtraUtilities:divisionSigil")); - run(); - } - - private static void run() { - ItemUtils.getItemForOreDict("ExtraUtilities:bedrockiumIngot", "ingotBedrockium", "Bedrockium Ingot", 0); - } -} diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java deleted file mode 100644 index 9a9557e418..0000000000 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java +++ /dev/null @@ -1,14 +0,0 @@ -package gtPlusPlus.core.common.compat; - -import gtPlusPlus.xmod.pamsharvest.fishtrap.FishTrapHandler; - -public class COMPAT_HarvestCraft { - - public static void OreDict() { - run(); - } - - private static void run() { - FishTrapHandler.pamsHarvestCraftCompat(); - } -} diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java deleted file mode 100644 index c442251a0e..0000000000 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java +++ /dev/null @@ -1,58 +0,0 @@ -package gtPlusPlus.core.common.compat; - -import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue; - -import net.minecraft.item.ItemStack; - -import gtPlusPlus.core.lib.CORE.ConfigSwitches; -import gtPlusPlus.core.recipe.ShapedRecipeObject; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class COMPAT_IC2 { - - private static ItemStack itemCropnalyzer = ItemUtils.simpleMetaStack("IC2:itemCropnalyzer", 0, 1); - private static ItemStack itemSolarHelmet = ItemUtils.simpleMetaStack("IC2:itemSolarHelmet", 0, 1); - - public static ShapedRecipeObject Cropnalyzer = new ShapedRecipeObject( - "ore:cableGt02Copper", - "ore:cableGt02Copper", - null, - "minecraft:redstone", - "ore:blockGlass", - "minecraft:redstone", - "minecraft:redstone", - "ore:circuitBasic", - "minecraft:redstone", - itemCropnalyzer); - public static ShapedRecipeObject SolarHelmet = new ShapedRecipeObject( - "ore:plateIron", - "ore:plateIron", - "ore:plateIron", - "ore:plateIron", - "gregtech:gt.metaitem.01:32750", - "ore:plateIron", - "ore:craftingWireCopper", - "ore:craftingWireCopper", - "ore:craftingWireCopper", - itemSolarHelmet); - - public static void OreDict() { - run(); - } - - private static void run() { - - if (ConfigSwitches.disableIC2Recipes) { - - // Remove these. - RemoveRecipeQueue.add("IC2:itemCable"); - RemoveRecipeQueue.add("IC2:itemCable:1"); - RemoveRecipeQueue.add("IC2:itemCable:2"); - RemoveRecipeQueue.add("IC2:itemCable:3"); - RemoveRecipeQueue.add("IC2:itemCable:5"); - RemoveRecipeQueue.add("IC2:itemCable:6"); - RemoveRecipeQueue.add("IC2:itemCable:10"); - RemoveRecipeQueue.add("IC2:itemCable:13"); - } - } -} diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java deleted file mode 100644 index d9c9fec08e..0000000000 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java +++ /dev/null @@ -1,47 +0,0 @@ -package gtPlusPlus.core.common.compat; - -import static gregtech.api.enums.Mods.ForbiddenMagic; - -import gregtech.api.util.GT_OreDictUnificator; -import gtPlusPlus.core.lib.CORE.ConfigSwitches; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class COMPAT_Thaumcraft { - - public static void OreDict() { - - if (ConfigSwitches.enableThaumcraftShardUnification) { - run(); - } - } - - private static void run() { - - for (int i = 0; i <= 6; i++) { - ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard " + i, i); - GT_OreDictUnificator - .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1)); - ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard " + i, i); - GT_OreDictUnificator - .registerOre("gemInfusedAnything", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1)); - } - - if (ForbiddenMagic.isModLoaded()) { - for (int i = 0; i <= 6; i++) { - ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "shardAny", "FM Shard " + i, i); - GT_OreDictUnificator - .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1)); - ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "gemInfusedAnything", "FM Shard " + i, i); - GT_OreDictUnificator.registerOre( - "gemInfusedAnything", - ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1)); - } - ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "shardAny", "FM Gluttony Shard", 0); - GT_OreDictUnificator - .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1)); - ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "gemInfusedAnything", "FM Gluttony Shard", 0); - GT_OreDictUnificator - .registerOre("gemInfusedAnything", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1)); - } - } -} diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java deleted file mode 100644 index f6fdd87eec..0000000000 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java +++ /dev/null @@ -1,28 +0,0 @@ -package gtPlusPlus.core.common.compat; - -import static gregtech.api.enums.Mods.Witchery; - -import net.minecraft.item.ItemStack; - -import gregtech.api.util.GT_OreDictUnificator; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class COMPAT_Witchery { - - public static void OreDict() { - run(); - } - - private static void run() { - // Koboldite - ItemStack aKobolditeDust = ItemUtils - .getItemStackWithMeta(Witchery.isModLoaded(), "witchery:ingredient", "Koboldite Dust", 148, 1); - ItemStack aKobolditeNugget = ItemUtils - .getItemStackWithMeta(Witchery.isModLoaded(), "witchery:ingredient", "Koboldite Nugget", 149, 1); - ItemStack aKobolditeIngot = ItemUtils - .getItemStackWithMeta(Witchery.isModLoaded(), "witchery:ingredient", "Koboldite Ingot", 150, 1); - if (aKobolditeDust != null) GT_OreDictUnificator.registerOre("dust" + "Koboldite", aKobolditeDust); - if (aKobolditeNugget != null) GT_OreDictUnificator.registerOre("nugget" + "Koboldite", aKobolditeNugget); - if (aKobolditeIngot != null) GT_OreDictUnificator.registerOre("ingot" + "Koboldite", aKobolditeIngot); - } -} diff --git a/src/main/java/gtPlusPlus/core/common/compat/CompatBaubles.java b/src/main/java/gtPlusPlus/core/common/compat/CompatBaubles.java new file mode 100644 index 0000000000..02b6edf453 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/common/compat/CompatBaubles.java @@ -0,0 +1,58 @@ +package gtPlusPlus.core.common.compat; + +import static gregtech.api.enums.Mods.Baubles; +import static gregtech.client.GTTooltipHandler.Tier.EV; +import static gregtech.client.GTTooltipHandler.Tier.HV; +import static gregtech.client.GTTooltipHandler.Tier.IV; +import static gregtech.client.GTTooltipHandler.Tier.LV; +import static gregtech.client.GTTooltipHandler.Tier.LuV; +import static gregtech.client.GTTooltipHandler.Tier.MV; +import static gregtech.client.GTTooltipHandler.Tier.UHV; +import static gregtech.client.GTTooltipHandler.Tier.UV; +import static gregtech.client.GTTooltipHandler.Tier.ZPM; +import static gregtech.client.GTTooltipHandler.registerTieredTooltip; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.item.ModItems; +import gtPlusPlus.core.item.bauble.BatteryPackBaseBauble; +import gtPlusPlus.core.item.bauble.FireProtectionBauble; +import gtPlusPlus.core.item.general.ItemCloakingDevice; +import gtPlusPlus.core.item.general.ItemHealingDevice; + +public class CompatBaubles { + + public static void run() { + if (Baubles.isModLoaded()) { + baublesLoaded(); + } + } + + public static void baublesLoaded() { + Logger.INFO("Baubles Found - Loading Wearables."); + ModItems.itemPersonalCloakingDevice = new ItemCloakingDevice(0); + ModItems.itemPersonalHealingDevice = new ItemHealingDevice(); + ModItems.itemSupremePizzaGloves = new FireProtectionBauble(); + + ModItems.itemChargePack_Low_1 = new BatteryPackBaseBauble(1); + registerTieredTooltip(new ItemStack(ModItems.itemChargePack_Low_1, 1, OreDictionary.WILDCARD_VALUE), LV); + ModItems.itemChargePack_Low_2 = new BatteryPackBaseBauble(2); + registerTieredTooltip(new ItemStack(ModItems.itemChargePack_Low_2, 1, OreDictionary.WILDCARD_VALUE), MV); + ModItems.itemChargePack_Low_3 = new BatteryPackBaseBauble(3); + registerTieredTooltip(new ItemStack(ModItems.itemChargePack_Low_3, 1, OreDictionary.WILDCARD_VALUE), HV); + ModItems.itemChargePack_Low_4 = new BatteryPackBaseBauble(4); + registerTieredTooltip(new ItemStack(ModItems.itemChargePack_Low_4, 1, OreDictionary.WILDCARD_VALUE), EV); + ModItems.itemChargePack_Low_5 = new BatteryPackBaseBauble(5); + registerTieredTooltip(new ItemStack(ModItems.itemChargePack_Low_5, 1, OreDictionary.WILDCARD_VALUE), IV); + ModItems.itemChargePack_High_1 = new BatteryPackBaseBauble(6); + registerTieredTooltip(new ItemStack(ModItems.itemChargePack_High_1, 1, OreDictionary.WILDCARD_VALUE), LuV); + ModItems.itemChargePack_High_2 = new BatteryPackBaseBauble(7); + registerTieredTooltip(new ItemStack(ModItems.itemChargePack_High_2, 1, OreDictionary.WILDCARD_VALUE), ZPM); + ModItems.itemChargePack_High_3 = new BatteryPackBaseBauble(8); + registerTieredTooltip(new ItemStack(ModItems.itemChargePack_High_3, 1, OreDictionary.WILDCARD_VALUE), UV); + ModItems.itemChargePack_High_4 = new BatteryPackBaseBauble(9); + registerTieredTooltip(new ItemStack(ModItems.itemChargePack_High_4, 1, OreDictionary.WILDCARD_VALUE), UHV); + } +} diff --git a/src/main/java/gtPlusPlus/core/common/compat/CompatExtraUtils.java b/src/main/java/gtPlusPlus/core/common/compat/CompatExtraUtils.java new file mode 100644 index 0000000000..3d188bd9c0 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/common/compat/CompatExtraUtils.java @@ -0,0 +1,18 @@ +package gtPlusPlus.core.common.compat; + +import net.minecraft.item.ItemStack; + +import gtPlusPlus.core.recipe.RecipesTools; +import gtPlusPlus.core.util.minecraft.ItemUtils; + +public class CompatExtraUtils { + + public static void OreDict() { + RecipesTools.RECIPE_DivisionSigil = new ItemStack(ItemUtils.getItemFromFQRN("ExtraUtilities:divisionSigil")); + run(); + } + + private static void run() { + ItemUtils.getItemForOreDict("ExtraUtilities:bedrockiumIngot", "ingotBedrockium", "Bedrockium Ingot", 0); + } +} diff --git a/src/main/java/gtPlusPlus/core/common/compat/CompatHarvestCraft.java b/src/main/java/gtPlusPlus/core/common/compat/CompatHarvestCraft.java new file mode 100644 index 0000000000..5e4baf5c88 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/common/compat/CompatHarvestCraft.java @@ -0,0 +1,14 @@ +package gtPlusPlus.core.common.compat; + +import gtPlusPlus.xmod.pamsharvest.fishtrap.FishTrapHandler; + +public class CompatHarvestCraft { + + public static void OreDict() { + run(); + } + + private static void run() { + FishTrapHandler.pamsHarvestCraftCompat(); + } +} diff --git a/src/main/java/gtPlusPlus/core/common/compat/CompatIC2.java b/src/main/java/gtPlusPlus/core/common/compat/CompatIC2.java new file mode 100644 index 0000000000..c6662800b2 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/common/compat/CompatIC2.java @@ -0,0 +1,58 @@ +package gtPlusPlus.core.common.compat; + +import static gtPlusPlus.core.handler.CompatHandler.RemoveRecipeQueue; + +import net.minecraft.item.ItemStack; + +import gtPlusPlus.core.lib.GTPPCore.ConfigSwitches; +import gtPlusPlus.core.recipe.ShapedRecipeObject; +import gtPlusPlus.core.util.minecraft.ItemUtils; + +public class CompatIC2 { + + private static ItemStack itemCropnalyzer = ItemUtils.simpleMetaStack("IC2:itemCropnalyzer", 0, 1); + private static ItemStack itemSolarHelmet = ItemUtils.simpleMetaStack("IC2:itemSolarHelmet", 0, 1); + + public static ShapedRecipeObject Cropnalyzer = new ShapedRecipeObject( + "ore:cableGt02Copper", + "ore:cableGt02Copper", + null, + "minecraft:redstone", + "ore:blockGlass", + "minecraft:redstone", + "minecraft:redstone", + "ore:circuitBasic", + "minecraft:redstone", + itemCropnalyzer); + public static ShapedRecipeObject SolarHelmet = new ShapedRecipeObject( + "ore:plateIron", + "ore:plateIron", + "ore:plateIron", + "ore:plateIron", + "gregtech:gt.metaitem.01:32750", + "ore:plateIron", + "ore:craftingWireCopper", + "ore:craftingWireCopper", + "ore:craftingWireCopper", + itemSolarHelmet); + + public static void OreDict() { + run(); + } + + private static void run() { + + if (ConfigSwitches.disableIC2Recipes) { + + // Remove these. + RemoveRecipeQueue.add("IC2:itemCable"); + RemoveRecipeQueue.add("IC2:itemCable:1"); + RemoveRecipeQueue.add("IC2:itemCable:2"); + RemoveRecipeQueue.add("IC2:itemCable:3"); + RemoveRecipeQueue.add("IC2:itemCable:5"); + RemoveRecipeQueue.add("IC2:itemCable:6"); + RemoveRecipeQueue.add("IC2:itemCable:10"); + RemoveRecipeQueue.add("IC2:itemCable:13"); + } + } +} diff --git a/src/main/java/gtPlusPlus/core/common/compat/CompatThaumcraft.java b/src/main/java/gtPlusPlus/core/common/compat/CompatThaumcraft.java new file mode 100644 index 0000000000..8e06c95c67 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/common/compat/CompatThaumcraft.java @@ -0,0 +1,46 @@ +package gtPlusPlus.core.common.compat; + +import static gregtech.api.enums.Mods.ForbiddenMagic; + +import gregtech.api.util.GTOreDictUnificator; +import gtPlusPlus.core.lib.GTPPCore.ConfigSwitches; +import gtPlusPlus.core.util.minecraft.ItemUtils; + +public class CompatThaumcraft { + + public static void OreDict() { + + if (ConfigSwitches.enableThaumcraftShardUnification) { + run(); + } + } + + private static void run() { + + for (int i = 0; i <= 6; i++) { + ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard " + i, i); + GTOreDictUnificator.registerOre("shardAny", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1)); + ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard " + i, i); + GTOreDictUnificator + .registerOre("gemInfusedAnything", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1)); + } + + if (ForbiddenMagic.isModLoaded()) { + for (int i = 0; i <= 6; i++) { + ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "shardAny", "FM Shard " + i, i); + GTOreDictUnificator + .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1)); + ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "gemInfusedAnything", "FM Shard " + i, i); + GTOreDictUnificator.registerOre( + "gemInfusedAnything", + ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1)); + } + ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "shardAny", "FM Gluttony Shard", 0); + GTOreDictUnificator + .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1)); + ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "gemInfusedAnything", "FM Gluttony Shard", 0); + GTOreDictUnificator + .registerOre("gemInfusedAnything", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1)); + } + } +} diff --git a/src/main/java/gtPlusPlus/core/common/compat/CompatWitchery.java b/src/main/java/gtPlusPlus/core/common/compat/CompatWitchery.java new file mode 100644 index 0000000000..3003749c79 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/common/compat/CompatWitchery.java @@ -0,0 +1,28 @@ +package gtPlusPlus.core.common.compat; + +import static gregtech.api.enums.Mods.Witchery; + +import net.minecraft.item.ItemStack; + +import gregtech.api.util.GTOreDictUnificator; +import gtPlusPlus.core.util.minecraft.ItemUtils; + +public class CompatWitchery { + + public static void OreDict() { + run(); + } + + private static void run() { + // Koboldite + ItemStack aKobolditeDust = ItemUtils + .getItemStackWithMeta(Witchery.isModLoaded(), "witchery:ingredient", "Koboldite Dust", 148, 1); + ItemStack aKobolditeNugget = ItemUtils + .getItemStackWithMeta(Witchery.isModLoaded(), "witchery:ingredient", "Koboldite Nugget", 149, 1); + ItemStack aKobolditeIngot = ItemUtils + .getItemStackWithMeta(Witchery.isModLoaded(), "witchery:ingredient", "Koboldite Ingot", 150, 1); + if (aKobolditeDust != null) GTOreDictUnificator.registerOre("dust" + "Koboldite", aKobolditeDust); + if (aKobolditeNugget != null) GTOreDictUnificator.registerOre("nugget" + "Koboldite", aKobolditeNugget); + if (aKobolditeIngot != null) GTOreDictUnificator.registerOre("ingot" + "Koboldite", aKobolditeIngot); + } +} -- cgit