aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/preloader/asm
diff options
context:
space:
mode:
authorNotAPenguin <michiel.vandeginste@gmail.com>2024-09-02 23:17:17 +0200
committerGitHub <noreply@github.com>2024-09-02 23:17:17 +0200
commit1b820de08a05070909a267e17f033fcf58ac8710 (patch)
tree02831a025986a06b20f87e5bcc69d1e0c639a342 /src/main/java/gtPlusPlus/preloader/asm
parentafd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff)
downloadGT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz
GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2
GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip
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
Diffstat (limited to 'src/main/java/gtPlusPlus/preloader/asm')
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java12
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/PreloaderDummyContainer.java (renamed from src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java)20
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java4
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java20
4 files changed, 28 insertions, 28 deletions
diff --git a/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java b/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java
index b4a49c275c..5fa903906a 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java
@@ -9,7 +9,7 @@ import net.minecraftforge.common.config.Property;
import org.apache.logging.log4j.Level;
import cpw.mods.fml.common.FMLLog;
-import gtPlusPlus.preloader.Preloader_Logger;
+import gtPlusPlus.preloader.PreloaderLogger;
public class AsmConfig {
@@ -130,11 +130,11 @@ public class AsmConfig {
config.save();
}
- Preloader_Logger.INFO("Gt Nbt Fix - Enabled: " + enableGtNbtFix);
- Preloader_Logger.INFO("Gt Tooltip Fix - Enabled: " + enableGtTooltipFix);
- Preloader_Logger.INFO("COFH Patch - Enabled: " + enableCofhPatch);
- Preloader_Logger.INFO("Thaumcraft Aspect Safety Patch - Enabled: " + enableTcAspectSafety);
- Preloader_Logger
+ PreloaderLogger.INFO("Gt Nbt Fix - Enabled: " + enableGtNbtFix);
+ PreloaderLogger.INFO("Gt Tooltip Fix - Enabled: " + enableGtTooltipFix);
+ PreloaderLogger.INFO("COFH Patch - Enabled: " + enableCofhPatch);
+ PreloaderLogger.INFO("Thaumcraft Aspect Safety Patch - Enabled: " + enableTcAspectSafety);
+ PreloaderLogger
.INFO("Fix bad usage of EntityLivingBase.setHealth Patch - Enabled: " + enabledFixEntitySetHealth);
} catch (Exception var3) {
diff --git a/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java b/src/main/java/gtPlusPlus/preloader/asm/PreloaderDummyContainer.java
index c77f570a8d..8e0684e53f 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/PreloaderDummyContainer.java
@@ -15,17 +15,17 @@ import cpw.mods.fml.common.DummyModContainer;
import cpw.mods.fml.common.LoadController;
import cpw.mods.fml.common.ModMetadata;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import gtPlusPlus.preloader.CORE_Preloader;
-import gtPlusPlus.preloader.Preloader_Logger;
+import gtPlusPlus.preloader.PreloaderCore;
+import gtPlusPlus.preloader.PreloaderLogger;
-public class Preloader_DummyContainer extends DummyModContainer {
+public class PreloaderDummyContainer extends DummyModContainer {
- public Preloader_DummyContainer() {
+ public PreloaderDummyContainer() {
super(new ModMetadata());
ModMetadata meta = getMetadata();
- meta.modId = CORE_Preloader.MODID;
- meta.name = CORE_Preloader.NAME;
- meta.version = CORE_Preloader.VERSION;
+ meta.modId = PreloaderCore.MODID;
+ meta.name = PreloaderCore.NAME;
+ meta.version = PreloaderCore.VERSION;
meta.credits = "Roll Credits ...";
meta.authorList = Collections.singletonList("Alkalus");
meta.screenshots = new String[0];
@@ -40,7 +40,7 @@ public class Preloader_DummyContainer extends DummyModContainer {
@Subscribe
public void preInit(FMLPreInitializationEvent event) {
- Preloader_Logger.INFO("Loading " + CORE_Preloader.MODID + " V" + CORE_Preloader.VERSION);
+ PreloaderLogger.INFO("Loading " + PreloaderCore.MODID + " V" + PreloaderCore.VERSION);
// Handle GT++ Config
handleConfigFile(event);
}
@@ -51,7 +51,7 @@ public class Preloader_DummyContainer extends DummyModContainer {
config.load();
// BGM Watchdog
- CORE_Preloader.enableWatchdogBGM = config.getInt(
+ PreloaderCore.enableWatchdogBGM = config.getInt(
"enableWatchdogBGM",
"features",
0,
@@ -60,7 +60,7 @@ public class Preloader_DummyContainer extends DummyModContainer {
"Set to a value greater than 0 to reduce the ticks taken to delay between BGM tracks. Acceptable Values are 1-32767, where 0 is disabled. Vanilla Uses 12,000 & 24,000. 200 is 10s.");
// Circuits
- CORE_Preloader.enableOldGTcircuits = config.getBoolean(
+ PreloaderCore.enableOldGTcircuits = config.getBoolean(
"enableOldGTcircuits",
GregTech.ID,
false,
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java
index 82526b1290..89554db7a1 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java
@@ -56,7 +56,7 @@ public class Preloader_ClassTransformer {
.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Injecting target method. [Unobfuscated]");
super.visitMethodInsn(
INVOKESTATIC,
- "gtPlusPlus/preloader/Preloader_GT_OreDict",
+ "gtPlusPlus/preloader/PreloaderGTOreDict",
"shouldPreventRegistration",
"(Ljava/lang/String;Lnet/minecraft/item/ItemStack;)Z",
false);
@@ -65,7 +65,7 @@ public class Preloader_ClassTransformer {
.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Injecting target method. [Obfuscated]");
super.visitMethodInsn(
INVOKESTATIC,
- "gtPlusPlus/preloader/Preloader_GT_OreDict",
+ "gtPlusPlus/preloader/PreloaderGTOreDict",
"shouldPreventRegistration",
"(Ljava/lang/String;Ladd;)Z",
false);
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
index 922ce88e27..06372740e4 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
@@ -9,8 +9,8 @@ import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassWriter;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.CORE_Preloader;
-import gtPlusPlus.preloader.Preloader_Logger;
+import gtPlusPlus.preloader.PreloaderCore;
+import gtPlusPlus.preloader.PreloaderLogger;
import gtPlusPlus.preloader.asm.AsmConfig;
import gtPlusPlus.preloader.asm.transformers.Preloader_ClassTransformer.OreDictionaryVisitor;
@@ -51,14 +51,14 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
// Do not transform if using lwjgl3
&& !ReflectionUtils.doesClassExist("org.lwjgl.system.Platform")) {
boolean isClientSettingsClass = !transformedName.equals("org.lwjgl.input.Keyboard");
- Preloader_Logger.INFO("LWJGL Keybinding index out of bounds fix", "Transforming " + transformedName);
+ PreloaderLogger.INFO("LWJGL Keybinding index out of bounds fix", "Transforming " + transformedName);
return new ClassTransformer_LWJGL_Keyboard(basicClass, isClientSettingsClass).getWriter()
.toByteArray();
}
// Fix the OreDictionary - Forge
if (transformedName.equals(FORGE_ORE_DICTIONARY) && AsmConfig.enableOreDictPatch) {
- Preloader_Logger.INFO("OreDictTransformer", "Transforming " + transformedName);
+ PreloaderLogger.INFO("OreDictTransformer", "Transforming " + transformedName);
ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
new ClassReader(basicClass).accept(new OreDictionaryVisitor(classWriter), 0);
return classWriter.toByteArray();
@@ -66,15 +66,15 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
// Fix the OreDictionary COFH
if (transformedName.equals(COFH_ORE_DICTIONARY_ARBITER)
- && (AsmConfig.enableCofhPatch || CORE_Preloader.DEV_ENVIRONMENT)) {
- Preloader_Logger.INFO("COFH", "Transforming " + transformedName);
+ && (AsmConfig.enableCofhPatch || PreloaderCore.DEV_ENVIRONMENT)) {
+ PreloaderLogger.INFO("COFH", "Transforming " + transformedName);
return new ClassTransformer_COFH_OreDictionaryArbiter(basicClass).getWriter()
.toByteArray();
}
if (IC2_WRENCH_PATCH_CLASS_NAMES.contains(transformedName)) {
- Preloader_Logger.INFO("IC2 getHarvestTool Patch", "Transforming " + transformedName);
- return new ClassTransformer_IC2_GetHarvestTool(basicClass, !CORE_Preloader.DEV_ENVIRONMENT, transformedName)
+ PreloaderLogger.INFO("IC2 getHarvestTool Patch", "Transforming " + transformedName);
+ return new ClassTransformer_IC2_GetHarvestTool(basicClass, !PreloaderCore.DEV_ENVIRONMENT, transformedName)
.getWriter()
.toByteArray();
}
@@ -82,8 +82,8 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
// Fix Thaumcraft stuff
// Patching ItemWispEssence to allow invalid item handling
if (transformedName.equals(THAUMCRAFT_ITEM_WISP_ESSENCE) && AsmConfig.enableTcAspectSafety) {
- Preloader_Logger.INFO("Thaumcraft WispEssence_Patch", "Transforming " + transformedName);
- return new ClassTransformer_TC_ItemWispEssence(basicClass, !CORE_Preloader.DEV_ENVIRONMENT).getWriter()
+ PreloaderLogger.INFO("Thaumcraft WispEssence_Patch", "Transforming " + transformedName);
+ return new ClassTransformer_TC_ItemWispEssence(basicClass, !PreloaderCore.DEV_ENVIRONMENT).getWriter()
.toByteArray();
}