etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated names to the latest mappings

This commit is contained in:
Adubbz 2015-02-16 09:18:48 +11:00
parent bd6bd33806
commit c96d1b439d
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/biomesoplenty/api/block/BOPPlant.java
View File

@ -49,7 +49,7 @@ public class BOPPlant extends BOPBlock
public boolean canBlockStay(World world, BlockPos pos, IBlockState state) public boolean canBlockStay(World world, BlockPos pos, IBlockState state)
{ {
Block ground = world.getBlockState(pos.offsetDown()).getBlock(); Block ground = world.getBlockState(pos.down()).getBlock();
return ground == Blocks.grass || ground == Blocks.dirt || ground == Blocks.farmland; return ground == Blocks.grass || ground == Blocks.dirt || ground == Blocks.farmland;
} }

2
src/main/java/biomesoplenty/common/block/BlockBOPFlower2.java
View File

@ -32,7 +32,7 @@ public class BlockBOPFlower2 extends BOPPlant
@Override @Override
public boolean canBlockStay(World world, BlockPos pos, IBlockState state) public boolean canBlockStay(World world, BlockPos pos, IBlockState state)
{ {
Block ground = world.getBlockState(pos.offsetDown()).getBlock(); Block ground = world.getBlockState(pos.down()).getBlock();
FlowerType type = (FlowerType) state.getValue(VARIANT_PROP); FlowerType type = (FlowerType) state.getValue(VARIANT_PROP);
switch (type) switch (type)

2
src/main/java/biomesoplenty/common/block/BlockBOPMushroom.java
View File

@ -45,7 +45,7 @@ public class BlockBOPMushroom extends BOPPlant
@Override @Override
public boolean canBlockStay(World world, BlockPos pos, IBlockState state) public boolean canBlockStay(World world, BlockPos pos, IBlockState state)
{ {
Block ground = world.getBlockState(pos.offsetDown()).getBlock(); Block ground = world.getBlockState(pos.down()).getBlock();
MushroomType type = (MushroomType) state.getValue(VARIANT_PROP); MushroomType type = (MushroomType) state.getValue(VARIANT_PROP);
switch (type) switch (type)

2
src/main/java/biomesoplenty/common/block/BlockBamboo.java
View File

@ -32,7 +32,7 @@ public class BlockBamboo extends BOPPlant
@Override @Override
public boolean canBlockStay(World world, BlockPos pos, IBlockState state) public boolean canBlockStay(World world, BlockPos pos, IBlockState state)
{ {
Block ground = world.getBlockState(pos.offsetDown()).getBlock(); Block ground = world.getBlockState(pos.down()).getBlock();
return ground == Blocks.grass || ground == Blocks.dirt || ground == this; return ground == Blocks.grass || ground == Blocks.dirt || ground == this;
} }

4
src/main/java/biomesoplenty/common/block/BlockCoral.java
View File

@ -52,8 +52,8 @@ public class BlockCoral extends BOPPlant
@Override @Override
public boolean canBlockStay(World world, BlockPos pos, IBlockState state) public boolean canBlockStay(World world, BlockPos pos, IBlockState state)
{ {
Block ground = world.getBlockState(pos.offsetDown()).getBlock(); Block ground = world.getBlockState(pos.down()).getBlock();
Block cover = world.getBlockState(pos.offsetUp()).getBlock(); Block cover = world.getBlockState(pos.up()).getBlock();
boolean hasWater = cover == Blocks.water || cover == Blocks.flowing_water; boolean hasWater = cover == Blocks.water || cover == Blocks.flowing_water;
// TODO: Make all types depend on mud // TODO: Make all types depend on mud

2
src/main/java/biomesoplenty/common/handler/BlockModelRegisterEventHandler.java
View File

@ -35,7 +35,7 @@ public class BlockModelRegisterEventHandler
for (Entry<Block, Set<IProperty>> entry : hiddenProperties.entrySet()) for (Entry<Block, Set<IProperty>> entry : hiddenProperties.entrySet())
{ {
modelShapes.func_178121_a(entry.getKey(), (new StateMap.Builder()).func_178442_a(entry.getValue().toArray(new IProperty[] {})).build()); modelShapes.registerBlockWithStateMapper(entry.getKey(), (new StateMap.Builder()).addPropertiesToIgnore(entry.getValue().toArray(new IProperty[] {})).build());
} }
} }

4
src/main/java/biomesoplenty/common/handler/DrawScreenEventHandler.java
View File

@ -32,8 +32,8 @@ public class DrawScreenEventHandler
if (screenGui instanceof GuiCreateWorld) if (screenGui instanceof GuiCreateWorld)
{ {
GuiCreateWorld createWorldGui = (GuiCreateWorld) screenGui; GuiCreateWorld createWorldGui = (GuiCreateWorld) screenGui;
GuiButton mapTypeButton = createWorldGui.field_146320_D; GuiButton mapTypeButton = createWorldGui.btnMapType;
int worldTypeIndex = createWorldGui.field_146331_K; int worldTypeIndex = createWorldGui.selectedIndex;
if (mapTypeButton.isMouseOver() && WorldType.worldTypes[worldTypeIndex] == ModBiomes.worldTypeBOP) if (mapTypeButton.isMouseOver() && WorldType.worldTypes[worldTypeIndex] == ModBiomes.worldTypeBOP)
{ {

2
src/main/java/biomesoplenty/common/mixin/decoration/MixinWorldGenCactus.java
View File

@ -37,7 +37,7 @@ public abstract class MixinWorldGenCactus extends WorldGenerator //implements IE
{ {
int x = random.nextInt(16) + 8; int x = random.nextInt(16) + 8;
int z = random.nextInt(16) + 8; int z = random.nextInt(16) + 8;
int y = random.nextInt(world.getHorizon(pos.add(x, 0, z)).getY() * 2); int y = random.nextInt(world.getHeight(pos.add(x, 0, z)).getY() * 2);
this.generate(world, random, pos.add(x, y, z)); this.generate(world, random, pos.add(x, y, z));
} }