aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gtPlusPlus/core/common')
-rw-r--r--src/main/java/gtPlusPlus/core/common/CommonProxy.java38
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/CompatBaubles.java (renamed from src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java)22
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/CompatExtraUtils.java (renamed from src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java)6
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/CompatHarvestCraft.java (renamed from src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java)2
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/CompatIC2.java (renamed from src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java)6
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/CompatThaumcraft.java (renamed from src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java)19
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/CompatWitchery.java (renamed from src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java)10
7 files changed, 51 insertions, 52 deletions
diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
index 90b4c99ed8..b358548e15 100644
--- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
@@ -27,8 +27,8 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.entity.InternalEntityRegistry;
import gtPlusPlus.core.handler.BookHandler;
import gtPlusPlus.core.handler.BurnableFuelHandler;
-import gtPlusPlus.core.handler.COMPAT_HANDLER;
-import gtPlusPlus.core.handler.COMPAT_IntermodStaging;
+import gtPlusPlus.core.handler.CompatHandler;
+import gtPlusPlus.core.handler.CompatIntermodStaging;
import gtPlusPlus.core.handler.GuiHandler;
import gtPlusPlus.core.handler.events.EnderDragonDeathHandler;
import gtPlusPlus.core.handler.events.EntityDeathHandler;
@@ -36,14 +36,14 @@ import gtPlusPlus.core.handler.events.GeneralTooltipEventHandler;
import gtPlusPlus.core.handler.events.PlayerSleepEventHandler;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.bauble.BaseBauble;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.tileentities.ModTileEntities;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.EntityUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.CORE_Preloader;
+import gtPlusPlus.preloader.PreloaderCore;
import gtPlusPlus.xmod.gregtech.api.util.SpecialBehaviourTooltipHandler;
import gtPlusPlus.xmod.ic2.CustomInternalName;
@@ -56,9 +56,9 @@ public class CommonProxy {
public void preInit(final FMLPreInitializationEvent e) {
Logger.INFO("Doing some house cleaning.");
- if (!CORE_Preloader.DEBUG_MODE) {
+ if (!PreloaderCore.DEBUG_MODE) {
Logger.WARNING("Development mode not enabled.");
- } else if (CORE_Preloader.DEBUG_MODE) {
+ } else if (PreloaderCore.DEBUG_MODE) {
Logger.INFO("Development mode enabled.");
} else {
Logger.WARNING("Development mode not set.");
@@ -70,7 +70,7 @@ public class CommonProxy {
ModItems.init();
ModBlocks.init();
CI.preInit();
- COMPAT_IntermodStaging.preInit(e);
+ CompatIntermodStaging.preInit(e);
BookHandler.run();
// Registration of entities and renderers
Logger.INFO("[Proxy] Calling Entity registration.");
@@ -97,15 +97,15 @@ public class CommonProxy {
Utils.registerEvent(new EntityDeathHandler());
// Compat Handling
- COMPAT_HANDLER.registerMyModsOreDictEntries();
- COMPAT_HANDLER.intermodOreDictionarySupport();
- COMPAT_IntermodStaging.init(e);
+ CompatHandler.registerMyModsOreDictEntries();
+ CompatHandler.intermodOreDictionarySupport();
+ CompatIntermodStaging.init(e);
}
public void postInit(final FMLPostInitializationEvent e) {
// Make Burnables burnable
- if (!CORE.burnables.isEmpty()) {
+ if (!GTPPCore.burnables.isEmpty()) {
BurnableFuelHandler fuelHandler = new BurnableFuelHandler();
GameRegistry.registerFuelHandler(fuelHandler);
Logger.INFO(
@@ -115,28 +115,28 @@ public class CommonProxy {
// Compat Handling
Logger.INFO("Removing recipes from other mods.");
- COMPAT_HANDLER.RemoveRecipesFromOtherMods();
+ CompatHandler.RemoveRecipesFromOtherMods();
Logger.INFO("Initialising Handler, Then Adding Recipes");
- COMPAT_HANDLER.InitialiseHandlerThenAddRecipes();
+ CompatHandler.InitialiseHandlerThenAddRecipes();
Logger.INFO("Loading Intermod staging.");
- COMPAT_IntermodStaging.postInit(e);
+ CompatIntermodStaging.postInit(e);
Logger.INFO("Loading queued recipes.");
- COMPAT_HANDLER.runQueuedRecipes();
+ CompatHandler.runQueuedRecipes();
Logger.INFO("Registering custom mob drops.");
registerCustomMobDrops();
// Moved last, to prevent recipes being generated post initialisation.
Logger.INFO("Loading Gregtech API recipes.");
- COMPAT_HANDLER.startLoadingGregAPIBasedRecipes();
+ CompatHandler.startLoadingGregAPIBasedRecipes();
}
public void serverStarting(final FMLServerStartingEvent e) {
- COMPAT_HANDLER.InitialiseLateHandlerThenAddRecipes();
+ CompatHandler.InitialiseLateHandlerThenAddRecipes();
}
public void onLoadComplete(FMLLoadCompleteEvent event) {
- COMPAT_IntermodStaging.onLoadComplete(event);
- COMPAT_HANDLER.onLoadComplete(event);
+ CompatIntermodStaging.onLoadComplete(event);
+ CompatHandler.onLoadComplete(event);
}
public void registerNetworkStuff() {
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/main/java/gtPlusPlus/core/common/compat/CompatBaubles.java
index e90596c876..02b6edf453 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/CompatBaubles.java
@@ -1,16 +1,16 @@
package gtPlusPlus.core.common.compat;
import static gregtech.api.enums.Mods.Baubles;
-import static gregtech.client.GT_TooltipHandler.Tier.EV;
-import static gregtech.client.GT_TooltipHandler.Tier.HV;
-import static gregtech.client.GT_TooltipHandler.Tier.IV;
-import static gregtech.client.GT_TooltipHandler.Tier.LV;
-import static gregtech.client.GT_TooltipHandler.Tier.LuV;
-import static gregtech.client.GT_TooltipHandler.Tier.MV;
-import static gregtech.client.GT_TooltipHandler.Tier.UHV;
-import static gregtech.client.GT_TooltipHandler.Tier.UV;
-import static gregtech.client.GT_TooltipHandler.Tier.ZPM;
-import static gregtech.client.GT_TooltipHandler.registerTieredTooltip;
+import static gregtech.client.GTTooltipHandler.Tier.EV;
+import static gregtech.client.GTTooltipHandler.Tier.HV;
+import static gregtech.client.GTTooltipHandler.Tier.IV;
+import static gregtech.client.GTTooltipHandler.Tier.LV;
+import static gregtech.client.GTTooltipHandler.Tier.LuV;
+import static gregtech.client.GTTooltipHandler.Tier.MV;
+import static gregtech.client.GTTooltipHandler.Tier.UHV;
+import static gregtech.client.GTTooltipHandler.Tier.UV;
+import static gregtech.client.GTTooltipHandler.Tier.ZPM;
+import static gregtech.client.GTTooltipHandler.registerTieredTooltip;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
@@ -22,7 +22,7 @@ import gtPlusPlus.core.item.bauble.FireProtectionBauble;
import gtPlusPlus.core.item.general.ItemCloakingDevice;
import gtPlusPlus.core.item.general.ItemHealingDevice;
-public class COMPAT_Baubles {
+public class CompatBaubles {
public static void run() {
if (Baubles.isModLoaded()) {
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java b/src/main/java/gtPlusPlus/core/common/compat/CompatExtraUtils.java
index f61c70ab5b..3d188bd9c0 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/CompatExtraUtils.java
@@ -2,13 +2,13 @@ package gtPlusPlus.core.common.compat;
import net.minecraft.item.ItemStack;
-import gtPlusPlus.core.recipe.RECIPES_Tools;
+import gtPlusPlus.core.recipe.RecipesTools;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-public class COMPAT_ExtraUtils {
+public class CompatExtraUtils {
public static void OreDict() {
- RECIPES_Tools.RECIPE_DivisionSigil = new ItemStack(ItemUtils.getItemFromFQRN("ExtraUtilities:divisionSigil"));
+ RecipesTools.RECIPE_DivisionSigil = new ItemStack(ItemUtils.getItemFromFQRN("ExtraUtilities:divisionSigil"));
run();
}
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java b/src/main/java/gtPlusPlus/core/common/compat/CompatHarvestCraft.java
index 9a9557e418..5e4baf5c88 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/CompatHarvestCraft.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.common.compat;
import gtPlusPlus.xmod.pamsharvest.fishtrap.FishTrapHandler;
-public class COMPAT_HarvestCraft {
+public class CompatHarvestCraft {
public static void OreDict() {
run();
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/main/java/gtPlusPlus/core/common/compat/CompatIC2.java
index c442251a0e..c6662800b2 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/CompatIC2.java
@@ -1,14 +1,14 @@
package gtPlusPlus.core.common.compat;
-import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
+import static gtPlusPlus.core.handler.CompatHandler.RemoveRecipeQueue;
import net.minecraft.item.ItemStack;
-import gtPlusPlus.core.lib.CORE.ConfigSwitches;
+import gtPlusPlus.core.lib.GTPPCore.ConfigSwitches;
import gtPlusPlus.core.recipe.ShapedRecipeObject;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-public class COMPAT_IC2 {
+public class CompatIC2 {
private static ItemStack itemCropnalyzer = ItemUtils.simpleMetaStack("IC2:itemCropnalyzer", 0, 1);
private static ItemStack itemSolarHelmet = ItemUtils.simpleMetaStack("IC2:itemSolarHelmet", 0, 1);
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java b/src/main/java/gtPlusPlus/core/common/compat/CompatThaumcraft.java
index d9c9fec08e..8e06c95c67 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/CompatThaumcraft.java
@@ -2,11 +2,11 @@ package gtPlusPlus.core.common.compat;
import static gregtech.api.enums.Mods.ForbiddenMagic;
-import gregtech.api.util.GT_OreDictUnificator;
-import gtPlusPlus.core.lib.CORE.ConfigSwitches;
+import gregtech.api.util.GTOreDictUnificator;
+import gtPlusPlus.core.lib.GTPPCore.ConfigSwitches;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-public class COMPAT_Thaumcraft {
+public class CompatThaumcraft {
public static void OreDict() {
@@ -19,28 +19,27 @@ public class COMPAT_Thaumcraft {
for (int i = 0; i <= 6; i++) {
ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard " + i, i);
- GT_OreDictUnificator
- .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1));
+ GTOreDictUnificator.registerOre("shardAny", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1));
ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard " + i, i);
- GT_OreDictUnificator
+ GTOreDictUnificator
.registerOre("gemInfusedAnything", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1));
}
if (ForbiddenMagic.isModLoaded()) {
for (int i = 0; i <= 6; i++) {
ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "shardAny", "FM Shard " + i, i);
- GT_OreDictUnificator
+ GTOreDictUnificator
.registerOre("shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1));
ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "gemInfusedAnything", "FM Shard " + i, i);
- GT_OreDictUnificator.registerOre(
+ GTOreDictUnificator.registerOre(
"gemInfusedAnything",
ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1));
}
ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "shardAny", "FM Gluttony Shard", 0);
- GT_OreDictUnificator
+ GTOreDictUnificator
.registerOre("shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1));
ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "gemInfusedAnything", "FM Gluttony Shard", 0);
- GT_OreDictUnificator
+ GTOreDictUnificator
.registerOre("gemInfusedAnything", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1));
}
}
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java b/src/main/java/gtPlusPlus/core/common/compat/CompatWitchery.java
index f6fdd87eec..3003749c79 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/CompatWitchery.java
@@ -4,10 +4,10 @@ import static gregtech.api.enums.Mods.Witchery;
import net.minecraft.item.ItemStack;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-public class COMPAT_Witchery {
+public class CompatWitchery {
public static void OreDict() {
run();
@@ -21,8 +21,8 @@ public class COMPAT_Witchery {
.getItemStackWithMeta(Witchery.isModLoaded(), "witchery:ingredient", "Koboldite Nugget", 149, 1);
ItemStack aKobolditeIngot = ItemUtils
.getItemStackWithMeta(Witchery.isModLoaded(), "witchery:ingredient", "Koboldite Ingot", 150, 1);
- if (aKobolditeDust != null) GT_OreDictUnificator.registerOre("dust" + "Koboldite", aKobolditeDust);
- if (aKobolditeNugget != null) GT_OreDictUnificator.registerOre("nugget" + "Koboldite", aKobolditeNugget);
- if (aKobolditeIngot != null) GT_OreDictUnificator.registerOre("ingot" + "Koboldite", aKobolditeIngot);
+ if (aKobolditeDust != null) GTOreDictUnificator.registerOre("dust" + "Koboldite", aKobolditeDust);
+ if (aKobolditeNugget != null) GTOreDictUnificator.registerOre("nugget" + "Koboldite", aKobolditeNugget);
+ if (aKobolditeIngot != null) GTOreDictUnificator.registerOre("ingot" + "Koboldite", aKobolditeIngot);
}
}
generated by cgit (git 2.34.1) at 2026-01-08 19:15:19 +0000