diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-07-26 21:22:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 21:22:19 +0200 |
| commit | 140d9e38a3c6bd224985da48238dc4ac9ae07ec0 (patch) | |
| tree | 9d20aa713458e9d29274cdce175f109aae1a86c3 /src | |
| parent | dba555e9f897bceebe78a6b2abe26d87e4e23388 (diff) | |
| parent | 116bbb1246f8d5a9a13d656fea52701600b01036 (diff) | |
| download | GT5-Unofficial-140d9e38a3c6bd224985da48238dc4ac9ae07ec0.tar.gz GT5-Unofficial-140d9e38a3c6bd224985da48238dc4ac9ae07ec0.tar.bz2 GT5-Unofficial-140d9e38a3c6bd224985da48238dc4ac9ae07ec0.zip | |
Merge pull request #14 from Sphyix/master
Removed hazmat logic and ASM to gt5u
Diffstat (limited to 'src')
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java | 3 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java index 287820404a..b322036ef7 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java @@ -41,6 +41,9 @@ public class HazmatUtils { if (mInit) { return; } + //doInit(); Disabled, hazmat moved to gt5u + } + public static void doInit() { mInstance = new HazmatUtils(); diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java index b85e408153..782e6cada0 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java +++ b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java @@ -180,11 +180,10 @@ public class Preloader_Transformer_Handler implements IClassTransformer { * Gregtech ASM Patches */ - //Make GT_Utilities safer - if (transformedName.equals(GT_UTILITY)) { - Preloader_Logger.INFO("Gregtech Utilities Patch", "Transforming "+transformedName); - return new ClassTransformer_GT_Utility(basicClass, transformedName).getWriter().toByteArray(); - } +// if (transformedName.equals(GT_UTILITY)) { +// Preloader_Logger.INFO("Gregtech Utilities Patch", "Transforming "+transformedName); +// return new ClassTransformer_GT_Utility(basicClass, transformedName).getWriter().toByteArray(); +// } //Inject Custom constructors for Busses if (transformedName.equals(GT_MTE_HATCH_INPUTBUS) || transformedName.equals(GT_MTE_HATCH_OUTPUTBUS) || transformedName.equals(GTPP_MTE_HATCH_SUPER_INPUT_BUS) || transformedName.equals(GTPP_MTE_HATCH_SUPER_OUTPUT_BUS)) { Preloader_Logger.INFO("Gregtech Bus Patch", "Transforming "+transformedName); |