diff options
author | Alkalus <draknyte1@hotmail.com> | 2018-05-13 01:46:31 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-13 01:46:31 +1000 |
commit | 4d15336cfb84a61d7609d75c683f21ea084f47bb (patch) | |
tree | 1e3e837486ab8843bd97951d3f0cfdf2f69dc0d5 /src/Java/gtPlusPlus/preloader | |
parent | 3ce52cc43f1b41ec0b4f9486afc188bd4d11c055 (diff) | |
download | GT5-Unofficial-4d15336cfb84a61d7609d75c683f21ea084f47bb.tar.gz GT5-Unofficial-4d15336cfb84a61d7609d75c683f21ea084f47bb.tar.bz2 GT5-Unofficial-4d15336cfb84a61d7609d75c683f21ea084f47bb.zip |
Codeenvy (#273)
+ Added recipes for all Advanced Multis.
+ Added new casings for Advanced EBF.
+ Added Turbine Animations.
+ Added recipe for the Air Intake Hatch.
+ Added new textures for the Adv. Vac. Freezer and casings.
% Gave old Adv. Vac. Freezer texture to Adv. EBF.
% Swapped recipe materials for Adv. Vac. and EBF.
+ Added a book for Power Storage Solutions.
+ Added book for the FFPP.
- Removed some useless Meta Tiles. (This removes advanced Mixer recipes, but not the tiles themselves.)
$ Fixed issue with AIC tooltip.
$ Fixed some chemical processing recipes. #266
$ Fixed Large Auto-Assembler Name.
$ Possible fix for #239.
$ Other Bug Fixes.
$ Fixed Old School Circuits breaking Integrated Circuit Recipes.
% Made all FFPP recipes require/produces 1/10th of the original fluid amounts. #268
% Made Adv. EBF. Use new casing textures.
% Streamlined Old School Circuit function call locations to a single handler.
% Cleaned up ASM Logging.
Diffstat (limited to 'src/Java/gtPlusPlus/preloader')
-rw-r--r-- | src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java index f33c0a029d..c3a1f23f53 100644 --- a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java +++ b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java @@ -14,11 +14,14 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class Preloader_GT_OreDict { public static boolean shouldPreventRegistration(final String string, final ItemStack bannedItem) { - - if (bannedItem == null || (!CORE_Preloader.enableOldGTcircuits && !LoadedMods.Mekanism)) { + + if (bannedItem == null) { + return false; + } + else if (!CORE_Preloader.enableOldGTcircuits && !LoadedMods.Mekanism){ return false; } - + try { if (CORE_Preloader.enableOldGTcircuits){ if ((bannedItem != null) && ItemUtils.getModId(bannedItem).toLowerCase().equals("gregtech")){ @@ -145,8 +148,19 @@ public class Preloader_GT_OreDict { FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "A mod tried to register an invalid item with the OreDictionary."); if (bannedItem != null){ FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Please report this issue to the authors of %s", ItemUtils.getModId(bannedItem)); + try { + if (bannedItem.getItemDamage() <= Short.MAX_VALUE-1) { + FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Item was not null, but still invalidly registering: %s", bannedItem.getDisplayName() != null ? bannedItem.getDisplayName() : "INVALID ITEM FOUND"); + } + else { + FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Item was not null, but still invalidly registering: %s", "Found Wildcard item that is being registered too early."); + } + } + catch (Exception h) { + h.printStackTrace(); + } } - FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "%s", e.getMessage()); + //FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "%s", e.getMessage()); } return false; } |