Removed stalactites/stalagmites
|
@ -124,7 +124,6 @@ public class BOPBlocks
|
||||||
public static Block dirt;
|
public static Block dirt;
|
||||||
public static Block farmland_0;
|
public static Block farmland_0;
|
||||||
public static Block farmland_1;
|
public static Block farmland_1;
|
||||||
public static Block stone_formations;
|
|
||||||
public static Block hard_ice;
|
public static Block hard_ice;
|
||||||
public static Block dried_sand;
|
public static Block dried_sand;
|
||||||
public static Block mud_brick_block;
|
public static Block mud_brick_block;
|
||||||
|
|
|
@ -13,7 +13,7 @@ public interface IBOPWorldSettings
|
||||||
|
|
||||||
enum GeneratorType
|
enum GeneratorType
|
||||||
{
|
{
|
||||||
GEMS, ROCK_FORMATIONS, POISON_IVY, BERRY_BUSHES, THORNS, QUICKSAND, LIQUID_POISON, HOT_SPRINGS,
|
GEMS, POISON_IVY, BERRY_BUSHES, THORNS, QUICKSAND, LIQUID_POISON, HOT_SPRINGS,
|
||||||
NETHER_HIVES, END_FEATURES
|
NETHER_HIVES, END_FEATURES
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -174,7 +174,6 @@ public class GuiBOPConfigureWorld extends GuiScreen implements GuiSlider.FormatH
|
||||||
BIOME_SIZE (105),
|
BIOME_SIZE (105),
|
||||||
LAND_SCHEME (106),
|
LAND_SCHEME (106),
|
||||||
RAIN_SCHEME (107),
|
RAIN_SCHEME (107),
|
||||||
GENERATE_ROCK_FORMATIONS (116),
|
|
||||||
GENERATE_POISON_IVY (117),
|
GENERATE_POISON_IVY (117),
|
||||||
GENERATE_BERRY_BUSHES (119),
|
GENERATE_BERRY_BUSHES (119),
|
||||||
GENERATE_THORNS (120),
|
GENERATE_THORNS (120),
|
||||||
|
@ -244,7 +243,6 @@ public class GuiBOPConfigureWorld extends GuiScreen implements GuiSlider.FormatH
|
||||||
this.pageNames[2] = "Feature Generation Settings";
|
this.pageNames[2] = "Feature Generation Settings";
|
||||||
GuiBOPPageList.GuiFieldEntry[] page2Fields = new GuiBOPPageList.GuiFieldEntry[] {
|
GuiBOPPageList.GuiFieldEntry[] page2Fields = new GuiBOPPageList.GuiFieldEntry[] {
|
||||||
new GuiBOPPageList.GuiButtonEntry(GuiEntries.GENERATE_BOP_GEMS.getId(), "BOP Gems", true, this.settings.generateBopGems),
|
new GuiBOPPageList.GuiButtonEntry(GuiEntries.GENERATE_BOP_GEMS.getId(), "BOP Gems", true, this.settings.generateBopGems),
|
||||||
new GuiBOPPageList.GuiButtonEntry(GuiEntries.GENERATE_ROCK_FORMATIONS.getId(), "Rock Formations", true, this.settings.generateRockFormations),
|
|
||||||
new GuiBOPPageList.GuiButtonEntry(GuiEntries.GENERATE_POISON_IVY.getId(), "Poison Ivy", true, this.settings.generatePoisonIvy),
|
new GuiBOPPageList.GuiButtonEntry(GuiEntries.GENERATE_POISON_IVY.getId(), "Poison Ivy", true, this.settings.generatePoisonIvy),
|
||||||
new GuiBOPPageList.GuiButtonEntry(GuiEntries.GENERATE_BERRY_BUSHES.getId(), "Berry Bushes", true, this.settings.generateBerryBushes),
|
new GuiBOPPageList.GuiButtonEntry(GuiEntries.GENERATE_BERRY_BUSHES.getId(), "Berry Bushes", true, this.settings.generateBerryBushes),
|
||||||
new GuiBOPPageList.GuiButtonEntry(GuiEntries.GENERATE_THORNS.getId(), "Thorns", true, this.settings.generateThorns),
|
new GuiBOPPageList.GuiButtonEntry(GuiEntries.GENERATE_THORNS.getId(), "Thorns", true, this.settings.generateThorns),
|
||||||
|
@ -354,9 +352,6 @@ public class GuiBOPConfigureWorld extends GuiScreen implements GuiSlider.FormatH
|
||||||
case GENERATE_BOP_GEMS:
|
case GENERATE_BOP_GEMS:
|
||||||
this.settings.generateBopGems = value;
|
this.settings.generateBopGems = value;
|
||||||
break;
|
break;
|
||||||
case GENERATE_ROCK_FORMATIONS:
|
|
||||||
this.settings.generateRockFormations = value;
|
|
||||||
break;
|
|
||||||
case GENERATE_POISON_IVY:
|
case GENERATE_POISON_IVY:
|
||||||
this.settings.generatePoisonIvy = value;
|
this.settings.generatePoisonIvy = value;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -75,8 +75,6 @@ public class BOPHellBiome extends BOPBiome
|
||||||
@Override
|
@Override
|
||||||
public void applySettings(IBOPWorldSettings settings)
|
public void applySettings(IBOPWorldSettings settings)
|
||||||
{
|
{
|
||||||
if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");}
|
|
||||||
|
|
||||||
if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby"); this.removeGenerator("topaz");
|
if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby"); this.removeGenerator("topaz");
|
||||||
this.removeGenerator("amber"); this.removeGenerator("peridot"); this.removeGenerator("malachite");
|
this.removeGenerator("amber"); this.removeGenerator("peridot"); this.removeGenerator("malachite");
|
||||||
this.removeGenerator("sapphire"); this.removeGenerator("tanzanite"); this.removeGenerator("amethyst");}
|
this.removeGenerator("sapphire"); this.removeGenerator("tanzanite"); this.removeGenerator("amethyst");}
|
||||||
|
|
|
@ -63,14 +63,11 @@ public class BOPOverworldBiome extends BOPBiome
|
||||||
IBlockPosQuery suitableStonePosition = BlockQuery.buildAnd().withAltitudeBetween(0, 55).blocks(Blocks.STONE).create();
|
IBlockPosQuery suitableStonePosition = BlockQuery.buildAnd().withAltitudeBetween(0, 55).blocks(Blocks.STONE).create();
|
||||||
this.addGenerator("miners_delight", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.25F).generationAttempts(64).with(BOPFlowers.MINERS_DELIGHT).placeOn(suitableStonePosition).scatterYMethod(ScatterYMethod.BELOW_GROUND).create());
|
this.addGenerator("miners_delight", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.25F).generationAttempts(64).with(BOPFlowers.MINERS_DELIGHT).placeOn(suitableStonePosition).scatterYMethod(ScatterYMethod.BELOW_GROUND).create());
|
||||||
this.addGenerator("glowshrooms", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.5F).generationAttempts(64).placeOn(suitableStonePosition).with(BOPBlocks.mushroom.getDefaultState().withProperty(BlockBOPMushroom.VARIANT, BlockBOPMushroom.MushroomType.GLOWSHROOM)).scatterYMethod(ScatterYMethod.BELOW_GROUND).create());
|
this.addGenerator("glowshrooms", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.5F).generationAttempts(64).placeOn(suitableStonePosition).with(BOPBlocks.mushroom.getDefaultState().withProperty(BlockBOPMushroom.VARIANT, BlockBOPMushroom.MushroomType.GLOWSHROOM)).scatterYMethod(ScatterYMethod.BELOW_GROUND).create());
|
||||||
this.addGenerator("stone_formations", GeneratorStage.FLOWERS,(new GeneratorColumns.Builder()).amountPerChunk(30.0F).generationAttempts(16).placeOn(suitableStonePosition).with(BOPBlocks.stone_formations.getDefaultState()).minHeight(1).maxHeight(5).randomDirection(true).scatterYMethod(ScatterYMethod.BELOW_GROUND).create());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void applySettings(IBOPWorldSettings settings)
|
public void applySettings(IBOPWorldSettings settings)
|
||||||
{
|
{
|
||||||
if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");}
|
|
||||||
|
|
||||||
if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby"); this.removeGenerator("topaz");
|
if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby"); this.removeGenerator("topaz");
|
||||||
this.removeGenerator("amber"); this.removeGenerator("peridot"); this.removeGenerator("malachite");
|
this.removeGenerator("amber"); this.removeGenerator("peridot"); this.removeGenerator("malachite");
|
||||||
this.removeGenerator("sapphire"); this.removeGenerator("tanzanite"); this.removeGenerator("amethyst");}
|
this.removeGenerator("sapphire"); this.removeGenerator("tanzanite"); this.removeGenerator("amethyst");}
|
||||||
|
|
|
@ -58,12 +58,9 @@ public class BiomeGenOriginBeach extends BOPOverworldBiome
|
||||||
public void applySettings(IBOPWorldSettings settings)
|
public void applySettings(IBOPWorldSettings settings)
|
||||||
{
|
{
|
||||||
this.removeGenerator("roots");
|
this.removeGenerator("roots");
|
||||||
this.removeGenerator("stone_formations");
|
|
||||||
this.removeGenerator("glowshrooms");
|
this.removeGenerator("glowshrooms");
|
||||||
this.removeGenerator("miners_delight");
|
this.removeGenerator("miners_delight");
|
||||||
|
|
||||||
if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");}
|
|
||||||
|
|
||||||
if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby"); this.removeGenerator("topaz");
|
if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby"); this.removeGenerator("topaz");
|
||||||
this.removeGenerator("amber"); this.removeGenerator("peridot"); this.removeGenerator("malachite");
|
this.removeGenerator("amber"); this.removeGenerator("peridot"); this.removeGenerator("malachite");
|
||||||
this.removeGenerator("sapphire"); this.removeGenerator("tanzanite"); this.removeGenerator("amethyst");}
|
this.removeGenerator("sapphire"); this.removeGenerator("tanzanite"); this.removeGenerator("amethyst");}
|
||||||
|
|
|
@ -83,12 +83,9 @@ public class BiomeGenOriginIsland extends BOPOverworldBiome
|
||||||
public void applySettings(IBOPWorldSettings settings)
|
public void applySettings(IBOPWorldSettings settings)
|
||||||
{
|
{
|
||||||
this.removeGenerator("roots");
|
this.removeGenerator("roots");
|
||||||
this.removeGenerator("stone_formations");
|
|
||||||
this.removeGenerator("glowshrooms");
|
this.removeGenerator("glowshrooms");
|
||||||
this.removeGenerator("miners_delight");
|
this.removeGenerator("miners_delight");
|
||||||
|
|
||||||
if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");}
|
|
||||||
|
|
||||||
if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby"); this.removeGenerator("topaz");
|
if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby"); this.removeGenerator("topaz");
|
||||||
this.removeGenerator("amber"); this.removeGenerator("peridot"); this.removeGenerator("malachite");
|
this.removeGenerator("amber"); this.removeGenerator("peridot"); this.removeGenerator("malachite");
|
||||||
this.removeGenerator("sapphire"); this.removeGenerator("tanzanite"); this.removeGenerator("amethyst");}
|
this.removeGenerator("sapphire"); this.removeGenerator("tanzanite"); this.removeGenerator("amethyst");}
|
||||||
|
|
|
@ -32,14 +32,11 @@ public class BiomeExtEnd extends ExtendedBiomeWrapper
|
||||||
@Override
|
@Override
|
||||||
public void applySettings(IBOPWorldSettings settings)
|
public void applySettings(IBOPWorldSettings settings)
|
||||||
{
|
{
|
||||||
this.removeGenerator("stone_formations");
|
|
||||||
this.removeGenerator("glowshrooms");
|
this.removeGenerator("glowshrooms");
|
||||||
this.removeGenerator("miners_delight");
|
this.removeGenerator("miners_delight");
|
||||||
this.removeGenerator("roots");
|
this.removeGenerator("roots");
|
||||||
|
|
||||||
if (!settings.isEnabled(GeneratorType.END_FEATURES)) {this.removeGenerator("crystals"); this.removeGenerator("biome_essence");}
|
if (!settings.isEnabled(GeneratorType.END_FEATURES)) {this.removeGenerator("crystals"); this.removeGenerator("biome_essence");}
|
||||||
|
|
||||||
if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");}
|
|
||||||
|
|
||||||
if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby"); this.removeGenerator("topaz");
|
if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby"); this.removeGenerator("topaz");
|
||||||
this.removeGenerator("amber"); this.removeGenerator("peridot"); this.removeGenerator("malachite");
|
this.removeGenerator("amber"); this.removeGenerator("peridot"); this.removeGenerator("malachite");
|
||||||
|
|
|
@ -47,14 +47,11 @@ public class ExtendedBiomeWrapper implements IExtendedBiome
|
||||||
IBlockPosQuery suitableStonePosition = BlockQuery.buildAnd().withAltitudeBetween(0, 55).blocks(Blocks.STONE).create();
|
IBlockPosQuery suitableStonePosition = BlockQuery.buildAnd().withAltitudeBetween(0, 55).blocks(Blocks.STONE).create();
|
||||||
this.addGenerator("miners_delight", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.25F).generationAttempts(64).with(BOPFlowers.MINERS_DELIGHT).placeOn(suitableStonePosition).scatterYMethod(ScatterYMethod.BELOW_GROUND).create());
|
this.addGenerator("miners_delight", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.25F).generationAttempts(64).with(BOPFlowers.MINERS_DELIGHT).placeOn(suitableStonePosition).scatterYMethod(ScatterYMethod.BELOW_GROUND).create());
|
||||||
this.addGenerator("glowshrooms", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.5F).generationAttempts(64).placeOn(suitableStonePosition).with(BOPBlocks.mushroom.getDefaultState().withProperty(BlockBOPMushroom.VARIANT, BlockBOPMushroom.MushroomType.GLOWSHROOM)).scatterYMethod(ScatterYMethod.BELOW_GROUND).create());
|
this.addGenerator("glowshrooms", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.5F).generationAttempts(64).placeOn(suitableStonePosition).with(BOPBlocks.mushroom.getDefaultState().withProperty(BlockBOPMushroom.VARIANT, BlockBOPMushroom.MushroomType.GLOWSHROOM)).scatterYMethod(ScatterYMethod.BELOW_GROUND).create());
|
||||||
this.addGenerator("stone_formations", GeneratorStage.FLOWERS,(new GeneratorColumns.Builder()).amountPerChunk(30.0F).generationAttempts(16).placeOn(suitableStonePosition).with(BOPBlocks.stone_formations.getDefaultState()).minHeight(1).maxHeight(7).randomDirection(true).scatterYMethod(ScatterYMethod.BELOW_GROUND).create());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void applySettings(IBOPWorldSettings settings)
|
public void applySettings(IBOPWorldSettings settings)
|
||||||
{
|
{
|
||||||
if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");}
|
|
||||||
|
|
||||||
if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby"); this.removeGenerator("topaz");
|
if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby"); this.removeGenerator("topaz");
|
||||||
this.removeGenerator("amber"); this.removeGenerator("peridot"); this.removeGenerator("malachite");
|
this.removeGenerator("amber"); this.removeGenerator("peridot"); this.removeGenerator("malachite");
|
||||||
this.removeGenerator("sapphire"); this.removeGenerator("tanzanite"); this.removeGenerator("amethyst");}
|
this.removeGenerator("sapphire"); this.removeGenerator("tanzanite"); this.removeGenerator("amethyst");}
|
||||||
|
|
|
@ -1,185 +0,0 @@
|
||||||
/*******************************************************************************
|
|
||||||
* Copyright 2014-2016, the Biomes O' Plenty Team
|
|
||||||
*
|
|
||||||
* This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
|
|
||||||
*
|
|
||||||
* To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
package biomesoplenty.common.block;
|
|
||||||
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import biomesoplenty.common.item.ItemBOPBlock;
|
|
||||||
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.PropertyEnum;
|
|
||||||
import net.minecraft.block.state.BlockStateContainer;
|
|
||||||
import net.minecraft.block.state.IBlockState;
|
|
||||||
import net.minecraft.init.Blocks;
|
|
||||||
import net.minecraft.item.ItemBlock;
|
|
||||||
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;
|
|
||||||
|
|
||||||
public class BlockBOPStoneFormations extends BlockBOPDecoration implements IBOPBlock
|
|
||||||
{
|
|
||||||
// add properties
|
|
||||||
public enum FormationType implements IStringSerializable
|
|
||||||
{
|
|
||||||
STONE_FORMATION;
|
|
||||||
@Override
|
|
||||||
public String getName()
|
|
||||||
{
|
|
||||||
return this.name().toLowerCase();
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
public String toString()
|
|
||||||
{
|
|
||||||
return this.getName();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum FormationPosition implements IStringSerializable
|
|
||||||
{
|
|
||||||
STALAGMITE_SMALL, STALACTITE_SMALL, STAL_SINGLE, STAL_CONNECTOR, STALAGMITE_MEDIUM, STALACTITE_MEDIUM, STALAGMITE_TOP, STALACTITE_BOTTOM;
|
|
||||||
@Override
|
|
||||||
public String getName()
|
|
||||||
{
|
|
||||||
return this.name().toLowerCase();
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
public String toString()
|
|
||||||
{
|
|
||||||
return this.getName();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static final PropertyEnum VARIANT = PropertyEnum.create("variant", FormationType.class);
|
|
||||||
public static final PropertyEnum POSITION = PropertyEnum.create("position", FormationPosition.class);
|
|
||||||
@Override
|
|
||||||
protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, POSITION, VARIANT);}
|
|
||||||
|
|
||||||
|
|
||||||
// implement IBOPBlock
|
|
||||||
@Override
|
|
||||||
public Class<? extends ItemBlock> getItemClass() { return ItemBOPBlock.class; }
|
|
||||||
@Override
|
|
||||||
public IProperty[] getPresetProperties() { return new IProperty[] {VARIANT}; }
|
|
||||||
@Override
|
|
||||||
public IProperty[] getNonRenderingProperties() { return null; }
|
|
||||||
@Override
|
|
||||||
public String getStateName(IBlockState state)
|
|
||||||
{
|
|
||||||
return ((FormationType) state.getValue(VARIANT)).getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public BlockBOPStoneFormations()
|
|
||||||
{
|
|
||||||
super(Material.ROCK);
|
|
||||||
// set some defaults
|
|
||||||
this.setHardness(1.0F);
|
|
||||||
this.setSoundType(SoundType.STONE);
|
|
||||||
this.setHarvestLevel("pickaxe", 0);
|
|
||||||
this.setDefaultState( this.blockState.getBaseState().withProperty(POSITION, FormationPosition.STALAGMITE_SMALL).withProperty(VARIANT, FormationType.STONE_FORMATION) );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
|
|
||||||
{
|
|
||||||
boolean formationAbove = (worldIn.getBlockState(pos.up()).getBlock() == this);
|
|
||||||
boolean formationBelow = (worldIn.getBlockState(pos.down()).getBlock() == this);
|
|
||||||
|
|
||||||
boolean groundAbove = (worldIn.getBlockState(pos.up()).getBlock() == Blocks.STONE);
|
|
||||||
boolean groundBelow = (worldIn.getBlockState(pos.down()).getBlock() == Blocks.STONE);
|
|
||||||
|
|
||||||
FormationPosition position;
|
|
||||||
position = FormationPosition.STALAGMITE_SMALL;
|
|
||||||
|
|
||||||
if (groundAbove && !formationAbove)
|
|
||||||
{
|
|
||||||
if (groundBelow && !formationBelow)
|
|
||||||
{
|
|
||||||
position = FormationPosition.STAL_SINGLE;
|
|
||||||
}
|
|
||||||
else if (!groundBelow)
|
|
||||||
{
|
|
||||||
if (formationBelow) position = FormationPosition.STALACTITE_MEDIUM;
|
|
||||||
else position = FormationPosition.STALACTITE_SMALL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (!groundAbove)
|
|
||||||
{
|
|
||||||
if (!groundBelow)
|
|
||||||
{
|
|
||||||
if (formationAbove)
|
|
||||||
{
|
|
||||||
if (formationBelow) {position = FormationPosition.STAL_CONNECTOR;}
|
|
||||||
else {position = FormationPosition.STALACTITE_BOTTOM;}
|
|
||||||
}
|
|
||||||
else if (formationBelow)
|
|
||||||
{
|
|
||||||
position = FormationPosition.STALAGMITE_TOP;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (!formationAbove && !formationBelow) {position = FormationPosition.STALAGMITE_SMALL;}
|
|
||||||
else if (formationAbove && !formationBelow) {position = FormationPosition.STALAGMITE_MEDIUM;}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return state.withProperty(POSITION, position);
|
|
||||||
}
|
|
||||||
|
|
||||||
// map from state to meta and vice verca
|
|
||||||
@Override
|
|
||||||
public IBlockState getStateFromMeta(int meta)
|
|
||||||
{
|
|
||||||
return this.getDefaultState().withProperty(VARIANT, FormationType.values()[meta]);
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
public int getMetaFromState(IBlockState state)
|
|
||||||
{
|
|
||||||
return ((FormationType) state.getValue(VARIANT)).ordinal();
|
|
||||||
}
|
|
||||||
|
|
||||||
// different variants have different sizes
|
|
||||||
@Override
|
|
||||||
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos)
|
|
||||||
{
|
|
||||||
return new AxisAlignedBB(0.09999999403953552D, 0.0D, 0.09999999403953552D, 0.8999999761581421D, 1.0D, 0.8999999761581421D);
|
|
||||||
/*FormationPosition position = (FormationPosition) state.getValue(this.POSITION);
|
|
||||||
switch (position)
|
|
||||||
{
|
|
||||||
case STALAGMITE_SMALL: case STALAGMITE_TOP:
|
|
||||||
return new AxisAlignedBB(0.09999999403953552D, 0.0D, 0.09999999403953552D, 0.8999999761581421D, 0.800000011920929D, 0.8999999761581421D);
|
|
||||||
case STALACTITE_SMALL: case STALACTITE_BOTTOM:
|
|
||||||
return new AxisAlignedBB(0.09999999403953552D, 0.199999988079071D, 0.09999999403953552D, 0.8999999761581421D, 1.0D, 0.8999999761581421D);
|
|
||||||
default:
|
|
||||||
return new AxisAlignedBB(0.09999999403953552D, 0.0D, 0.09999999403953552D, 0.8999999761581421D, 1.0D, 0.8999999761581421D);
|
|
||||||
}*/
|
|
||||||
}
|
|
||||||
|
|
||||||
// which types of mushroom can live on which types of block
|
|
||||||
@Override
|
|
||||||
public boolean canBlockStay(World world, BlockPos pos, IBlockState state)
|
|
||||||
{
|
|
||||||
return world.getBlockState(pos.down()).getBlock() == Blocks.STONE || world.getBlockState(pos.down()) == state || world.getBlockState(pos.up()).getBlock() == Blocks.STONE || world.getBlockState(pos.up()) == state;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
@SideOnly(Side.CLIENT)
|
|
||||||
public Block.EnumOffsetType getOffsetType()
|
|
||||||
{
|
|
||||||
return Block.EnumOffsetType.NONE;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -50,7 +50,6 @@ import biomesoplenty.common.block.BlockBOPPlanks;
|
||||||
import biomesoplenty.common.block.BlockBOPPlant;
|
import biomesoplenty.common.block.BlockBOPPlant;
|
||||||
import biomesoplenty.common.block.BlockBOPSapling;
|
import biomesoplenty.common.block.BlockBOPSapling;
|
||||||
import biomesoplenty.common.block.BlockBOPSeaweed;
|
import biomesoplenty.common.block.BlockBOPSeaweed;
|
||||||
import biomesoplenty.common.block.BlockBOPStoneFormations;
|
|
||||||
import biomesoplenty.common.block.BlockBOPStoneStairs;
|
import biomesoplenty.common.block.BlockBOPStoneStairs;
|
||||||
import biomesoplenty.common.block.BlockBOPTerrarium;
|
import biomesoplenty.common.block.BlockBOPTerrarium;
|
||||||
import biomesoplenty.common.block.BlockBOPVine;
|
import biomesoplenty.common.block.BlockBOPVine;
|
||||||
|
@ -252,8 +251,6 @@ public class ModBlocks
|
||||||
|
|
||||||
// Plants
|
// Plants
|
||||||
|
|
||||||
stone_formations = registerBlock( new BlockBOPStoneFormations(), "stone_formations" );
|
|
||||||
|
|
||||||
coral = registerBlock( new BlockBOPCoral(), "coral" );
|
coral = registerBlock( new BlockBOPCoral(), "coral" );
|
||||||
seaweed = registerBlock( new BlockBOPSeaweed(), "seaweed" );
|
seaweed = registerBlock( new BlockBOPSeaweed(), "seaweed" );
|
||||||
waterlily = registerBlock( new BlockBOPLilypad(), "waterlily" );
|
waterlily = registerBlock( new BlockBOPLilypad(), "waterlily" );
|
||||||
|
|
|
@ -75,7 +75,6 @@ public class BOPWorldSettings implements IBOPWorldSettings
|
||||||
public BiomeSize biomeSize = BiomeSize.MEDIUM;
|
public BiomeSize biomeSize = BiomeSize.MEDIUM;
|
||||||
public float amplitude = 1.0F;
|
public float amplitude = 1.0F;
|
||||||
public boolean generateBopGems = true;
|
public boolean generateBopGems = true;
|
||||||
public boolean generateRockFormations = true;
|
|
||||||
public boolean generatePoisonIvy = false;
|
public boolean generatePoisonIvy = false;
|
||||||
public boolean generateBerryBushes = true;
|
public boolean generateBerryBushes = true;
|
||||||
public boolean generateThorns = true;
|
public boolean generateThorns = true;
|
||||||
|
@ -133,7 +132,6 @@ public class BOPWorldSettings implements IBOPWorldSettings
|
||||||
obj.addProperty("biomeSize", this.biomeSize.name().toLowerCase());
|
obj.addProperty("biomeSize", this.biomeSize.name().toLowerCase());
|
||||||
obj.addProperty("amplitude", this.amplitude);
|
obj.addProperty("amplitude", this.amplitude);
|
||||||
obj.addProperty("generateBopOre", this.generateBopGems);
|
obj.addProperty("generateBopOre", this.generateBopGems);
|
||||||
obj.addProperty("generateRockFormations", this.generateRockFormations);
|
|
||||||
obj.addProperty("generatePoisonIvy", this.generatePoisonIvy);
|
obj.addProperty("generatePoisonIvy", this.generatePoisonIvy);
|
||||||
obj.addProperty("generateBerryBushes", this.generateBerryBushes);
|
obj.addProperty("generateBerryBushes", this.generateBerryBushes);
|
||||||
obj.addProperty("generateThorns", this.generateThorns);
|
obj.addProperty("generateThorns", this.generateThorns);
|
||||||
|
@ -166,7 +164,6 @@ public class BOPWorldSettings implements IBOPWorldSettings
|
||||||
this.biomeSize = worldConfig.getEnum("biomeSize", this.biomeSize, BiomeSize.class);
|
this.biomeSize = worldConfig.getEnum("biomeSize", this.biomeSize, BiomeSize.class);
|
||||||
this.amplitude = worldConfig.getFloat("amplitude", this.amplitude);
|
this.amplitude = worldConfig.getFloat("amplitude", this.amplitude);
|
||||||
this.generateBopGems = worldConfig.getBool("generateBopOre", this.generateBopGems);
|
this.generateBopGems = worldConfig.getBool("generateBopOre", this.generateBopGems);
|
||||||
this.generateRockFormations = worldConfig.getBool("generateRockFormations", this.generateRockFormations);
|
|
||||||
this.generatePoisonIvy = worldConfig.getBool("generatePoisonIvy", this.generatePoisonIvy);
|
this.generatePoisonIvy = worldConfig.getBool("generatePoisonIvy", this.generatePoisonIvy);
|
||||||
this.generateBerryBushes = worldConfig.getBool("generateBerryBushes", this.generateBerryBushes);
|
this.generateBerryBushes = worldConfig.getBool("generateBerryBushes", this.generateBerryBushes);
|
||||||
this.generateThorns = worldConfig.getBool("generateThorns", this.generateThorns);
|
this.generateThorns = worldConfig.getBool("generateThorns", this.generateThorns);
|
||||||
|
@ -194,7 +191,6 @@ public class BOPWorldSettings implements IBOPWorldSettings
|
||||||
this.biomeSize = BiomeSize.MEDIUM;
|
this.biomeSize = BiomeSize.MEDIUM;
|
||||||
this.amplitude = 1.0F;
|
this.amplitude = 1.0F;
|
||||||
this.generateBopGems = true;
|
this.generateBopGems = true;
|
||||||
this.generateRockFormations = true;
|
|
||||||
this.generatePoisonIvy = false;
|
this.generatePoisonIvy = false;
|
||||||
this.generateBerryBushes = true;
|
this.generateBerryBushes = true;
|
||||||
this.generateThorns = true;
|
this.generateThorns = true;
|
||||||
|
@ -243,8 +239,6 @@ public class BOPWorldSettings implements IBOPWorldSettings
|
||||||
{
|
{
|
||||||
case GEMS:
|
case GEMS:
|
||||||
return this.generateBopGems;
|
return this.generateBopGems;
|
||||||
case ROCK_FORMATIONS:
|
|
||||||
return this.generateRockFormations;
|
|
||||||
case POISON_IVY:
|
case POISON_IVY:
|
||||||
return this.generatePoisonIvy;
|
return this.generatePoisonIvy;
|
||||||
case BERRY_BUSHES:
|
case BERRY_BUSHES:
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
{
|
|
||||||
"variants": {
|
|
||||||
"position=stal_single,variant=stone_formation": { "model": "biomesoplenty:stal_single" },
|
|
||||||
"position=stal_connector,variant=stone_formation": { "model": "biomesoplenty:stal_connector" },
|
|
||||||
"position=stalagmite_small,variant=stone_formation": { "model": "biomesoplenty:stalagmite_small" },
|
|
||||||
"position=stalagmite_medium,variant=stone_formation": { "model": "biomesoplenty:stalagmite_medium" },
|
|
||||||
"position=stalagmite_top,variant=stone_formation": { "model": "biomesoplenty:stalagmite_top" },
|
|
||||||
"position=stalactite_small,variant=stone_formation": { "model": "biomesoplenty:stalactite_small" },
|
|
||||||
"position=stalactite_medium,variant=stone_formation": { "model": "biomesoplenty:stalactite_medium" },
|
|
||||||
"position=stalactite_bottom,variant=stone_formation": { "model": "biomesoplenty:stalactite_bottom" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -391,7 +391,6 @@ tile.sapling_2.mahogany_sapling.name=Mahogany Sapling
|
||||||
tile.sapling_2.ebony_sapling.name=Ebony Sapling
|
tile.sapling_2.ebony_sapling.name=Ebony Sapling
|
||||||
tile.sapling_2.eucalyptus_sapling.name=Eucalyptus Sapling
|
tile.sapling_2.eucalyptus_sapling.name=Eucalyptus Sapling
|
||||||
tile.seaweed.kelp.name=Kelp
|
tile.seaweed.kelp.name=Kelp
|
||||||
tile.stone_formations.stone_formation.name=Rock Formation
|
|
||||||
tile.terrarium.terrarium_fern.name=Fern Terrarium
|
tile.terrarium.terrarium_fern.name=Fern Terrarium
|
||||||
tile.terrarium.terrarium_mushroom.name=Mushroom Terrarium
|
tile.terrarium.terrarium_mushroom.name=Mushroom Terrarium
|
||||||
tile.terrarium.terrarium_cactus.name=Cactus Terrarium
|
tile.terrarium.terrarium_cactus.name=Cactus Terrarium
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "block/cross",
|
|
||||||
"textures": {
|
|
||||||
"cross": "biomesoplenty:blocks/stal_connector"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "block/cross",
|
|
||||||
"textures": {
|
|
||||||
"cross": "biomesoplenty:blocks/stal_single"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "block/cross",
|
|
||||||
"textures": {
|
|
||||||
"cross": "biomesoplenty:blocks/stalactite_bottom"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "block/cross",
|
|
||||||
"textures": {
|
|
||||||
"cross": "biomesoplenty:blocks/stalactite_medium"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "block/cross",
|
|
||||||
"textures": {
|
|
||||||
"cross": "biomesoplenty:blocks/stalactite_small"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "block/cross",
|
|
||||||
"textures": {
|
|
||||||
"cross": "biomesoplenty:blocks/stalagmite_medium"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "block/cross",
|
|
||||||
"textures": {
|
|
||||||
"cross": "biomesoplenty:blocks/stalagmite_small"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "block/cross",
|
|
||||||
"textures": {
|
|
||||||
"cross": "biomesoplenty:blocks/stalagmite_top"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "item/generated",
|
|
||||||
"textures": {
|
|
||||||
"layer0": "biomesoplenty:blocks/stalagmite_small"
|
|
||||||
}
|
|
||||||
}
|
|
Before Width: | Height: | Size: 243 B |
Before Width: | Height: | Size: 436 B |
Before Width: | Height: | Size: 224 B |
Before Width: | Height: | Size: 423 B |
Before Width: | Height: | Size: 331 B |
Before Width: | Height: | Size: 308 B |
Before Width: | Height: | Size: 265 B |
Before Width: | Height: | Size: 242 B |