diff options
author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-02-05 20:02:33 +0000 |
---|---|---|
committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-02-05 20:02:33 +0000 |
commit | 5507b8c0e7b2117a33dfb1fedbd14b3c30f6a01b (patch) | |
tree | 7e4439b8b7a4d60efc65d6d6aee925c017a0c626 /src/Java/gtPlusPlus/core/handler | |
parent | 6770cc2c03d06ddbb59d993d4f157b3ad02e1d35 (diff) | |
download | GT5-Unofficial-5507b8c0e7b2117a33dfb1fedbd14b3c30f6a01b.tar.gz GT5-Unofficial-5507b8c0e7b2117a33dfb1fedbd14b3c30f6a01b.tar.bz2 GT5-Unofficial-5507b8c0e7b2117a33dfb1fedbd14b3c30f6a01b.zip |
+ Added recipe for Nano Healer.
+ Added recipe for Strange Dust.
+ Added recipe for Slow Builders Ring.
+ Added recipes for Charge Packs.
+ Added recipes to make obtaining Zirconium a little earlier.
+ Added packager recipes for all ore materials.
+ Added lathe recipes for all materials -> rods. Closes #411.
+ Added way to process Silicon Carbide into Synthetic Graphite. Closes #407.
+ Added proper achievement localization for all new AL recipes.
+ Added more INIT_PHASE's.
- Removed ways to obtain Trinium dust in GTNH. (Leave handling to GT instead).
% Adjusted recipes for Cyclotron and Casings, it's now assembled instead of shape crafted.
% Adjusted circuits used in lower tier dehydrator recipes for consistency. Closes #364.
% Adjusted a few materials having '-' in their name within en_US.lang.
% Adjusted power capacity of the Gem Batteries.
% Adjusted tiering for Large Auto-Assembler, it has been reduced by one.
% Adjusted composition of Pikyonium to now require Yttrium, instead of the rare Ytterbium.
% Adjusted composition of DEEP_EARTH_REACTOR_FUEL_DEPOSIT to be slightly more balanced.
% Adjusted smelting point of Zirconium Carbide.
$ Fixed an NPE in GeneralTooltipEventHandler.java.
$ Fixed weird invisible recipes. Closes #304.
$ Confirmed Large Mixer is now working correctly. Closes #366. (Closed in previous commit https://github.com/draknyte1/GTplusplus/commit/918d763dabd82d47db739a1b0a51c01f0803adc0).
$ Confirmed Matter Fabricator is now working correctly. Closes #360.
+ Auto Doors. Closes #338. (Closed in previous commit https://github.com/draknyte1/GTplusplus/commit/22c6a05a8a3a00294bcb8890a1e2a0fdc9196de8).
% Changed Energy Buffer Recipes. Closes #52. (Closed in previous commit https://github.com/draknyte1/GTplusplus/commit/499411aa21ac4a742b6d51ef3ce9c4046d0a22c1).
$ Invalid Recipe. Closes #241. (Closed in unknown, previous commit).
Diffstat (limited to 'src/Java/gtPlusPlus/core/handler')
-rw-r--r-- | src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java index 6c940371b3..6d09f65f3f 100644 --- a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java +++ b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java @@ -7,6 +7,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import gregtech.api.enums.ItemList; +import gtPlusPlus.GTplusplus; +import gtPlusPlus.GTplusplus.INIT_PHASE; import gtPlusPlus.core.handler.events.BlockEventHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -22,8 +24,13 @@ public class GeneralTooltipEventHandler { @SubscribeEvent public void onItemTooltip(ItemTooltipEvent event){ + + if (GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.STARTED) { + return; + } + if (CORE.ConfigSwitches.chanceToDropFluoriteOre > 0) { - if (!BlockEventHandler.blockLimestone.isEmpty()) { + if (BlockEventHandler.blockLimestone != null && !BlockEventHandler.blockLimestone.isEmpty()) { for (ItemStack h : BlockEventHandler.blockLimestone) { if (h != null && Block.getBlockFromItem(h.getItem()) == Block.getBlockFromItem(event.itemStack.getItem())) { if (ItemUtils.getModId(h) != null && !ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) { @@ -32,7 +39,7 @@ public class GeneralTooltipEventHandler { } } } - if (!BlockEventHandler.oreLimestone.isEmpty()) { + if (BlockEventHandler.oreLimestone != null && !BlockEventHandler.oreLimestone.isEmpty()) { for (ItemStack h : BlockEventHandler.oreLimestone) { if (h != null && Block.getBlockFromItem(h.getItem()) == Block.getBlockFromItem(event.itemStack.getItem())) { if (ItemUtils.getModId(h) != null && !ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) { |