diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-03-14 04:40:57 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-03-14 04:40:57 +1000 |
| commit | bf6713f0d1669e400b4545b173c18a3b66cad113 (patch) | |
| tree | 169c30de9539cd3249045280fcea32372d4f7c25 /src/Java/gtPlusPlus/xmod | |
| parent | dde7a2c8c7daabc31b577d5876ef654340658bf7 (diff) | |
| download | GT5-Unofficial-bf6713f0d1669e400b4545b173c18a3b66cad113.tar.gz GT5-Unofficial-bf6713f0d1669e400b4545b173c18a3b66cad113.tar.bz2 GT5-Unofficial-bf6713f0d1669e400b4545b173c18a3b66cad113.zip | |
% Refactored all Everglades stuff to it's own package.
$ Fixed inverted EIO tooltip logic.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
3 files changed, 12 insertions, 12 deletions
diff --git a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java b/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java index 667b5d2e51..bed1ec1c3a 100644 --- a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java +++ b/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java @@ -18,20 +18,20 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent; public class HandlerTooltip_EIO { - Item mIngot; - ItemStack mPulsatingIron; - ItemStack mConductiveIron; - ItemStack mRedstoneAlloy; - ItemStack mElectricalSteel; - ItemStack mEnergeticAlloy; - ItemStack mVibrantAlloy; - ItemStack mSoularium; - ItemStack mDarkIron; + private static volatile Item mIngot; + private static volatile ItemStack mPulsatingIron; + private static volatile ItemStack mConductiveIron; + private static volatile ItemStack mRedstoneAlloy; + private static volatile ItemStack mElectricalSteel; + private static volatile ItemStack mEnergeticAlloy; + private static volatile ItemStack mVibrantAlloy; + private static volatile ItemStack mSoularium; + private static volatile ItemStack mDarkIron; @SubscribeEvent public void onItemTooltip(ItemTooltipEvent event){ //Is EIO loaded? - if (disableEnderIOIngotTooltips && LoadedMods.EnderIO){ + if (!disableEnderIOIngotTooltips && LoadedMods.EnderIO){ //Is the EIO Ingot Item null? //If it is, reflect in. diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index 1b3b682ea4..f510cd08ba 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java @@ -9,7 +9,7 @@ import gtPlusPlus.core.handler.COMPAT_HANDLER; import gtPlusPlus.core.handler.OldCircuitHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.CORE.ConfigSwitches; -import gtPlusPlus.core.world.darkworld.gen.gt.WorldGen_GT; +import gtPlusPlus.everglades.gen.gt.WorldGen_GT; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config; import gtPlusPlus.xmod.gregtech.api.world.GTPP_Worldgen; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java index d60065b367..b47ae47574 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java @@ -20,7 +20,7 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.core.world.darkworld.block.DarkWorldContentLoader; +import gtPlusPlus.everglades.block.DarkWorldContentLoader; import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import ic2.core.init.BlocksItems; |