diff --git a/src/main/java/biomesoplenty/api/BOPBlockHelper.java b/src/main/java/biomesoplenty/api/BOPBlockHelper.java index a9f7fa7e0..9aabeab1e 100644 --- a/src/main/java/biomesoplenty/api/BOPBlockHelper.java +++ b/src/main/java/biomesoplenty/api/BOPBlockHelper.java @@ -1,9 +1,7 @@ package biomesoplenty.api; import net.minecraft.block.Block; -import biomesoplenty.common.utils.BOPModInfo; import cpw.mods.fml.common.registry.GameData; -import cpw.mods.fml.common.registry.GameRegistry; public class BOPBlockHelper { diff --git a/src/main/java/biomesoplenty/api/content/BOPCBlocks.java b/src/main/java/biomesoplenty/api/content/BOPCBlocks.java index 86092459d..22304e410 100644 --- a/src/main/java/biomesoplenty/api/content/BOPCBlocks.java +++ b/src/main/java/biomesoplenty/api/content/BOPCBlocks.java @@ -1,82 +1,6 @@ package biomesoplenty.api.content; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import biomesoplenty.api.BOPBlockHelper; -import biomesoplenty.common.blocks.BlockAsh; -import biomesoplenty.common.blocks.BlockBOPAppleLeaves; -import biomesoplenty.common.blocks.BlockBOPColorizedLeaves; -import biomesoplenty.common.blocks.BlockBOPColorizedSapling; -import biomesoplenty.common.blocks.BlockBOPCoral; -import biomesoplenty.common.blocks.BlockBOPFlower; -import biomesoplenty.common.blocks.BlockBOPFlower2; -import biomesoplenty.common.blocks.BlockBOPFoliage; -import biomesoplenty.common.blocks.BlockBOPGems; -import biomesoplenty.common.blocks.BlockBOPGeneric; -import biomesoplenty.common.blocks.BlockBOPGrass; -import biomesoplenty.common.blocks.BlockBOPLeaves; -import biomesoplenty.common.blocks.BlockBOPLog; -import biomesoplenty.common.blocks.BlockBOPMushroom; -import biomesoplenty.common.blocks.BlockBOPPersimmonLeaves; -import biomesoplenty.common.blocks.BlockBOPPetals; -import biomesoplenty.common.blocks.BlockBOPPlank; -import biomesoplenty.common.blocks.BlockBOPPlant; -import biomesoplenty.common.blocks.BlockBOPRocks; -import biomesoplenty.common.blocks.BlockBOPSapling; -import biomesoplenty.common.blocks.BlockBOPSlab; -import biomesoplenty.common.blocks.BlockBOPStairs; -import biomesoplenty.common.blocks.BlockBamboo; -import biomesoplenty.common.blocks.BlockBones; -import biomesoplenty.common.blocks.BlockFlesh; -import biomesoplenty.common.blocks.BlockFlowerVine; -import biomesoplenty.common.blocks.BlockGrave; -import biomesoplenty.common.blocks.BlockHive; -import biomesoplenty.common.blocks.BlockHoney; -import biomesoplenty.common.blocks.BlockIvy; -import biomesoplenty.common.blocks.BlockLongGrass; -import biomesoplenty.common.blocks.BlockMoss; -import biomesoplenty.common.blocks.BlockMud; -import biomesoplenty.common.blocks.BlockOriginGrass; -import biomesoplenty.common.blocks.BlockOvergrownNetherrack; -import biomesoplenty.common.blocks.BlockStoneFormations; -import biomesoplenty.common.blocks.BlockTreeMoss; -import biomesoplenty.common.blocks.BlockTurnip; -import biomesoplenty.common.blocks.BlockWillow; -import biomesoplenty.common.blocks.BlockBOPColorizedLeaves.ColourizedLeafCategory; -import biomesoplenty.common.blocks.BlockBOPCoral.CoralCategory; -import biomesoplenty.common.blocks.BlockBOPGeneric.BlockType; -import biomesoplenty.common.blocks.BlockBOPLeaves.LeafCategory; -import biomesoplenty.common.blocks.BlockBOPLog.LogCategory; -import biomesoplenty.common.blocks.BlockBOPSlab.SlabCategory; -import biomesoplenty.common.blocks.BlockBOPStairs.Category; -import biomesoplenty.common.itemblocks.ItemBlockAppleLeaves; -import biomesoplenty.common.itemblocks.ItemBlockBamboo; -import biomesoplenty.common.itemblocks.ItemBlockBones; -import biomesoplenty.common.itemblocks.ItemBlockColorizedLeaves; -import biomesoplenty.common.itemblocks.ItemBlockColorizedSapling; -import biomesoplenty.common.itemblocks.ItemBlockCoral; -import biomesoplenty.common.itemblocks.ItemBlockFlower; -import biomesoplenty.common.itemblocks.ItemBlockFlower2; -import biomesoplenty.common.itemblocks.ItemBlockFoliage; -import biomesoplenty.common.itemblocks.ItemBlockGems; -import biomesoplenty.common.itemblocks.ItemBlockGrass; -import biomesoplenty.common.itemblocks.ItemBlockGrave; -import biomesoplenty.common.itemblocks.ItemBlockHive; -import biomesoplenty.common.itemblocks.ItemBlockIvy; -import biomesoplenty.common.itemblocks.ItemBlockLeaves; -import biomesoplenty.common.itemblocks.ItemBlockLog; -import biomesoplenty.common.itemblocks.ItemBlockMoss; -import biomesoplenty.common.itemblocks.ItemBlockMud; -import biomesoplenty.common.itemblocks.ItemBlockMushroom; -import biomesoplenty.common.itemblocks.ItemBlockPersimmonLeaves; -import biomesoplenty.common.itemblocks.ItemBlockPetals; -import biomesoplenty.common.itemblocks.ItemBlockPlank; -import biomesoplenty.common.itemblocks.ItemBlockPlant; -import biomesoplenty.common.itemblocks.ItemBlockRocks; -import biomesoplenty.common.itemblocks.ItemBlockSapling; -import biomesoplenty.common.itemblocks.ItemBlockSlab; -import biomesoplenty.common.itemblocks.ItemBlockStoneFormations; -import biomesoplenty.common.itemblocks.ItemBlockWillow; public class BOPCBlocks { diff --git a/src/main/java/biomesoplenty/api/content/BOPCPotions.java b/src/main/java/biomesoplenty/api/content/BOPCPotions.java new file mode 100644 index 000000000..c23cb3b21 --- /dev/null +++ b/src/main/java/biomesoplenty/api/content/BOPCPotions.java @@ -0,0 +1,9 @@ +package biomesoplenty.api.content; + +import net.minecraft.potion.Potion; + +public class BOPCPotions +{ + public static Potion paralysis; + public static Potion possession; +} diff --git a/src/main/java/biomesoplenty/common/biomes/BOPOceanBiome.java b/src/main/java/biomesoplenty/common/biomes/BOPOceanBiome.java index 69dc0a4e5..8e5139ca8 100644 --- a/src/main/java/biomesoplenty/common/biomes/BOPOceanBiome.java +++ b/src/main/java/biomesoplenty/common/biomes/BOPOceanBiome.java @@ -1,7 +1,7 @@ package biomesoplenty.common.biomes; import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.api.BOPBiomeManager; +import biomesoplenty.common.world.BOPBiomeManager; public abstract class BOPOceanBiome extends BOPSubBiome { diff --git a/src/main/java/biomesoplenty/common/configuration/structures/BOPConfigurationStrongholds.java b/src/main/java/biomesoplenty/common/configuration/structures/BOPConfigurationStrongholds.java index 212759b42..b309e275b 100644 --- a/src/main/java/biomesoplenty/common/configuration/structures/BOPConfigurationStrongholds.java +++ b/src/main/java/biomesoplenty/common/configuration/structures/BOPConfigurationStrongholds.java @@ -11,8 +11,8 @@ import net.minecraftforge.common.config.Configuration; import org.apache.logging.log4j.Level; -import biomesoplenty.api.BOPBiomeManager; import biomesoplenty.api.content.BOPCBiomes; +import biomesoplenty.common.world.BOPBiomeManager; import cpw.mods.fml.common.FMLLog; public class BOPConfigurationStrongholds diff --git a/src/main/java/biomesoplenty/common/configuration/structures/BOPConfigurationVillages.java b/src/main/java/biomesoplenty/common/configuration/structures/BOPConfigurationVillages.java index 313b68804..bf4c678b7 100644 --- a/src/main/java/biomesoplenty/common/configuration/structures/BOPConfigurationVillages.java +++ b/src/main/java/biomesoplenty/common/configuration/structures/BOPConfigurationVillages.java @@ -11,8 +11,8 @@ import net.minecraftforge.common.config.Configuration; import org.apache.logging.log4j.Level; -import biomesoplenty.api.BOPBiomeManager; import biomesoplenty.api.content.BOPCBiomes; +import biomesoplenty.common.world.BOPBiomeManager; import cpw.mods.fml.common.FMLLog; public class BOPConfigurationVillages diff --git a/src/main/java/biomesoplenty/common/core/BOPBiomes.java b/src/main/java/biomesoplenty/common/core/BOPBiomes.java index 5a573cfaa..8fb8761d7 100644 --- a/src/main/java/biomesoplenty/common/core/BOPBiomes.java +++ b/src/main/java/biomesoplenty/common/core/BOPBiomes.java @@ -14,8 +14,6 @@ import net.minecraftforge.common.BiomeManager.BiomeEntry; import org.apache.logging.log4j.Level; -import biomesoplenty.api.BOPBiomeManager; -import biomesoplenty.api.BOPBiomeManager.TemperatureType; import biomesoplenty.api.content.BOPCBiomes; import biomesoplenty.common.biomes.nether.BiomeGenBoneyard; import biomesoplenty.common.biomes.nether.BiomeGenCorruptedSands; @@ -98,7 +96,9 @@ import biomesoplenty.common.configuration.BOPConfigurationBiomeWeights; import biomesoplenty.common.configuration.BOPConfigurationIDs; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.utils.BOPLogger; +import biomesoplenty.common.world.BOPBiomeManager; import biomesoplenty.common.world.WorldTypeBOP; +import biomesoplenty.common.world.BOPBiomeManager.TemperatureType; import biomesoplenty.common.world.decoration.BOPDecorationManager; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/biomesoplenty/common/core/BOPPotions.java b/src/main/java/biomesoplenty/common/core/BOPPotions.java index edb336e76..f4c5c8f13 100644 --- a/src/main/java/biomesoplenty/common/core/BOPPotions.java +++ b/src/main/java/biomesoplenty/common/core/BOPPotions.java @@ -1,5 +1,7 @@ package biomesoplenty.common.core; +import static biomesoplenty.api.content.BOPCPotions.*; + import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -37,17 +39,12 @@ public class BOPPotions private static void intializePotions() { - registerPotion(new PotionParalysis(getNextID(), true, 16767262).setPotionName("potion.paralysis")); - registerPotion(new PotionPossession(getNextID(), true, 1280).setPotionName("potion.possession")); + paralysis = new PotionParalysis(getNextID(), true, 16767262).setPotionName("potion.paralysis"); + possession = new PotionPossession(getNextID(), true, 1280).setPotionName("potion.possession"); } public static int getNextID() { return potionOffset++ - 1; } - - public static void registerPotion(Potion potion) - { - BOPPotionHelper.registerPotion(potion, potion.getName().replace("potion.", "")); - } } diff --git a/src/main/java/biomesoplenty/api/BOPBiomeManager.java b/src/main/java/biomesoplenty/common/world/BOPBiomeManager.java similarity index 97% rename from src/main/java/biomesoplenty/api/BOPBiomeManager.java rename to src/main/java/biomesoplenty/common/world/BOPBiomeManager.java index 58b3ce5fe..ad48cfcdd 100644 --- a/src/main/java/biomesoplenty/api/BOPBiomeManager.java +++ b/src/main/java/biomesoplenty/common/world/BOPBiomeManager.java @@ -1,9 +1,8 @@ -package biomesoplenty.api; +package biomesoplenty.common.world; import java.util.ArrayList; import java.util.List; -import net.minecraft.util.WeightedRandom; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.BiomeManager.BiomeEntry; import biomesoplenty.common.configuration.BOPConfigurationBiomeGen; diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java index 39ce2cfc1..859300b47 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java @@ -12,9 +12,9 @@ import net.minecraft.world.gen.layer.GenLayerBiome; import net.minecraft.world.gen.layer.IntCache; import net.minecraftforge.common.BiomeManager; import net.minecraftforge.common.BiomeManager.BiomeEntry; -import biomesoplenty.api.BOPBiomeManager; import biomesoplenty.common.configuration.BOPConfigurationBiomeGen; import biomesoplenty.common.core.BOPBiomes; +import biomesoplenty.common.world.BOPBiomeManager; public class GenLayerBiomeBOP extends GenLayerBiome { diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerRiverMixBOP.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerRiverMixBOP.java index bf7572107..80d6429a5 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerRiverMixBOP.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerRiverMixBOP.java @@ -4,8 +4,8 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.layer.GenLayer; import net.minecraft.world.gen.layer.GenLayerRiverMix; import net.minecraft.world.gen.layer.IntCache; -import biomesoplenty.api.BOPBiomeManager; import biomesoplenty.api.content.BOPCBiomes; +import biomesoplenty.common.world.BOPBiomeManager; public class GenLayerRiverMixBOP extends GenLayerRiverMix { diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerShoreBOP.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerShoreBOP.java index 7ce454a2c..599d5d4c7 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerShoreBOP.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerShoreBOP.java @@ -5,7 +5,7 @@ import net.minecraft.world.biome.BiomeGenJungle; import net.minecraft.world.biome.BiomeGenMesa; import net.minecraft.world.gen.layer.GenLayer; import net.minecraft.world.gen.layer.IntCache; -import biomesoplenty.api.BOPBiomeManager; +import biomesoplenty.common.world.BOPBiomeManager; public class GenLayerShoreBOP extends GenLayer { diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerSubBiome.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerSubBiome.java index 3ba97fd40..b2118921b 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerSubBiome.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerSubBiome.java @@ -9,8 +9,8 @@ import net.minecraftforge.common.BiomeManager.BiomeEntry; import org.apache.commons.lang3.tuple.Pair; -import biomesoplenty.api.BOPBiomeManager; import biomesoplenty.common.biomes.BOPSubBiome; +import biomesoplenty.common.world.BOPBiomeManager; import biomesoplenty.common.world.noise.SimplexNoise; public class GenLayerSubBiome extends GenLayer diff --git a/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellBiomes.java b/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellBiomes.java index 229e4d0b2..89f1a49bd 100644 --- a/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellBiomes.java +++ b/src/main/java/biomesoplenty/common/world/layer/hell/BiomeLayerHellBiomes.java @@ -7,7 +7,7 @@ import net.minecraft.util.WeightedRandom; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.layer.IntCache; import net.minecraftforge.common.BiomeManager.BiomeEntry; -import biomesoplenty.api.BOPBiomeManager; +import biomesoplenty.common.world.BOPBiomeManager; public class BiomeLayerHellBiomes extends BiomeLayerHell {