Skip to content

Commit

Permalink
Fixed surface_rock_decorator
Browse files Browse the repository at this point in the history
  • Loading branch information
DaFuqs committed Jan 25, 2021
1 parent d8ec02e commit 042e245
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@
public class BambooDecorator extends SpheroidDecorator {

private static final Block bambooBlock = Blocks.BAMBOO;
private static BlockState bambooBlockState;
private static final BlockState bambooSaplingBlockState = Blocks.BAMBOO_SAPLING.getDefaultState();
private static final int BAMBOO_CHANCE = 11;
private static BlockState bambooBlockState;
private static BlockState bambooSaplingBlockState;

public BambooDecorator(BlockState placementBlockState) {
public BambooDecorator(BlockState placementBlockState, BlockState bambooSaplingBlockState) {
this.bambooBlockState = placementBlockState;
this.bambooSaplingBlockState = bambooSaplingBlockState;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ private static void setupNether(SpheroidLoader spheroidLoader) {
BlockState sythian_sprout = getDefaultBlockState(MOD_ID,"sythian_nylium"); // plant
PlantDecorator SYTHIAN_SPROUT_DECORATOR = new PlantDecorator(sythian_sprout, 0.1F);
BlockState sythian_stalk_block = getDefaultBlockState(MOD_ID,"sythian_stalk_block"); // like bamboo
BambooDecorator SYTHIAN_STALK_DECORATOR = new BambooDecorator(sythian_stalk_block.with(BambooBlock.AGE, 0).with(BambooBlock.STAGE, 0));
BambooDecorator SYTHIAN_STALK_DECORATOR = new BambooDecorator(sythian_stalk_block.with(BambooBlock.AGE, 0).with(BambooBlock.STAGE, 0), sythian_stalk_block.with(BambooBlock.AGE, 0).with(BambooBlock.STAGE, 0));
SpheroidType SYTHIAN_NYLIUM = new ModularSpheroidType(null, 10, 16, Blocks.NETHERRACK.getDefaultState())
.setTopBlockState(sythian_nylium)
.addDecorator(SYTHIAN_SPROUT_DECORATOR, 0.8F)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static void setup(SpheroidLoader spheroidLoader) {
PlantDecorator sandy_grass_decorator = new PlantDecorator(sandy_grass, 0.1F);
PlantDecorator short_grass_decorator = new PlantDecorator(short_grass, 0.1F);
GroundDecorator geyser_decorator = new GroundDecorator(geyser, 0.1F);
GroundDecorator surface_rock_decorator = new GroundDecorator(surface_rock, 0.1F);
PlantDecorator surface_rock_decorator = new PlantDecorator(surface_rock, 0.07F);
UnderPlantDecorator pine_cone_decorator = new UnderPlantDecorator(pinecone, 0.25F);

SpheroidType PEAT = new LiquidSpheroidType(null, 5, 9, Blocks.WATER.getDefaultState(), MAP_GLASS, 1, 2, 65, 100, 60)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ public static void setup(SpheroidLoader spheroidLoader) {
PlantDecorator terrestria_cattail_decorator = new PlantDecorator(terrestria_cattail, 0.1F); // TODO single block, in water
PlantDecorator terrestria_indian_paintbrush_decorator = new PlantDecorator(terrestria_indian_paintbrush, 0.1F);
PlantDecorator terrestria_monsteras_decorator = new PlantDecorator(terrestria_monsteras, 0.1F);
PlantDecorator terrestria_tiny_cactus_decorator = new PlantDecorator(terrestria_tiny_cactus, 0.05F);
PlantDecorator terrestria_agave_decorator = new PlantDecorator(terrestria_agave, 0.05F);
PlantDecorator terrestria_aloe_vera_decorator = new PlantDecorator(terrestria_aloe_vera, 0.05F);
PlantDecorator terrestria_tiny_cactus_decorator = new PlantDecorator(terrestria_tiny_cactus, 0.04F);
PlantDecorator terrestria_agave_decorator = new PlantDecorator(terrestria_agave, 0.03F);
PlantDecorator terrestria_aloe_vera_decorator = new PlantDecorator(terrestria_aloe_vera, 0.02F);
PlantDecorator terrestria_dead_grass_decorator = new PlantDecorator(terrestria_dead_grass, 0.1F);

// WOOD
Expand Down Expand Up @@ -107,7 +107,7 @@ public static void setup(SpheroidLoader spheroidLoader) {
SpheroidListVanilla.RED_SAND.addDecorator(terrestria_dead_grass_decorator, 0.7F);
SpheroidListVanilla.SAND.addDecorator(terrestria_tiny_cactus_decorator, 0.2F);
SpheroidListVanilla.GRASS.addDecorator(terrestria_aloe_vera_decorator, 0.1F);
SpheroidListVanilla.GRASS.addDecorator(terrestria_agave_decorator, 0.1F);
SpheroidListVanilla.SAND.addDecorator(terrestria_agave_decorator, 0.1F);

// Add common blocks to maps
SpheroidList.MAP_STONES.put(terrestria_basalt, 0.4F);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public static class SpheroidDecorators {
public static SpheroidDecorator CACTUS = new CactusDecorator(Blocks.CACTUS.getDefaultState());
public static SpheroidDecorator SEA_GREENS = new SeaGreensDecorator();
public static SpheroidDecorator COCOA = new CocoaDecorator();
public static SpheroidDecorator BAMBOO = new BambooDecorator(Blocks.BAMBOO.getDefaultState().with(BambooBlock.AGE, 0).with(BambooBlock.STAGE, 0));
public static SpheroidDecorator BAMBOO = new BambooDecorator(Blocks.BAMBOO.getDefaultState().with(BambooBlock.AGE, 0).with(BambooBlock.STAGE, 0), Blocks.BAMBOO_SAPLING.getDefaultState());
public static SpheroidDecorator SUGAR_CANE_POND = new SugarCanePondDecorator();
public static SpheroidDecorator CENTER_POND_UNDERWATER_RUIN_SMALL_CHEST = new CenterPondDecorator(Blocks.SAND.getDefaultState(), Blocks.WATER.getDefaultState(), LootTables.UNDERWATER_RUIN_SMALL_CHEST, 0.5F);
public static SpheroidDecorator CENTER_POND_UNDERWATER_RUIN_BIG_CHEST = new CenterPondDecorator(Blocks.GRAVEL.getDefaultState(), Blocks.WATER.getDefaultState(), LootTables.UNDERWATER_RUIN_BIG_CHEST, 0.5F);
Expand Down

0 comments on commit 042e245

Please sign in to comment.