diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2022-01-21 19:17:26 +0000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2022-01-21 19:17:26 +0000 |
| commit | ba8f7141fb7f91c0f7e769afa9bf406071f33759 (patch) | |
| tree | 3b1a7ebd8343e61a8314b023a3e5e253b0dad968 /src/main/java/gtPlusPlus/preloader/asm | |
| parent | 8ef649f21845808a6f58f02a4b50c799529eb258 (diff) | |
| parent | 888f07c5796b860bb7e0fbb507a5728950e941fd (diff) | |
| download | GT5-Unofficial-ba8f7141fb7f91c0f7e769afa9bf406071f33759.tar.gz GT5-Unofficial-ba8f7141fb7f91c0f7e769afa9bf406071f33759.tar.bz2 GT5-Unofficial-ba8f7141fb7f91c0f7e769afa9bf406071f33759.zip | |
Merge branch 'master' of https://github.com/GTNewHorizons/GTplusplus into New-Multis-3
# Conflicts:
# .gitignore
# build.gradle
# src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
# src/main/java/gtPlusPlus/core/lib/LoadedMods.java
# src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
# src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
# src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
# src/main/resources/assets/miscutils/lang/en_US.lang
Diffstat (limited to 'src/main/java/gtPlusPlus/preloader/asm')
| -rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java | 4 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java b/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java index 5ff001ea2a..fd07fd1bbe 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java +++ b/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java @@ -79,8 +79,8 @@ public class Preloader_FMLLoadingPlugin implements IFMLLoadingPlugin { //Preloader_Logger.INFO("Is Client? "+Utils.isClient()+" | Is Server? "+Utils.isServer()); Locale aDefaultLocale = Locale.getDefault(); NumberFormat aFormat = NumberFormat.getInstance(); - Locale aDisplayLocale = (Locale) ReflectionUtils.getFieldValue(ReflectionUtils.getField(Locale.class, "defaultDisplayLocale")); - Locale aFormatLocale = (Locale) ReflectionUtils.getFieldValue(ReflectionUtils.getField(Locale.class, "defaultFormatLocale")); + Locale aDisplayLocale = ReflectionUtils.getFieldValue(ReflectionUtils.getField(Locale.class, "defaultDisplayLocale")); + Locale aFormatLocale = ReflectionUtils.getFieldValue(ReflectionUtils.getField(Locale.class, "defaultFormatLocale")); Preloader_Logger.INFO("Locale: "+aDefaultLocale+" | Test: "+aFormat.format(1000000000)+" | Display: "+aDisplayLocale+" | Format: "+aFormatLocale); } diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java index 05b8054ff8..86a22ce4b9 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java @@ -82,7 +82,7 @@ public class ClassTransformer_TT_ThaumicRestorer { mTookLastTick = ReflectionUtils.getField(mTileRepairerClass, "tookLastTick"); mDamageLastTick = ReflectionUtils.getField(mTileRepairerClass, "dmgLastTick"); mProxyTC = ReflectionUtils.getField(mThaumicTinkerer, "tcProxy"); - repairTConTools = (boolean) ReflectionUtils.getFieldValue(mRepairTiconTools); + repairTConTools = ReflectionUtils.getFieldValue(mRepairTiconTools); mInit = true; } if (mInit) { |