diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/bop')
4 files changed, 13 insertions, 14 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java b/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java index 39aee4681f..918ec9621d 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java +++ b/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java @@ -1,12 +1,13 @@ package gtPlusPlus.xmod.bop; +import static gregtech.api.enums.Mods.BiomesOPlenty; + import java.lang.reflect.Field; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; @@ -33,19 +34,14 @@ public class HANDLER_BiomesOPlenty { public static void preInit() { BOP_Block_Registrator.run(); - if (LoadedMods.BiomesOPlenty) { + if (BiomesOPlenty.isModLoaded()) { setFields(); registerPineconeToOreDict(); } } - public static void init() { - if (LoadedMods.BiomesOPlenty) {} - } - public static void postInit() { BOP_Block_Registrator.recipes(); - if (LoadedMods.BiomesOPlenty) {} } private static void registerPineconeToOreDict() { diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java index 8c8b712c07..22732d647a 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.bop.blocks.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import java.util.Random; @@ -18,7 +20,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -93,7 +94,7 @@ public class LeavesBase extends BlockLeaves { this.leafTextures[i] = new IIcon[leafType[i].length]; for (int j = 0; j < leafType[i].length; ++j) { this.leafTextures[i][j] = iIcon - .registerIcon(CORE.MODID + ":" + "trees/" + "leaves/" + "leaves_" + leafType[i][j]); + .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "leaves/" + "leaves_" + leafType[i][j]); } } setVanillaVariable(this.field_150129_M, this.leafTextures); diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java index 10f217a42d..3547c8b5bf 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.bop.blocks.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.block.BlockLog; @@ -15,7 +17,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -74,9 +75,9 @@ public abstract class LogBase extends BlockLog { this.textureTop = new IIcon[treeType.length]; for (int i = 0; i < this.textureSide.length; ++i) { - this.textureSide[i] = iIcon.registerIcon(CORE.MODID + ":" + "trees/" + "logs/" + "log_" + treeType[i]); + this.textureSide[i] = iIcon.registerIcon(GTPlusPlus.ID + ":" + "trees/" + "logs/" + "log_" + treeType[i]); this.textureTop[i] = iIcon - .registerIcon(CORE.MODID + ":" + "trees/" + "logs/" + "log_" + treeType[i] + "_top"); + .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "logs/" + "log_" + treeType[i] + "_top"); } setVanillaVariable(this.field_150167_a, this.textureSide); diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java index 6a8e1f9cc7..75c0d5bd59 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.bop.blocks.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import java.util.Random; @@ -23,7 +25,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -180,7 +181,7 @@ public class SaplingBase extends BlockSapling { public void registerBlockIcons(IIconRegister iIcon) { for (int i = 0; i < saplingTextures.length; ++i) { saplingTextures[i] = iIcon - .registerIcon(CORE.MODID + ":" + "trees/" + "saplings/" + "sapling_" + saplingTypes[i]); + .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "saplings/" + "sapling_" + saplingTypes[i]); } } } |