From ea38d3ed15c8720cc8e9c1316c624efe6da78baf Mon Sep 17 00:00:00 2001 From: Adubbz Date: Wed, 2 Mar 2016 22:42:38 +1100 Subject: [PATCH] Begin updating to 1.9 --- build.properties | 8 +- .../biomesoplenty/api/biome/BOPBiome.java | 6 +- .../biome/generation/BOPGeneratorBase.java | 4 +- .../biome/generation/GenerationManager.java | 4 +- .../biome/generation/GeneratorRegistry.java | 4 +- .../api/biome/generation/GeneratorStage.java | 4 +- .../biome/generation/GeneratorWeighted.java | 4 +- .../api/biome/generation/IGenerator.java | 2 +- .../api/block/ISustainsPlantType.java | 2 +- .../client/gui/GuiBOPConfig.java | 7 +- .../client/gui/GuiBOPConfigureWorld.java | 17 ++- .../client/gui/GuiBOPPageList.java | 8 +- .../biomesoplenty/client/gui/GuiFactory.java | 4 +- .../client/handler/ModelBakeHandler.java | 6 +- .../client/model/ModelBiomeFinder.java | 4 +- .../client/model/ModelFlowerBasket.java | 4 +- .../client/particle/EntityPixieTrailFX.java | 3 +- .../client/particle/EntityTrailFX.java | 1 - .../biomesoplenty/client/util/ModelUtils.java | 2 +- .../common/biome/overworld/BiomeGenAlps.java | 4 +- .../biome/overworld/BiomeGenBambooForest.java | 24 ++-- .../common/biome/overworld/BiomeGenBayou.java | 15 +- .../common/biome/overworld/BiomeGenBog.java | 18 ++- .../biome/overworld/BiomeGenBorealForest.java | 15 +- .../biome/overworld/BiomeGenBrushland.java | 13 +- .../biome/overworld/BiomeGenChaparral.java | 13 +- .../overworld/BiomeGenCherryBlossomGrove.java | 11 +- .../biome/overworld/BiomeGenColdDesert.java | 8 +- .../overworld/BiomeGenConiferousForest.java | 14 +- .../biome/overworld/BiomeGenCoralReef.java | 2 - .../common/biome/overworld/BiomeGenCrag.java | 2 +- .../biome/overworld/BiomeGenDeadForest.java | 9 +- .../biome/overworld/BiomeGenDeadSwamp.java | 12 +- .../overworld/BiomeGenDummyTemplate.java | 11 +- .../overworld/BiomeGenEucalyptusForest.java | 14 +- .../common/biome/overworld/BiomeGenFen.java | 14 +- .../biome/overworld/BiomeGenFlowerField.java | 7 +- .../biome/overworld/BiomeGenFlowerIsland.java | 16 +-- .../biome/overworld/BiomeGenGlacier.java | 18 +-- .../biome/overworld/BiomeGenGrassland.java | 8 +- .../biome/overworld/BiomeGenGravelBeach.java | 10 -- .../common/biome/overworld/BiomeGenGrove.java | 13 +- .../biome/overworld/BiomeGenHeathland.java | 20 +-- .../biome/overworld/BiomeGenHighland.java | 8 +- .../biome/overworld/BiomeGenLandOfLakes.java | 18 +-- .../overworld/BiomeGenLavenderFields.java | 7 +- .../biome/overworld/BiomeGenLushDesert.java | 11 +- .../biome/overworld/BiomeGenLushSwamp.java | 17 +-- .../biome/overworld/BiomeGenMapleWoods.java | 16 +-- .../common/biome/overworld/BiomeGenMarsh.java | 13 +- .../biome/overworld/BiomeGenMeadow.java | 13 +- .../common/biome/overworld/BiomeGenMoor.java | 17 ++- .../biome/overworld/BiomeGenMountain.java | 25 ++-- .../biome/overworld/BiomeGenMysticGrove.java | 20 ++- .../common/biome/overworld/BiomeGenOasis.java | 2 - .../biome/overworld/BiomeGenOminousWoods.java | 13 +- .../biome/overworld/BiomeGenOrchard.java | 12 +- .../biome/overworld/BiomeGenOriginIsland.java | 25 ++-- .../biome/overworld/BiomeGenOutback.java | 18 ++- .../overworld/BiomeGenOvergrownCliffs.java | 18 +-- .../biome/overworld/BiomeGenPrairie.java | 5 +- .../biome/overworld/BiomeGenQuagmire.java | 10 +- .../biome/overworld/BiomeGenRainforest.java | 21 +-- .../overworld/BiomeGenRedwoodForest.java | 30 ++-- .../overworld/BiomeGenSacredSprings.java | 7 +- .../overworld/BiomeGenSeasonalForest.java | 15 +- .../biome/overworld/BiomeGenShield.java | 23 ++- .../biome/overworld/BiomeGenShrubland.java | 12 +- .../BiomeGenSnowyConiferousForest.java | 14 +- .../biome/overworld/BiomeGenSnowyForest.java | 11 +- .../biome/overworld/BiomeGenSteppe.java | 17 +-- .../BiomeGenTemperateRainforest.java | 20 +-- .../overworld/BiomeGenTropicalIsland.java | 9 -- .../overworld/BiomeGenTropicalRainforest.java | 17 ++- .../biome/overworld/BiomeGenTundra.java | 6 +- .../overworld/BiomeGenVolcanicIsland.java | 2 +- .../biome/overworld/BiomeGenWasteland.java | 20 +-- .../biome/overworld/BiomeGenWetland.java | 19 ++- .../biome/overworld/BiomeGenWoodland.java | 15 +- .../overworld/BiomeGenXericShrubland.java | 22 ++- .../biome/vanilla/BiomeExtBirchForest.java | 3 +- .../vanilla/BiomeExtBirchForestHills.java | 3 +- .../biome/vanilla/BiomeExtColdTaiga.java | 3 +- .../biome/vanilla/BiomeExtColdTaigaHills.java | 3 +- .../common/biome/vanilla/BiomeExtDesert.java | 5 +- .../biome/vanilla/BiomeExtDesertHills.java | 7 +- .../common/biome/vanilla/BiomeExtEnd.java | 5 +- .../biome/vanilla/BiomeExtExtremeHills.java | 7 +- .../vanilla/BiomeExtExtremeHillsPlus.java | 5 +- .../common/biome/vanilla/BiomeExtForest.java | 6 +- .../biome/vanilla/BiomeExtForestHills.java | 6 +- .../biome/vanilla/BiomeExtIceMountains.java | 2 +- .../biome/vanilla/BiomeExtIcePlains.java | 2 +- .../common/biome/vanilla/BiomeExtJungle.java | 4 +- .../biome/vanilla/BiomeExtJungleHills.java | 4 +- .../biome/vanilla/BiomeExtMegaTaiga.java | 2 +- .../biome/vanilla/BiomeExtMegaTaigaHills.java | 2 +- .../common/biome/vanilla/BiomeExtMesa.java | 2 +- .../biome/vanilla/BiomeExtMesaPlateau.java | 2 +- .../biome/vanilla/BiomeExtMushroomIsland.java | 9 +- .../common/biome/vanilla/BiomeExtOcean.java | 9 +- .../common/biome/vanilla/BiomeExtPlains.java | 2 +- .../biome/vanilla/BiomeExtRoofedForest.java | 4 +- .../common/biome/vanilla/BiomeExtSavanna.java | 4 +- .../biome/vanilla/BiomeExtSavannaPlateau.java | 6 +- .../biome/vanilla/BiomeExtSwampland.java | 9 +- .../common/biome/vanilla/BiomeExtTaiga.java | 2 +- .../biome/vanilla/BiomeExtTaigaHills.java | 2 +- .../common/block/BlockBOPAsh.java | 12 +- .../common/block/BlockBOPBamboo.java | 8 +- .../common/block/BlockBOPBiomeBlock.java | 2 +- .../common/block/BlockBOPBones.java | 9 +- .../common/block/BlockBOPCoral.java | 4 +- .../common/block/BlockBOPCrystal.java | 2 +- .../common/block/BlockBOPDecoration.java | 9 +- .../common/block/BlockBOPDirt.java | 13 +- .../common/block/BlockBOPDoor.java | 2 +- .../block/BlockBOPDoubleDecoration.java | 3 +- .../common/block/BlockBOPDoubleOtherSlab.java | 3 +- .../common/block/BlockBOPDoublePlant.java | 12 +- .../common/block/BlockBOPDoubleWoodSlab.java | 5 +- .../common/block/BlockBOPFarmland.java | 8 +- .../common/block/BlockBOPFence.java | 2 +- .../common/block/BlockBOPFenceGate.java | 2 +- .../common/block/BlockBOPFlesh.java | 10 +- .../common/block/BlockBOPFlower.java | 4 +- .../common/block/BlockBOPGem.java | 1 - .../common/block/BlockBOPGemOre.java | 5 +- .../common/block/BlockBOPGeneric.java | 2 +- .../common/block/BlockBOPGrass.java | 6 +- .../common/block/BlockBOPHalfOtherSlab.java | 1 - .../common/block/BlockBOPHalfWoodSlab.java | 3 +- .../common/block/BlockBOPHive.java | 21 ++- .../common/block/BlockBOPHoney.java | 5 +- .../common/block/BlockBOPLeaves.java | 15 +- .../common/block/BlockBOPLilypad.java | 10 +- .../common/block/BlockBOPLog.java | 4 +- .../common/block/BlockBOPMud.java | 13 +- .../common/block/BlockBOPMushroom.java | 3 +- .../common/block/BlockBOPPlanks.java | 19 ++- .../common/block/BlockBOPPlant.java | 4 +- .../common/block/BlockBOPSand.java | 11 +- .../common/block/BlockBOPSapling.java | 6 +- .../common/block/BlockBOPSeaweed.java | 4 +- .../common/block/BlockBOPStone.java | 3 +- .../common/block/BlockBOPTerrarium.java | 8 +- .../common/block/BlockBOPTurnip.java | 8 +- .../common/block/BlockBOPVine.java | 2 +- .../common/block/BlockBOPWoodStairs.java | 2 +- .../common/command/BOPCommand.java | 5 +- .../config/GameplayConfigurationHandler.java | 4 +- .../config/MiscConfigurationHandler.java | 4 +- .../common/entities/EntityButterfly.java | 6 +- .../common/entities/EntityPixie.java | 6 +- .../common/entities/EntitySnail.java | 6 +- .../common/entities/EntityWasp.java | 4 +- .../common/entities/ModelButterfly.java | 2 +- .../common/entities/ModelPixie.java | 2 +- .../common/entities/ModelSnail.java | 1 - .../common/entities/ModelWasp.java | 2 +- .../common/entities/RenderButterfly.java | 4 - .../entities/projectiles/EntityDart.java | 7 +- .../entities/projectiles/EntityMudball.java | 1 - .../entities/projectiles/RenderDart.java | 19 ++- .../entities/projectiles/RenderMudball.java | 2 +- .../dispenser/DispenserBehaviorDart.java | 2 +- .../common/enums/BOPFlowers.java | 2 +- .../biomesoplenty/common/enums/BOPPlants.java | 2 +- .../biomesoplenty/common/enums/BOPTrees.java | 6 +- .../biomesoplenty/common/enums/BOPWoods.java | 6 +- .../common/fluids/blocks/BlockHoneyFluid.java | 2 +- .../blocks/BlockHotSpringWaterFluid.java | 3 +- .../fluids/blocks/BlockPoisonFluid.java | 2 +- .../handler/AchievementEventHandler.java | 43 +++--- .../common/handler/BucketEventHandler.java | 19 ++- .../common/handler/FlippersEventHandler.java | 2 +- .../common/handler/GuiEventHandler.java | 4 +- .../common/handler/ItemEventHandler.java | 1 - .../common/handler/TrailsEventHandler.java | 2 +- .../common/handler/UseHoeEventHandler.java | 2 +- .../decoration/DecorateBiomeEventHandler.java | 4 +- .../common/init/ModAchievements.java | 11 +- .../biomesoplenty/common/init/ModBiomes.java | 71 +++++----- .../common/init/ModBlockQueries.java | 44 +++++- .../biomesoplenty/common/init/ModBlocks.java | 78 ++++++++--- .../common/init/ModConfiguration.java | 4 +- .../common/init/ModCrafting.java | 21 ++- .../common/init/ModEntities.java | 8 +- .../common/init/ModGenerators.java | 32 ++++- .../common/init/ModHandlers.java | 18 ++- .../biomesoplenty/common/init/ModItems.java | 131 ++++++++++++++++-- .../biomesoplenty/common/init/ModPotions.java | 8 +- .../common/init/ModVanillaCompat.java | 8 +- .../common/integration/ThaumcraftCompat.java | 5 +- .../inventory/ContainerFlowerBasket.java | 2 +- .../common/item/ItemAmbrosia.java | 15 +- .../common/item/ItemBOPBlock.java | 3 - .../common/item/ItemBOPFlower.java | 8 -- .../common/item/ItemBOPLilypad.java | 3 +- .../common/item/ItemBOPPlant.java | 3 +- .../common/item/ItemBOPScythe.java | 2 +- .../common/item/ItemBOPSpawnEgg.java | 5 +- .../common/item/ItemBiomeEssence.java | 7 +- .../common/item/ItemBiomeFinder.java | 4 +- .../common/item/ItemEnderporter.java | 3 - .../common/item/ItemJarEmpty.java | 10 +- .../common/item/ItemJarFilled.java | 7 +- .../common/item/ItemMudball.java | 2 +- .../common/item/ItemWadingBoots.java | 3 +- .../common/util/biome/BiomeUtils.java | 16 +-- .../common/util/biome/GeneratorUtils.java | 17 ++- .../common/util/block/BlockQuery.java | 9 +- .../common/util/block/BlockStateUtils.java | 10 +- .../common/util/config/BOPConfig.java | 19 ++- .../common/world/BOPWorldSettings.java | 2 - ...kManagerBOP.java => BiomeProviderBOP.java} | 16 +-- .../world/ChunkProviderGenerateBOP.java | 28 ++-- .../world/ChunkProviderGenerateVanilla.java | 28 ++-- .../common/world/NoiseGeneratorBOP.java | 2 +- .../common/world/TerrainSettings.java | 2 +- .../common/world/WorldTypeBOP.java | 3 +- .../world/feature/GeneratorBigFlower.java | 14 +- .../world/feature/GeneratorBigMushroom.java | 12 +- .../common/world/feature/GeneratorBlobs.java | 12 +- .../world/feature/GeneratorColumns.java | 10 +- .../world/feature/GeneratorCrystals.java | 2 +- .../world/feature/GeneratorDoubleFlora.java | 4 +- .../common/world/feature/GeneratorFlora.java | 31 +++-- .../common/world/feature/GeneratorGrass.java | 6 +- .../common/world/feature/GeneratorLakes.java | 2 +- .../common/world/feature/GeneratorLogs.java | 16 +-- .../world/feature/GeneratorMixedLily.java | 12 +- .../world/feature/GeneratorOreBase.java | 7 +- .../world/feature/GeneratorOreCluster.java | 3 +- .../world/feature/GeneratorOreSingle.java | 10 +- .../world/feature/GeneratorReplacing.java | 12 +- .../common/world/feature/GeneratorSpike.java | 2 +- .../world/feature/GeneratorSplatter.java | 2 +- .../world/feature/GeneratorSplotches.java | 11 +- .../world/feature/GeneratorWaterside.java | 11 +- .../feature/tree/GeneratorBasicTree.java | 2 +- .../feature/tree/GeneratorBayouTree.java | 2 +- .../world/feature/tree/GeneratorBigTree.java | 18 +-- .../world/feature/tree/GeneratorBulbTree.java | 2 +- .../world/feature/tree/GeneratorBush.java | 8 +- .../world/feature/tree/GeneratorHugeTree.java | 2 +- .../feature/tree/GeneratorMahoganyTree.java | 2 +- .../feature/tree/GeneratorMegaJungleTree.java | 4 +- .../world/feature/tree/GeneratorPineTree.java | 12 +- .../feature/tree/GeneratorProfileTree.java | 10 +- .../feature/tree/GeneratorRedwoodTree.java | 5 +- .../feature/tree/GeneratorTaigaTree.java | 4 +- .../world/feature/tree/GeneratorTreeBase.java | 26 ++-- .../feature/tree/GeneratorTwigletTree.java | 8 +- .../common/world/layer/GenLayerBOPRiver.java | 3 +- .../common/world/layer/GenLayerBiomeBOP.java | 17 +-- .../world/layer/GenLayerBiomeEdgeBOP.java | 31 +++-- .../world/layer/GenLayerBiomeIslands.java | 13 +- .../common/world/layer/GenLayerClimate.java | 3 +- .../world/layer/GenLayerLargeIsland.java | 1 - .../world/layer/GenLayerRiverMixBOP.java | 31 ++--- .../common/world/layer/GenLayerShoreBOP.java | 28 ++-- .../layer/GenLayerTemperatureLatitude.java | 2 +- .../biomesoplenty/core/BiomesOPlenty.java | 19 ++- .../java/biomesoplenty/core/ClientProxy.java | 54 ++++---- 265 files changed, 1255 insertions(+), 1395 deletions(-) rename src/main/java/biomesoplenty/common/world/{WorldChunkManagerBOP.java => BiomeProviderBOP.java} (95%) diff --git a/build.properties b/build.properties index 7497a85e3..1415b34ed 100644 --- a/build.properties +++ b/build.properties @@ -1,4 +1,4 @@ -minecraft_version=1.8.9 -forge_version=11.15.1.1726 -mod_version=3.0.0 -mappings_version=snapshot_nodoc_20160104 \ No newline at end of file +minecraft_version=1.9 +forge_version= +mod_version=4.0.0 +mappings_version= \ No newline at end of file diff --git a/src/main/java/biomesoplenty/api/biome/BOPBiome.java b/src/main/java/biomesoplenty/api/biome/BOPBiome.java index dae9a2899..7d928bd61 100644 --- a/src/main/java/biomesoplenty/api/biome/BOPBiome.java +++ b/src/main/java/biomesoplenty/api/biome/BOPBiome.java @@ -19,13 +19,11 @@ import java.util.Random; import biomesoplenty.api.biome.generation.GenerationManager; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.IGenerator; -import biomesoplenty.common.block.BlockBOPDoublePlant; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.TerrainSettings; -import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import net.minecraft.block.BlockSand; import net.minecraft.block.material.Material; @@ -33,11 +31,11 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EnumCreatureType; +import net.minecraft.init.Biomes; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.ChunkPrimer; -import net.minecraftforge.common.BiomeManager; public class BOPBiome extends BiomeGenBase implements IExtendedBiome { @@ -53,7 +51,7 @@ public class BOPBiome extends BiomeGenBase implements IExtendedBiome public boolean canGenerateVillages = true; public boolean canGenerateRivers = true; - public int beachBiomeId = BiomeGenBase.beach.biomeID; + public int beachBiomeId = Biomes.beach.biomeID; public TerrainSettings terrainSettings = new TerrainSettings(); public boolean noNeighborTerrainInfuence = false; diff --git a/src/main/java/biomesoplenty/api/biome/generation/BOPGeneratorBase.java b/src/main/java/biomesoplenty/api/biome/generation/BOPGeneratorBase.java index 87e1ca2b8..efad195b3 100644 --- a/src/main/java/biomesoplenty/api/biome/generation/BOPGeneratorBase.java +++ b/src/main/java/biomesoplenty/api/biome/generation/BOPGeneratorBase.java @@ -10,8 +10,8 @@ package biomesoplenty.api.biome.generation; import java.util.Random; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; diff --git a/src/main/java/biomesoplenty/api/biome/generation/GenerationManager.java b/src/main/java/biomesoplenty/api/biome/generation/GenerationManager.java index 37b3020d7..4957e2df4 100644 --- a/src/main/java/biomesoplenty/api/biome/generation/GenerationManager.java +++ b/src/main/java/biomesoplenty/api/biome/generation/GenerationManager.java @@ -12,11 +12,11 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import biomesoplenty.common.util.config.BOPConfig.IConfigObj; - import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableList; +import biomesoplenty.common.util.config.BOPConfig.IConfigObj; + public class GenerationManager { private Map generators = new HashMap(); diff --git a/src/main/java/biomesoplenty/api/biome/generation/GeneratorRegistry.java b/src/main/java/biomesoplenty/api/biome/generation/GeneratorRegistry.java index c42132980..e78647fe1 100644 --- a/src/main/java/biomesoplenty/api/biome/generation/GeneratorRegistry.java +++ b/src/main/java/biomesoplenty/api/biome/generation/GeneratorRegistry.java @@ -11,11 +11,11 @@ package biomesoplenty.api.biome.generation; import java.util.HashMap; import java.util.Map; -import biomesoplenty.common.util.config.BOPConfig.IConfigObj; - import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; +import biomesoplenty.common.util.config.BOPConfig.IConfigObj; + public class GeneratorRegistry { private static BiMap> generatorClasses = HashBiMap.create(); diff --git a/src/main/java/biomesoplenty/api/biome/generation/GeneratorStage.java b/src/main/java/biomesoplenty/api/biome/generation/GeneratorStage.java index e1c86b578..170c9f384 100644 --- a/src/main/java/biomesoplenty/api/biome/generation/GeneratorStage.java +++ b/src/main/java/biomesoplenty/api/biome/generation/GeneratorStage.java @@ -8,10 +8,10 @@ package biomesoplenty.api.biome.generation; -import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate; - import com.google.gson.annotations.SerializedName; +import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate; + public enum GeneratorStage { @SerializedName("pre") diff --git a/src/main/java/biomesoplenty/api/biome/generation/GeneratorWeighted.java b/src/main/java/biomesoplenty/api/biome/generation/GeneratorWeighted.java index bf35745d4..24ae2fc38 100644 --- a/src/main/java/biomesoplenty/api/biome/generation/GeneratorWeighted.java +++ b/src/main/java/biomesoplenty/api/biome/generation/GeneratorWeighted.java @@ -12,9 +12,9 @@ import java.util.HashMap; import java.util.Map.Entry; import java.util.Random; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class GeneratorWeighted extends BOPGeneratorBase { diff --git a/src/main/java/biomesoplenty/api/biome/generation/IGenerator.java b/src/main/java/biomesoplenty/api/biome/generation/IGenerator.java index 872a5bc5f..cff569a81 100644 --- a/src/main/java/biomesoplenty/api/biome/generation/IGenerator.java +++ b/src/main/java/biomesoplenty/api/biome/generation/IGenerator.java @@ -11,7 +11,7 @@ package biomesoplenty.api.biome.generation; import java.util.Random; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public interface IGenerator diff --git a/src/main/java/biomesoplenty/api/block/ISustainsPlantType.java b/src/main/java/biomesoplenty/api/block/ISustainsPlantType.java index d0d2bb0b2..38ebfe0d4 100644 --- a/src/main/java/biomesoplenty/api/block/ISustainsPlantType.java +++ b/src/main/java/biomesoplenty/api/block/ISustainsPlantType.java @@ -8,7 +8,7 @@ package biomesoplenty.api.block; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.EnumPlantType; diff --git a/src/main/java/biomesoplenty/client/gui/GuiBOPConfig.java b/src/main/java/biomesoplenty/client/gui/GuiBOPConfig.java index b63ce4e48..52d87c585 100644 --- a/src/main/java/biomesoplenty/client/gui/GuiBOPConfig.java +++ b/src/main/java/biomesoplenty/client/gui/GuiBOPConfig.java @@ -1,20 +1,19 @@ package biomesoplenty.client.gui; +import java.util.ArrayList; +import java.util.List; + import biomesoplenty.common.config.GameplayConfigurationHandler; import biomesoplenty.common.config.MiscConfigurationHandler; import biomesoplenty.common.remote.TrailManager; import biomesoplenty.common.util.entity.PlayerUtil; import biomesoplenty.core.BiomesOPlenty; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.util.StatCollector; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.fml.client.config.DummyConfigElement; import net.minecraftforge.fml.client.config.GuiConfig; import net.minecraftforge.fml.client.config.IConfigElement; -import java.util.ArrayList; -import java.util.List; - public class GuiBOPConfig extends GuiConfig { public GuiBOPConfig(GuiScreen parentScreen) diff --git a/src/main/java/biomesoplenty/client/gui/GuiBOPConfigureWorld.java b/src/main/java/biomesoplenty/client/gui/GuiBOPConfigureWorld.java index 992749adc..b86a1916b 100644 --- a/src/main/java/biomesoplenty/client/gui/GuiBOPConfigureWorld.java +++ b/src/main/java/biomesoplenty/client/gui/GuiBOPConfigureWorld.java @@ -2,6 +2,14 @@ package biomesoplenty.client.gui; import java.io.IOException; +import com.google.common.base.Predicate; +import com.google.common.primitives.Floats; + +import biomesoplenty.common.world.BOPWorldSettings; +import biomesoplenty.common.world.BOPWorldSettings.BiomeSize; +import biomesoplenty.common.world.BOPWorldSettings.LandMassScheme; +import biomesoplenty.common.world.BOPWorldSettings.RainfallVariationScheme; +import biomesoplenty.common.world.BOPWorldSettings.TemperatureVariationScheme; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiCreateWorld; @@ -11,19 +19,10 @@ import net.minecraft.client.gui.GuiSlider; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.BOPWorldSettings.BiomeSize; -import biomesoplenty.common.world.BOPWorldSettings.LandMassScheme; -import biomesoplenty.common.world.BOPWorldSettings.RainfallVariationScheme; -import biomesoplenty.common.world.BOPWorldSettings.TemperatureVariationScheme; - -import com.google.common.base.Predicate; -import com.google.common.primitives.Floats; @SideOnly(Side.CLIENT) public class GuiBOPConfigureWorld extends GuiScreen implements GuiSlider.FormatHelper, GuiBOPPageList.GuiResponder diff --git a/src/main/java/biomesoplenty/client/gui/GuiBOPPageList.java b/src/main/java/biomesoplenty/client/gui/GuiBOPPageList.java index 3c086a373..c1ffaa2af 100644 --- a/src/main/java/biomesoplenty/client/gui/GuiBOPPageList.java +++ b/src/main/java/biomesoplenty/client/gui/GuiBOPPageList.java @@ -8,6 +8,10 @@ package biomesoplenty.client.gui; +import com.google.common.base.Objects; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; @@ -19,10 +23,6 @@ import net.minecraft.client.gui.GuiTextField; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import com.google.common.base.Objects; -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; - public abstract class GuiBOPPageList extends GuiBOPPageDelegate { public GuiBOPPageList(int width, int height, int top, int bottom, int slotHeight, int pageNumber) diff --git a/src/main/java/biomesoplenty/client/gui/GuiFactory.java b/src/main/java/biomesoplenty/client/gui/GuiFactory.java index a19c7f5e0..3155eb1ce 100644 --- a/src/main/java/biomesoplenty/client/gui/GuiFactory.java +++ b/src/main/java/biomesoplenty/client/gui/GuiFactory.java @@ -1,11 +1,11 @@ package biomesoplenty.client.gui; +import java.util.Set; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.fml.client.IModGuiFactory; -import java.util.Set; - public class GuiFactory implements IModGuiFactory { @Override diff --git a/src/main/java/biomesoplenty/client/handler/ModelBakeHandler.java b/src/main/java/biomesoplenty/client/handler/ModelBakeHandler.java index 3a007a92f..6a3ceb39a 100644 --- a/src/main/java/biomesoplenty/client/handler/ModelBakeHandler.java +++ b/src/main/java/biomesoplenty/client/handler/ModelBakeHandler.java @@ -16,10 +16,10 @@ import biomesoplenty.client.model.ModelBiomeFinder; import biomesoplenty.client.model.ModelFlowerBasket; import biomesoplenty.client.texture.TextureAnimationFrame; import biomesoplenty.client.util.TextureUtils; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.util.IRegistry; +import net.minecraft.util.registry.IRegistry; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.client.model.IModel; diff --git a/src/main/java/biomesoplenty/client/model/ModelBiomeFinder.java b/src/main/java/biomesoplenty/client/model/ModelBiomeFinder.java index cade5b3af..529a29a9f 100644 --- a/src/main/java/biomesoplenty/client/model/ModelBiomeFinder.java +++ b/src/main/java/biomesoplenty/client/model/ModelBiomeFinder.java @@ -11,15 +11,13 @@ package biomesoplenty.client.model; import biomesoplenty.client.util.ModelUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.ISmartItemModel; public class ModelBiomeFinder extends IFlexibleBakedModel.Wrapper implements ISmartItemModel { diff --git a/src/main/java/biomesoplenty/client/model/ModelFlowerBasket.java b/src/main/java/biomesoplenty/client/model/ModelFlowerBasket.java index 2ed2e6817..d571c4cae 100644 --- a/src/main/java/biomesoplenty/client/model/ModelFlowerBasket.java +++ b/src/main/java/biomesoplenty/client/model/ModelFlowerBasket.java @@ -9,11 +9,9 @@ package biomesoplenty.client.model; import biomesoplenty.common.inventory.InventoryFlowerBasket; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; -import net.minecraftforge.client.model.IFlexibleBakedModel; -import net.minecraftforge.client.model.ISmartItemModel; public class ModelFlowerBasket extends IFlexibleBakedModel.Wrapper implements ISmartItemModel { diff --git a/src/main/java/biomesoplenty/client/particle/EntityPixieTrailFX.java b/src/main/java/biomesoplenty/client/particle/EntityPixieTrailFX.java index a541eecf2..39217c352 100644 --- a/src/main/java/biomesoplenty/client/particle/EntityPixieTrailFX.java +++ b/src/main/java/biomesoplenty/client/particle/EntityPixieTrailFX.java @@ -11,9 +11,8 @@ package biomesoplenty.client.particle; import biomesoplenty.core.ClientProxy; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.client.FMLClientHandler; diff --git a/src/main/java/biomesoplenty/client/particle/EntityTrailFX.java b/src/main/java/biomesoplenty/client/particle/EntityTrailFX.java index 74559f282..dc15ff859 100644 --- a/src/main/java/biomesoplenty/client/particle/EntityTrailFX.java +++ b/src/main/java/biomesoplenty/client/particle/EntityTrailFX.java @@ -9,7 +9,6 @@ package biomesoplenty.client.particle; import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; diff --git a/src/main/java/biomesoplenty/client/util/ModelUtils.java b/src/main/java/biomesoplenty/client/util/ModelUtils.java index dd4718c90..a7ddba1f9 100644 --- a/src/main/java/biomesoplenty/client/util/ModelUtils.java +++ b/src/main/java/biomesoplenty/client/util/ModelUtils.java @@ -10,9 +10,9 @@ package biomesoplenty.client.util; import com.google.common.base.Function; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IModel; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java index 6b38907f0..a0ad30475 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java @@ -8,8 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.block.BOPBlocks; @@ -17,6 +15,8 @@ import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorLakes; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; public class BiomeGenAlps extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java index 9d99654f4..df7ebbc45 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java @@ -10,21 +10,9 @@ package biomesoplenty.common.biome.overworld; import java.util.Random; -import net.minecraft.block.BlockDirt; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.passive.EntityOcelot; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.chunk.ChunkPrimer; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; -import biomesoplenty.api.biome.generation.IGenerator; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.block.BlockQueries; import biomesoplenty.common.block.BlockBOPCoral; @@ -42,9 +30,17 @@ import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.tree.GeneratorBulbTree; -import biomesoplenty.common.world.feature.tree.GeneratorBush; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; import biomesoplenty.common.world.feature.tree.GeneratorTwigletTree; +import net.minecraft.block.BlockDirt; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.passive.EntityOcelot; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.chunk.ChunkPrimer; public class BiomeGenBambooForest extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java index ccab7e91d..bc4adba41 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java @@ -8,12 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.entity.monster.EntitySlime; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -37,14 +31,15 @@ import biomesoplenty.common.world.feature.GeneratorColumns; import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; -import biomesoplenty.common.world.feature.GeneratorLogs; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorSplatter; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBayouTree; -import biomesoplenty.common.world.feature.tree.GeneratorBulbTree; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; -import biomesoplenty.common.world.feature.tree.GeneratorTwigletTree; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.monster.EntitySlime; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenBayou extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java index b0cd90986..c721e1262 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java @@ -8,15 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.monster.EntitySlime; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; @@ -27,7 +18,6 @@ import biomesoplenty.common.block.BlockBOPCoral; import biomesoplenty.common.block.BlockBOPDirt; import biomesoplenty.common.block.BlockBOPDoublePlant; import biomesoplenty.common.block.BlockBOPGrass; -import biomesoplenty.common.block.BlockBOPLilypad; import biomesoplenty.common.block.BlockBOPMushroom; import biomesoplenty.common.block.BlockBOPPlant; import biomesoplenty.common.entities.EntitySnail; @@ -44,6 +34,14 @@ import biomesoplenty.common.world.feature.GeneratorLakes; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorTwigletTree; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.monster.EntitySlime; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenBog extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java index 18baf4502..4dd598dc5 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java @@ -1,18 +1,10 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.entity.passive.EntityWolf; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.common.block.BlockBOPDoublePlant; -import biomesoplenty.common.block.BlockBOPLilypad; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; @@ -26,6 +18,13 @@ import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorBush; import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityWolf; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenBorealForest extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java index f4fa862b4..96e2a97aa 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java @@ -1,11 +1,5 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -26,8 +20,13 @@ import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorBigTree; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; import biomesoplenty.common.world.feature.tree.GeneratorTwigletTree; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenBrushland extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java index 02d6ad0cb..2c7f1a2d6 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java @@ -8,13 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.entity.passive.EntityHorse; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -31,6 +24,12 @@ import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorSplotches; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBush; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityHorse; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenChaparral extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java index ff23dc15b..c6af0c474 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java @@ -8,12 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -34,6 +28,11 @@ import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorBigTree; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenCherryBlossomGrove extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java index 83c9a0805..2ec145eab 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java @@ -10,10 +10,6 @@ package biomesoplenty.common.biome.overworld; import java.util.Random; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.world.World; -import net.minecraft.world.chunk.ChunkPrimer; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.block.BOPBlocks; @@ -28,6 +24,10 @@ import biomesoplenty.common.world.feature.GeneratorBlobs; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorSplatter; import biomesoplenty.common.world.feature.GeneratorSplotches; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; +import net.minecraft.world.chunk.ChunkPrimer; public class BiomeGenColdDesert extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java index ca97b7e08..88a2bbb86 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java @@ -1,11 +1,5 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.entity.passive.EntityWolf; -import net.minecraft.init.Blocks; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; @@ -14,9 +8,7 @@ import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.block.BlockBOPDirt; import biomesoplenty.common.block.BlockBOPDoublePlant; import biomesoplenty.common.block.BlockBOPGrass; -import biomesoplenty.common.block.BlockBOPLilypad; import biomesoplenty.common.block.BlockBOPMushroom; -import biomesoplenty.common.entities.EntitySnail; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; @@ -28,9 +20,13 @@ import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; -import biomesoplenty.common.world.feature.GeneratorSplatter; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityWolf; +import net.minecraft.init.Blocks; public class BiomeGenConiferousForest extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCoralReef.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCoralReef.java index 6724085f0..674854642 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCoralReef.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCoralReef.java @@ -11,12 +11,10 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.api.block.BlockQueries; import biomesoplenty.common.block.BlockBOPCoral; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.GeneratorColumns; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorOreSingle; import net.minecraft.init.Blocks; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java index adc7d2281..28bad4391 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java @@ -8,13 +8,13 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.init.Blocks; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.init.Blocks; public class BiomeGenCrag extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java index 9f3aaeb5d..1c33ef8c7 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java @@ -8,10 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; @@ -29,9 +25,12 @@ import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; -import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorBigTree; import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenDeadForest extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java index 05b4013f2..f16e8f92f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java @@ -8,12 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -39,7 +33,11 @@ import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorSplotches; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBigTree; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenDeadSwamp extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDummyTemplate.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDummyTemplate.java index 7ac5ae0f3..874d06959 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDummyTemplate.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDummyTemplate.java @@ -8,11 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.block.BlockFlower.EnumFlowerType; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -20,7 +15,6 @@ import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.block.BlockQueries; import biomesoplenty.common.block.BlockBOPCoral; import biomesoplenty.common.block.BlockBOPDoublePlant; -import biomesoplenty.common.block.BlockBOPLilypad; import biomesoplenty.common.block.BlockBOPMushroom; import biomesoplenty.common.block.BlockBOPPlant; import biomesoplenty.common.enums.BOPClimates; @@ -37,6 +31,11 @@ import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorMixedLily; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockFlower.EnumFlowerType; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; // This class is not intended to be used in the game diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java index 5604a4e43..b69f774e7 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java @@ -8,13 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.entity.passive.EntityOcelot; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -28,11 +21,14 @@ import biomesoplenty.common.enums.BOPWoods; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; -import biomesoplenty.common.world.feature.GeneratorMixedLily; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.tree.GeneratorBulbTree; import biomesoplenty.common.world.feature.tree.GeneratorBush; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityOcelot; +import net.minecraft.init.Blocks; public class BiomeGenEucalyptusForest extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java index 0e5ac680f..cde628cab 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java @@ -8,13 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; @@ -40,11 +33,16 @@ import biomesoplenty.common.world.feature.GeneratorColumns; import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; -import biomesoplenty.common.world.feature.GeneratorMixedLily; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBigTree; import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenFen extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java index 4fefdb0f2..0369d34a3 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java @@ -8,10 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockFlower.EnumFlowerType; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -23,6 +19,9 @@ import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.block.BlockFlower.EnumFlowerType; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.util.math.BlockPos; public class BiomeGenFlowerField extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java index d2a1838c9..1d1dc4676 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java @@ -8,14 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockFlower.EnumFlowerType; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -23,7 +15,6 @@ import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.block.BlockBOPGrass; import biomesoplenty.common.entities.EntityButterfly; import biomesoplenty.common.entities.EntitySnail; -import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; @@ -38,7 +29,12 @@ import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorSplatter; import biomesoplenty.common.world.feature.tree.GeneratorBush; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockFlower.EnumFlowerType; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenFlowerIsland extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGlacier.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGlacier.java index 1e739425b..acaa72a09 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGlacier.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGlacier.java @@ -8,27 +8,13 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; -import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.block.BlockBOPDirt; -import biomesoplenty.common.block.BlockBOPDoublePlant; -import biomesoplenty.common.block.BlockBOPGrass; -import biomesoplenty.common.block.BlockBOPCoral; -import biomesoplenty.common.entities.EntitySnail; -import biomesoplenty.common.enums.BOPClimates; -import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; -import biomesoplenty.common.enums.BOPPlants; -import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.*; +import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.init.Blocks; public class BiomeGenGlacier extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java index b449dde63..67540d66f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java @@ -8,10 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.entity.passive.EntityHorse; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; @@ -32,6 +28,10 @@ import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorLakes; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityHorse; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenGrassland extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGravelBeach.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGravelBeach.java index 015651db4..bfbfdc908 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGravelBeach.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGravelBeach.java @@ -9,16 +9,6 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiome; -import biomesoplenty.api.biome.generation.GeneratorStage; -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.api.block.BlockQueries; -import biomesoplenty.common.block.BlockBOPCoral; -import biomesoplenty.common.enums.BOPGems; -import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; -import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.GeneratorColumns; -import biomesoplenty.common.world.feature.GeneratorFlora; -import biomesoplenty.common.world.feature.GeneratorOreSingle; import net.minecraft.init.Blocks; public class BiomeGenGravelBeach extends BOPBiome diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java index 5eb22ce46..c0823726d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java @@ -8,13 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -31,7 +24,11 @@ import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.tree.GeneratorBush; import biomesoplenty.common.world.feature.tree.GeneratorProfileTree; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.util.math.BlockPos; public class BiomeGenGrove extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java index bcb5f8543..9b698bf87 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java @@ -8,20 +8,9 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.block.material.Material; -import net.minecraft.entity.passive.EntityHorse; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.block.BlockBOPDirt; -import biomesoplenty.common.block.BlockBOPGrass; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; @@ -31,7 +20,6 @@ import biomesoplenty.common.enums.BOPWoods; import biomesoplenty.common.util.block.BlockQuery; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; @@ -40,7 +28,13 @@ import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorBigTree; import biomesoplenty.common.world.feature.tree.GeneratorBush; import biomesoplenty.common.world.feature.tree.GeneratorPineTree; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.block.material.Material; +import net.minecraft.entity.passive.EntityHorse; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenHeathland extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java index 08a30a468..bf5c2be0b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java @@ -8,10 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.init.Blocks; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -21,9 +17,11 @@ import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorBlobs; import biomesoplenty.common.world.feature.GeneratorDoubleFlora; -import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.init.Blocks; public class BiomeGenHighland extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java index d4386e5ea..103655255 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java @@ -8,40 +8,32 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.entity.monster.EntitySlime; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; +import biomesoplenty.common.block.BlockBOPCoral; import biomesoplenty.common.block.BlockBOPDirt; -import biomesoplenty.common.block.BlockBOPDoublePlant; import biomesoplenty.common.block.BlockBOPGrass; import biomesoplenty.common.block.BlockBOPLilypad; -import biomesoplenty.common.block.BlockBOPCoral; import biomesoplenty.common.entities.EntitySnail; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; -import biomesoplenty.common.enums.BOPTrees; import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorLakes; import biomesoplenty.common.world.feature.GeneratorOreSingle; -import biomesoplenty.common.world.feature.GeneratorSplotches; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; -import biomesoplenty.common.world.feature.tree.GeneratorBush; import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenLandOfLakes extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java index e7bcde1d8..57c3b587b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java @@ -8,10 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -28,7 +24,8 @@ import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorBigTree; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.util.math.BlockPos; public class BiomeGenLavenderFields extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java index 4c693cdc9..de453b4d4 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java @@ -8,10 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.init.Blocks; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -21,7 +17,6 @@ import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; -import biomesoplenty.common.enums.BOPTrees; import biomesoplenty.common.enums.BOPWoods; import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.util.block.BlockQuery; @@ -33,10 +28,12 @@ import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorLakes; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; -import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorBigTree; import biomesoplenty.common.world.feature.tree.GeneratorBush; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.init.Blocks; public class BiomeGenLushDesert extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java index 8dcb0e0ba..1e08d7a87 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java @@ -8,15 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockFlower.EnumFlowerType; -import net.minecraft.block.BlockLeaves; -import net.minecraft.block.BlockOldLeaf; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.monster.EntitySlime; -import net.minecraft.init.Blocks; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -24,7 +15,6 @@ import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.block.BlockQueries; import biomesoplenty.common.block.BlockBOPCoral; import biomesoplenty.common.block.BlockBOPDoublePlant; -import biomesoplenty.common.block.BlockBOPLeaves; import biomesoplenty.common.block.BlockBOPLilypad; import biomesoplenty.common.block.BlockBOPMushroom; import biomesoplenty.common.block.BlockBOPPlant; @@ -43,6 +33,13 @@ import biomesoplenty.common.world.feature.GeneratorLakes; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockFlower.EnumFlowerType; +import net.minecraft.block.BlockOldLeaf; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.monster.EntitySlime; +import net.minecraft.init.Blocks; public class BiomeGenLushSwamp extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java index 45cd83b6b..a95edfb0b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java @@ -1,32 +1,26 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.entity.passive.EntityWolf; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; -import biomesoplenty.common.block.BlockBOPDoublePlant; -import biomesoplenty.common.block.BlockBOPLilypad; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.enums.BOPTrees; import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; -import biomesoplenty.common.world.feature.tree.GeneratorBush; import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityWolf; +import net.minecraft.init.Blocks; public class BiomeGenMapleWoods extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java index 8d0b05b82..e47218189 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java @@ -8,19 +8,13 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.entity.monster.EntitySlime; -import net.minecraft.init.Blocks; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; +import biomesoplenty.common.block.BlockBOPCoral; import biomesoplenty.common.block.BlockBOPDirt; import biomesoplenty.common.block.BlockBOPGrass; -import biomesoplenty.common.block.BlockBOPLilypad; -import biomesoplenty.common.block.BlockBOPCoral; import biomesoplenty.common.entities.EntitySnail; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPGems; @@ -32,8 +26,11 @@ import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorLakes; import biomesoplenty.common.world.feature.GeneratorOreSingle; -import biomesoplenty.common.world.feature.GeneratorSplotches; import biomesoplenty.common.world.feature.GeneratorWaterside; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.monster.EntitySlime; +import net.minecraft.init.Blocks; public class BiomeGenMarsh extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java index 3a45510b9..785aa9a68 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java @@ -1,11 +1,5 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; @@ -13,7 +7,6 @@ import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.block.BlockBOPCoral; import biomesoplenty.common.block.BlockBOPDoublePlant; -import biomesoplenty.common.block.BlockBOPLilypad; import biomesoplenty.common.entities.EntityButterfly; import biomesoplenty.common.entities.EntitySnail; import biomesoplenty.common.enums.BOPClimates; @@ -29,6 +22,12 @@ import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBush; import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenMeadow extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java index 0fb468ac5..d9ada5b34 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java @@ -8,19 +8,14 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; +import biomesoplenty.common.block.BlockBOPCoral; import biomesoplenty.common.block.BlockBOPDirt; import biomesoplenty.common.block.BlockBOPDoublePlant; import biomesoplenty.common.block.BlockBOPGrass; -import biomesoplenty.common.block.BlockBOPCoral; import biomesoplenty.common.entities.EntitySnail; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPFlowers; @@ -28,7 +23,15 @@ import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.*; +import biomesoplenty.common.world.feature.GeneratorDoubleFlora; +import biomesoplenty.common.world.feature.GeneratorFlora; +import biomesoplenty.common.world.feature.GeneratorGrass; +import biomesoplenty.common.world.feature.GeneratorLakes; +import biomesoplenty.common.world.feature.GeneratorOreSingle; +import biomesoplenty.common.world.feature.GeneratorWaterside; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenMoor extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java index f5f7d7128..ab03c6abd 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java @@ -10,21 +10,9 @@ package biomesoplenty.common.biome.overworld; import java.util.Random; -import net.minecraft.block.BlockDirt; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.passive.EntitySheep; -import net.minecraft.entity.passive.EntityWolf; -import net.minecraft.init.Blocks; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.chunk.ChunkPrimer; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.block.BlockBOPDoublePlant; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPPlants; @@ -39,13 +27,22 @@ import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorLakes; -import biomesoplenty.common.world.feature.GeneratorLogs; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorSplotches; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorPineTree; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockDirt; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.passive.EntitySheep; +import net.minecraft.entity.passive.EntityWolf; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.chunk.ChunkPrimer; public class BiomeGenMountain extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java index b56576c9a..dd22efd1e 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java @@ -8,17 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockLeaves; -import net.minecraft.block.BlockOldLeaf; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.monster.EntityWitch; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -44,7 +33,14 @@ import biomesoplenty.common.world.feature.GeneratorLakes; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorBigTree; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockOldLeaf; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.monster.EntityWitch; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenMysticGrove extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOasis.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOasis.java index 5bf9cd96c..5dfa89a61 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOasis.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOasis.java @@ -14,7 +14,6 @@ import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.api.block.BlockQueries; import biomesoplenty.common.block.BlockBOPCoral; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; @@ -32,7 +31,6 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.ChunkPrimer; public class BiomeGenOasis extends BOPBiome diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java index e135ee1ea..a9a1c25ad 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java @@ -8,13 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockLeaves; -import net.minecraft.block.BlockOldLeaf; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -36,6 +29,12 @@ import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorBigTree; import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockOldLeaf; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenOminousWoods extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java index 7445e90b6..2294ef66e 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java @@ -3,10 +3,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.block.BlockBOPDirt; import biomesoplenty.common.block.BlockBOPDoublePlant; -import biomesoplenty.common.block.BlockBOPGrass; import biomesoplenty.common.block.BlockBOPMushroom; import biomesoplenty.common.entities.EntityButterfly; import biomesoplenty.common.enums.BOPClimates; @@ -19,18 +16,11 @@ import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; -import biomesoplenty.common.world.feature.GeneratorWaterside; -import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorBigTree; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; -import net.minecraft.block.BlockPlanks.EnumType; import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockTallGrass; import net.minecraft.entity.passive.EntityHorse; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; +import net.minecraft.util.math.BlockPos; public class BiomeGenOrchard extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java index a406cdd31..ae62209e0 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java @@ -8,6 +8,17 @@ package biomesoplenty.common.biome.overworld; +import biomesoplenty.api.biome.BOPBiome; +import biomesoplenty.api.biome.generation.GeneratorStage; +import biomesoplenty.api.biome.generation.GeneratorWeighted; +import biomesoplenty.api.block.BOPBlocks; +import biomesoplenty.common.block.BlockBOPGrass; +import biomesoplenty.common.block.BlockBOPGrass.BOPGrassType; +import biomesoplenty.common.enums.BOPFlowers; +import biomesoplenty.common.enums.BOPTrees; +import biomesoplenty.common.world.BOPWorldSettings; +import biomesoplenty.common.world.feature.GeneratorFlora; +import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import net.minecraft.block.BlockFlower.EnumFlowerType; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntitySkeleton; @@ -17,20 +28,8 @@ import net.minecraft.entity.passive.EntityChicken; import net.minecraft.entity.passive.EntityCow; import net.minecraft.entity.passive.EntityPig; import net.minecraft.entity.passive.EntitySheep; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.api.biome.BOPBiome; -import biomesoplenty.api.biome.generation.GeneratorStage; -import biomesoplenty.api.biome.generation.GeneratorWeighted; -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.block.BlockBOPGrass; -import biomesoplenty.common.block.BlockBOPGrass.BOPGrassType; -import biomesoplenty.common.enums.BOPClimates; -import biomesoplenty.common.enums.BOPFlowers; -import biomesoplenty.common.enums.BOPTrees; -import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.GeneratorFlora; -import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; public class BiomeGenOriginIsland extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java index 3a8a8d3cf..795e11be7 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java @@ -8,15 +8,10 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockSand; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.init.Blocks; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.block.BlockBOPDirt; import biomesoplenty.common.block.BlockBOPGrass; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPGems; @@ -24,8 +19,17 @@ import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.util.block.BlockQuery; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.*; -import biomesoplenty.common.world.feature.tree.*; +import biomesoplenty.common.world.feature.GeneratorColumns; +import biomesoplenty.common.world.feature.GeneratorFlora; +import biomesoplenty.common.world.feature.GeneratorGrass; +import biomesoplenty.common.world.feature.GeneratorOreSingle; +import biomesoplenty.common.world.feature.GeneratorSplatter; +import biomesoplenty.common.world.feature.tree.GeneratorBush; +import biomesoplenty.common.world.feature.tree.GeneratorTwigletTree; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockSand; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.init.Blocks; public class BiomeGenOutback extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java index 164be1e06..e5a5c01b1 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java @@ -8,31 +8,23 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.passive.EntityOcelot; -import net.minecraft.init.Blocks; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; -import biomesoplenty.common.world.feature.GeneratorLakes; import biomesoplenty.common.world.feature.GeneratorOreSingle; -import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorBush; import biomesoplenty.common.world.feature.tree.GeneratorMahoganyTree; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityOcelot; +import net.minecraft.init.Blocks; public class BiomeGenOvergrownCliffs extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java index df156890f..3951de00d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java @@ -20,13 +20,12 @@ import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; -import net.minecraft.block.BlockPlanks.EnumType; import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockPlanks.EnumType; import net.minecraft.block.BlockTallGrass; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; +import net.minecraft.util.math.BlockPos; public class BiomeGenPrairie extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java index 2798f311f..82f04c059 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java @@ -8,11 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.entity.monster.EntitySlime; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -20,7 +15,6 @@ import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.block.BlockBOPCoral; import biomesoplenty.common.block.BlockBOPGrass; import biomesoplenty.common.block.BlockBOPLilypad; -import biomesoplenty.common.entities.EntitySnail; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; @@ -32,6 +26,10 @@ import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorSplatter; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.monster.EntitySlime; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenQuagmire extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java index 56c8e06d4..287bf853c 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java @@ -1,18 +1,8 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.block.BlockFlower.EnumFlowerType; -import net.minecraft.entity.passive.EntityOcelot; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; -import biomesoplenty.common.block.BlockBOPDoublePlant; import biomesoplenty.common.block.BlockBOPLilypad; import biomesoplenty.common.entities.EntityButterfly; import biomesoplenty.common.enums.BOPClimates; @@ -21,16 +11,19 @@ import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.enums.BOPTrees; import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; -import biomesoplenty.common.world.feature.GeneratorMixedLily; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorBigTree; -import biomesoplenty.common.world.feature.tree.GeneratorBush; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockFlower.EnumFlowerType; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityOcelot; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenRainforest extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java index e345ad0d1..a06db896f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java @@ -2,44 +2,32 @@ package biomesoplenty.common.biome.overworld; import java.util.Random; -import net.minecraft.block.BlockDirt; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.block.BlockFlower.EnumFlowerType; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; -import net.minecraft.world.chunk.ChunkPrimer; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.block.BlockBOPCoral; -import biomesoplenty.common.block.BlockBOPDoublePlant; -import biomesoplenty.common.block.BlockBOPLilypad; -import biomesoplenty.common.block.BlockBOPMushroom; import biomesoplenty.common.entities.EntitySnail; import biomesoplenty.common.enums.BOPClimates; -import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.enums.BOPTrees; import biomesoplenty.common.enums.BOPWoods; -import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBush; import biomesoplenty.common.world.feature.tree.GeneratorRedwoodTree; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockDirt; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockFlower.EnumFlowerType; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; +import net.minecraft.world.chunk.ChunkPrimer; public class BiomeGenRedwoodForest extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java index fc7d60c60..c83260240 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java @@ -16,21 +16,18 @@ import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorLakes; -import biomesoplenty.common.world.feature.GeneratorMixedLily; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.tree.GeneratorBigTree; import biomesoplenty.common.world.feature.tree.GeneratorBush; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockFlower.EnumFlowerType; import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockTallGrass; -import net.minecraft.block.BlockFlower.EnumFlowerType; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; +import net.minecraft.util.math.BlockPos; public class BiomeGenSacredSprings extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java index 23df8586f..e8de2175c 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java @@ -1,18 +1,10 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.entity.passive.EntityWolf; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.common.block.BlockBOPDoublePlant; -import biomesoplenty.common.block.BlockBOPLilypad; import biomesoplenty.common.block.BlockBOPMushroom; import biomesoplenty.common.entities.EntitySnail; import biomesoplenty.common.enums.BOPClimates; @@ -27,7 +19,12 @@ import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorBigTree; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityWolf; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenSeasonalForest extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java index 34e94dbff..9a99561c7 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java @@ -10,24 +10,12 @@ package biomesoplenty.common.biome.overworld; import java.util.Random; -import net.minecraft.block.BlockDirt; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.passive.EntityHorse; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.chunk.ChunkPrimer; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.block.BlockBOPCoral; -import biomesoplenty.common.block.BlockBOPLilypad; import biomesoplenty.common.block.BlockBOPMushroom; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPGems; @@ -37,16 +25,21 @@ import biomesoplenty.common.enums.BOPWoods; import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; -import biomesoplenty.common.world.feature.GeneratorSplotches; import biomesoplenty.common.world.feature.GeneratorWaterside; -import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorBush; import biomesoplenty.common.world.feature.tree.GeneratorPineTree; import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.chunk.ChunkPrimer; public class BiomeGenShield extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java index d0616bcd2..a64620a43 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java @@ -8,19 +8,11 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockFlower.EnumFlowerType; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.entity.passive.EntityHorse; -import net.minecraft.init.Blocks; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.block.BlockBOPDirt; import biomesoplenty.common.block.BlockBOPDoublePlant; -import biomesoplenty.common.block.BlockBOPGrass; import biomesoplenty.common.entities.EntityButterfly; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPGems; @@ -32,6 +24,10 @@ import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBush; +import net.minecraft.block.BlockFlower.EnumFlowerType; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityHorse; +import net.minecraft.init.Blocks; public class BiomeGenShrubland extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java index 20666c29b..c23d43c56 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java @@ -1,19 +1,11 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.entity.passive.EntityWolf; -import net.minecraft.init.Blocks; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.block.BlockBOPDirt; -import biomesoplenty.common.block.BlockBOPDoublePlant; import biomesoplenty.common.block.BlockBOPGrass; -import biomesoplenty.common.block.BlockBOPLilypad; -import biomesoplenty.common.block.BlockBOPMushroom; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; @@ -21,12 +13,16 @@ import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.enums.BOPTrees; import biomesoplenty.common.enums.BOPWoods; import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.passive.EntityWolf; +import net.minecraft.init.Blocks; public class BiomeGenSnowyConiferousForest extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java index 28c590770..3de6818bc 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java @@ -8,16 +8,9 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.block.BlockBOPDirt; -import biomesoplenty.common.block.BlockBOPGrass; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; @@ -29,7 +22,9 @@ import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorBigTree; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.util.math.BlockPos; public class BiomeGenSnowyForest extends BOPBiome diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java index afc817286..eef92ad5f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java @@ -10,13 +10,6 @@ package biomesoplenty.common.biome.overworld; import java.util.Random; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.passive.EntityHorse; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.chunk.ChunkPrimer; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; @@ -24,18 +17,22 @@ import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.block.BlockBOPDirt; import biomesoplenty.common.block.BlockBOPGrass; -import biomesoplenty.common.block.BlockBOPPlant; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; -import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; -import biomesoplenty.common.world.feature.GeneratorSplotches; import biomesoplenty.common.world.feature.GeneratorWaterside; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.passive.EntityHorse; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.chunk.ChunkPrimer; public class BiomeGenSteppe extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java index 759f700eb..28df25fde 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java @@ -1,30 +1,17 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockLeaves; -import net.minecraft.block.BlockOldLeaf; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.entity.passive.EntityWolf; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.block.BlockBOPCoral; -import biomesoplenty.common.block.BlockBOPDirt; import biomesoplenty.common.block.BlockBOPDoublePlant; -import biomesoplenty.common.block.BlockBOPGrass; import biomesoplenty.common.block.BlockBOPLeaves; import biomesoplenty.common.block.BlockBOPLilypad; import biomesoplenty.common.block.BlockBOPMushroom; import biomesoplenty.common.entities.EntitySnail; import biomesoplenty.common.enums.BOPClimates; -import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.enums.BOPTrees; @@ -39,6 +26,13 @@ import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorBush; import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockOldLeaf; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenTemperateRainforest extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java index 04392220d..f06f8c354 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java @@ -11,26 +11,17 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.api.block.BlockQueries; -import biomesoplenty.common.block.BlockBOPCoral; import biomesoplenty.common.entities.EntityButterfly; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; -import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.GeneratorColumns; -import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; -import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockTallGrass; -import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.init.Blocks; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; public class BiomeGenTropicalIsland extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java index b25a0ac45..2d6fc658d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java @@ -1,13 +1,5 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.passive.EntityOcelot; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -29,7 +21,14 @@ import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorMahoganyTree; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.passive.EntityOcelot; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenTropicalRainforest extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java index 4bd0cd3f5..a7ab93376 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java @@ -8,9 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; @@ -28,6 +25,9 @@ import biomesoplenty.common.world.feature.GeneratorLakes; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBush; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenTundra extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenVolcanicIsland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenVolcanicIsland.java index 674fd1f77..e349a653c 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenVolcanicIsland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenVolcanicIsland.java @@ -8,7 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.init.Blocks; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.block.BOPBlocks; @@ -18,6 +17,7 @@ import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.world.feature.GeneratorLakes; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorSplotches; +import net.minecraft.init.Blocks; public class BiomeGenVolcanicIsland extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java index 7d824de92..d3129fc05 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java @@ -8,39 +8,27 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.block.BlockFlower.EnumFlowerType; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.monster.EntitySlime; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.block.BlockBOPCoral; -import biomesoplenty.common.block.BlockBOPGrass; -import biomesoplenty.common.block.BlockBOPLilypad; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.enums.BOPTrees; import biomesoplenty.common.enums.BOPWoods; -import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.util.block.BlockQuery; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; -import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorLakes; import biomesoplenty.common.world.feature.GeneratorOreSingle; -import biomesoplenty.common.world.feature.GeneratorSpike; -import biomesoplenty.common.world.feature.GeneratorSplatter; -import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorBigTree; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenWasteland extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java index a3be3af78..7237cb2f7 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java @@ -8,16 +8,6 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockOldLeaf; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockFlower.EnumFlowerType; -import net.minecraft.block.BlockLeaves; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.entity.monster.EntitySlime; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -46,6 +36,15 @@ import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockFlower.EnumFlowerType; +import net.minecraft.block.BlockOldLeaf; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.entity.monster.EntitySlime; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenWetland extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java index f571c1203..3fa5cd1e0 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java @@ -8,35 +8,30 @@ package biomesoplenty.common.biome.overworld; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.common.block.BlockBOPDoublePlant; -import biomesoplenty.common.block.BlockBOPLilypad; import biomesoplenty.common.block.BlockBOPMushroom; import biomesoplenty.common.entities.EntityButterfly; import biomesoplenty.common.entities.EntitySnail; import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; -import biomesoplenty.common.enums.BOPWoods; import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.GeneratorBigMushroom; import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; -import biomesoplenty.common.world.feature.GeneratorLogs; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; import biomesoplenty.common.world.feature.tree.GeneratorBigTree; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; public class BiomeGenWoodland extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java index e0e14ba26..31519edc1 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java @@ -10,15 +10,6 @@ package biomesoplenty.common.biome.overworld; import java.util.Random; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockTallGrass; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.chunk.ChunkPrimer; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -28,19 +19,22 @@ import biomesoplenty.common.enums.BOPClimates; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; -import biomesoplenty.common.util.block.BlockQuery; -import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorColumns; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; -import biomesoplenty.common.world.feature.GeneratorSplatter; -import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; -import biomesoplenty.common.world.feature.tree.GeneratorBigTree; import biomesoplenty.common.world.feature.tree.GeneratorBush; import biomesoplenty.common.world.feature.tree.GeneratorTwigletTree; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.chunk.ChunkPrimer; public class BiomeGenXericShrubland extends BOPBiome { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForest.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForest.java index 3338d4902..bc3127d07 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForest.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForest.java @@ -1,7 +1,5 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.init.Blocks; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; @@ -16,6 +14,7 @@ import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtBirchForest extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForestHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForestHills.java index 83db12a04..db947f36a 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForestHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForestHills.java @@ -1,7 +1,5 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.init.Blocks; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; @@ -16,6 +14,7 @@ import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtBirchForestHills extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaiga.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaiga.java index 1bc3644ad..66d1dc019 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaiga.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaiga.java @@ -1,7 +1,5 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -12,6 +10,7 @@ import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtColdTaiga extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaigaHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaigaHills.java index 79f519c9c..0dac0df57 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaigaHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaigaHills.java @@ -1,7 +1,5 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -12,6 +10,7 @@ import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtColdTaigaHills extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtDesert.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtDesert.java index 419d71581..9c733e68f 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtDesert.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtDesert.java @@ -1,10 +1,7 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.block.state.IBlockState; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; -import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.block.BlockBOPSand; import biomesoplenty.common.enums.BOPGems; @@ -13,6 +10,8 @@ import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorLakes; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.block.state.IBlockState; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtDesert extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtDesertHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtDesertHills.java index d6ec2670a..8f8dd7f9c 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtDesertHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtDesertHills.java @@ -1,18 +1,13 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.block.state.IBlockState; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; -import biomesoplenty.api.biome.generation.GeneratorWeighted; -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.block.BlockBOPSand; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; -import biomesoplenty.common.world.feature.GeneratorLakes; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtDesertHills extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtEnd.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtEnd.java index c46b519db..16d1c24f6 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtEnd.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtEnd.java @@ -1,7 +1,5 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.init.Blocks; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.block.BOPBlocks; @@ -10,8 +8,9 @@ import biomesoplenty.common.util.block.BlockQuery; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorCrystals; -import biomesoplenty.common.world.feature.GeneratorOreCluster; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.init.Blocks; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtEnd extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHills.java index f631ab058..e00d3e17b 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHills.java @@ -1,22 +1,17 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.block.BlockPlanks; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.common.enums.BOPFlowers; -import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.enums.BOPTrees; import biomesoplenty.common.enums.BOPWoods; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; -import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; -import biomesoplenty.common.world.feature.tree.GeneratorBigTree; -import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtExtremeHills extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHillsPlus.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHillsPlus.java index 461e86f27..ee3159369 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHillsPlus.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHillsPlus.java @@ -1,20 +1,17 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.common.enums.BOPFlowers; -import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.enums.BOPTrees; import biomesoplenty.common.enums.BOPWoods; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; -import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; -import biomesoplenty.common.world.feature.tree.GeneratorBigTree; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtExtremeHillsPlus extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForest.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForest.java index 634e9531a..e5f382d19 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForest.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForest.java @@ -1,9 +1,5 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower.EnumFlowerType; -import net.minecraft.init.Blocks; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; @@ -14,13 +10,13 @@ import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.enums.BOPTrees; -import biomesoplenty.common.enums.BOPWoods; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtForest extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForestHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForestHills.java index ec2f01cd4..4fbe65dfb 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForestHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForestHills.java @@ -1,9 +1,5 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower.EnumFlowerType; -import net.minecraft.init.Blocks; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; @@ -14,13 +10,13 @@ import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.enums.BOPTrees; -import biomesoplenty.common.enums.BOPWoods; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtForestHills extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIceMountains.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIceMountains.java index 7ce1b5c4f..5b3d88c6f 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIceMountains.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIceMountains.java @@ -1,6 +1,5 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -11,6 +10,7 @@ import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtIceMountains extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIcePlains.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIcePlains.java index 777770690..f70ee0783 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIcePlains.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIcePlains.java @@ -1,6 +1,5 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -11,6 +10,7 @@ import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtIcePlains extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungle.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungle.java index 62ff23fd1..f4c57b747 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungle.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungle.java @@ -1,18 +1,16 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; -import biomesoplenty.common.block.BlockBOPDoublePlant; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtJungle extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungleHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungleHills.java index a23324482..c87f3481f 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungleHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungleHills.java @@ -1,18 +1,16 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; -import biomesoplenty.common.block.BlockBOPDoublePlant; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtJungleHills extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaiga.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaiga.java index f0f98c478..a3d6d5b3e 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaiga.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaiga.java @@ -1,6 +1,5 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; @@ -12,6 +11,7 @@ import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtMegaTaiga extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaigaHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaigaHills.java index 4d6e65edb..bd2d4ca55 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaigaHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaigaHills.java @@ -1,6 +1,5 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; @@ -12,6 +11,7 @@ import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtMegaTaigaHills extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesa.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesa.java index 881b03be3..20df9816b 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesa.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesa.java @@ -1,6 +1,5 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -11,6 +10,7 @@ import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtMesa extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesaPlateau.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesaPlateau.java index 061d084a8..572f2436a 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesaPlateau.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesaPlateau.java @@ -1,6 +1,5 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -11,6 +10,7 @@ import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtMesaPlateau extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMushroomIsland.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMushroomIsland.java index 5ba4027b1..ee9192761 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMushroomIsland.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMushroomIsland.java @@ -1,20 +1,13 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; -import biomesoplenty.api.biome.generation.GeneratorWeighted; -import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.block.BlockBOPMushroom; -import biomesoplenty.common.block.BlockBOPSand; import biomesoplenty.common.enums.BOPGems; -import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; -import biomesoplenty.common.world.feature.GeneratorLakes; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtMushroomIsland extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtOcean.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtOcean.java index edda7e287..22a60ac9a 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtOcean.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtOcean.java @@ -1,18 +1,11 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.block.state.IBlockState; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; -import biomesoplenty.api.biome.generation.GeneratorWeighted; -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.block.BlockBOPSand; import biomesoplenty.common.enums.BOPGems; -import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.GeneratorFlora; -import biomesoplenty.common.world.feature.GeneratorLakes; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtOcean extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtPlains.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtPlains.java index 299356e24..89b3a7c74 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtPlains.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtPlains.java @@ -1,6 +1,5 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -11,6 +10,7 @@ import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtPlains extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtRoofedForest.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtRoofedForest.java index 43200a9e2..b4e54415e 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtRoofedForest.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtRoofedForest.java @@ -1,18 +1,16 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.world.biome.BiomeGenBase; -import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; import biomesoplenty.common.block.BlockBOPMushroom; -import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtRoofedForest extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavanna.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavanna.java index 624051402..ea16f3907 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavanna.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavanna.java @@ -1,7 +1,5 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.block.state.IBlockState; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -15,6 +13,8 @@ import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorLakes; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.block.state.IBlockState; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtSavanna extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavannaPlateau.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavannaPlateau.java index 43c60ed95..7e2df1521 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavannaPlateau.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavannaPlateau.java @@ -1,20 +1,16 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.block.state.IBlockState; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.block.BlockBOPSand; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; -import biomesoplenty.common.world.feature.GeneratorLakes; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtSavannaPlateau extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSwampland.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSwampland.java index d05d9688a..204247ae6 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSwampland.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSwampland.java @@ -1,10 +1,5 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.block.BlockLeaves; -import net.minecraft.block.BlockOldLeaf; -import net.minecraft.block.BlockPlanks; -import net.minecraft.init.Blocks; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -25,9 +20,11 @@ import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; -import biomesoplenty.common.world.feature.GeneratorSplotches; import biomesoplenty.common.world.feature.GeneratorWaterside; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; +import net.minecraft.block.BlockOldLeaf; +import net.minecraft.init.Blocks; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtSwampland extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaiga.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaiga.java index d3c0ba15e..249585fbe 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaiga.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaiga.java @@ -1,6 +1,5 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; @@ -12,6 +11,7 @@ import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtTaiga extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaigaHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaigaHills.java index 9d6a0676e..5931fca0f 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaigaHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaigaHills.java @@ -1,6 +1,5 @@ package biomesoplenty.common.biome.vanilla; -import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.ExtendedBiomeWrapper; import biomesoplenty.api.biome.generation.GeneratorStage; @@ -12,6 +11,7 @@ import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; import biomesoplenty.common.world.feature.GeneratorOreSingle; +import net.minecraft.world.biome.BiomeGenBase; public class BiomeExtTaigaHills extends ExtendedBiomeWrapper { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPAsh.java b/src/main/java/biomesoplenty/common/block/BlockBOPAsh.java index cc1e3a14f..0a1d4fb26 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPAsh.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPAsh.java @@ -11,17 +11,17 @@ package biomesoplenty.common.block; import java.util.Random; import biomesoplenty.api.item.BOPItems; -import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.Item; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -34,12 +34,12 @@ public class BlockBOPAsh extends BlockBOPGeneric this.setHardness(0.4F); this.setHarvestLevel("shovel", 0); - this.setStepSound(Block.soundTypeSand); + this.setStepSound(SoundType.SAND); } // ash blocks are slightly lower @Override - public AxisAlignedBB getCollisionBoundingBox(World world, BlockPos pos, IBlockState state) + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { float heightOffset = 0.125F; return new AxisAlignedBB((double) pos.getX(), (double) pos.getY(), (double) pos.getZ(), (double) (pos.getX() + 1), (double) ((float) (pos.getY() + 1) - heightOffset), (double) (pos.getZ() + 1)); @@ -79,7 +79,7 @@ public class BlockBOPAsh extends BlockBOPGeneric // randomly show some smoke particles @Override @SideOnly(Side.CLIENT) - public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random random) + public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random random) { if (random.nextInt(2) == 0) { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPBamboo.java b/src/main/java/biomesoplenty/common/block/BlockBOPBamboo.java index 64813c6ac..3ee646c2f 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPBamboo.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPBamboo.java @@ -12,15 +12,15 @@ import java.util.Random; import biomesoplenty.api.block.BOPBlocks; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyInteger; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -39,7 +39,7 @@ public class BlockBOPBamboo extends BlockBOPDecoration { super(Material.wood); this.setHardness(0.2F); - this.setStepSound(Block.soundTypeWood); + this.setStepSound(SoundType.WOOD); this.setBlockBoundsByRadiusAndHeight(0.1875F , 1.0F); this.setDefaultState(this.blockState.getBaseState().withProperty(AGE, Integer.valueOf(0))); diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPBiomeBlock.java b/src/main/java/biomesoplenty/common/block/BlockBOPBiomeBlock.java index d7bd718e9..e04220278 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPBiomeBlock.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPBiomeBlock.java @@ -20,7 +20,7 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPBones.java b/src/main/java/biomesoplenty/common/block/BlockBOPBones.java index 1107a7045..d92577110 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPBones.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPBones.java @@ -8,25 +8,24 @@ package biomesoplenty.common.block; +import biomesoplenty.api.block.IBOPBlock; +import biomesoplenty.common.item.ItemBOPBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import biomesoplenty.api.block.IBOPBlock; -import biomesoplenty.common.item.ItemBOPBlock; public class BlockBOPBones extends Block implements IBOPBlock { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPCoral.java b/src/main/java/biomesoplenty/common/block/BlockBOPCoral.java index 308e27482..70d6ae297 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPCoral.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPCoral.java @@ -9,15 +9,15 @@ package biomesoplenty.common.block; import static net.minecraft.block.BlockLiquid.LEVEL; + import biomesoplenty.api.block.BlockQueries; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPCrystal.java b/src/main/java/biomesoplenty/common/block/BlockBOPCrystal.java index f77a33a3f..777f576af 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPCrystal.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPCrystal.java @@ -21,7 +21,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.boss.EntityDragon; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; public class BlockBOPCrystal extends Block implements IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDecoration.java b/src/main/java/biomesoplenty/common/block/BlockBOPDecoration.java index b8e5becc1..bed37e3da 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDecoration.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDecoration.java @@ -10,6 +10,8 @@ package biomesoplenty.common.block; import java.util.Random; +import biomesoplenty.api.block.IBOPBlock; +import biomesoplenty.common.item.ItemBOPBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -17,16 +19,13 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import biomesoplenty.api.block.IBOPBlock; -import biomesoplenty.common.item.ItemBOPBlock; public class BlockBOPDecoration extends Block implements IBOPBlock { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDirt.java b/src/main/java/biomesoplenty/common/block/BlockBOPDirt.java index 77fae3558..6cf6cf39d 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDirt.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDirt.java @@ -10,28 +10,25 @@ package biomesoplenty.common.block; import java.util.Random; +import biomesoplenty.api.block.BOPBlocks; +import biomesoplenty.api.block.IBOPBlock; +import biomesoplenty.api.block.ISustainsPlantType; +import biomesoplenty.common.item.ItemBOPBlock; import biomesoplenty.common.util.block.VariantPagingHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.api.block.IBOPBlock; -import biomesoplenty.api.block.ISustainsPlantType; -import biomesoplenty.common.item.ItemBOPBlock; public class BlockBOPDirt extends Block implements IBOPBlock, ISustainsPlantType { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDoor.java b/src/main/java/biomesoplenty/common/block/BlockBOPDoor.java index 9e53a4377..06b9f6716 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDoor.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDoor.java @@ -21,7 +21,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDoubleDecoration.java b/src/main/java/biomesoplenty/common/block/BlockBOPDoubleDecoration.java index 965d00b2c..ebc085507 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDoubleDecoration.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDoubleDecoration.java @@ -14,14 +14,13 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDoubleOtherSlab.java b/src/main/java/biomesoplenty/common/block/BlockBOPDoubleOtherSlab.java index 52e2f56bc..4b8a24e94 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDoubleOtherSlab.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDoubleOtherSlab.java @@ -12,11 +12,10 @@ import java.util.ArrayList; import java.util.List; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.enums.BOPWoods; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @SuppressWarnings("unchecked") diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDoublePlant.java b/src/main/java/biomesoplenty/common/block/BlockBOPDoublePlant.java index a4fbcacac..dd47c7828 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDoublePlant.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDoublePlant.java @@ -12,19 +12,21 @@ import java.util.List; import com.google.common.collect.ImmutableSet; +import biomesoplenty.api.block.BOPBlocks; +import biomesoplenty.api.block.BlockQueries; +import biomesoplenty.common.enums.BOPPlants; +import biomesoplenty.common.util.block.BlockStateUtils; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; @@ -33,10 +35,6 @@ import net.minecraft.world.biome.BiomeColorHelper; import net.minecraftforge.common.IShearable; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.api.block.BlockQueries; -import biomesoplenty.common.enums.BOPPlants; -import biomesoplenty.common.util.block.BlockStateUtils; public class BlockBOPDoublePlant extends BlockBOPDoubleDecoration implements IShearable { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPDoubleWoodSlab.java b/src/main/java/biomesoplenty/common/block/BlockBOPDoubleWoodSlab.java index 1250f8f05..6d4243050 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPDoubleWoodSlab.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPDoubleWoodSlab.java @@ -10,7 +10,6 @@ package biomesoplenty.common.block; import java.util.ArrayList; import java.util.List; -import java.util.Random; import com.google.common.collect.ImmutableSet; @@ -21,17 +20,15 @@ import biomesoplenty.common.util.block.VariantPagingHelper; import net.minecraft.block.BlockSlab; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFarmland.java b/src/main/java/biomesoplenty/common/block/BlockBOPFarmland.java index cd9c21da7..d06123a25 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFarmland.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFarmland.java @@ -8,6 +8,8 @@ package biomesoplenty.common.block; +import java.util.Random; + import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.block.IBOPBlock; import biomesoplenty.common.item.ItemBOPBlock; @@ -17,7 +19,6 @@ import net.minecraft.block.BlockDirt; import net.minecraft.block.BlockFarmland; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -26,16 +27,13 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; -import java.util.Random; - public class BlockBOPFarmland extends BlockFarmland implements IBOPBlock { public static VariantPagingHelper paging = new VariantPagingHelper(2, BlockBOPDirt.BOPDirtType.class); diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFence.java b/src/main/java/biomesoplenty/common/block/BlockBOPFence.java index e35781da6..2637488e1 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFence.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFence.java @@ -20,8 +20,8 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; public class BlockBOPFence extends BlockFence implements IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java b/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java index 284b1a530..20ce75489 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java @@ -20,8 +20,8 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; public class BlockBOPFenceGate extends BlockFenceGate implements IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFlesh.java b/src/main/java/biomesoplenty/common/block/BlockBOPFlesh.java index facd00713..d66303c4c 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFlesh.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFlesh.java @@ -10,6 +10,9 @@ package biomesoplenty.common.block; import java.util.Random; +import biomesoplenty.api.block.IBOPBlock; +import biomesoplenty.api.item.BOPItems; +import biomesoplenty.common.item.ItemBOPBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -19,15 +22,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import biomesoplenty.api.block.IBOPBlock; -import biomesoplenty.api.item.BOPItems; -import biomesoplenty.common.item.ItemBOPBlock; public class BlockBOPFlesh extends Block implements IBOPBlock { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java b/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java index a3df42755..0be5d0f60 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java @@ -15,12 +15,10 @@ import java.util.Random; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.config.GameplayConfigurationHandler; import biomesoplenty.common.enums.BOPFlowers; -import biomesoplenty.common.enums.BOPWoods; import biomesoplenty.common.item.ItemBOPFlower; import biomesoplenty.common.util.block.VariantPagingHelper; import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -32,9 +30,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPGem.java b/src/main/java/biomesoplenty/common/block/BlockBOPGem.java index 79c62bc1a..91f3ae5dd 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPGem.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPGem.java @@ -15,7 +15,6 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPGemOre.java b/src/main/java/biomesoplenty/common/block/BlockBOPGemOre.java index e725ac4f1..b740b1be9 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPGemOre.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPGemOre.java @@ -20,12 +20,11 @@ import biomesoplenty.common.util.block.BlockStateUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPGeneric.java b/src/main/java/biomesoplenty/common/block/BlockBOPGeneric.java index 2d2e89cfb..27c8e4953 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPGeneric.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPGeneric.java @@ -19,8 +19,8 @@ import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemBlock; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.EnumPlantType; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java b/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java index 5d299a44e..2c87a336f 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPGrass.java @@ -21,7 +21,6 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.entity.Entity; @@ -31,12 +30,11 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.IStringSerializable; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java b/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java index 2335cfbde..ec713d438 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java @@ -19,7 +19,6 @@ import net.minecraft.block.BlockSlab; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPHalfWoodSlab.java b/src/main/java/biomesoplenty/common/block/BlockBOPHalfWoodSlab.java index 6d45bc2d2..d355b3c4d 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPHalfWoodSlab.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPHalfWoodSlab.java @@ -19,15 +19,14 @@ import biomesoplenty.common.util.block.VariantPagingHelper; import net.minecraft.block.BlockSlab; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPHive.java b/src/main/java/biomesoplenty/common/block/BlockBOPHive.java index 39524ba2f..a985d26e3 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPHive.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPHive.java @@ -10,21 +10,20 @@ package biomesoplenty.common.block; import java.util.Random; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; -import net.minecraft.block.state.IBlockState; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.util.BlockPos; -import net.minecraft.util.IStringSerializable; -import net.minecraft.world.World; import biomesoplenty.api.block.IBOPBlock; import biomesoplenty.api.item.BOPItems; import biomesoplenty.common.entities.EntityWasp; import biomesoplenty.common.item.ItemBOPBlock; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class BlockBOPHive extends Block implements IBOPBlock { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPHoney.java b/src/main/java/biomesoplenty/common/block/BlockBOPHoney.java index 23e0c32c4..792b64398 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPHoney.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPHoney.java @@ -8,16 +8,15 @@ package biomesoplenty.common.block; +import biomesoplenty.api.block.IBOPBlock; +import biomesoplenty.common.item.ItemBOPBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemBlock; -import net.minecraft.util.EnumWorldBlockLayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import biomesoplenty.api.block.IBOPBlock; -import biomesoplenty.common.item.ItemBOPBlock; public class BlockBOPHoney extends Block implements IBOPBlock { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java b/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java index d810d5a90..0760e5587 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java @@ -11,10 +11,14 @@ package biomesoplenty.common.block; import java.util.List; import java.util.Random; +import biomesoplenty.api.block.IBOPBlock; +import biomesoplenty.api.item.BOPItems; +import biomesoplenty.common.enums.BOPTrees; +import biomesoplenty.common.item.ItemBOPBlock; +import biomesoplenty.common.util.block.VariantPagingHelper; import net.minecraft.block.BlockLeaves; import net.minecraft.block.BlockPlanks; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -23,21 +27,14 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeColorHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import biomesoplenty.api.block.IBOPBlock; -import biomesoplenty.api.item.BOPItems; -import biomesoplenty.common.enums.BOPTrees; -import biomesoplenty.common.item.ItemBOPBlock; -import biomesoplenty.common.util.block.VariantPagingHelper; // TODO: using fast graphics - transparent color is always rendered as black - can we override this somehow? // TODO: using fast graphics - flowering leaves overlay seems to be tinted green - I think that is because it doesn't use distinct tintindexes on fast graphics diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java b/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java index e0f4f2e46..b14398ea3 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java @@ -9,23 +9,17 @@ package biomesoplenty.common.block; import biomesoplenty.api.block.IBOPBlock; -import biomesoplenty.common.block.BlockBOPGrass.BOPGrassType; -import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.item.ItemBOPLilypad; import net.minecraft.block.BlockLilyPad; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemBlock; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.IStringSerializable; -import net.minecraft.world.ColorizerFoliage; -import net.minecraft.world.ColorizerGrass; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeColorHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLog.java b/src/main/java/biomesoplenty/common/block/BlockBOPLog.java index 64d925235..a29fed39a 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPLog.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLog.java @@ -9,18 +9,16 @@ package biomesoplenty.common.block; import biomesoplenty.api.block.IBOPBlock; -import biomesoplenty.common.enums.BOPTrees; import biomesoplenty.common.enums.BOPWoods; import biomesoplenty.common.item.ItemBOPBlock; import biomesoplenty.common.util.block.VariantPagingHelper; import net.minecraft.block.BlockLog; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; public class BlockBOPLog extends BlockLog implements IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPMud.java b/src/main/java/biomesoplenty/common/block/BlockBOPMud.java index 14ff9f6fc..8c7a842e2 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPMud.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPMud.java @@ -10,28 +10,27 @@ package biomesoplenty.common.block; import java.util.Random; +import biomesoplenty.api.block.IBOPBlock; +import biomesoplenty.api.block.ISustainsPlantType; +import biomesoplenty.api.item.BOPItems; +import biomesoplenty.common.item.ItemBOPBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; -import biomesoplenty.api.block.IBOPBlock; -import biomesoplenty.api.block.ISustainsPlantType; -import biomesoplenty.api.item.BOPItems; -import biomesoplenty.common.item.ItemBOPBlock; public class BlockBOPMud extends Block implements IBOPBlock, ISustainsPlantType { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPMushroom.java b/src/main/java/biomesoplenty/common/block/BlockBOPMushroom.java index 8e4892022..e59962f17 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPMushroom.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPMushroom.java @@ -12,11 +12,10 @@ import biomesoplenty.api.block.BlockQueries; import biomesoplenty.common.item.ItemBOPBlock; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemBlock; -import net.minecraft.util.BlockPos; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPPlanks.java b/src/main/java/biomesoplenty/common/block/BlockBOPPlanks.java index 50c51abe5..1f86a6139 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPPlanks.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPPlanks.java @@ -8,20 +8,19 @@ package biomesoplenty.common.block; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockState; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemBlock; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.IBlockAccess; import biomesoplenty.api.block.IBOPBlock; import biomesoplenty.common.enums.BOPWoods; import biomesoplenty.common.item.ItemBOPBlock; import biomesoplenty.common.util.block.VariantPagingHelper; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemBlock; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; public class BlockBOPPlanks extends Block implements IBOPBlock { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java b/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java index da46be705..0a6fbf5c7 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java @@ -14,12 +14,10 @@ import java.util.Random; import biomesoplenty.api.block.BlockQueries; import biomesoplenty.api.item.BOPItems; import biomesoplenty.common.enums.BOPPlants; -import biomesoplenty.common.enums.BOPWoods; import biomesoplenty.common.item.ItemBOPPlant; import biomesoplenty.common.util.block.VariantPagingHelper; import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -34,10 +32,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPSand.java b/src/main/java/biomesoplenty/common/block/BlockBOPSand.java index b78dea6c3..e15f84746 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPSand.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPSand.java @@ -8,25 +8,24 @@ package biomesoplenty.common.block; +import biomesoplenty.api.block.IBOPBlock; +import biomesoplenty.api.block.ISustainsPlantType; +import biomesoplenty.common.item.ItemBOPBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockFalling; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.item.ItemBlock; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; -import biomesoplenty.api.block.IBOPBlock; -import biomesoplenty.api.block.ISustainsPlantType; -import biomesoplenty.common.item.ItemBOPBlock; public class BlockBOPSand extends BlockFalling implements IBOPBlock, ISustainsPlantType { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPSapling.java b/src/main/java/biomesoplenty/common/block/BlockBOPSapling.java index 45cc11040..7a8b7e7a9 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPSapling.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPSapling.java @@ -10,7 +10,6 @@ package biomesoplenty.common.block; import java.util.Random; -import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.block.BlockQueries; import biomesoplenty.common.enums.BOPTrees; @@ -18,7 +17,6 @@ import biomesoplenty.common.enums.BOPWoods; import biomesoplenty.common.item.ItemBOPSapling; import biomesoplenty.common.util.block.VariantPagingHelper; import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; -import biomesoplenty.common.world.feature.tree.GeneratorBayouTree; import biomesoplenty.common.world.feature.tree.GeneratorBigTree; import biomesoplenty.common.world.feature.tree.GeneratorBulbTree; import biomesoplenty.common.world.feature.tree.GeneratorMahoganyTree; @@ -26,17 +24,15 @@ import biomesoplenty.common.world.feature.tree.GeneratorPineTree; import biomesoplenty.common.world.feature.tree.GeneratorRedwoodTree; import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; import net.minecraft.block.Block; -import net.minecraft.block.BlockLeaves; import net.minecraft.block.BlockOldLeaf; import net.minecraft.block.BlockPlanks; import net.minecraft.block.IGrowable; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyInteger; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenTrees; import net.minecraft.world.gen.feature.WorldGenerator; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPSeaweed.java b/src/main/java/biomesoplenty/common/block/BlockBOPSeaweed.java index 8b2ac385c..25484561a 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPSeaweed.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPSeaweed.java @@ -9,6 +9,7 @@ package biomesoplenty.common.block; import static net.minecraft.block.BlockLiquid.LEVEL; + import biomesoplenty.api.block.BlockQueries; import biomesoplenty.api.block.IBOPBlock; import biomesoplenty.common.item.ItemBOPBlock; @@ -16,12 +17,11 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; -import net.minecraft.util.BlockPos; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPStone.java b/src/main/java/biomesoplenty/common/block/BlockBOPStone.java index 235e17f23..21c980a34 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPStone.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPStone.java @@ -15,12 +15,11 @@ import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.item.ItemBlock; -import net.minecraft.util.BlockPos; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; import net.minecraft.world.World; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPTerrarium.java b/src/main/java/biomesoplenty/common/block/BlockBOPTerrarium.java index 9a72b99c2..3db977fc0 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPTerrarium.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPTerrarium.java @@ -8,19 +8,17 @@ package biomesoplenty.common.block; +import biomesoplenty.api.block.IBOPBlock; +import biomesoplenty.common.item.ItemBOPBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemBlock; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; -import biomesoplenty.api.block.IBOPBlock; -import biomesoplenty.common.item.ItemBOPBlock; public class BlockBOPTerrarium extends Block implements IBOPBlock { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPTurnip.java b/src/main/java/biomesoplenty/common/block/BlockBOPTurnip.java index 3bbd2c5d5..7fa8ac6d6 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPTurnip.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPTurnip.java @@ -9,17 +9,17 @@ package biomesoplenty.common.block; +import biomesoplenty.api.block.IBOPBlock; +import biomesoplenty.api.item.BOPItems; +import biomesoplenty.common.item.ItemBOPBlock; import net.minecraft.block.BlockCrops; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.EnumPlantType; -import biomesoplenty.api.block.IBOPBlock; -import biomesoplenty.api.item.BOPItems; -import biomesoplenty.common.item.ItemBOPBlock; // TODO: stop snow settling on this (floats above it) public class BlockBOPTurnip extends BlockCrops implements IBOPBlock diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPVine.java b/src/main/java/biomesoplenty/common/block/BlockBOPVine.java index 3060a738a..8944eb51a 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPVine.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPVine.java @@ -15,8 +15,8 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPWoodStairs.java b/src/main/java/biomesoplenty/common/block/BlockBOPWoodStairs.java index 659e62223..abd5ab9bf 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPWoodStairs.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPWoodStairs.java @@ -19,8 +19,8 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; public class BlockBOPWoodStairs extends BlockStairs implements IBOPBlock diff --git a/src/main/java/biomesoplenty/common/command/BOPCommand.java b/src/main/java/biomesoplenty/common/command/BOPCommand.java index c07c95db4..822009ac4 100644 --- a/src/main/java/biomesoplenty/common/command/BOPCommand.java +++ b/src/main/java/biomesoplenty/common/command/BOPCommand.java @@ -17,15 +17,12 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; -import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.command.NumberInvalidException; import net.minecraft.command.WrongUsageException; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; diff --git a/src/main/java/biomesoplenty/common/config/GameplayConfigurationHandler.java b/src/main/java/biomesoplenty/common/config/GameplayConfigurationHandler.java index 85a5a21cb..200b711c0 100644 --- a/src/main/java/biomesoplenty/common/config/GameplayConfigurationHandler.java +++ b/src/main/java/biomesoplenty/common/config/GameplayConfigurationHandler.java @@ -7,13 +7,13 @@ ******************************************************************************/ package biomesoplenty.common.config; +import java.io.File; + import biomesoplenty.core.BiomesOPlenty; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.fml.client.event.ConfigChangedEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import java.io.File; - public class GameplayConfigurationHandler { public static Configuration config; diff --git a/src/main/java/biomesoplenty/common/config/MiscConfigurationHandler.java b/src/main/java/biomesoplenty/common/config/MiscConfigurationHandler.java index 81e1211fd..873bdc9b6 100644 --- a/src/main/java/biomesoplenty/common/config/MiscConfigurationHandler.java +++ b/src/main/java/biomesoplenty/common/config/MiscConfigurationHandler.java @@ -8,6 +8,8 @@ package biomesoplenty.common.config; +import java.io.File; + import biomesoplenty.common.remote.TrailManager; import biomesoplenty.common.remote.TrailManager.TrailVisibilityMode; import biomesoplenty.common.util.entity.PlayerUtil; @@ -18,8 +20,6 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; -import java.io.File; - public class MiscConfigurationHandler { public static Configuration config; diff --git a/src/main/java/biomesoplenty/common/entities/EntityButterfly.java b/src/main/java/biomesoplenty/common/entities/EntityButterfly.java index e0a1a87a7..9163d85b6 100644 --- a/src/main/java/biomesoplenty/common/entities/EntityButterfly.java +++ b/src/main/java/biomesoplenty/common/entities/EntityButterfly.java @@ -21,10 +21,10 @@ import net.minecraft.entity.ai.EntityMoveHelper; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.DifficultyInstance; import net.minecraft.world.World; diff --git a/src/main/java/biomesoplenty/common/entities/EntityPixie.java b/src/main/java/biomesoplenty/common/entities/EntityPixie.java index 5120810b3..7f35893e9 100644 --- a/src/main/java/biomesoplenty/common/entities/EntityPixie.java +++ b/src/main/java/biomesoplenty/common/entities/EntityPixie.java @@ -21,10 +21,10 @@ import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.ai.EntityMoveHelper; import net.minecraft.entity.monster.IMob; import net.minecraft.item.Item; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; diff --git a/src/main/java/biomesoplenty/common/entities/EntitySnail.java b/src/main/java/biomesoplenty/common/entities/EntitySnail.java index f1ea568a2..fb080c948 100644 --- a/src/main/java/biomesoplenty/common/entities/EntitySnail.java +++ b/src/main/java/biomesoplenty/common/entities/EntitySnail.java @@ -8,15 +8,15 @@ package biomesoplenty.common.entities; +import biomesoplenty.api.block.BOPBlocks; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -import biomesoplenty.api.block.BOPBlocks; public class EntitySnail extends EntityLiving implements IMob { diff --git a/src/main/java/biomesoplenty/common/entities/EntityWasp.java b/src/main/java/biomesoplenty/common/entities/EntityWasp.java index d1f6bf93f..fc5fbf90d 100644 --- a/src/main/java/biomesoplenty/common/entities/EntityWasp.java +++ b/src/main/java/biomesoplenty/common/entities/EntityWasp.java @@ -21,10 +21,10 @@ import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.ai.EntityAIFindEntityNearestPlayer; import net.minecraft.entity.ai.EntityMoveHelper; import net.minecraft.entity.monster.IMob; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; public class EntityWasp extends EntityFlying implements IMob { diff --git a/src/main/java/biomesoplenty/common/entities/ModelButterfly.java b/src/main/java/biomesoplenty/common/entities/ModelButterfly.java index c7d0660ff..36c3bc4f9 100644 --- a/src/main/java/biomesoplenty/common/entities/ModelButterfly.java +++ b/src/main/java/biomesoplenty/common/entities/ModelButterfly.java @@ -3,7 +3,7 @@ package biomesoplenty.common.entities; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; public class ModelButterfly extends ModelBase { diff --git a/src/main/java/biomesoplenty/common/entities/ModelPixie.java b/src/main/java/biomesoplenty/common/entities/ModelPixie.java index 775797a70..825ee37dc 100644 --- a/src/main/java/biomesoplenty/common/entities/ModelPixie.java +++ b/src/main/java/biomesoplenty/common/entities/ModelPixie.java @@ -3,7 +3,7 @@ package biomesoplenty.common.entities; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; public class ModelPixie extends ModelBase { diff --git a/src/main/java/biomesoplenty/common/entities/ModelSnail.java b/src/main/java/biomesoplenty/common/entities/ModelSnail.java index 6562b9984..4f278d605 100644 --- a/src/main/java/biomesoplenty/common/entities/ModelSnail.java +++ b/src/main/java/biomesoplenty/common/entities/ModelSnail.java @@ -3,7 +3,6 @@ package biomesoplenty.common.entities; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; public class ModelSnail extends ModelBase { diff --git a/src/main/java/biomesoplenty/common/entities/ModelWasp.java b/src/main/java/biomesoplenty/common/entities/ModelWasp.java index b186079d4..fadd5cc3b 100644 --- a/src/main/java/biomesoplenty/common/entities/ModelWasp.java +++ b/src/main/java/biomesoplenty/common/entities/ModelWasp.java @@ -11,7 +11,7 @@ package biomesoplenty.common.entities; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; public class ModelWasp extends ModelBase { diff --git a/src/main/java/biomesoplenty/common/entities/RenderButterfly.java b/src/main/java/biomesoplenty/common/entities/RenderButterfly.java index c6d4534fb..1667b1ea1 100644 --- a/src/main/java/biomesoplenty/common/entities/RenderButterfly.java +++ b/src/main/java/biomesoplenty/common/entities/RenderButterfly.java @@ -1,11 +1,7 @@ package biomesoplenty.common.entities; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.entity.passive.EntityRabbit; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/biomesoplenty/common/entities/projectiles/EntityDart.java b/src/main/java/biomesoplenty/common/entities/projectiles/EntityDart.java index 8f80b4e0a..d3765b488 100644 --- a/src/main/java/biomesoplenty/common/entities/projectiles/EntityDart.java +++ b/src/main/java/biomesoplenty/common/entities/projectiles/EntityDart.java @@ -19,14 +19,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.Item; -import net.minecraft.network.play.server.S2BPacketChangeGameState; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; public class EntityDart extends EntityArrow diff --git a/src/main/java/biomesoplenty/common/entities/projectiles/EntityMudball.java b/src/main/java/biomesoplenty/common/entities/projectiles/EntityMudball.java index 6dc59581a..23e07b8c6 100644 --- a/src/main/java/biomesoplenty/common/entities/projectiles/EntityMudball.java +++ b/src/main/java/biomesoplenty/common/entities/projectiles/EntityMudball.java @@ -7,7 +7,6 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; public class EntityMudball extends EntityThrowable diff --git a/src/main/java/biomesoplenty/common/entities/projectiles/RenderDart.java b/src/main/java/biomesoplenty/common/entities/projectiles/RenderDart.java index 9fc60070e..270d103b1 100644 --- a/src/main/java/biomesoplenty/common/entities/projectiles/RenderDart.java +++ b/src/main/java/biomesoplenty/common/entities/projectiles/RenderDart.java @@ -8,20 +8,17 @@ package biomesoplenty.common.entities.projectiles; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.entity.Entity; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - import org.lwjgl.opengl.GL11; import biomesoplenty.common.item.ItemDart; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderDart extends Render diff --git a/src/main/java/biomesoplenty/common/entities/projectiles/RenderMudball.java b/src/main/java/biomesoplenty/common/entities/projectiles/RenderMudball.java index 6f382f89c..8aa37a114 100644 --- a/src/main/java/biomesoplenty/common/entities/projectiles/RenderMudball.java +++ b/src/main/java/biomesoplenty/common/entities/projectiles/RenderMudball.java @@ -3,9 +3,9 @@ package biomesoplenty.common.entities.projectiles; import biomesoplenty.api.item.BOPItems; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; diff --git a/src/main/java/biomesoplenty/common/entities/projectiles/dispenser/DispenserBehaviorDart.java b/src/main/java/biomesoplenty/common/entities/projectiles/dispenser/DispenserBehaviorDart.java index 0494a6ac5..35c55a019 100644 --- a/src/main/java/biomesoplenty/common/entities/projectiles/dispenser/DispenserBehaviorDart.java +++ b/src/main/java/biomesoplenty/common/entities/projectiles/dispenser/DispenserBehaviorDart.java @@ -1,10 +1,10 @@ package biomesoplenty.common.entities.projectiles.dispenser; +import biomesoplenty.common.entities.projectiles.EntityDart; import net.minecraft.dispenser.BehaviorProjectileDispense; import net.minecraft.dispenser.IPosition; import net.minecraft.entity.IProjectile; import net.minecraft.world.World; -import biomesoplenty.common.entities.projectiles.EntityDart; public class DispenserBehaviorDart extends BehaviorProjectileDispense { diff --git a/src/main/java/biomesoplenty/common/enums/BOPFlowers.java b/src/main/java/biomesoplenty/common/enums/BOPFlowers.java index 4e1fa983b..f355f69bd 100644 --- a/src/main/java/biomesoplenty/common/enums/BOPFlowers.java +++ b/src/main/java/biomesoplenty/common/enums/BOPFlowers.java @@ -8,8 +8,8 @@ package biomesoplenty.common.enums; -import net.minecraft.util.IStringSerializable; import biomesoplenty.common.util.block.VariantPagingHelper.IPagedVariants; +import net.minecraft.util.IStringSerializable; public enum BOPFlowers implements IStringSerializable, IPagedVariants { diff --git a/src/main/java/biomesoplenty/common/enums/BOPPlants.java b/src/main/java/biomesoplenty/common/enums/BOPPlants.java index 4aedab5b9..dccb2eab0 100644 --- a/src/main/java/biomesoplenty/common/enums/BOPPlants.java +++ b/src/main/java/biomesoplenty/common/enums/BOPPlants.java @@ -8,8 +8,8 @@ package biomesoplenty.common.enums; -import net.minecraft.util.IStringSerializable; import biomesoplenty.common.util.block.VariantPagingHelper.IPagedVariants; +import net.minecraft.util.IStringSerializable; public enum BOPPlants implements IStringSerializable, IPagedVariants { diff --git a/src/main/java/biomesoplenty/common/enums/BOPTrees.java b/src/main/java/biomesoplenty/common/enums/BOPTrees.java index a1ec50179..91e8a29f7 100644 --- a/src/main/java/biomesoplenty/common/enums/BOPTrees.java +++ b/src/main/java/biomesoplenty/common/enums/BOPTrees.java @@ -8,11 +8,11 @@ package biomesoplenty.common.enums; -import net.minecraft.util.IStringSerializable; -import biomesoplenty.common.util.block.VariantPagingHelper.IPagedVariants; - import com.google.common.base.Predicate; +import biomesoplenty.common.util.block.VariantPagingHelper.IPagedVariants; +import net.minecraft.util.IStringSerializable; + public enum BOPTrees implements IStringSerializable, IPagedVariants { diff --git a/src/main/java/biomesoplenty/common/enums/BOPWoods.java b/src/main/java/biomesoplenty/common/enums/BOPWoods.java index bf66253ce..64204fa14 100644 --- a/src/main/java/biomesoplenty/common/enums/BOPWoods.java +++ b/src/main/java/biomesoplenty/common/enums/BOPWoods.java @@ -8,11 +8,11 @@ package biomesoplenty.common.enums; -import net.minecraft.util.IStringSerializable; -import biomesoplenty.common.util.block.VariantPagingHelper.IPagedVariants; - import com.google.common.base.Predicate; +import biomesoplenty.common.util.block.VariantPagingHelper.IPagedVariants; +import net.minecraft.util.IStringSerializable; + public enum BOPWoods implements IStringSerializable, IPagedVariants { diff --git a/src/main/java/biomesoplenty/common/fluids/blocks/BlockHoneyFluid.java b/src/main/java/biomesoplenty/common/fluids/blocks/BlockHoneyFluid.java index b7ed6521e..0b9862dbb 100644 --- a/src/main/java/biomesoplenty/common/fluids/blocks/BlockHoneyFluid.java +++ b/src/main/java/biomesoplenty/common/fluids/blocks/BlockHoneyFluid.java @@ -13,7 +13,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidFinite; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/biomesoplenty/common/fluids/blocks/BlockHotSpringWaterFluid.java b/src/main/java/biomesoplenty/common/fluids/blocks/BlockHotSpringWaterFluid.java index 615a7712e..6578233d6 100644 --- a/src/main/java/biomesoplenty/common/fluids/blocks/BlockHotSpringWaterFluid.java +++ b/src/main/java/biomesoplenty/common/fluids/blocks/BlockHotSpringWaterFluid.java @@ -10,15 +10,14 @@ package biomesoplenty.common.fluids.blocks; import java.util.Random; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/biomesoplenty/common/fluids/blocks/BlockPoisonFluid.java b/src/main/java/biomesoplenty/common/fluids/blocks/BlockPoisonFluid.java index e3a824a99..12dc37d84 100644 --- a/src/main/java/biomesoplenty/common/fluids/blocks/BlockPoisonFluid.java +++ b/src/main/java/biomesoplenty/common/fluids/blocks/BlockPoisonFluid.java @@ -13,7 +13,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java b/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java index d02d35098..35586f5fc 100644 --- a/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java +++ b/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java @@ -10,26 +10,8 @@ package biomesoplenty.common.handler; import java.util.Iterator; import java.util.Set; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.stats.AchievementList; -import net.minecraft.util.BlockPos; -import net.minecraft.util.JsonSerializableSet; -import net.minecraft.util.MathHelper; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerUseItemEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; -import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.PlayerEvent; -import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; +import com.google.common.collect.Sets; + import biomesoplenty.api.achievement.BOPAchievements; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.block.BOPBlocks; @@ -42,8 +24,25 @@ import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.enums.BOPTrees; import biomesoplenty.common.item.ItemJarFilled; - -import com.google.common.collect.Sets; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.AchievementList; +import net.minecraft.util.JsonSerializableSet; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; +import net.minecraftforge.event.world.BlockEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; public class AchievementEventHandler { diff --git a/src/main/java/biomesoplenty/common/handler/BucketEventHandler.java b/src/main/java/biomesoplenty/common/handler/BucketEventHandler.java index 3142439a8..1bdc67243 100644 --- a/src/main/java/biomesoplenty/common/handler/BucketEventHandler.java +++ b/src/main/java/biomesoplenty/common/handler/BucketEventHandler.java @@ -8,22 +8,21 @@ package biomesoplenty.common.handler; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.stats.StatList; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.event.entity.player.FillBucketEvent; -import net.minecraftforge.fml.common.eventhandler.Event.Result; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.item.BOPItems; import biomesoplenty.common.fluids.blocks.BlockBloodFluid; import biomesoplenty.common.fluids.blocks.BlockHoneyFluid; import biomesoplenty.common.fluids.blocks.BlockHotSpringWaterFluid; import biomesoplenty.common.fluids.blocks.BlockPoisonFluid; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.StatList; +import net.minecraft.util.math.BlockPos; +import net.minecraftforge.event.entity.player.FillBucketEvent; +import net.minecraftforge.fml.common.eventhandler.Event.Result; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class BucketEventHandler { diff --git a/src/main/java/biomesoplenty/common/handler/FlippersEventHandler.java b/src/main/java/biomesoplenty/common/handler/FlippersEventHandler.java index fd0f783e7..d9853a47f 100644 --- a/src/main/java/biomesoplenty/common/handler/FlippersEventHandler.java +++ b/src/main/java/biomesoplenty/common/handler/FlippersEventHandler.java @@ -1,10 +1,10 @@ package biomesoplenty.common.handler; +import biomesoplenty.api.item.BOPItems; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import biomesoplenty.api.item.BOPItems; public class FlippersEventHandler { diff --git a/src/main/java/biomesoplenty/common/handler/GuiEventHandler.java b/src/main/java/biomesoplenty/common/handler/GuiEventHandler.java index f53e43409..1b738bd96 100644 --- a/src/main/java/biomesoplenty/common/handler/GuiEventHandler.java +++ b/src/main/java/biomesoplenty/common/handler/GuiEventHandler.java @@ -8,14 +8,14 @@ package biomesoplenty.common.handler; +import biomesoplenty.common.config.MiscConfigurationHandler; +import biomesoplenty.common.init.ModBiomes; import net.minecraft.client.gui.GuiCreateWorld; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import biomesoplenty.common.config.MiscConfigurationHandler; -import biomesoplenty.common.init.ModBiomes; public class GuiEventHandler { diff --git a/src/main/java/biomesoplenty/common/handler/ItemEventHandler.java b/src/main/java/biomesoplenty/common/handler/ItemEventHandler.java index f97853ce8..c724f0d29 100644 --- a/src/main/java/biomesoplenty/common/handler/ItemEventHandler.java +++ b/src/main/java/biomesoplenty/common/handler/ItemEventHandler.java @@ -8,7 +8,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.event.entity.item.ItemTossEvent; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/biomesoplenty/common/handler/TrailsEventHandler.java b/src/main/java/biomesoplenty/common/handler/TrailsEventHandler.java index f9f4532e0..8ca3f0f5a 100644 --- a/src/main/java/biomesoplenty/common/handler/TrailsEventHandler.java +++ b/src/main/java/biomesoplenty/common/handler/TrailsEventHandler.java @@ -15,8 +15,8 @@ import biomesoplenty.common.remote.TrailManager.TrailVisibilityMode; import biomesoplenty.core.BiomesOPlenty; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; diff --git a/src/main/java/biomesoplenty/common/handler/UseHoeEventHandler.java b/src/main/java/biomesoplenty/common/handler/UseHoeEventHandler.java index 64ee0e300..03b0af72c 100644 --- a/src/main/java/biomesoplenty/common/handler/UseHoeEventHandler.java +++ b/src/main/java/biomesoplenty/common/handler/UseHoeEventHandler.java @@ -15,7 +15,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.UseHoeEvent; import net.minecraftforge.fml.common.eventhandler.Event; diff --git a/src/main/java/biomesoplenty/common/handler/decoration/DecorateBiomeEventHandler.java b/src/main/java/biomesoplenty/common/handler/decoration/DecorateBiomeEventHandler.java index affb3965c..8d75014e8 100644 --- a/src/main/java/biomesoplenty/common/handler/decoration/DecorateBiomeEventHandler.java +++ b/src/main/java/biomesoplenty/common/handler/decoration/DecorateBiomeEventHandler.java @@ -11,13 +11,11 @@ package biomesoplenty.common.handler.decoration; import java.util.Random; import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.api.biome.BiomeOwner; import biomesoplenty.api.biome.IExtendedBiome; import biomesoplenty.api.biome.generation.GenerationManager; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.IGenerator; -import biomesoplenty.common.init.ModBiomes; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.event.terraingen.DecorateBiomeEvent; diff --git a/src/main/java/biomesoplenty/common/init/ModAchievements.java b/src/main/java/biomesoplenty/common/init/ModAchievements.java index 19625b0c3..aa15c8cee 100644 --- a/src/main/java/biomesoplenty/common/init/ModAchievements.java +++ b/src/main/java/biomesoplenty/common/init/ModAchievements.java @@ -12,8 +12,8 @@ import static biomesoplenty.api.achievement.BOPAchievements.craft_amethyst_sword import static biomesoplenty.api.achievement.BOPAchievements.craft_dart_blower; import static biomesoplenty.api.achievement.BOPAchievements.craft_flax_string; import static biomesoplenty.api.achievement.BOPAchievements.craft_muddy_pickaxe; -import static biomesoplenty.api.achievement.BOPAchievements.craft_terrestrial_artifact; import static biomesoplenty.api.achievement.BOPAchievements.craft_poison_jar; +import static biomesoplenty.api.achievement.BOPAchievements.craft_terrestrial_artifact; import static biomesoplenty.api.achievement.BOPAchievements.eat_shroom_powder; import static biomesoplenty.api.achievement.BOPAchievements.explore_all_biomes; import static biomesoplenty.api.achievement.BOPAchievements.grow_sacred_oak; @@ -31,10 +31,7 @@ import static biomesoplenty.api.achievement.BOPAchievements.obtain_turnip; import static biomesoplenty.api.achievement.BOPAchievements.obtain_wilted_lily; import static biomesoplenty.api.achievement.BOPAchievements.use_biome_finder; import static biomesoplenty.api.achievement.BOPAchievements.use_enderporter; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.stats.Achievement; -import net.minecraftforge.common.AchievementPage; + import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.item.BOPItems; import biomesoplenty.common.block.BlockBOPFlower; @@ -44,6 +41,10 @@ import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.enums.BOPTrees; import biomesoplenty.common.item.ItemJarFilled; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; +import net.minecraftforge.common.AchievementPage; public class ModAchievements { diff --git a/src/main/java/biomesoplenty/common/init/ModBiomes.java b/src/main/java/biomesoplenty/common/init/ModBiomes.java index d0069f09d..4c3700b5a 100644 --- a/src/main/java/biomesoplenty/common/init/ModBiomes.java +++ b/src/main/java/biomesoplenty/common/init/ModBiomes.java @@ -8,8 +8,6 @@ package biomesoplenty.common.init; -import static biomesoplenty.api.biome.BOPBiomes.excludedDecoratedWorldTypes; - import static biomesoplenty.api.biome.BOPBiomes.alps; import static biomesoplenty.api.biome.BOPBiomes.bamboo_forest; import static biomesoplenty.api.biome.BOPBiomes.bayou; @@ -32,6 +30,7 @@ import static biomesoplenty.api.biome.BOPBiomes.desert_extension; import static biomesoplenty.api.biome.BOPBiomes.desert_hills_extension; import static biomesoplenty.api.biome.BOPBiomes.end_extension; import static biomesoplenty.api.biome.BOPBiomes.eucalyptus_forest; +import static biomesoplenty.api.biome.BOPBiomes.excludedDecoratedWorldTypes; import static biomesoplenty.api.biome.BOPBiomes.extreme_hills_extension; import static biomesoplenty.api.biome.BOPBiomes.extreme_hills_plus_extension; import static biomesoplenty.api.biome.BOPBiomes.fen; @@ -45,8 +44,8 @@ import static biomesoplenty.api.biome.BOPBiomes.gravel_beach; import static biomesoplenty.api.biome.BOPBiomes.grove; import static biomesoplenty.api.biome.BOPBiomes.heathland; import static biomesoplenty.api.biome.BOPBiomes.highland; -import static biomesoplenty.api.biome.BOPBiomes.ice_plains_extension; import static biomesoplenty.api.biome.BOPBiomes.ice_mountains_extension; +import static biomesoplenty.api.biome.BOPBiomes.ice_plains_extension; import static biomesoplenty.api.biome.BOPBiomes.jungle_extension; import static biomesoplenty.api.biome.BOPBiomes.jungle_hills_extension; import static biomesoplenty.api.biome.BOPBiomes.kelp_forest; @@ -69,8 +68,8 @@ import static biomesoplenty.api.biome.BOPBiomes.mystic_grove; import static biomesoplenty.api.biome.BOPBiomes.oasis; import static biomesoplenty.api.biome.BOPBiomes.ocean_extension; import static biomesoplenty.api.biome.BOPBiomes.ominous_woods; -import static biomesoplenty.api.biome.BOPBiomes.origin_island; import static biomesoplenty.api.biome.BOPBiomes.orchard; +import static biomesoplenty.api.biome.BOPBiomes.origin_island; import static biomesoplenty.api.biome.BOPBiomes.outback; import static biomesoplenty.api.biome.BOPBiomes.overgrown_cliffs; import static biomesoplenty.api.biome.BOPBiomes.plains_extension; @@ -111,11 +110,10 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import net.minecraft.world.WorldType; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.common.BiomeDictionary; -import net.minecraftforge.common.BiomeDictionary.Type; -import net.minecraftforge.common.BiomeManager; +import com.google.common.base.Optional; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; + import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.IExtendedBiome; @@ -191,8 +189,8 @@ import biomesoplenty.common.biome.vanilla.BiomeExtExtremeHills; import biomesoplenty.common.biome.vanilla.BiomeExtExtremeHillsPlus; import biomesoplenty.common.biome.vanilla.BiomeExtForest; import biomesoplenty.common.biome.vanilla.BiomeExtForestHills; -import biomesoplenty.common.biome.vanilla.BiomeExtIcePlains; import biomesoplenty.common.biome.vanilla.BiomeExtIceMountains; +import biomesoplenty.common.biome.vanilla.BiomeExtIcePlains; import biomesoplenty.common.biome.vanilla.BiomeExtJungle; import biomesoplenty.common.biome.vanilla.BiomeExtJungleHills; import biomesoplenty.common.biome.vanilla.BiomeExtMegaTaiga; @@ -210,15 +208,16 @@ import biomesoplenty.common.biome.vanilla.BiomeExtTaiga; import biomesoplenty.common.biome.vanilla.BiomeExtTaigaHills; import biomesoplenty.common.command.BOPCommand; import biomesoplenty.common.enums.BOPClimates; -import biomesoplenty.common.enums.BOPClimates.WeightedBiomeEntry; import biomesoplenty.common.util.biome.BiomeUtils; import biomesoplenty.common.util.config.BOPConfig; import biomesoplenty.common.world.WorldTypeBOP; import biomesoplenty.core.BiomesOPlenty; - -import com.google.common.base.Optional; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; +import net.minecraft.init.Biomes; +import net.minecraft.world.WorldType; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.BiomeDictionary; +import net.minecraftforge.common.BiomeDictionary.Type; +import net.minecraftforge.common.BiomeManager; public class ModBiomes implements BOPBiomes.IBiomeRegistry { @@ -332,27 +331,27 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry // this severely limits the number of new biomes we can add (we'd have to keep the number below 128 to avoid clashes) // we hard code the list of vanilla biomes with mutated versions below, which enables other biomes to use the biome ids which are not taken - setSubBiome(BiomeGenBase.plains, BiomeGenBase.getBiome(BiomeGenBase.plains.biomeID + 128)); - setSubBiome(BiomeGenBase.desert, BiomeGenBase.getBiome(BiomeGenBase.desert.biomeID + 128)); - setSubBiome(BiomeGenBase.forest, BiomeGenBase.getBiome(BiomeGenBase.forest.biomeID + 128)); - setSubBiome(BiomeGenBase.taiga, BiomeGenBase.getBiome(BiomeGenBase.taiga.biomeID + 128)); - setSubBiome(BiomeGenBase.swampland, BiomeGenBase.getBiome(BiomeGenBase.swampland.biomeID + 128)); - setSubBiome(BiomeGenBase.icePlains, BiomeGenBase.getBiome(BiomeGenBase.icePlains.biomeID + 128)); - setSubBiome(BiomeGenBase.jungle, BiomeGenBase.getBiome(BiomeGenBase.jungle.biomeID + 128)); - setSubBiome(BiomeGenBase.jungleEdge, BiomeGenBase.getBiome(BiomeGenBase.jungleEdge.biomeID + 128)); - setSubBiome(BiomeGenBase.coldTaiga, BiomeGenBase.getBiome(BiomeGenBase.coldTaiga.biomeID + 128)); - setSubBiome(BiomeGenBase.savanna, BiomeGenBase.getBiome(BiomeGenBase.savanna.biomeID + 128)); - setSubBiome(BiomeGenBase.savannaPlateau, BiomeGenBase.getBiome(BiomeGenBase.savannaPlateau.biomeID + 128)); - setSubBiome(BiomeGenBase.mesa, BiomeGenBase.getBiome(BiomeGenBase.mesa.biomeID + 128)); - setSubBiome(BiomeGenBase.mesaPlateau, BiomeGenBase.getBiome(BiomeGenBase.mesaPlateau.biomeID + 128)); - setSubBiome(BiomeGenBase.mesaPlateau_F, BiomeGenBase.getBiome(BiomeGenBase.mesaPlateau_F.biomeID + 128)); - setSubBiome(BiomeGenBase.birchForest, BiomeGenBase.getBiome(BiomeGenBase.birchForest.biomeID + 128)); - setSubBiome(BiomeGenBase.birchForestHills, BiomeGenBase.getBiome(BiomeGenBase.birchForestHills.biomeID + 128)); - setSubBiome(BiomeGenBase.roofedForest, BiomeGenBase.getBiome(BiomeGenBase.roofedForest.biomeID + 128)); - setSubBiome(BiomeGenBase.megaTaiga, BiomeGenBase.getBiome(BiomeGenBase.megaTaiga.biomeID + 128)); - setSubBiome(BiomeGenBase.extremeHills, BiomeGenBase.getBiome(BiomeGenBase.extremeHills.biomeID + 128)); - setSubBiome(BiomeGenBase.extremeHillsPlus, BiomeGenBase.getBiome(BiomeGenBase.extremeHillsPlus.biomeID + 128)); - setSubBiome(BiomeGenBase.megaTaigaHills, BiomeGenBase.getBiome(BiomeGenBase.megaTaigaHills.biomeID + 128)); + setSubBiome(Biomes.plains, BiomeGenBase.getBiome(Biomes.plains.biomeID + 128)); + setSubBiome(Biomes.desert, BiomeGenBase.getBiome(Biomes.desert.biomeID + 128)); + setSubBiome(Biomes.forest, BiomeGenBase.getBiome(Biomes.forest.biomeID + 128)); + setSubBiome(Biomes.taiga, BiomeGenBase.getBiome(Biomes.taiga.biomeID + 128)); + setSubBiome(Biomes.swampland, BiomeGenBase.getBiome(Biomes.swampland.biomeID + 128)); + setSubBiome(Biomes.icePlains, BiomeGenBase.getBiome(Biomes.icePlains.biomeID + 128)); + setSubBiome(Biomes.jungle, BiomeGenBase.getBiome(Biomes.jungle.biomeID + 128)); + setSubBiome(Biomes.jungleEdge, BiomeGenBase.getBiome(Biomes.jungleEdge.biomeID + 128)); + setSubBiome(Biomes.coldTaiga, BiomeGenBase.getBiome(Biomes.coldTaiga.biomeID + 128)); + setSubBiome(Biomes.savanna, BiomeGenBase.getBiome(Biomes.savanna.biomeID + 128)); + setSubBiome(Biomes.savannaPlateau, BiomeGenBase.getBiome(Biomes.savannaPlateau.biomeID + 128)); + setSubBiome(Biomes.mesa, BiomeGenBase.getBiome(Biomes.mesa.biomeID + 128)); + setSubBiome(Biomes.mesaPlateau, BiomeGenBase.getBiome(Biomes.mesaPlateau.biomeID + 128)); + setSubBiome(Biomes.mesaPlateau_F, BiomeGenBase.getBiome(Biomes.mesaPlateau_F.biomeID + 128)); + setSubBiome(Biomes.birchForest, BiomeGenBase.getBiome(Biomes.birchForest.biomeID + 128)); + setSubBiome(Biomes.birchForestHills, BiomeGenBase.getBiome(Biomes.birchForestHills.biomeID + 128)); + setSubBiome(Biomes.roofedForest, BiomeGenBase.getBiome(Biomes.roofedForest.biomeID + 128)); + setSubBiome(Biomes.megaTaiga, BiomeGenBase.getBiome(Biomes.megaTaiga.biomeID + 128)); + setSubBiome(Biomes.extremeHills, BiomeGenBase.getBiome(Biomes.extremeHills.biomeID + 128)); + setSubBiome(Biomes.extremeHillsPlus, BiomeGenBase.getBiome(Biomes.extremeHillsPlus.biomeID + 128)); + setSubBiome(Biomes.megaTaigaHills, BiomeGenBase.getBiome(Biomes.megaTaigaHills.biomeID + 128)); } private static void registerBiomes() diff --git a/src/main/java/biomesoplenty/common/init/ModBlockQueries.java b/src/main/java/biomesoplenty/common/init/ModBlockQueries.java index c77e9ed71..ffbbd74a8 100644 --- a/src/main/java/biomesoplenty/common/init/ModBlockQueries.java +++ b/src/main/java/biomesoplenty/common/init/ModBlockQueries.java @@ -8,19 +8,49 @@ package biomesoplenty.common.init; -import static biomesoplenty.api.block.BlockQueries.*; -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; -import net.minecraftforge.common.EnumPlantType; +import static biomesoplenty.api.block.BlockQueries.air; +import static biomesoplenty.api.block.BlockQueries.airAbove; +import static biomesoplenty.api.block.BlockQueries.airBelow; +import static biomesoplenty.api.block.BlockQueries.airOrLeaves; +import static biomesoplenty.api.block.BlockQueries.anything; +import static biomesoplenty.api.block.BlockQueries.breakable; +import static biomesoplenty.api.block.BlockQueries.endish; +import static biomesoplenty.api.block.BlockQueries.fertile; +import static biomesoplenty.api.block.BlockQueries.fertileOrNetherrack; +import static biomesoplenty.api.block.BlockQueries.fertileSeaBed; +import static biomesoplenty.api.block.BlockQueries.groundBlocks; +import static biomesoplenty.api.block.BlockQueries.hasWater; +import static biomesoplenty.api.block.BlockQueries.hellish; +import static biomesoplenty.api.block.BlockQueries.litBeach; +import static biomesoplenty.api.block.BlockQueries.litDry; +import static biomesoplenty.api.block.BlockQueries.litFertile; +import static biomesoplenty.api.block.BlockQueries.litFertileOrDry; +import static biomesoplenty.api.block.BlockQueries.litFertileWaterside; +import static biomesoplenty.api.block.BlockQueries.litSand; +import static biomesoplenty.api.block.BlockQueries.nothing; +import static biomesoplenty.api.block.BlockQueries.replaceable; +import static biomesoplenty.api.block.BlockQueries.rootsCanDigThrough; +import static biomesoplenty.api.block.BlockQueries.solid; +import static biomesoplenty.api.block.BlockQueries.spectralMoss; +import static biomesoplenty.api.block.BlockQueries.suitableForReed; +import static biomesoplenty.api.block.BlockQueries.surfaceBlocks; +import static biomesoplenty.api.block.BlockQueries.sustainsCave; +import static biomesoplenty.api.block.BlockQueries.sustainsNether; +import static biomesoplenty.api.block.BlockQueries.underwater; +import static biomesoplenty.api.block.BlockQueries.waterCovered; + import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.block.BlockBOPGrass; import biomesoplenty.common.util.block.BlockQuery; import biomesoplenty.common.util.block.BlockQuery.BlockQueryMaterial; import biomesoplenty.common.util.block.BlockQuery.BlockQueryState; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; public class ModBlockQueries { diff --git a/src/main/java/biomesoplenty/common/init/ModBlocks.java b/src/main/java/biomesoplenty/common/init/ModBlocks.java index f9687b054..ad5434c96 100644 --- a/src/main/java/biomesoplenty/common/init/ModBlocks.java +++ b/src/main/java/biomesoplenty/common/init/ModBlocks.java @@ -11,10 +11,66 @@ package biomesoplenty.common.init; import static biomesoplenty.api.block.BOPBlocks.*; import static biomesoplenty.api.item.BOPItems.blood_bucket; import static biomesoplenty.api.item.BOPItems.honey_bucket; -import static biomesoplenty.api.item.BOPItems.poison_bucket; import static biomesoplenty.api.item.BOPItems.hot_spring_water_bucket; +import static biomesoplenty.api.item.BOPItems.poison_bucket; -import biomesoplenty.common.block.*; +import com.google.common.collect.ImmutableSet; + +import biomesoplenty.api.block.IBOPBlock; +import biomesoplenty.api.item.BOPItems; +import biomesoplenty.common.block.BlockBOPAsh; +import biomesoplenty.common.block.BlockBOPBamboo; +import biomesoplenty.common.block.BlockBOPBiomeBlock; +import biomesoplenty.common.block.BlockBOPBones; +import biomesoplenty.common.block.BlockBOPCoral; +import biomesoplenty.common.block.BlockBOPCrystal; +import biomesoplenty.common.block.BlockBOPDirt; +import biomesoplenty.common.block.BlockBOPDoor; +import biomesoplenty.common.block.BlockBOPDoubleOtherSlab; +import biomesoplenty.common.block.BlockBOPDoublePlant; +import biomesoplenty.common.block.BlockBOPDoubleWoodSlab; +import biomesoplenty.common.block.BlockBOPFarmland; +import biomesoplenty.common.block.BlockBOPFence; +import biomesoplenty.common.block.BlockBOPFenceGate; +import biomesoplenty.common.block.BlockBOPFlesh; +import biomesoplenty.common.block.BlockBOPFlower; +import biomesoplenty.common.block.BlockBOPGem; +import biomesoplenty.common.block.BlockBOPGemOre; +import biomesoplenty.common.block.BlockBOPGeneric; +import biomesoplenty.common.block.BlockBOPGrass; +import biomesoplenty.common.block.BlockBOPHalfOtherSlab; +import biomesoplenty.common.block.BlockBOPHalfWoodSlab; +import biomesoplenty.common.block.BlockBOPHive; +import biomesoplenty.common.block.BlockBOPHoney; +import biomesoplenty.common.block.BlockBOPLeaves; +import biomesoplenty.common.block.BlockBOPLilypad; +import biomesoplenty.common.block.BlockBOPLog; +import biomesoplenty.common.block.BlockBOPMud; +import biomesoplenty.common.block.BlockBOPMushroom; +import biomesoplenty.common.block.BlockBOPPlanks; +import biomesoplenty.common.block.BlockBOPPlant; +import biomesoplenty.common.block.BlockBOPSand; +import biomesoplenty.common.block.BlockBOPSapling; +import biomesoplenty.common.block.BlockBOPSeaweed; +import biomesoplenty.common.block.BlockBOPStone; +import biomesoplenty.common.block.BlockBOPTerrarium; +import biomesoplenty.common.block.BlockBOPTurnip; +import biomesoplenty.common.block.BlockBOPVine; +import biomesoplenty.common.block.BlockBOPWoodStairs; +import biomesoplenty.common.command.BOPCommand; +import biomesoplenty.common.enums.BOPWoods; +import biomesoplenty.common.fluids.BloodFluid; +import biomesoplenty.common.fluids.HoneyFluid; +import biomesoplenty.common.fluids.HotSpringWaterFluid; +import biomesoplenty.common.fluids.PoisonFluid; +import biomesoplenty.common.fluids.blocks.BlockBloodFluid; +import biomesoplenty.common.fluids.blocks.BlockHoneyFluid; +import biomesoplenty.common.fluids.blocks.BlockHotSpringWaterFluid; +import biomesoplenty.common.fluids.blocks.BlockPoisonFluid; +import biomesoplenty.common.util.BOPReflectionHelper; +import biomesoplenty.common.util.block.BlockStateUtils; +import biomesoplenty.common.util.inventory.CreativeTabBOP; +import biomesoplenty.core.BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockStairs; @@ -32,24 +88,6 @@ import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; -import biomesoplenty.api.block.IBOPBlock; -import biomesoplenty.api.item.BOPItems; -import biomesoplenty.common.command.BOPCommand; -import biomesoplenty.common.enums.BOPWoods; -import biomesoplenty.common.fluids.BloodFluid; -import biomesoplenty.common.fluids.HoneyFluid; -import biomesoplenty.common.fluids.HotSpringWaterFluid; -import biomesoplenty.common.fluids.PoisonFluid; -import biomesoplenty.common.fluids.blocks.BlockBloodFluid; -import biomesoplenty.common.fluids.blocks.BlockHoneyFluid; -import biomesoplenty.common.fluids.blocks.BlockHotSpringWaterFluid; -import biomesoplenty.common.fluids.blocks.BlockPoisonFluid; -import biomesoplenty.common.util.BOPReflectionHelper; -import biomesoplenty.common.util.block.BlockStateUtils; -import biomesoplenty.common.util.inventory.CreativeTabBOP; -import biomesoplenty.core.BiomesOPlenty; - -import com.google.common.collect.ImmutableSet; public class ModBlocks { diff --git a/src/main/java/biomesoplenty/common/init/ModConfiguration.java b/src/main/java/biomesoplenty/common/init/ModConfiguration.java index dc768bcbe..ff88827af 100644 --- a/src/main/java/biomesoplenty/common/init/ModConfiguration.java +++ b/src/main/java/biomesoplenty/common/init/ModConfiguration.java @@ -8,12 +8,12 @@ package biomesoplenty.common.init; +import java.io.File; + import biomesoplenty.common.config.GameplayConfigurationHandler; import biomesoplenty.common.config.MiscConfigurationHandler; import net.minecraftforge.common.MinecraftForge; -import java.io.File; - public class ModConfiguration { public static void init(File configDirectory) diff --git a/src/main/java/biomesoplenty/common/init/ModCrafting.java b/src/main/java/biomesoplenty/common/init/ModCrafting.java index 946541ee9..de083dd11 100644 --- a/src/main/java/biomesoplenty/common/init/ModCrafting.java +++ b/src/main/java/biomesoplenty/common/init/ModCrafting.java @@ -8,14 +8,8 @@ package biomesoplenty.common.init; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; +import com.google.common.base.CaseFormat; + import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.item.BOPItems; import biomesoplenty.common.block.BlockBOPBones; @@ -30,7 +24,6 @@ import biomesoplenty.common.block.BlockBOPHalfOtherSlab; import biomesoplenty.common.block.BlockBOPHalfWoodSlab; import biomesoplenty.common.block.BlockBOPHive; import biomesoplenty.common.block.BlockBOPLeaves; -import biomesoplenty.common.block.BlockBOPLilypad; import biomesoplenty.common.block.BlockBOPLog; import biomesoplenty.common.block.BlockBOPMushroom; import biomesoplenty.common.block.BlockBOPPlanks; @@ -49,8 +42,14 @@ import biomesoplenty.common.enums.BOPWoods; import biomesoplenty.common.handler.FurnaceFuelHandler; import biomesoplenty.common.item.ItemDart; import biomesoplenty.common.item.ItemJarFilled; - -import com.google.common.base.CaseFormat; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; public class ModCrafting { diff --git a/src/main/java/biomesoplenty/common/init/ModEntities.java b/src/main/java/biomesoplenty/common/init/ModEntities.java index a6651f699..be0ca03a6 100644 --- a/src/main/java/biomesoplenty/common/init/ModEntities.java +++ b/src/main/java/biomesoplenty/common/init/ModEntities.java @@ -13,8 +13,12 @@ import java.util.Map; import com.google.common.collect.Maps; import biomesoplenty.common.command.BOPCommand; -import biomesoplenty.common.entities.*; -import biomesoplenty.common.entities.projectiles.*; +import biomesoplenty.common.entities.EntityButterfly; +import biomesoplenty.common.entities.EntityPixie; +import biomesoplenty.common.entities.EntitySnail; +import biomesoplenty.common.entities.EntityWasp; +import biomesoplenty.common.entities.projectiles.EntityDart; +import biomesoplenty.common.entities.projectiles.EntityMudball; import biomesoplenty.core.BiomesOPlenty; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; diff --git a/src/main/java/biomesoplenty/common/init/ModGenerators.java b/src/main/java/biomesoplenty/common/init/ModGenerators.java index 25299b134..5ca619c5a 100644 --- a/src/main/java/biomesoplenty/common/init/ModGenerators.java +++ b/src/main/java/biomesoplenty/common/init/ModGenerators.java @@ -9,9 +9,37 @@ package biomesoplenty.common.init; import static biomesoplenty.api.biome.generation.GeneratorRegistry.registerGenerator; + import biomesoplenty.api.biome.generation.GeneratorWeighted; -import biomesoplenty.common.world.feature.*; -import biomesoplenty.common.world.feature.tree.*; +import biomesoplenty.common.world.feature.GeneratorBigFlower; +import biomesoplenty.common.world.feature.GeneratorBigMushroom; +import biomesoplenty.common.world.feature.GeneratorBlobs; +import biomesoplenty.common.world.feature.GeneratorColumns; +import biomesoplenty.common.world.feature.GeneratorCrystals; +import biomesoplenty.common.world.feature.GeneratorDoubleFlora; +import biomesoplenty.common.world.feature.GeneratorFlora; +import biomesoplenty.common.world.feature.GeneratorGrass; +import biomesoplenty.common.world.feature.GeneratorLakes; +import biomesoplenty.common.world.feature.GeneratorLogs; +import biomesoplenty.common.world.feature.GeneratorMixedLily; +import biomesoplenty.common.world.feature.GeneratorOreCluster; +import biomesoplenty.common.world.feature.GeneratorOreSingle; +import biomesoplenty.common.world.feature.GeneratorSpike; +import biomesoplenty.common.world.feature.GeneratorSplatter; +import biomesoplenty.common.world.feature.GeneratorSplotches; +import biomesoplenty.common.world.feature.GeneratorWaterside; +import biomesoplenty.common.world.feature.tree.GeneratorBasicTree; +import biomesoplenty.common.world.feature.tree.GeneratorBayouTree; +import biomesoplenty.common.world.feature.tree.GeneratorBigTree; +import biomesoplenty.common.world.feature.tree.GeneratorBulbTree; +import biomesoplenty.common.world.feature.tree.GeneratorBush; +import biomesoplenty.common.world.feature.tree.GeneratorMahoganyTree; +import biomesoplenty.common.world.feature.tree.GeneratorMegaJungleTree; +import biomesoplenty.common.world.feature.tree.GeneratorPineTree; +import biomesoplenty.common.world.feature.tree.GeneratorProfileTree; +import biomesoplenty.common.world.feature.tree.GeneratorRedwoodTree; +import biomesoplenty.common.world.feature.tree.GeneratorTaigaTree; +import biomesoplenty.common.world.feature.tree.GeneratorTwigletTree; public class ModGenerators { diff --git a/src/main/java/biomesoplenty/common/init/ModHandlers.java b/src/main/java/biomesoplenty/common/init/ModHandlers.java index 3e50d3180..1a295dd17 100644 --- a/src/main/java/biomesoplenty/common/init/ModHandlers.java +++ b/src/main/java/biomesoplenty/common/init/ModHandlers.java @@ -8,15 +8,23 @@ package biomesoplenty.common.init; +import biomesoplenty.client.handler.ModelBakeHandler; +import biomesoplenty.common.handler.AchievementEventHandler; +import biomesoplenty.common.handler.BucketEventHandler; +import biomesoplenty.common.handler.DyeEventHandler; +import biomesoplenty.common.handler.FlippersEventHandler; +import biomesoplenty.common.handler.GuiEventHandler; +import biomesoplenty.common.handler.ItemEventHandler; +import biomesoplenty.common.handler.TrailsEventHandler; +import biomesoplenty.common.handler.UseHoeEventHandler; +import biomesoplenty.common.handler.decoration.DecorateBiomeEventHandler; +import biomesoplenty.common.handler.potion.PotionParalysisEventHandler; +import biomesoplenty.common.handler.potion.PotionPossessionEventHandler; +import biomesoplenty.common.network.BOPPacketHandler; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import biomesoplenty.client.handler.*; -import biomesoplenty.common.handler.*; -import biomesoplenty.common.handler.decoration.*; -import biomesoplenty.common.handler.potion.*; -import biomesoplenty.common.network.BOPPacketHandler; public class ModHandlers { diff --git a/src/main/java/biomesoplenty/common/init/ModItems.java b/src/main/java/biomesoplenty/common/init/ModItems.java index 14db00351..3dfc68af2 100644 --- a/src/main/java/biomesoplenty/common/init/ModItems.java +++ b/src/main/java/biomesoplenty/common/init/ModItems.java @@ -8,18 +8,133 @@ package biomesoplenty.common.init; -import static biomesoplenty.api.item.BOPItems.*; -import static biomesoplenty.api.item.BOPItemHelper.*; +import static biomesoplenty.api.item.BOPItemHelper.amethyst_armor_material; +import static biomesoplenty.api.item.BOPItemHelper.amethyst_tool_material; +import static biomesoplenty.api.item.BOPItemHelper.dull_flower_band_material; +import static biomesoplenty.api.item.BOPItemHelper.exotic_flower_band_material; +import static biomesoplenty.api.item.BOPItemHelper.flippers_material; +import static biomesoplenty.api.item.BOPItemHelper.lush_flower_band_material; +import static biomesoplenty.api.item.BOPItemHelper.mud_armor_material; +import static biomesoplenty.api.item.BOPItemHelper.mud_tool_material; +import static biomesoplenty.api.item.BOPItemHelper.plain_flower_band_material; +import static biomesoplenty.api.item.BOPItemHelper.wading_boots_material; +import static biomesoplenty.api.item.BOPItems.ambrosia; +import static biomesoplenty.api.item.BOPItems.amethyst_axe; +import static biomesoplenty.api.item.BOPItems.amethyst_boots; +import static biomesoplenty.api.item.BOPItems.amethyst_chestplate; +import static biomesoplenty.api.item.BOPItems.amethyst_helmet; +import static biomesoplenty.api.item.BOPItems.amethyst_hoe; +import static biomesoplenty.api.item.BOPItems.amethyst_leggings; +import static biomesoplenty.api.item.BOPItems.amethyst_pickaxe; +import static biomesoplenty.api.item.BOPItems.amethyst_scythe; +import static biomesoplenty.api.item.BOPItems.amethyst_shovel; +import static biomesoplenty.api.item.BOPItems.amethyst_sword; +import static biomesoplenty.api.item.BOPItems.ash; +import static biomesoplenty.api.item.BOPItems.berries; +import static biomesoplenty.api.item.BOPItems.biome_essence; +import static biomesoplenty.api.item.BOPItems.biome_finder; +import static biomesoplenty.api.item.BOPItems.black_dye; +import static biomesoplenty.api.item.BOPItems.blue_dye; +import static biomesoplenty.api.item.BOPItems.brown_dye; +import static biomesoplenty.api.item.BOPItems.crystal_shard; +import static biomesoplenty.api.item.BOPItems.dart; +import static biomesoplenty.api.item.BOPItems.dart_blower; +import static biomesoplenty.api.item.BOPItems.diamond_scythe; +import static biomesoplenty.api.item.BOPItems.dull_flower_band; +import static biomesoplenty.api.item.BOPItems.earth; +import static biomesoplenty.api.item.BOPItems.enderporter; +import static biomesoplenty.api.item.BOPItems.exotic_flower_band; +import static biomesoplenty.api.item.BOPItems.filled_honeycomb; +import static biomesoplenty.api.item.BOPItems.flax_string; +import static biomesoplenty.api.item.BOPItems.fleshchunk; +import static biomesoplenty.api.item.BOPItems.flippers; +import static biomesoplenty.api.item.BOPItems.flower_basket; +import static biomesoplenty.api.item.BOPItems.gem; +import static biomesoplenty.api.item.BOPItems.gold_scythe; +import static biomesoplenty.api.item.BOPItems.green_dye; +import static biomesoplenty.api.item.BOPItems.honeycomb; +import static biomesoplenty.api.item.BOPItems.ichor; +import static biomesoplenty.api.item.BOPItems.iron_scythe; +import static biomesoplenty.api.item.BOPItems.jar_empty; +import static biomesoplenty.api.item.BOPItems.jar_filled; +import static biomesoplenty.api.item.BOPItems.lush_flower_band; +import static biomesoplenty.api.item.BOPItems.mud_axe; +import static biomesoplenty.api.item.BOPItems.mud_boots; +import static biomesoplenty.api.item.BOPItems.mud_brick; +import static biomesoplenty.api.item.BOPItems.mud_chestplate; +import static biomesoplenty.api.item.BOPItems.mud_helmet; +import static biomesoplenty.api.item.BOPItems.mud_hoe; +import static biomesoplenty.api.item.BOPItems.mud_leggings; +import static biomesoplenty.api.item.BOPItems.mud_pickaxe; +import static biomesoplenty.api.item.BOPItems.mud_scythe; +import static biomesoplenty.api.item.BOPItems.mud_shovel; +import static biomesoplenty.api.item.BOPItems.mud_sword; +import static biomesoplenty.api.item.BOPItems.mudball; +import static biomesoplenty.api.item.BOPItems.peach; +import static biomesoplenty.api.item.BOPItems.pear; +import static biomesoplenty.api.item.BOPItems.persimmon; +import static biomesoplenty.api.item.BOPItems.pinecone; +import static biomesoplenty.api.item.BOPItems.pixie_dust; +import static biomesoplenty.api.item.BOPItems.plain_flower_band; +import static biomesoplenty.api.item.BOPItems.record_corruption; +import static biomesoplenty.api.item.BOPItems.record_wanderer; +import static biomesoplenty.api.item.BOPItems.ricebowl; +import static biomesoplenty.api.item.BOPItems.saladfruit; +import static biomesoplenty.api.item.BOPItems.saladshroom; +import static biomesoplenty.api.item.BOPItems.saladveggie; +import static biomesoplenty.api.item.BOPItems.shroompowder; +import static biomesoplenty.api.item.BOPItems.soul; +import static biomesoplenty.api.item.BOPItems.spawn_egg; +import static biomesoplenty.api.item.BOPItems.stone_scythe; +import static biomesoplenty.api.item.BOPItems.terrestrial_artifact; +import static biomesoplenty.api.item.BOPItems.turnip; +import static biomesoplenty.api.item.BOPItems.turnip_seeds; +import static biomesoplenty.api.item.BOPItems.wading_boots; +import static biomesoplenty.api.item.BOPItems.white_dye; +import static biomesoplenty.api.item.BOPItems.wood_scythe; import java.util.ArrayList; import java.util.List; -import net.minecraft.client.resources.model.ModelBakery; -import net.minecraft.client.resources.model.ModelResourceLocation; +import biomesoplenty.api.block.BOPBlocks; +import biomesoplenty.common.command.BOPCommand; +import biomesoplenty.common.item.ItemAmbrosia; +import biomesoplenty.common.item.ItemBOPFood; +import biomesoplenty.common.item.ItemBOPRecord; +import biomesoplenty.common.item.ItemBOPScythe; +import biomesoplenty.common.item.ItemBOPSpawnEgg; +import biomesoplenty.common.item.ItemBiomeEssence; +import biomesoplenty.common.item.ItemBiomeFinder; +import biomesoplenty.common.item.ItemDart; +import biomesoplenty.common.item.ItemDartBlower; +import biomesoplenty.common.item.ItemEnderporter; +import biomesoplenty.common.item.ItemFlippers; +import biomesoplenty.common.item.ItemFlowerBand; +import biomesoplenty.common.item.ItemFlowerBasket; +import biomesoplenty.common.item.ItemGem; +import biomesoplenty.common.item.ItemJarEmpty; +import biomesoplenty.common.item.ItemJarFilled; +import biomesoplenty.common.item.ItemMudball; +import biomesoplenty.common.item.ItemWadingBoots; +import biomesoplenty.common.util.BOPReflectionHelper; +import biomesoplenty.common.util.inventory.CreativeTabBOP; +import biomesoplenty.core.BiomesOPlenty; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; -import net.minecraft.item.*; +import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemAxe; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemHoe; +import net.minecraft.item.ItemPickaxe; +import net.minecraft.item.ItemSeeds; +import net.minecraft.item.ItemSoup; +import net.minecraft.item.ItemSpade; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; import net.minecraft.potion.Potion; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; @@ -27,12 +142,6 @@ import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.command.BOPCommand; -import biomesoplenty.common.item.*; -import biomesoplenty.common.util.BOPReflectionHelper; -import biomesoplenty.common.util.inventory.CreativeTabBOP; -import biomesoplenty.core.BiomesOPlenty; public class ModItems { diff --git a/src/main/java/biomesoplenty/common/init/ModPotions.java b/src/main/java/biomesoplenty/common/init/ModPotions.java index f8c522fa6..b4d7bf55a 100644 --- a/src/main/java/biomesoplenty/common/init/ModPotions.java +++ b/src/main/java/biomesoplenty/common/init/ModPotions.java @@ -8,12 +8,14 @@ package biomesoplenty.common.init; -import static biomesoplenty.api.potion.BOPPotions.*; +import static biomesoplenty.api.potion.BOPPotions.paralysis; +import static biomesoplenty.api.potion.BOPPotions.possession; +import biomesoplenty.common.potion.PotionParalysis; +import biomesoplenty.common.potion.PotionPossession; +import biomesoplenty.common.util.BOPReflectionHelper; import net.minecraft.potion.Potion; import net.minecraft.util.ResourceLocation; -import biomesoplenty.common.potion.*; -import biomesoplenty.common.util.BOPReflectionHelper; public class ModPotions { diff --git a/src/main/java/biomesoplenty/common/init/ModVanillaCompat.java b/src/main/java/biomesoplenty/common/init/ModVanillaCompat.java index 878e1a395..65f4fe163 100644 --- a/src/main/java/biomesoplenty/common/init/ModVanillaCompat.java +++ b/src/main/java/biomesoplenty/common/init/ModVanillaCompat.java @@ -1,15 +1,15 @@ package biomesoplenty.common.init; -import net.minecraft.block.BlockDispenser; -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandomChestContent; -import net.minecraftforge.common.ChestGenHooks; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.item.BOPItems; import biomesoplenty.common.entities.projectiles.dispenser.DispenserBehaviorDart; import biomesoplenty.common.entities.projectiles.dispenser.DispenserBehaviorMudball; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPTrees; +import net.minecraft.block.BlockDispenser; +import net.minecraft.item.ItemStack; +import net.minecraft.util.WeightedRandomChestContent; +import net.minecraftforge.common.ChestGenHooks; public class ModVanillaCompat { diff --git a/src/main/java/biomesoplenty/common/integration/ThaumcraftCompat.java b/src/main/java/biomesoplenty/common/integration/ThaumcraftCompat.java index 14ba0d1fb..7e4870603 100644 --- a/src/main/java/biomesoplenty/common/integration/ThaumcraftCompat.java +++ b/src/main/java/biomesoplenty/common/integration/ThaumcraftCompat.java @@ -1,5 +1,7 @@ package biomesoplenty.common.integration; +import com.sun.jna.platform.unix.X11.XSizeHints.Aspect; + import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.item.BOPItems; import biomesoplenty.common.block.BlockBOPBones; @@ -28,9 +30,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.event.FMLInterModComms; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; public class ThaumcraftCompat { diff --git a/src/main/java/biomesoplenty/common/inventory/ContainerFlowerBasket.java b/src/main/java/biomesoplenty/common/inventory/ContainerFlowerBasket.java index 1fa8b5c51..37ee1833d 100644 --- a/src/main/java/biomesoplenty/common/inventory/ContainerFlowerBasket.java +++ b/src/main/java/biomesoplenty/common/inventory/ContainerFlowerBasket.java @@ -8,8 +8,8 @@ package biomesoplenty.common.inventory; -import static biomesoplenty.common.inventory.InventoryFlowerBasket.INVENTORY_ROWS; import static biomesoplenty.common.inventory.InventoryFlowerBasket.INVENTORY_COLUMNS; +import static biomesoplenty.common.inventory.InventoryFlowerBasket.INVENTORY_ROWS; import biomesoplenty.common.item.ItemFlowerBasket; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/biomesoplenty/common/item/ItemAmbrosia.java b/src/main/java/biomesoplenty/common/item/ItemAmbrosia.java index bc76ff471..29ae30d58 100644 --- a/src/main/java/biomesoplenty/common/item/ItemAmbrosia.java +++ b/src/main/java/biomesoplenty/common/item/ItemAmbrosia.java @@ -8,8 +8,11 @@ package biomesoplenty.common.item; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.init.MobEffects; +import net.minecraft.init.PotionTypes; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -48,16 +51,16 @@ public class ItemAmbrosia extends ItemFood protected void onFoodEaten(ItemStack stack, World worldIn, EntityPlayer player) { if (worldIn.isRemote) {return;} - player.addPotionEffect(new PotionEffect(Potion.absorption.id, 5000, 4)); - player.addPotionEffect(new PotionEffect(Potion.saturation.id, 100, 1)); - player.addPotionEffect(new PotionEffect(Potion.regeneration.id, 500, 2)); - player.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 500, 2)); - player.addPotionEffect(new PotionEffect(Potion.resistance.id, 600, 1)); + player.addPotionEffect(new PotionEffect(MobEffects.absorption, 5000, 4)); + player.addPotionEffect(new PotionEffect(MobEffects.saturation, 100, 1)); + player.addPotionEffect(new PotionEffect(MobEffects.regeneration, 500, 2)); + player.addPotionEffect(new PotionEffect(MobEffects.digSpeed, 500, 2)); + player.addPotionEffect(new PotionEffect(MobEffects.resistance, 600, 1)); } // keep the empty bottle after finishing @Override - public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityPlayer playerIn) + public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityLivingBase playerIn) { super.onItemUseFinish(stack, worldIn, playerIn); return new ItemStack(Items.glass_bottle); diff --git a/src/main/java/biomesoplenty/common/item/ItemBOPBlock.java b/src/main/java/biomesoplenty/common/item/ItemBOPBlock.java index 7315c0acc..fcd51c051 100644 --- a/src/main/java/biomesoplenty/common/item/ItemBOPBlock.java +++ b/src/main/java/biomesoplenty/common/item/ItemBOPBlock.java @@ -9,15 +9,12 @@ package biomesoplenty.common.item; import java.util.List; -import java.util.Map; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Maps; import biomesoplenty.api.block.IBOPBlock; import biomesoplenty.common.util.block.BlockStateUtils; import net.minecraft.block.Block; -import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/biomesoplenty/common/item/ItemBOPFlower.java b/src/main/java/biomesoplenty/common/item/ItemBOPFlower.java index b0cd9fdeb..ee9382857 100644 --- a/src/main/java/biomesoplenty/common/item/ItemBOPFlower.java +++ b/src/main/java/biomesoplenty/common/item/ItemBOPFlower.java @@ -8,18 +8,10 @@ package biomesoplenty.common.item; -import java.util.Random; - -import biomesoplenty.api.particle.BOPParticleTypes; import biomesoplenty.common.block.BlockBOPFlower; import biomesoplenty.common.enums.BOPFlowers; -import biomesoplenty.core.BiomesOPlenty; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; public class ItemBOPFlower extends ItemBOPBlock { diff --git a/src/main/java/biomesoplenty/common/item/ItemBOPLilypad.java b/src/main/java/biomesoplenty/common/item/ItemBOPLilypad.java index daacf6b4b..a7280b2b0 100644 --- a/src/main/java/biomesoplenty/common/item/ItemBOPLilypad.java +++ b/src/main/java/biomesoplenty/common/item/ItemBOPLilypad.java @@ -17,8 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ItemBOPLilypad extends ItemBOPBlock { diff --git a/src/main/java/biomesoplenty/common/item/ItemBOPPlant.java b/src/main/java/biomesoplenty/common/item/ItemBOPPlant.java index fedef00a1..4aafb059b 100644 --- a/src/main/java/biomesoplenty/common/item/ItemBOPPlant.java +++ b/src/main/java/biomesoplenty/common/item/ItemBOPPlant.java @@ -18,8 +18,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ItemBOPPlant extends ItemBOPBlock { diff --git a/src/main/java/biomesoplenty/common/item/ItemBOPScythe.java b/src/main/java/biomesoplenty/common/item/ItemBOPScythe.java index 67fcea818..f31d353cd 100644 --- a/src/main/java/biomesoplenty/common/item/ItemBOPScythe.java +++ b/src/main/java/biomesoplenty/common/item/ItemBOPScythe.java @@ -20,7 +20,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/biomesoplenty/common/item/ItemBOPSpawnEgg.java b/src/main/java/biomesoplenty/common/item/ItemBOPSpawnEgg.java index 293967cd2..78d71e892 100644 --- a/src/main/java/biomesoplenty/common/item/ItemBOPSpawnEgg.java +++ b/src/main/java/biomesoplenty/common/item/ItemBOPSpawnEgg.java @@ -29,10 +29,9 @@ import net.minecraft.stats.StatList; import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/biomesoplenty/common/item/ItemBiomeEssence.java b/src/main/java/biomesoplenty/common/item/ItemBiomeEssence.java index b5818203b..d3bb61efb 100644 --- a/src/main/java/biomesoplenty/common/item/ItemBiomeEssence.java +++ b/src/main/java/biomesoplenty/common/item/ItemBiomeEssence.java @@ -10,9 +10,10 @@ package biomesoplenty.common.item; import java.util.List; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -36,7 +37,7 @@ public class ItemBiomeEssence extends Item BiomeGenBase biome = this.getBiome(itemStack); if (biome != null) { - infoList.add(biome.biomeName); + infoList.add(biome.getBiomeName()); } } @@ -45,7 +46,7 @@ public class ItemBiomeEssence extends Item public int getColorFromItemStack(ItemStack itemStack, int tintIndex) { BiomeGenBase biome = this.getBiome(itemStack); - return biome == null ? 0xFFFFFF : biome.color; + return biome == null ? 0xFFFFFF : biome.getGrassColorAtPos(BlockPos.ORIGIN); } @Override diff --git a/src/main/java/biomesoplenty/common/item/ItemBiomeFinder.java b/src/main/java/biomesoplenty/common/item/ItemBiomeFinder.java index 27c4e0223..70682beb6 100644 --- a/src/main/java/biomesoplenty/common/item/ItemBiomeFinder.java +++ b/src/main/java/biomesoplenty/common/item/ItemBiomeFinder.java @@ -16,9 +16,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; diff --git a/src/main/java/biomesoplenty/common/item/ItemEnderporter.java b/src/main/java/biomesoplenty/common/item/ItemEnderporter.java index ea610a9e6..26187541e 100644 --- a/src/main/java/biomesoplenty/common/item/ItemEnderporter.java +++ b/src/main/java/biomesoplenty/common/item/ItemEnderporter.java @@ -13,9 +13,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; public class ItemEnderporter extends Item { diff --git a/src/main/java/biomesoplenty/common/item/ItemJarEmpty.java b/src/main/java/biomesoplenty/common/item/ItemJarEmpty.java index 80a719796..6081c4047 100644 --- a/src/main/java/biomesoplenty/common/item/ItemJarEmpty.java +++ b/src/main/java/biomesoplenty/common/item/ItemJarEmpty.java @@ -8,6 +8,9 @@ package biomesoplenty.common.item; +import biomesoplenty.api.block.BOPBlocks; +import biomesoplenty.api.item.BOPItems; +import biomesoplenty.common.entities.EntityPixie; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -15,14 +18,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.MovingObjectPosition.MovingObjectType; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.api.item.BOPItems; -import biomesoplenty.common.entities.EntityPixie; public class ItemJarEmpty extends Item diff --git a/src/main/java/biomesoplenty/common/item/ItemJarFilled.java b/src/main/java/biomesoplenty/common/item/ItemJarFilled.java index 7b803c52a..ce3c9c69f 100644 --- a/src/main/java/biomesoplenty/common/item/ItemJarFilled.java +++ b/src/main/java/biomesoplenty/common/item/ItemJarFilled.java @@ -15,13 +15,10 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/biomesoplenty/common/item/ItemMudball.java b/src/main/java/biomesoplenty/common/item/ItemMudball.java index 79979a44e..9cc0d463a 100644 --- a/src/main/java/biomesoplenty/common/item/ItemMudball.java +++ b/src/main/java/biomesoplenty/common/item/ItemMudball.java @@ -9,9 +9,9 @@ package biomesoplenty.common.item; import biomesoplenty.common.entities.projectiles.EntityMudball; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.stats.StatList; import net.minecraft.world.World; diff --git a/src/main/java/biomesoplenty/common/item/ItemWadingBoots.java b/src/main/java/biomesoplenty/common/item/ItemWadingBoots.java index 6adaad6f2..591a8c197 100644 --- a/src/main/java/biomesoplenty/common/item/ItemWadingBoots.java +++ b/src/main/java/biomesoplenty/common/item/ItemWadingBoots.java @@ -1,5 +1,6 @@ package biomesoplenty.common.item; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemArmor; public class ItemWadingBoots extends ItemArmor @@ -8,7 +9,7 @@ public class ItemWadingBoots extends ItemArmor public ItemWadingBoots(ItemArmor.ArmorMaterial material, int renderIndex) { // boots are always on your feet - armorType = 3 - super(material, renderIndex, 3); + super(material, renderIndex, EntityEquipmentSlot.FEET); } } diff --git a/src/main/java/biomesoplenty/common/util/biome/BiomeUtils.java b/src/main/java/biomesoplenty/common/util/biome/BiomeUtils.java index 07516fb0f..0ab27c78a 100644 --- a/src/main/java/biomesoplenty/common/util/biome/BiomeUtils.java +++ b/src/main/java/biomesoplenty/common/util/biome/BiomeUtils.java @@ -8,16 +8,14 @@ package biomesoplenty.common.util.biome; +import com.google.common.base.CaseFormat; + import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.WorldTypeBOP; import biomesoplenty.core.BiomesOPlenty; - -import com.google.common.base.CaseFormat; - -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.biome.WorldChunkManager; import net.minecraft.world.gen.ChunkProviderSettings; public class BiomeUtils @@ -35,12 +33,14 @@ public class BiomeUtils } } + //TODO: This MUST be replaced with Vanilla's new proper identifiers + @Deprecated public static String getBiomeIdentifier(BiomeGenBase biome) { // Vanilla Biomes are typically named in upper camel case, sometimes with spaces // We follow the same convention with BOP Biomes // return a standardised identifier for use in json files, etc by converting to lowercase with underscores - return CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, biome.biomeName.replace(" ", "")); + return CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, biome.getBiomeName().replace(" ", "")); } public static BlockPos spiralOutwardsLookingForBiome(World world, BiomeGenBase biomeToFind, double startX, double startZ) @@ -75,11 +75,11 @@ public class BiomeUtils BiomeGenBase[] biomesAtSample = chunkManager.getBiomeGenAt(null, (int)x, (int)z, 1, 1, false); if (biomesAtSample[0] == biomeToFind) { - BiomesOPlenty.logger.info("Found "+biomeToFind.biomeName+" after "+n+" samples, spaced "+sampleSpace+" blocks apart at ("+((int)x)+","+((int)z)+") distance "+((int)dist)); + BiomesOPlenty.logger.info("Found "+biomeToFind.getBiomeName()+" after "+n+" samples, spaced "+sampleSpace+" blocks apart at ("+((int)x)+","+((int)z)+") distance "+((int)dist)); return new BlockPos((int)x, 0, (int)z); } } - BiomesOPlenty.logger.info("Failed to find "+biomeToFind.biomeName+" gave up after "+n+" samples, spaced "+sampleSpace+" blocks apart distance "+((int)dist)); + BiomesOPlenty.logger.info("Failed to find "+biomeToFind.getBiomeName()+" gave up after "+n+" samples, spaced "+sampleSpace+" blocks apart distance "+((int)dist)); return null; } diff --git a/src/main/java/biomesoplenty/common/util/biome/GeneratorUtils.java b/src/main/java/biomesoplenty/common/util/biome/GeneratorUtils.java index 3da1d183a..b5d37ad95 100644 --- a/src/main/java/biomesoplenty/common/util/biome/GeneratorUtils.java +++ b/src/main/java/biomesoplenty/common/util/biome/GeneratorUtils.java @@ -11,21 +11,20 @@ package biomesoplenty.common.util.biome; import java.util.Collection; import java.util.Random; -import net.minecraft.block.BlockLog; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; - import org.apache.commons.lang3.tuple.Pair; -import biomesoplenty.api.block.BlockQueries; -import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; - import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSyntaxException; +import biomesoplenty.api.block.BlockQueries; +import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; +import net.minecraft.block.BlockLog; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + public class GeneratorUtils { public static Pair validateMinMaxHeight(int minHeight, int maxHeight) diff --git a/src/main/java/biomesoplenty/common/util/block/BlockQuery.java b/src/main/java/biomesoplenty/common/util/block/BlockQuery.java index fd9bb40fd..5bf242fc8 100644 --- a/src/main/java/biomesoplenty/common/util/block/BlockQuery.java +++ b/src/main/java/biomesoplenty/common/util/block/BlockQuery.java @@ -17,21 +17,20 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.api.block.BlockQueries; -import biomesoplenty.api.block.ISustainsPlantType; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; +import biomesoplenty.api.block.BOPBlocks; +import biomesoplenty.api.block.BlockQueries; +import biomesoplenty.api.block.ISustainsPlantType; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; diff --git a/src/main/java/biomesoplenty/common/util/block/BlockStateUtils.java b/src/main/java/biomesoplenty/common/util/block/BlockStateUtils.java index 3c2267cc5..2602037cd 100644 --- a/src/main/java/biomesoplenty/common/util/block/BlockStateUtils.java +++ b/src/main/java/biomesoplenty/common/util/block/BlockStateUtils.java @@ -11,15 +11,15 @@ package biomesoplenty.common.util.block; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Stack; import java.util.Map.Entry; +import java.util.Stack; +import com.google.common.collect.ImmutableSet; + +import biomesoplenty.api.block.IBOPBlock; import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; -import biomesoplenty.api.block.IBOPBlock; - -import com.google.common.collect.ImmutableSet; public class BlockStateUtils { @@ -141,7 +141,7 @@ public class BlockStateUtils public static IProperty getPropertyByName(IBlockState blockState, String propertyName) { - for (IProperty property : (ImmutableSet) blockState.getProperties().keySet()) + for (IProperty property : (ImmutableSet>) blockState.getProperties().keySet()) { if (property.getName().equals(propertyName)) return property; diff --git a/src/main/java/biomesoplenty/common/util/config/BOPConfig.java b/src/main/java/biomesoplenty/common/util/config/BOPConfig.java index e6d7bee24..743e7308b 100644 --- a/src/main/java/biomesoplenty/common/util/config/BOPConfig.java +++ b/src/main/java/biomesoplenty/common/util/config/BOPConfig.java @@ -17,18 +17,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import net.minecraft.block.Block; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.IBlockState; - import org.apache.commons.io.FileUtils; -import biomesoplenty.common.util.block.BlockQuery; -import biomesoplenty.common.util.block.BlockStateUtils; -import biomesoplenty.common.util.block.BlockQuery.BlockQueryParseException; -import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; -import biomesoplenty.core.BiomesOPlenty; - import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; @@ -36,6 +26,15 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import biomesoplenty.common.util.block.BlockQuery; +import biomesoplenty.common.util.block.BlockQuery.BlockQueryParseException; +import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; +import biomesoplenty.common.util.block.BlockStateUtils; +import biomesoplenty.core.BiomesOPlenty; +import net.minecraft.block.Block; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.IBlockState; + public class BOPConfig { diff --git a/src/main/java/biomesoplenty/common/world/BOPWorldSettings.java b/src/main/java/biomesoplenty/common/world/BOPWorldSettings.java index e10adb78e..93e12461d 100644 --- a/src/main/java/biomesoplenty/common/world/BOPWorldSettings.java +++ b/src/main/java/biomesoplenty/common/world/BOPWorldSettings.java @@ -10,8 +10,6 @@ package biomesoplenty.common.world; import java.io.File; -import javax.swing.text.html.HTMLDocument.HTMLReader.FormAction; - import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; diff --git a/src/main/java/biomesoplenty/common/world/WorldChunkManagerBOP.java b/src/main/java/biomesoplenty/common/world/BiomeProviderBOP.java similarity index 95% rename from src/main/java/biomesoplenty/common/world/WorldChunkManagerBOP.java rename to src/main/java/biomesoplenty/common/world/BiomeProviderBOP.java index ecbba7f03..c074ae055 100644 --- a/src/main/java/biomesoplenty/common/world/WorldChunkManagerBOP.java +++ b/src/main/java/biomesoplenty/common/world/BiomeProviderBOP.java @@ -8,9 +8,6 @@ package biomesoplenty.common.world; -import java.util.List; - -import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.IExtendedBiome; import biomesoplenty.common.world.BOPWorldSettings.LandMassScheme; @@ -29,13 +26,10 @@ import biomesoplenty.common.world.layer.GenLayerSubBiomesBOP; import biomesoplenty.common.world.layer.GenLayerTemperatureLatitude; import biomesoplenty.common.world.layer.GenLayerTemperatureNoise; import biomesoplenty.common.world.layer.GenLayerTemperatureRandom; -import net.minecraft.crash.CrashReport; -import net.minecraft.crash.CrashReportCategory; -import net.minecraft.util.ReportedException; import net.minecraft.world.World; import net.minecraft.world.WorldType; import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.biome.WorldChunkManager; +import net.minecraft.world.biome.BiomeProvider; import net.minecraft.world.gen.layer.GenLayer; import net.minecraft.world.gen.layer.GenLayerAddMushroomIsland; import net.minecraft.world.gen.layer.GenLayerDeepOcean; @@ -44,15 +38,13 @@ import net.minecraft.world.gen.layer.GenLayerIsland; import net.minecraft.world.gen.layer.GenLayerRemoveTooMuchOcean; import net.minecraft.world.gen.layer.GenLayerRiver; import net.minecraft.world.gen.layer.GenLayerRiverInit; -import net.minecraft.world.gen.layer.GenLayerShore; import net.minecraft.world.gen.layer.GenLayerSmooth; import net.minecraft.world.gen.layer.GenLayerVoronoiZoom; import net.minecraft.world.gen.layer.GenLayerZoom; -import net.minecraft.world.gen.layer.IntCache; -public class WorldChunkManagerBOP extends WorldChunkManager +public class BiomeProviderBOP extends BiomeProvider { - public WorldChunkManagerBOP(long seed, WorldType worldType, String chunkProviderSettings) + public BiomeProviderBOP(long seed, WorldType worldType, String chunkProviderSettings) { super(); if (!(worldType instanceof WorldTypeBOP)) @@ -88,7 +80,7 @@ public class WorldChunkManagerBOP extends WorldChunkManager this.biomeIndexLayer = agenlayer[1]; } - public WorldChunkManagerBOP(World world) + public BiomeProviderBOP(World world) { this(world.getSeed(), world.getWorldInfo().getTerrainType(), world.getWorldInfo().getGeneratorOptions()); } diff --git a/src/main/java/biomesoplenty/common/world/ChunkProviderGenerateBOP.java b/src/main/java/biomesoplenty/common/world/ChunkProviderGenerateBOP.java index 5b02853c7..eebba57aa 100644 --- a/src/main/java/biomesoplenty/common/world/ChunkProviderGenerateBOP.java +++ b/src/main/java/biomesoplenty/common/world/ChunkProviderGenerateBOP.java @@ -8,6 +8,19 @@ package biomesoplenty.common.world; +import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.CAVE; +import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.MINESHAFT; +import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.OCEAN_MONUMENT; +import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.RAVINE; +import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.SCATTERED_FEATURE; +import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.STRONGHOLD; +import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.VILLAGE; +import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.ANIMALS; +import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.DUNGEON; +import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.ICE; +import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.LAKE; +import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.LAVA; + import java.util.HashMap; import java.util.List; import java.util.Map; @@ -18,11 +31,10 @@ import net.minecraft.block.BlockFalling; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.IProgressUpdate; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.ChunkCoordIntPair; -import net.minecraft.world.SpawnerAnimals; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; @@ -40,11 +52,11 @@ import net.minecraft.world.gen.structure.MapGenScatteredFeature; import net.minecraft.world.gen.structure.MapGenStronghold; import net.minecraft.world.gen.structure.MapGenVillage; import net.minecraft.world.gen.structure.StructureOceanMonument; -import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.*; -import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.*; -import net.minecraftforge.common.*; -import net.minecraftforge.fml.common.eventhandler.Event.*; -import net.minecraftforge.event.terraingen.*; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.terraingen.ChunkProviderEvent; +import net.minecraftforge.event.terraingen.PopulateChunkEvent; +import net.minecraftforge.event.terraingen.TerrainGen; +import net.minecraftforge.fml.common.eventhandler.Event.Result; public class ChunkProviderGenerateBOP implements IChunkProvider { diff --git a/src/main/java/biomesoplenty/common/world/ChunkProviderGenerateVanilla.java b/src/main/java/biomesoplenty/common/world/ChunkProviderGenerateVanilla.java index 29ab662d9..6af20907c 100644 --- a/src/main/java/biomesoplenty/common/world/ChunkProviderGenerateVanilla.java +++ b/src/main/java/biomesoplenty/common/world/ChunkProviderGenerateVanilla.java @@ -1,5 +1,18 @@ package biomesoplenty.common.world; +import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.CAVE; +import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.MINESHAFT; +import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.OCEAN_MONUMENT; +import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.RAVINE; +import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.SCATTERED_FEATURE; +import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.STRONGHOLD; +import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.VILLAGE; +import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.ANIMALS; +import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.DUNGEON; +import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.ICE; +import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.LAKE; +import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.LAVA; + import java.util.List; import java.util.Random; @@ -7,11 +20,10 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockFalling; import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.IProgressUpdate; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.ChunkCoordIntPair; -import net.minecraft.world.SpawnerAnimals; import net.minecraft.world.World; import net.minecraft.world.WorldType; import net.minecraft.world.biome.BiomeGenBase; @@ -32,11 +44,11 @@ import net.minecraft.world.gen.structure.MapGenScatteredFeature; import net.minecraft.world.gen.structure.MapGenStronghold; import net.minecraft.world.gen.structure.MapGenVillage; import net.minecraft.world.gen.structure.StructureOceanMonument; -import static net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.*; -import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.*; -import net.minecraftforge.common.*; -import net.minecraftforge.fml.common.eventhandler.Event.*; -import net.minecraftforge.event.terraingen.*; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.terraingen.ChunkProviderEvent; +import net.minecraftforge.event.terraingen.PopulateChunkEvent; +import net.minecraftforge.event.terraingen.TerrainGen; +import net.minecraftforge.fml.common.eventhandler.Event.Result; public class ChunkProviderGenerateVanilla implements IChunkProvider { diff --git a/src/main/java/biomesoplenty/common/world/NoiseGeneratorBOP.java b/src/main/java/biomesoplenty/common/world/NoiseGeneratorBOP.java index a24d2b7fb..388282e64 100644 --- a/src/main/java/biomesoplenty/common/world/NoiseGeneratorBOP.java +++ b/src/main/java/biomesoplenty/common/world/NoiseGeneratorBOP.java @@ -9,7 +9,7 @@ package biomesoplenty.common.world; import java.util.Random; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.gen.NoiseGenerator; public class NoiseGeneratorBOP extends NoiseGenerator diff --git a/src/main/java/biomesoplenty/common/world/TerrainSettings.java b/src/main/java/biomesoplenty/common/world/TerrainSettings.java index bcbc9a9a0..f51d410e3 100644 --- a/src/main/java/biomesoplenty/common/world/TerrainSettings.java +++ b/src/main/java/biomesoplenty/common/world/TerrainSettings.java @@ -8,7 +8,7 @@ package biomesoplenty.common.world; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.BiomeGenBase; public class TerrainSettings diff --git a/src/main/java/biomesoplenty/common/world/WorldTypeBOP.java b/src/main/java/biomesoplenty/common/world/WorldTypeBOP.java index 64d4ffdf3..2f48ae89f 100644 --- a/src/main/java/biomesoplenty/common/world/WorldTypeBOP.java +++ b/src/main/java/biomesoplenty/common/world/WorldTypeBOP.java @@ -13,7 +13,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiCreateWorld; import net.minecraft.world.World; import net.minecraft.world.WorldType; -import net.minecraft.world.biome.WorldChunkManager; import net.minecraft.world.chunk.IChunkProvider; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -30,7 +29,7 @@ public class WorldTypeBOP extends WorldType @Override public WorldChunkManager getChunkManager(World world) { - return new WorldChunkManagerBOP(world); + return new BiomeProviderBOP(world); } @Override diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorBigFlower.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorBigFlower.java index 382bc97e3..454f46cce 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorBigFlower.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorBigFlower.java @@ -10,13 +10,6 @@ package biomesoplenty.common.world.feature; import java.util.Random; -import net.minecraft.block.Block; -import net.minecraft.block.BlockLeaves; -import net.minecraft.block.BlockLog; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; import biomesoplenty.api.biome.generation.BOPGeneratorBase; import biomesoplenty.api.block.BlockQueries; import biomesoplenty.common.block.BlockBOPLeaves; @@ -30,6 +23,13 @@ import biomesoplenty.common.util.block.BlockQuery.BlockQueryParseException; import biomesoplenty.common.util.block.BlockQuery.BlockQueryState; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; +import net.minecraft.block.Block; +import net.minecraft.block.BlockLeaves; +import net.minecraft.block.BlockLog; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class GeneratorBigFlower extends BOPGeneratorBase { diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorBigMushroom.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorBigMushroom.java index 8d4a5c569..2c3e51311 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorBigMushroom.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorBigMushroom.java @@ -10,12 +10,6 @@ package biomesoplenty.common.world.feature; import java.util.Random; -import net.minecraft.block.Block; -import net.minecraft.block.BlockHugeMushroom; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import biomesoplenty.api.biome.generation.BOPGeneratorBase; import biomesoplenty.api.block.BlockQueries; import biomesoplenty.common.util.biome.GeneratorUtils; @@ -25,6 +19,12 @@ import biomesoplenty.common.util.block.BlockQuery.BlockQueryParseException; import biomesoplenty.common.util.block.BlockQuery.BlockQueryState; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; +import net.minecraft.block.Block; +import net.minecraft.block.BlockHugeMushroom; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class GeneratorBigMushroom extends BOPGeneratorBase { diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorBlobs.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorBlobs.java index b659b62ba..48625f9b2 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorBlobs.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorBlobs.java @@ -10,17 +10,17 @@ package biomesoplenty.common.world.feature; import java.util.Random; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; import biomesoplenty.api.block.BlockQueries; import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.util.block.BlockQuery; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; public class GeneratorBlobs extends GeneratorReplacing { diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorColumns.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorColumns.java index 09b39c928..6ecf54ed7 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorColumns.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorColumns.java @@ -10,17 +10,17 @@ package biomesoplenty.common.world.feature; import java.util.Random; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import biomesoplenty.api.block.BlockQueries; import biomesoplenty.common.util.biome.GeneratorUtils; import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.util.block.BlockQuery.BlockQueryMaterial; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class GeneratorColumns extends GeneratorReplacing { diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorCrystals.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorCrystals.java index c09b4bc0d..b227773ff 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorCrystals.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorCrystals.java @@ -10,8 +10,8 @@ import biomesoplenty.common.util.config.BOPConfig.IConfigObj; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class GeneratorCrystals extends GeneratorReplacing diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorDoubleFlora.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorDoubleFlora.java index c10b09223..e92afcedd 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorDoubleFlora.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorDoubleFlora.java @@ -12,9 +12,9 @@ import java.util.Random; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.block.BlockQueries; -import biomesoplenty.common.block.BlockBOPDoublePlant; import biomesoplenty.common.block.BlockBOPDecoration; import biomesoplenty.common.block.BlockBOPDoubleDecoration; +import biomesoplenty.common.block.BlockBOPDoublePlant; import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.util.block.BlockQuery.BlockQueryMaterial; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; @@ -25,7 +25,7 @@ import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class GeneratorDoubleFlora extends GeneratorReplacing diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorFlora.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorFlora.java index 7f139ad74..12d7bba3b 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorFlora.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorFlora.java @@ -10,6 +10,21 @@ package biomesoplenty.common.world.feature; import java.util.Random; +import biomesoplenty.api.block.BOPBlocks; +import biomesoplenty.api.block.BlockQueries; +import biomesoplenty.common.block.BlockBOPDecoration; +import biomesoplenty.common.block.BlockBOPFlower; +import biomesoplenty.common.block.BlockBOPLeaves; +import biomesoplenty.common.block.BlockBOPLilypad; +import biomesoplenty.common.block.BlockBOPMushroom; +import biomesoplenty.common.block.BlockBOPPlant; +import biomesoplenty.common.enums.BOPFlowers; +import biomesoplenty.common.enums.BOPPlants; +import biomesoplenty.common.enums.BOPTrees; +import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; +import biomesoplenty.common.util.block.BlockQuery.BlockQueryMaterial; +import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; +import biomesoplenty.common.util.config.BOPConfig.IConfigObj; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockFlower; @@ -21,22 +36,8 @@ import net.minecraft.block.BlockTallGrass; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.api.block.BlockQueries; -import biomesoplenty.common.block.BlockBOPFlower; -import biomesoplenty.common.block.BlockBOPLeaves; -import biomesoplenty.common.block.BlockBOPLilypad; -import biomesoplenty.common.block.BlockBOPMushroom; -import biomesoplenty.common.block.BlockBOPPlant; -import biomesoplenty.common.block.BlockBOPDecoration; -import biomesoplenty.common.enums.BOPFlowers; -import biomesoplenty.common.enums.BOPPlants; -import biomesoplenty.common.enums.BOPTrees; -import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; -import biomesoplenty.common.util.block.BlockQuery.*; -import biomesoplenty.common.util.config.BOPConfig.IConfigObj; public class GeneratorFlora extends GeneratorReplacing { diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorGrass.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorGrass.java index 07e735cf2..4d2c03624 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorGrass.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorGrass.java @@ -8,13 +8,13 @@ package biomesoplenty.common.world.feature; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; import biomesoplenty.api.block.BlockQueries; import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.util.block.BlockQuery.BlockQueryMaterial; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; public class GeneratorGrass extends GeneratorFlora { diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorLakes.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorLakes.java index 7ef67877a..3a0ddf7de 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorLakes.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorLakes.java @@ -22,7 +22,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorLogs.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorLogs.java index 6fd606131..4efe6c15f 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorLogs.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorLogs.java @@ -10,6 +10,13 @@ package biomesoplenty.common.world.feature; import java.util.Random; +import biomesoplenty.common.block.BlockBOPLog; +import biomesoplenty.common.enums.BOPWoods; +import biomesoplenty.common.util.biome.GeneratorUtils; +import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; +import biomesoplenty.common.util.block.BlockQuery.BlockQueryMaterial; +import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; +import biomesoplenty.common.util.config.BOPConfig.IConfigObj; import net.minecraft.block.BlockLog; import net.minecraft.block.BlockNewLog; import net.minecraft.block.BlockOldLog; @@ -18,15 +25,8 @@ import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import biomesoplenty.common.block.BlockBOPLog; -import biomesoplenty.common.enums.BOPWoods; -import biomesoplenty.common.util.biome.GeneratorUtils; -import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; -import biomesoplenty.common.util.block.BlockQuery.BlockQueryMaterial; -import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; -import biomesoplenty.common.util.config.BOPConfig.IConfigObj; public class GeneratorLogs extends GeneratorReplacing { diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorMixedLily.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorMixedLily.java index 96842aa63..32abca06d 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorMixedLily.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorMixedLily.java @@ -10,12 +10,6 @@ package biomesoplenty.common.world.feature; import java.util.Random; -import net.minecraft.block.BlockLilyPad; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import biomesoplenty.api.biome.generation.BOPGeneratorBase; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.block.BlockBOPLilypad; @@ -23,6 +17,12 @@ import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.util.block.BlockQuery.BlockQueryMaterial; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; +import net.minecraft.block.BlockLilyPad; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class GeneratorMixedLily extends BOPGeneratorBase { diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorOreBase.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorOreBase.java index ec1c57dd0..5e6ec30e9 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorOreBase.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorOreBase.java @@ -10,10 +10,6 @@ package biomesoplenty.common.world.feature; import java.util.Random; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; - import org.apache.commons.lang3.tuple.Pair; import biomesoplenty.api.biome.generation.BOPGeneratorBase; @@ -22,6 +18,9 @@ import biomesoplenty.common.block.BlockBOPGem; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.util.biome.GeneratorUtils; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public abstract class GeneratorOreBase extends BOPGeneratorBase { diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorOreCluster.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorOreCluster.java index 88222213e..8be144e92 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorOreCluster.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorOreCluster.java @@ -16,11 +16,10 @@ import biomesoplenty.common.util.block.BlockQuery.BlockQueryParseException; import biomesoplenty.common.util.block.BlockQuery.BlockQueryState; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; -import biomesoplenty.common.world.feature.GeneratorOreSingle.Builder; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenMinable; diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorOreSingle.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorOreSingle.java index f991eb821..2c4fe1a4d 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorOreSingle.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorOreSingle.java @@ -10,17 +10,17 @@ package biomesoplenty.common.world.feature; import java.util.Random; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import biomesoplenty.common.util.block.BlockQuery; import biomesoplenty.common.util.block.BlockQuery.BlockQueryBlock; import biomesoplenty.common.util.block.BlockQuery.BlockQueryParseException; import biomesoplenty.common.util.block.BlockQuery.BlockQueryState; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class GeneratorOreSingle extends GeneratorOreBase { diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorReplacing.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorReplacing.java index 21e6548e5..0fb34f945 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorReplacing.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorReplacing.java @@ -10,19 +10,19 @@ package biomesoplenty.common.world.feature; import java.util.Random; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import biomesoplenty.api.biome.generation.BOPGeneratorBase; import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.util.block.BlockQuery; import biomesoplenty.common.util.block.BlockQuery.BlockQueryBlock; +import biomesoplenty.common.util.block.BlockQuery.BlockQueryMaterial; import biomesoplenty.common.util.block.BlockQuery.BlockQueryParseException; import biomesoplenty.common.util.block.BlockQuery.BlockQueryState; -import biomesoplenty.common.util.block.BlockQuery.BlockQueryMaterial; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public abstract class GeneratorReplacing extends BOPGeneratorBase { diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorSpike.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorSpike.java index 9167ea324..be17b9c54 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorSpike.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorSpike.java @@ -20,7 +20,7 @@ import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class GeneratorSpike extends GeneratorReplacing diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorSplatter.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorSplatter.java index 639da5e7a..420c8edd1 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorSplatter.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorSplatter.java @@ -16,7 +16,7 @@ import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class GeneratorSplatter extends GeneratorReplacing diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorSplotches.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorSplotches.java index 6c978e6b8..02f643dba 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorSplotches.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorSplotches.java @@ -10,15 +10,16 @@ package biomesoplenty.common.world.feature; import java.util.Random; +import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; +import biomesoplenty.common.util.block.BlockQuery.BlockQueryMaterial; +import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; +import biomesoplenty.common.util.config.BOPConfig.IConfigObj; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; -import biomesoplenty.common.util.block.BlockQuery.*; -import biomesoplenty.common.util.config.BOPConfig.IConfigObj; public class GeneratorSplotches extends GeneratorReplacing { diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorWaterside.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorWaterside.java index 251a8a0e9..a2124a451 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorWaterside.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorWaterside.java @@ -10,15 +10,16 @@ package biomesoplenty.common.world.feature; import java.util.Random; +import biomesoplenty.api.block.BlockQueries; +import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; +import biomesoplenty.common.util.block.BlockQuery.BlockQueryMaterial; +import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; +import biomesoplenty.common.util.config.BOPConfig.IConfigObj; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import biomesoplenty.api.block.BlockQueries; -import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; -import biomesoplenty.common.util.block.BlockQuery.*; -import biomesoplenty.common.util.config.BOPConfig.IConfigObj; public class GeneratorWaterside extends GeneratorReplacing { diff --git a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBasicTree.java b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBasicTree.java index 9d9a8fd45..4712c2479 100644 --- a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBasicTree.java +++ b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBasicTree.java @@ -27,8 +27,8 @@ import net.minecraft.block.BlockVine; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class GeneratorBasicTree extends GeneratorTreeBase diff --git a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBayouTree.java b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBayouTree.java index 409e89e1a..08613a78e 100644 --- a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBayouTree.java +++ b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBayouTree.java @@ -20,8 +20,8 @@ import biomesoplenty.common.util.config.BOPConfig.IConfigObj; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class GeneratorBayouTree extends GeneratorTreeBase diff --git a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBigTree.java b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBigTree.java index d54e375b1..fb43ef06e 100644 --- a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBigTree.java +++ b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBigTree.java @@ -13,22 +13,22 @@ import java.util.Random; import org.apache.commons.lang3.tuple.Pair; +import com.google.common.collect.Lists; + +import biomesoplenty.api.block.BlockQueries; +import biomesoplenty.common.util.biome.GeneratorUtils; +import biomesoplenty.common.util.block.BlockQuery.BlockQueryMaterial; +import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; +import biomesoplenty.common.util.config.BOPConfig.IConfigObj; import net.minecraft.block.BlockLog; import net.minecraft.block.BlockSapling; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -import biomesoplenty.api.block.BlockQueries; -import biomesoplenty.common.util.biome.GeneratorUtils; -import biomesoplenty.common.util.block.BlockQuery; -import biomesoplenty.common.util.block.BlockQuery.BlockQueryMaterial; -import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; -import biomesoplenty.common.util.config.BOPConfig.IConfigObj; -import com.google.common.collect.Lists; /*This class is heavily based on https://gist.github.com/grum/62cfdec0537e8db24eb3#file-bigtreefeature-java additional information has been added from http://pastebin.com/XBLdGqXQ. This class has been cross-checked diff --git a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBulbTree.java b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBulbTree.java index ac68181eb..5a583eeed 100644 --- a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBulbTree.java +++ b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBulbTree.java @@ -16,8 +16,8 @@ import biomesoplenty.common.util.config.BOPConfig.IConfigObj; import net.minecraft.block.BlockDirectional; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class GeneratorBulbTree extends GeneratorTreeBase diff --git a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBush.java b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBush.java index 57482479f..5b8284803 100644 --- a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBush.java +++ b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBush.java @@ -10,14 +10,14 @@ package biomesoplenty.common.world.feature.tree; import java.util.Random; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import biomesoplenty.api.block.BlockQueries; import biomesoplenty.common.util.biome.GeneratorUtils; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class GeneratorBush extends GeneratorTreeBase { diff --git a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorHugeTree.java b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorHugeTree.java index 14b0b5b75..17b7f7d7c 100644 --- a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorHugeTree.java +++ b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorHugeTree.java @@ -14,7 +14,7 @@ import biomesoplenty.common.util.biome.GeneratorUtils; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public abstract class GeneratorHugeTree extends GeneratorTreeBase diff --git a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorMahoganyTree.java b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorMahoganyTree.java index 079703e75..7649ded5d 100644 --- a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorMahoganyTree.java +++ b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorMahoganyTree.java @@ -16,9 +16,9 @@ import biomesoplenty.common.util.block.BlockQuery.BlockQueryMaterial; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class GeneratorMahoganyTree extends GeneratorBasicTree diff --git a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorMegaJungleTree.java b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorMegaJungleTree.java index 22e6f7752..0665eb15b 100644 --- a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorMegaJungleTree.java +++ b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorMegaJungleTree.java @@ -15,9 +15,9 @@ import biomesoplenty.common.util.config.BOPConfig.IConfigObj; import net.minecraft.block.BlockPlanks; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; public class GeneratorMegaJungleTree extends GeneratorHugeTree diff --git a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorPineTree.java b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorPineTree.java index 1da8825e7..d040a7fb9 100644 --- a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorPineTree.java +++ b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorPineTree.java @@ -10,15 +10,15 @@ package biomesoplenty.common.world.feature.tree; import java.util.Random; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; import biomesoplenty.api.block.BlockQueries; import biomesoplenty.common.util.biome.GeneratorUtils; -import biomesoplenty.common.util.block.BlockQuery.*; +import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class GeneratorPineTree extends GeneratorTreeBase { diff --git a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorProfileTree.java b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorProfileTree.java index fb3bfcf8c..d825c94f2 100644 --- a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorProfileTree.java +++ b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorProfileTree.java @@ -10,14 +10,14 @@ package biomesoplenty.common.world.feature.tree; import java.util.Random; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import biomesoplenty.api.block.BlockQueries; import biomesoplenty.common.util.biome.GeneratorUtils; -import biomesoplenty.common.util.block.BlockQuery.*; +import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class GeneratorProfileTree extends GeneratorTreeBase { diff --git a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorRedwoodTree.java b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorRedwoodTree.java index b79c58b83..64b6b3263 100644 --- a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorRedwoodTree.java +++ b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorRedwoodTree.java @@ -9,7 +9,6 @@ package biomesoplenty.common.world.feature.tree; import java.util.Random; -import biomesoplenty.api.biome.generation.IGenerator.IGeneratorBuilder; import biomesoplenty.api.block.BlockQueries; import biomesoplenty.common.block.BlockBOPLeaves; import biomesoplenty.common.block.BlockBOPLog; @@ -19,11 +18,9 @@ import biomesoplenty.common.util.biome.GeneratorUtils; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; import biomesoplenty.common.world.feature.GeneratorSpike; -import biomesoplenty.common.world.feature.tree.GeneratorPineTree.Builder; import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class GeneratorRedwoodTree extends GeneratorTreeBase diff --git a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorTaigaTree.java b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorTaigaTree.java index b4fcb4dca..a1528e28a 100644 --- a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorTaigaTree.java +++ b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorTaigaTree.java @@ -18,9 +18,9 @@ import net.minecraft.block.BlockOldLog; import net.minecraft.block.BlockPlanks; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; public class GeneratorTaigaTree extends GeneratorTreeBase diff --git a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorTreeBase.java b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorTreeBase.java index ffc5feb9a..eab15be26 100644 --- a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorTreeBase.java +++ b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorTreeBase.java @@ -10,6 +10,18 @@ package biomesoplenty.common.world.feature.tree; import java.util.Random; +import biomesoplenty.api.biome.generation.BOPGeneratorBase; +import biomesoplenty.common.block.BlockBOPLeaves; +import biomesoplenty.common.block.BlockBOPLog; +import biomesoplenty.common.enums.BOPTrees; +import biomesoplenty.common.enums.BOPWoods; +import biomesoplenty.common.util.biome.GeneratorUtils; +import biomesoplenty.common.util.block.BlockQuery; +import biomesoplenty.common.util.block.BlockQuery.BlockQueryBlock; +import biomesoplenty.common.util.block.BlockQuery.BlockQueryMaterial; +import biomesoplenty.common.util.block.BlockQuery.BlockQueryParseException; +import biomesoplenty.common.util.block.BlockQuery.BlockQueryState; +import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import net.minecraft.block.Block; import net.minecraft.block.BlockLeaves; import net.minecraft.block.BlockLog; @@ -23,21 +35,9 @@ import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import biomesoplenty.api.biome.generation.BOPGeneratorBase; -import biomesoplenty.common.block.BlockBOPLeaves; -import biomesoplenty.common.block.BlockBOPLog; -import biomesoplenty.common.enums.BOPTrees; -import biomesoplenty.common.enums.BOPWoods; -import biomesoplenty.common.util.biome.GeneratorUtils; -import biomesoplenty.common.util.block.BlockQuery; -import biomesoplenty.common.util.block.BlockQuery.BlockQueryBlock; -import biomesoplenty.common.util.block.BlockQuery.BlockQueryMaterial; -import biomesoplenty.common.util.block.BlockQuery.BlockQueryParseException; -import biomesoplenty.common.util.block.BlockQuery.BlockQueryState; -import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; public abstract class GeneratorTreeBase extends BOPGeneratorBase { diff --git a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorTwigletTree.java b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorTwigletTree.java index 40b03e18f..680ad5f3d 100644 --- a/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorTwigletTree.java +++ b/src/main/java/biomesoplenty/common/world/feature/tree/GeneratorTwigletTree.java @@ -10,13 +10,13 @@ package biomesoplenty.common.world.feature.tree; import java.util.Random; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import biomesoplenty.api.block.BlockQueries; import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.util.config.BOPConfig.IConfigObj; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class GeneratorTwigletTree extends GeneratorTreeBase { diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerBOPRiver.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerBOPRiver.java index 1ec167e49..a75c202e6 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerBOPRiver.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerBOPRiver.java @@ -1,5 +1,6 @@ package biomesoplenty.common.world.layer; +import net.minecraft.init.Biomes; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.layer.GenLayer; import net.minecraft.world.gen.layer.IntCache; @@ -38,7 +39,7 @@ public class GenLayerBOPRiver extends BOPGenLayer } else { - out[x + y * areaWidth] = BiomeGenBase.river.biomeID; + out[x + y * areaWidth] = BiomeGenBase.getIdForBiome(Biomes.river); } } } diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java index 8121599d6..deb55c802 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java @@ -8,13 +8,14 @@ package biomesoplenty.common.world.layer; +import biomesoplenty.common.enums.BOPClimates; +import biomesoplenty.common.init.ModBiomes; +import biomesoplenty.common.world.BOPWorldSettings; +import net.minecraft.init.Biomes; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.layer.GenLayer; import net.minecraft.world.gen.layer.IntCache; import net.minecraftforge.common.BiomeManager.BiomeType; -import biomesoplenty.common.enums.BOPClimates; -import biomesoplenty.common.init.ModBiomes; -import biomesoplenty.common.world.BOPWorldSettings; public class GenLayerBiomeBOP extends BOPGenLayer { @@ -52,22 +53,22 @@ public class GenLayerBiomeBOP extends BOPGenLayer BOPClimates climate = BOPClimates.lookup(climateValues[index]); // At this point, oceans and land have been assigned, and so have mushroom islands - if (landSeaVal == BiomeGenBase.deepOcean.biomeID) + if (landSeaVal == BiomeGenBase.getIdForBiome(Biomes.deepOcean)) { - out[index] = climate.getRandomOceanBiome(this, true).biomeID; + out[index] = BiomeGenBase.getIdForBiome(climate.getRandomOceanBiome(this, true)); } - else if ((landSeaVal == BiomeGenBase.mushroomIsland.biomeID || ModBiomes.islandBiomesMap.containsKey(landSeaVal)) && climate.biomeType != BiomeType.ICY) + else if ((landSeaVal == BiomeGenBase.getIdForBiome(Biomes.mushroomIsland) || ModBiomes.islandBiomesMap.containsKey(landSeaVal)) && climate.biomeType != BiomeType.ICY) { // keep islands, unless it's in an icy climate in which case, replace out[index] = landSeaVal; } else if (landSeaVal == 0) { - out[index] = climate.getRandomOceanBiome(this, false).biomeID; + out[index] = BiomeGenBase.getIdForBiome(climate.getRandomOceanBiome(this, false)); } else { - out[index] = climate.getRandomLandBiome(this).biomeID; + out[index] = BiomeGenBase.getIdForBiome(climate.getRandomLandBiome(this)); } } } diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeEdgeBOP.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeEdgeBOP.java index 18afe7011..697191d06 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeEdgeBOP.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeEdgeBOP.java @@ -11,6 +11,7 @@ package biomesoplenty.common.world.layer; import com.google.common.base.Optional; import biomesoplenty.api.biome.BOPBiomes; +import net.minecraft.init.Biomes; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.layer.GenLayer; import net.minecraft.world.gen.layer.IntCache; @@ -41,24 +42,24 @@ public class GenLayerBiomeEdgeBOP extends BOPGenLayer if (this.replaceBiomeEdge(parentVals, out, x, y, areaWidth, biomeId, BOPBiomes.mountain, BOPBiomes.mountain_foothills)) {continue;} // line BOP wasteland with vanilla desert - if (this.replaceBiomeEdge(parentVals, out, x, y, areaWidth, biomeId, BOPBiomes.wasteland, Optional.of(BiomeGenBase.desert))) {continue;} + if (this.replaceBiomeEdge(parentVals, out, x, y, areaWidth, biomeId, BOPBiomes.wasteland, Optional.of(Biomes.desert))) {continue;} // line extreme hills with extreme hills edge - if (this.replaceBiomeEdgeIfNecessary(parentVals, out, x, y, areaWidth, biomeId, BiomeGenBase.extremeHills.biomeID, BiomeGenBase.extremeHillsEdge.biomeID)) {continue;} + if (this.replaceBiomeEdgeIfNecessary(parentVals, out, x, y, areaWidth, biomeId, BiomeGenBase.getIdForBiome(Biomes.extremeHills), BiomeGenBase.getIdForBiome(Biomes.extremeHillsEdge))) {continue;} // line mesa plateau with mesa - if (this.replaceBiomeEdge(parentVals, out, x, y, areaWidth, biomeId, BiomeGenBase.mesaPlateau_F.biomeID, BiomeGenBase.mesa.biomeID)) {continue;} - if (this.replaceBiomeEdge(parentVals, out, x, y, areaWidth, biomeId, BiomeGenBase.mesaPlateau.biomeID, BiomeGenBase.mesa.biomeID)) {continue;} + if (this.replaceBiomeEdge(parentVals, out, x, y, areaWidth, biomeId, BiomeGenBase.getIdForBiome(Biomes.mesaPlateau_F), BiomeGenBase.getIdForBiome(Biomes.mesa))) {continue;} + if (this.replaceBiomeEdge(parentVals, out, x, y, areaWidth, biomeId, BiomeGenBase.getIdForBiome(Biomes.mesaPlateau), BiomeGenBase.getIdForBiome(Biomes.mesa))) {continue;} // line mega taiga with ordinary taiga - if (this.replaceBiomeEdge(parentVals, out, x, y, areaWidth, biomeId, BiomeGenBase.megaTaiga.biomeID, BiomeGenBase.taiga.biomeID)) {continue;} + if (this.replaceBiomeEdge(parentVals, out, x, y, areaWidth, biomeId, BiomeGenBase.getIdForBiome(Biomes.megaTaiga), BiomeGenBase.getIdForBiome(Biomes.taiga))) {continue;} int northBiomeId; int eastBiomeId; int westBiomeId; int southBiomeId; - if (biomeId == BiomeGenBase.desert.biomeID) + if (biomeId == BiomeGenBase.getIdForBiome(Biomes.desert)) { // if desert is next to ice plains turn it into extremeGillsPlus (separate the ice and desert with a big mountain) northBiomeId = parentVals[x + 1 + (y + 1 - 1) * (areaWidth + 2)]; @@ -66,16 +67,16 @@ public class GenLayerBiomeEdgeBOP extends BOPGenLayer westBiomeId = parentVals[x + 1 - 1 + (y + 1) * (areaWidth + 2)]; southBiomeId = parentVals[x + 1 + (y + 1 + 1) * (areaWidth + 2)]; - if (northBiomeId != BiomeGenBase.icePlains.biomeID && eastBiomeId != BiomeGenBase.icePlains.biomeID && westBiomeId != BiomeGenBase.icePlains.biomeID && southBiomeId != BiomeGenBase.icePlains.biomeID) + if (northBiomeId != BiomeGenBase.getIdForBiome(Biomes.icePlains) && eastBiomeId != BiomeGenBase.getIdForBiome(Biomes.icePlains) && westBiomeId != BiomeGenBase.getIdForBiome(Biomes.icePlains) && southBiomeId != BiomeGenBase.getIdForBiome(Biomes.icePlains)) { out[x + y * areaWidth] = biomeId; } else { - out[x + y * areaWidth] = BiomeGenBase.extremeHillsPlus.biomeID; + out[x + y * areaWidth] = BiomeGenBase.getIdForBiome(Biomes.extremeHillsPlus); } } - else if (biomeId == BiomeGenBase.swampland.biomeID) + else if (biomeId == BiomeGenBase.getIdForBiome(Biomes.swampland)) { // if swamp is next to desert, cold taiga or ice planes, turn it into plains // if swamp is next to jungle, turn it into jungle edge @@ -84,20 +85,20 @@ public class GenLayerBiomeEdgeBOP extends BOPGenLayer westBiomeId = parentVals[x + 1 - 1 + (y + 1) * (areaWidth + 2)]; southBiomeId = parentVals[x + 1 + (y + 1 + 1) * (areaWidth + 2)]; - if (northBiomeId != BiomeGenBase.desert.biomeID && eastBiomeId != BiomeGenBase.desert.biomeID && westBiomeId != BiomeGenBase.desert.biomeID && southBiomeId != BiomeGenBase.desert.biomeID && northBiomeId != BiomeGenBase.coldTaiga.biomeID && eastBiomeId != BiomeGenBase.coldTaiga.biomeID && westBiomeId != BiomeGenBase.coldTaiga.biomeID && southBiomeId != BiomeGenBase.coldTaiga.biomeID && northBiomeId != BiomeGenBase.icePlains.biomeID && eastBiomeId != BiomeGenBase.icePlains.biomeID && westBiomeId != BiomeGenBase.icePlains.biomeID && southBiomeId != BiomeGenBase.icePlains.biomeID) + if (northBiomeId != BiomeGenBase.getIdForBiome(Biomes.desert) && eastBiomeId != BiomeGenBase.getIdForBiome(Biomes.desert) && westBiomeId != BiomeGenBase.getIdForBiome(Biomes.desert) && southBiomeId != BiomeGenBase.getIdForBiome(Biomes.desert) && northBiomeId != BiomeGenBase.getIdForBiome(Biomes.coldTaiga) && eastBiomeId != BiomeGenBase.getIdForBiome(Biomes.coldTaiga) && westBiomeId != BiomeGenBase.getIdForBiome(Biomes.coldTaiga) && southBiomeId != BiomeGenBase.getIdForBiome(Biomes.coldTaiga) && northBiomeId != BiomeGenBase.getIdForBiome(Biomes.icePlains) && eastBiomeId != BiomeGenBase.getIdForBiome(Biomes.icePlains) && westBiomeId != BiomeGenBase.getIdForBiome(Biomes.icePlains) && southBiomeId != BiomeGenBase.getIdForBiome(Biomes.icePlains)) { - if (northBiomeId != BiomeGenBase.jungle.biomeID && southBiomeId != BiomeGenBase.jungle.biomeID && eastBiomeId != BiomeGenBase.jungle.biomeID && westBiomeId != BiomeGenBase.jungle.biomeID) + if (northBiomeId != BiomeGenBase.getIdForBiome(Biomes.jungle) && southBiomeId != BiomeGenBase.getIdForBiome(Biomes.jungle) && eastBiomeId != BiomeGenBase.getIdForBiome(Biomes.jungle) && westBiomeId != BiomeGenBase.getIdForBiome(Biomes.jungle)) { out[x + y * areaWidth] = biomeId; } else { - out[x + y * areaWidth] = BiomeGenBase.jungleEdge.biomeID; + out[x + y * areaWidth] = BiomeGenBase.getIdForBiome(Biomes.jungleEdge); } } else { - out[x + y * areaWidth] = BiomeGenBase.plains.biomeID; + out[x + y * areaWidth] = BiomeGenBase.getIdForBiome(Biomes.plains); } } else @@ -138,7 +139,7 @@ public class GenLayerBiomeEdgeBOP extends BOPGenLayer private boolean replaceBiomeEdge(int[] parentVals, int[] out, int x, int y, int areaWidth, int biomeId, Optional fromBiome, Optional toBiome) { - return fromBiome.isPresent() && toBiome.isPresent() && this.replaceBiomeEdge(parentVals, out, x, y, areaWidth, biomeId, fromBiome.get().biomeID, toBiome.get().biomeID); + return fromBiome.isPresent() && toBiome.isPresent() && this.replaceBiomeEdge(parentVals, out, x, y, areaWidth, biomeId, BiomeGenBase.getIdForBiome(fromBiome.get()), BiomeGenBase.getIdForBiome(toBiome.get())); } private boolean replaceBiomeEdge(int[] parentVals, int[] out, int x, int y, int areaWidth, int biomeId, int fromBiomeId, int toBiomeId) @@ -180,7 +181,7 @@ public class GenLayerBiomeEdgeBOP extends BOPGenLayer if (biomegenbaseA != null && biomegenbaseB != null) { - BiomeGenBase.TempCategory tempcategory = biomegenbaseA.getTempCategory(); + BiomeGenBase.TempCategory tempcategory = biomegenbaseA.getTempCategory(); BiomeGenBase.TempCategory tempcategory1 = biomegenbaseB.getTempCategory(); return tempcategory == tempcategory1 || tempcategory == BiomeGenBase.TempCategory.MEDIUM || tempcategory1 == BiomeGenBase.TempCategory.MEDIUM; } diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeIslands.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeIslands.java index 38af0007a..740722627 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeIslands.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeIslands.java @@ -9,6 +9,7 @@ package biomesoplenty.common.world.layer; import biomesoplenty.common.enums.BOPClimates; +import net.minecraft.init.Biomes; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.layer.GenLayer; import net.minecraft.world.gen.layer.IntCache; @@ -42,7 +43,7 @@ public class GenLayerBiomeIslands extends BOPGenLayer this.initChunkSeed((long)(x + areaX), (long)(z + areaY)); // if it's an ocean, there's a chance of creating an island here - if ((biomeID == BiomeGenBase.ocean.biomeID || biomeID == BiomeGenBase.deepOcean.biomeID) && (this.nextInt(this.islandChance) == 0)) + if ((biomeID == BiomeGenBase.getIdForBiome(Biomes.ocean) || biomeID == BiomeGenBase.getIdForBiome(Biomes.deepOcean)) && (this.nextInt(this.islandChance) == 0)) { // check that the tile is surrounded by ocean int biomeNorth = biomeIds[x + 1 + (z + 1 - 1) * (areaWidth + 2)]; @@ -50,14 +51,14 @@ public class GenLayerBiomeIslands extends BOPGenLayer int biomeWest = biomeIds[x + 1 - 1 + (z + 1) * (areaWidth + 2)]; int biomeSouth = biomeIds[x + 1 + (z + 1 + 1) * (areaWidth + 2)]; if ( - (biomeNorth == BiomeGenBase.ocean.biomeID || biomeNorth == BiomeGenBase.deepOcean.biomeID) && - (biomeEast == BiomeGenBase.ocean.biomeID || biomeEast == BiomeGenBase.deepOcean.biomeID) && - (biomeWest == BiomeGenBase.ocean.biomeID || biomeWest == BiomeGenBase.deepOcean.biomeID) && - (biomeSouth == BiomeGenBase.ocean.biomeID || biomeSouth == BiomeGenBase.deepOcean.biomeID) + (biomeNorth == BiomeGenBase.getIdForBiome(Biomes.ocean) || biomeNorth == BiomeGenBase.getIdForBiome(Biomes.deepOcean)) && + (biomeEast == BiomeGenBase.getIdForBiome(Biomes.ocean) || biomeEast == BiomeGenBase.getIdForBiome(Biomes.deepOcean)) && + (biomeWest == BiomeGenBase.getIdForBiome(Biomes.ocean) || biomeWest == BiomeGenBase.getIdForBiome(Biomes.deepOcean)) && + (biomeSouth == BiomeGenBase.getIdForBiome(Biomes.ocean) || biomeSouth == BiomeGenBase.getIdForBiome(Biomes.deepOcean)) ) { int climateVal = climateVals[x + z * areaWidth]; - out[x + z * areaWidth] = BOPClimates.lookup(climateVal).getRandomLandBiome(this).biomeID; + out[x + z * areaWidth] = BiomeGenBase.getIdForBiome(BOPClimates.lookup(climateVal).getRandomLandBiome(this)); } else { diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerClimate.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerClimate.java index 575a1bf50..e570ceac6 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerClimate.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerClimate.java @@ -1,8 +1,7 @@ package biomesoplenty.common.world.layer; import biomesoplenty.common.enums.BOPClimates; -import biomesoplenty.core.BiomesOPlenty; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.gen.layer.GenLayer; import net.minecraft.world.gen.layer.IntCache; diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerLargeIsland.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerLargeIsland.java index 073dc7948..eeceaa749 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerLargeIsland.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerLargeIsland.java @@ -10,7 +10,6 @@ package biomesoplenty.common.world.layer; import java.util.Iterator; import java.util.Map.Entry; -import biomesoplenty.common.enums.BOPClimates.WeightedBiomeEntry; import biomesoplenty.common.init.ModBiomes; import net.minecraft.world.gen.layer.GenLayer; import net.minecraft.world.gen.layer.IntCache; diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerRiverMixBOP.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerRiverMixBOP.java index cb532c511..c6280f7f0 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerRiverMixBOP.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerRiverMixBOP.java @@ -10,6 +10,7 @@ package biomesoplenty.common.world.layer; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; +import net.minecraft.init.Biomes; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.layer.GenLayer; import net.minecraft.world.gen.layer.IntCache; @@ -43,21 +44,21 @@ public class GenLayerRiverMixBOP extends BOPGenLayer for (int i = 0; i < areaWidth * areaHeight; ++i) { - if (biomeIds[i] != BiomeGenBase.frozenOcean.biomeID && biomeIds[i] != BiomeGenBase.ocean.biomeID && biomeIds[i] != BiomeGenBase.deepOcean.biomeID && biomeSupportsRivers(biomeIds[i])) + if (biomeIds[i] != BiomeGenBase.getIdForBiome(Biomes.frozenOcean) && biomeIds[i] != BiomeGenBase.getIdForBiome(Biomes.ocean) && biomeIds[i] != BiomeGenBase.getIdForBiome(Biomes.deepOcean) && biomeSupportsRivers(biomeIds[i])) { - if (riverValues[i] == BiomeGenBase.river.biomeID) + if (riverValues[i] == BiomeGenBase.getIdForBiome(Biomes.river)) { - if (biomeIds[i] == BiomeGenBase.icePlains.biomeID || (BOPBiomes.snowy_forest.isPresent() && biomeIds[i] == BOPBiomes.snowy_forest.get().biomeID) || (BOPBiomes.alps.isPresent() && biomeIds[i] == BOPBiomes.alps.get().biomeID)) + if (biomeIds[i] == BiomeGenBase.getIdForBiome(Biomes.icePlains) || (BOPBiomes.snowy_forest.isPresent() && biomeIds[i] == BiomeGenBase.getIdForBiome(BOPBiomes.snowy_forest.get())) || (BOPBiomes.alps.isPresent() && biomeIds[i] == BiomeGenBase.getIdForBiome(BOPBiomes.alps.get()))) { - out[i] = BiomeGenBase.frozenRiver.biomeID; + out[i] = BiomeGenBase.getIdForBiome(Biomes.frozenRiver); } - else if (biomeIds[i] != BiomeGenBase.mushroomIsland.biomeID && biomeIds[i] != BiomeGenBase.mushroomIslandShore.biomeID) + else if (biomeIds[i] != BiomeGenBase.getIdForBiome(Biomes.mushroomIsland) && biomeIds[i] != BiomeGenBase.getIdForBiome(Biomes.mushroomIslandShore)) { out[i] = riverValues[i] & 255; } else { - out[i] = BiomeGenBase.mushroomIslandShore.biomeID; + out[i] = BiomeGenBase.getIdForBiome(Biomes.mushroomIslandShore); } } else @@ -76,18 +77,14 @@ public class GenLayerRiverMixBOP extends BOPGenLayer private boolean biomeSupportsRivers(int biomeId) { - //Check if the biome id is valid - if (biomeId >= 0 && biomeId < BiomeGenBase.getBiomeGenArray().length) - { - BiomeGenBase biome = BiomeGenBase.getBiome(biomeId); + BiomeGenBase biome = BiomeGenBase.getBiome(biomeId); - if (biome != null && biome instanceof BOPBiome) - { - BOPBiome bopBiome = (BOPBiome)biome; - return bopBiome.canGenerateRivers; - } - } + if (biome != null && biome instanceof BOPBiome) + { + BOPBiome bopBiome = (BOPBiome)biome; + return bopBiome.canGenerateRivers; + } - return true; + return true; } } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerShoreBOP.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerShoreBOP.java index e9bae561c..42047f869 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerShoreBOP.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerShoreBOP.java @@ -9,9 +9,9 @@ package biomesoplenty.common.world.layer; import com.google.common.base.Predicate; -import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.BOPBiomes; import biomesoplenty.api.biome.IExtendedBiome; +import net.minecraft.init.Biomes; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenJungle; import net.minecraft.world.biome.BiomeGenMesa; @@ -41,9 +41,9 @@ public class GenLayerShoreBOP extends BOPGenLayer int biomeId = biomeIds[x + 1 + (z + 1) * (areaWidth + 2)]; BiomeGenBase biome = BiomeGenBase.getBiome(biomeId); - if (biomeId == BiomeGenBase.mushroomIsland.biomeID) + if (biomeId == BiomeGenBase.getIdForBiome(Biomes.mushroomIsland)) { - setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, BiomeGenBase.mushroomIslandShore.biomeID, OCEAN_PREDICATE); + setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, BiomeGenBase.getIdForBiome(Biomes.mushroomIslandShore), OCEAN_PREDICATE); } else if (biome != null && biome.getBiomeClass() == BiomeGenJungle.class) { @@ -55,25 +55,25 @@ public class GenLayerShoreBOP extends BOPGenLayer //Ensure the biomes surrounding the jungle are all suitable before generating a beach if (JUNGLE_BORDER_PREDICATE.apply(biomeNorth) && JUNGLE_BORDER_PREDICATE.apply(biomeEast) && JUNGLE_BORDER_PREDICATE.apply(biomeWest) && JUNGLE_BORDER_PREDICATE.apply(biomeSouth)) { - setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, BiomeGenBase.beach.biomeID, OCEANIC_PREDICATE); + setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, BiomeGenBase.getIdForBiome(Biomes.beach), OCEANIC_PREDICATE); } else //There is a non-jungle/ocean/taiga/forest next to the jungle, generate an edge biome { - out[x + z * areaWidth] = BiomeGenBase.jungleEdge.biomeID; + out[x + z * areaWidth] = BiomeGenBase.getIdForBiome(Biomes.jungleEdge); } } - else if (biomeId != BiomeGenBase.extremeHills.biomeID && biomeId != BiomeGenBase.extremeHillsPlus.biomeID && biomeId != BiomeGenBase.extremeHillsEdge.biomeID) + else if (biomeId != BiomeGenBase.getIdForBiome(Biomes.extremeHills) && biomeId != BiomeGenBase.getIdForBiome(Biomes.extremeHillsPlus) && biomeId != BiomeGenBase.getIdForBiome(Biomes.extremeHillsEdge)) { if (biome != null && biome.isSnowyBiome()) //Snowy biomes should have cold beaches { //Frozen ocean should not have a beach if (isBiomeOceanic(biomeId)) out[x + z * areaWidth] = biomeId; else - setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, BiomeGenBase.coldBeach.biomeID, OCEANIC_PREDICATE); + setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, BiomeGenBase.getIdForBiome(Biomes.coldBeach), OCEANIC_PREDICATE); } - else if (biomeId != BiomeGenBase.mesa.biomeID && biomeId != BiomeGenBase.mesaPlateau_F.biomeID) + else if (biomeId != BiomeGenBase.getIdForBiome(Biomes.mesa) && biomeId != BiomeGenBase.getIdForBiome(Biomes.mesaPlateau_F)) { - if (biomeId != BiomeGenBase.ocean.biomeID && biomeId != BiomeGenBase.deepOcean.biomeID && biomeId != BiomeGenBase.river.biomeID && biomeId != BiomeGenBase.swampland.biomeID) + if (biomeId != BiomeGenBase.getIdForBiome(Biomes.ocean) && biomeId != BiomeGenBase.getIdForBiome(Biomes.deepOcean) && biomeId != BiomeGenBase.getIdForBiome(Biomes.river) && biomeId != BiomeGenBase.getIdForBiome(Biomes.swampland)) { //Generate custom beaches for our biomes if (biome != null && BOPBiomes.REG_INSTANCE.getExtendedBiome(biome) != null) @@ -83,7 +83,7 @@ public class GenLayerShoreBOP extends BOPGenLayer } else { - setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, BiomeGenBase.beach.biomeID, OCEANIC_PREDICATE); + setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, BiomeGenBase.getIdForBiome(Biomes.beach), OCEANIC_PREDICATE); } } else //Biome is watery, don't put any beaches next to it @@ -102,7 +102,7 @@ public class GenLayerShoreBOP extends BOPGenLayer if (!isBiomeOceanic(biomeNorth) && !isBiomeOceanic(biomeEast) && !isBiomeOceanic(biomeWest) && !isBiomeOceanic(biomeSouth)) { //If at least one of the surrounding biomes is a non-mesa, set it to desert - setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, BiomeGenBase.desert.biomeID, MESA_PREDICATE); + setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, BiomeGenBase.getIdForBiome(Biomes.desert), MESA_PREDICATE); } else { @@ -112,7 +112,7 @@ public class GenLayerShoreBOP extends BOPGenLayer } else //Biome is a variant of the extreme hills { - this.setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, BiomeGenBase.stoneBeach.biomeID, OCEANIC_PREDICATE); + this.setBiomeWithAdjacent(biomeIds, out, x, z, areaWidth, biomeId, BiomeGenBase.getIdForBiome(Biomes.stoneBeach), OCEANIC_PREDICATE); } } } @@ -142,7 +142,7 @@ public class GenLayerShoreBOP extends BOPGenLayer @Override public boolean apply(Integer input) { - return input == BiomeGenBase.ocean.biomeID; + return input == BiomeGenBase.getIdForBiome(Biomes.ocean); } }; @@ -160,7 +160,7 @@ public class GenLayerShoreBOP extends BOPGenLayer @Override public boolean apply(Integer input) { - return BiomeGenBase.getBiome(input) != null && BiomeGenBase.getBiome(input).getBiomeClass() == BiomeGenJungle.class ? true : input == BiomeGenBase.jungleEdge.biomeID || input == BiomeGenBase.jungle.biomeID || input == BiomeGenBase.jungleHills.biomeID || input == BiomeGenBase.forest.biomeID || input == BiomeGenBase.taiga.biomeID || isBiomeOceanic(input); + return BiomeGenBase.getBiome(input) != null && BiomeGenBase.getBiome(input).getBiomeClass() == BiomeGenJungle.class ? true : input == BiomeGenBase.getIdForBiome(Biomes.jungleEdge) || input == BiomeGenBase.getIdForBiome(Biomes.jungle) || input == BiomeGenBase.getIdForBiome(Biomes.jungleHills) || input == BiomeGenBase.getIdForBiome(Biomes.forest) || input == BiomeGenBase.getIdForBiome(Biomes.taiga) || isBiomeOceanic(input); } }; diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerTemperatureLatitude.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerTemperatureLatitude.java index eef1d5320..48f201633 100644 --- a/src/main/java/biomesoplenty/common/world/layer/GenLayerTemperatureLatitude.java +++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerTemperatureLatitude.java @@ -8,7 +8,7 @@ package biomesoplenty.common.world.layer; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.gen.layer.IntCache; public class GenLayerTemperatureLatitude extends BOPGenLayer diff --git a/src/main/java/biomesoplenty/core/BiomesOPlenty.java b/src/main/java/biomesoplenty/core/BiomesOPlenty.java index d409d367a..0bfe1395d 100644 --- a/src/main/java/biomesoplenty/core/BiomesOPlenty.java +++ b/src/main/java/biomesoplenty/core/BiomesOPlenty.java @@ -10,16 +10,6 @@ package biomesoplenty.core; import java.io.File; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.Mod.Instance; -import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import net.minecraftforge.fml.common.network.NetworkRegistry; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -40,6 +30,15 @@ import biomesoplenty.common.init.ModItems; import biomesoplenty.common.init.ModPotions; import biomesoplenty.common.init.ModVanillaCompat; import biomesoplenty.common.remote.TrailManager; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.Mod.Instance; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +import net.minecraftforge.fml.common.network.NetworkRegistry; @Mod(modid = BiomesOPlenty.MOD_ID, name = BiomesOPlenty.MOD_NAME, dependencies = "required-after:Forge@[11.14.3.1468,)", guiFactory = BiomesOPlenty.GUI_FACTORY) public class BiomesOPlenty diff --git a/src/main/java/biomesoplenty/core/ClientProxy.java b/src/main/java/biomesoplenty/core/ClientProxy.java index 41fe640e2..c147d7d9f 100644 --- a/src/main/java/biomesoplenty/core/ClientProxy.java +++ b/src/main/java/biomesoplenty/core/ClientProxy.java @@ -11,33 +11,6 @@ package biomesoplenty.core; import java.util.List; import java.util.Map; -import net.minecraft.block.Block; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiMainMenu; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.block.statemap.IStateMapper; -import net.minecraft.client.renderer.block.statemap.StateMap; -import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.resources.AbstractResourcePack; -import net.minecraft.client.resources.IResourcePack; -import net.minecraft.client.resources.model.ModelBakery; -import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.entity.Entity; -import net.minecraft.item.Item; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.common.ForgeModContainer; -import net.minecraftforge.fml.client.FMLClientHandler; -import net.minecraftforge.fml.client.registry.IRenderFactory; -import net.minecraftforge.fml.client.registry.RenderingRegistry; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.relauncher.ReflectionHelper; import biomesoplenty.api.block.IBOPBlock; import biomesoplenty.api.item.BOPItems; import biomesoplenty.api.particle.BOPParticleTypes; @@ -57,6 +30,33 @@ import biomesoplenty.common.entities.projectiles.EntityDart; import biomesoplenty.common.entities.projectiles.EntityMudball; import biomesoplenty.common.entities.projectiles.RenderDart; import biomesoplenty.common.entities.projectiles.RenderMudball; +import net.minecraft.block.Block; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiMainMenu; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.statemap.IStateMapper; +import net.minecraft.client.renderer.block.statemap.StateMap; +import net.minecraft.client.renderer.block.statemap.StateMapperBase; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.resources.AbstractResourcePack; +import net.minecraft.client.resources.IResourcePack; +import net.minecraft.entity.Entity; +import net.minecraft.item.Item; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.common.ForgeModContainer; +import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.client.registry.IRenderFactory; +import net.minecraftforge.fml.client.registry.RenderingRegistry; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class ClientProxy extends CommonProxy {