From 965aa0551fd52ae8e51b215dd9861db23631ad9f Mon Sep 17 00:00:00 2001 From: Forstride Date: Sun, 5 Jul 2020 07:34:50 -0400 Subject: [PATCH] Added Nether Crystals, removed Ash Blocks --- .../biomesoplenty/api/block/BOPBlocks.java | 3 +- .../common/biome/overworld/VolcanoBiome.java | 2 +- .../common/block/NetherCrystalBlock.java | 92 ++++++++++++++++++ .../world/gen/feature/AshSplatterFeature.java | 54 ---------- .../world/gen/feature/BOPBiomeFeatures.java | 5 +- .../feature/VolcanoEdgeSurfaceBuilder.java | 2 +- .../gen/feature/VolcanoSurfaceBuilder.java | 2 +- .../gen/feature/tree/BasicTreeFeature.java | 2 +- .../gen/feature/tree/BushTreeFeature.java | 2 +- .../gen/feature/tree/TreeFeatureBase.java | 5 +- .../java/biomesoplenty/init/ModBlocks.java | 5 +- .../java/biomesoplenty/init/ModFeatures.java | 1 - .../biomesoplenty/blockstates/ash_block.json | 10 -- .../blockstates/nether_crystal.json | 1 - .../assets/biomesoplenty/lang/en_us.json | 1 - .../biomesoplenty/models/block/ash_block.json | 6 -- .../biomesoplenty/models/item/ash_block.json | 3 - .../textures/block/ash_block.png | Bin 301 -> 0 bytes .../textures/block/nether_crystal_block.png | Bin 233 -> 233 bytes .../loot_tables/blocks/ash_block.json | 19 ---- 20 files changed, 107 insertions(+), 108 deletions(-) create mode 100644 src/main/java/biomesoplenty/common/block/NetherCrystalBlock.java delete mode 100644 src/main/java/biomesoplenty/common/world/gen/feature/AshSplatterFeature.java delete mode 100644 src/main/resources/assets/biomesoplenty/blockstates/ash_block.json delete mode 100644 src/main/resources/assets/biomesoplenty/models/block/ash_block.json delete mode 100644 src/main/resources/assets/biomesoplenty/models/item/ash_block.json delete mode 100644 src/main/resources/assets/biomesoplenty/textures/block/ash_block.png delete mode 100644 src/main/resources/data/biomesoplenty/loot_tables/blocks/ash_block.json diff --git a/src/main/java/biomesoplenty/api/block/BOPBlocks.java b/src/main/java/biomesoplenty/api/block/BOPBlocks.java index 4bbbdfa4a..63f06c8eb 100644 --- a/src/main/java/biomesoplenty/api/block/BOPBlocks.java +++ b/src/main/java/biomesoplenty/api/block/BOPBlocks.java @@ -30,8 +30,9 @@ public class BOPBlocks public static Block mud_brick_wall; public static Block dried_salt; - public static Block ash_block; public static Block flesh; + public static Block nether_crystal_block; + public static Block nether_crystal; public static Block toadstool_block; public static Block glowshroom_block; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java index e9dcb6c28..2c6a4b930 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/VolcanoBiome.java @@ -36,7 +36,7 @@ public class VolcanoBiome extends BiomeBOP { public VolcanoBiome() { - super((new Biome.Builder()).surfaceBuilder(new ConfiguredSurfaceBuilder(BOPBiomeFeatures.VOLCANO_SURFACE_BUILDER, BOPBiomeFeatures.ASH_SURFACE)).precipitation(Biome.RainType.RAIN).biomeCategory(Biome.Category.NONE).depth(4.5F).scale(0.0F).temperature(0.95F).downfall(0.3F).specialEffects((new BiomeAmbience.Builder()).waterColor(4566514).waterFogColor(267827).fogColor(12638463).ambientMoodSound(MoodSoundAmbience.LEGACY_CAVE_SETTINGS).build()).parent((String)null)); + super((new Biome.Builder()).surfaceBuilder(new ConfiguredSurfaceBuilder(BOPBiomeFeatures.VOLCANO_SURFACE_BUILDER, BOPBiomeFeatures.BASALT_SURFACE)).precipitation(Biome.RainType.RAIN).biomeCategory(Biome.Category.NONE).depth(4.5F).scale(0.0F).temperature(0.95F).downfall(0.3F).specialEffects((new BiomeAmbience.Builder()).waterColor(4566514).waterFogColor(267827).fogColor(12638463).ambientMoodSound(MoodSoundAmbience.LEGACY_CAVE_SETTINGS).build()).parent((String)null)); // Structures DefaultBiomeFeatures.addDefaultOverworldLandStructures(this); diff --git a/src/main/java/biomesoplenty/common/block/NetherCrystalBlock.java b/src/main/java/biomesoplenty/common/block/NetherCrystalBlock.java new file mode 100644 index 000000000..697cfa79b --- /dev/null +++ b/src/main/java/biomesoplenty/common/block/NetherCrystalBlock.java @@ -0,0 +1,92 @@ +/******************************************************************************* + * Copyright 2014-2019, 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 biomesoplenty.api.block.BOPBlocks; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; +import net.minecraft.block.*; +import net.minecraft.item.BlockItemUseContext; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.StateContainer; +import net.minecraft.state.properties.AttachFace; +import net.minecraft.util.Direction; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.world.IBlockReader; +import net.minecraft.world.IWorld; +import net.minecraft.world.IWorldReader; + +import javax.annotation.Nullable; +import java.util.Map; + +public class NetherCrystalBlock extends HorizontalFaceBlock +{ + protected static final VoxelShape FLOOR_AABB = Block.box(2.0D, 0.0D, 2.0D, 14.0D, 13.0D, 14.0D); + protected static final VoxelShape CEILING_AABB = Block.box(2.0D, 3.0D, 2.0D, 14.0D, 16.0D, 14.0D); + + protected static final VoxelShape NORTH_AABB = Block.box(2.0D, 2.0D, 3.0D, 14.0D, 14.0D, 16.0D); + protected static final VoxelShape SOUTH_AABB = Block.box(2.0D, 2.0D, 0.0D, 14.0D, 14.0D, 13.0D); + + protected static final VoxelShape EAST_AABB = Block.box(0.0D, 2.0D, 2.0D, 13.0D, 14.0D, 14.0D); + protected static final VoxelShape WEST_AABB = Block.box(3.0D, 2.0D, 2.0D, 16.0D, 14.0D, 14.0D); + + public NetherCrystalBlock(Block.Properties properties) + { + super(properties); + this.registerDefaultState(this.stateDefinition.any().setValue(FACE, AttachFace.FLOOR).setValue(FACING, Direction.NORTH)); + } + + protected static boolean mayPlaceOn(BlockState state, IBlockReader worldIn, BlockPos pos) { + Block block = state.getBlock(); + return block == Blocks.NETHERRACK || block == BOPBlocks.nether_crystal_block; + } + + @Override + public boolean canSurvive(BlockState state, IWorldReader worldIn, BlockPos pos) { + return canAttach(worldIn, pos, getConnectedDirection(state).getOpposite()); + } + + public static boolean canAttach(IWorldReader p_220185_0_, BlockPos p_220185_1_, Direction p_220185_2_) { + BlockPos blockpos = p_220185_1_.relative(p_220185_2_); + return mayPlaceOn(p_220185_0_.getBlockState(blockpos), p_220185_0_, blockpos); + } + + public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { + Direction direction = state.getValue(FACING); + switch(state.getValue(FACE)) + { + case FLOOR: + return FLOOR_AABB; + case WALL: + switch(direction) + { + case EAST: + return EAST_AABB; + case WEST: + return WEST_AABB; + case SOUTH: + return SOUTH_AABB; + case NORTH: + default: + return NORTH_AABB; + } + case CEILING: + default: + return CEILING_AABB; + } + } + + @Override + protected void createBlockStateDefinition(StateContainer.Builder builderIn) { + builderIn.add(FACING, FACE); + } +} diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/AshSplatterFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/AshSplatterFeature.java deleted file mode 100644 index b95f08984..000000000 --- a/src/main/java/biomesoplenty/common/world/gen/feature/AshSplatterFeature.java +++ /dev/null @@ -1,54 +0,0 @@ -package biomesoplenty.common.world.gen.feature; - -import biomesoplenty.api.block.BOPBlocks; -import com.mojang.serialization.Codec; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ISeedReader; -import net.minecraft.world.gen.ChunkGenerator; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.NoFeatureConfig; -import net.minecraft.world.gen.feature.structure.StructureManager; - -import java.util.Random; - -public class AshSplatterFeature extends Feature { - public AshSplatterFeature(Codec deserializer) { - super(deserializer); - } - - @Override - public boolean place(ISeedReader worldIn, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos pos, NoFeatureConfig config) - { - int i = 0; - int j = rand.nextInt(8 - 2) + 2; - - for (int k = pos.getX() - j; k <= pos.getX() + j; ++k) - { - for (int l = pos.getZ() - j; l <= pos.getZ() + j; ++l) - { - int i1 = k - pos.getX(); - int j1 = l - pos.getZ(); - if (i1 * i1 + j1 * j1 <= j * j) - { - for (int k1 = pos.getY() - 2; k1 <= pos.getY() + 2; ++k1) - { - BlockPos blockpos = new BlockPos(k, k1, l); - BlockState blockstate = worldIn.getBlockState(blockpos); - BlockState blockstate1 = worldIn.getBlockState(blockpos.above()); - - if (blockstate.getBlock() == Blocks.NETHERRACK && blockstate1.isAir(worldIn, blockpos.above())) - { - worldIn.setBlock(blockpos, BOPBlocks.ash_block.defaultBlockState(), 2); - ++i; - break; - } - } - } - } - } - - return i > 0; - } -} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/BOPBiomeFeatures.java b/src/main/java/biomesoplenty/common/world/gen/feature/BOPBiomeFeatures.java index 635e3ddbf..760fc9380 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/BOPBiomeFeatures.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/BOPBiomeFeatures.java @@ -127,7 +127,6 @@ public class BOPBiomeFeatures public static final Feature NETHER_VINES = new NetherVinesFeature(NoFeatureConfig.CODEC); public static final Feature FLESH_SPLATTER = new FleshSplatterFeature(NoFeatureConfig.CODEC); public static final Feature BONE_SPINE = new BoneSpineFeature(NoFeatureConfig.CODEC); - public static final Feature ASH_SPLATTER = new AshSplatterFeature(NoFeatureConfig.CODEC); public static final Feature PODZOL_SPLATTER = new PodzolSplatterFeature(NoFeatureConfig.CODEC); public static final Feature MYCELIUM_SPLATTER = new MyceliumSplatterFeature(NoFeatureConfig.CODEC); public static final Feature SMALL_RED_MUSHROOM = new SmallRedMushroomFeature(NoFeatureConfig.CODEC); @@ -175,9 +174,9 @@ public class BOPBiomeFeatures public static final SurfaceBuilder DEEP_TOP_LAYER = new DeepTopLayerSurfaceBuilder(SurfaceBuilderConfig.CODEC); public static final SurfaceBuilder POPPY_FIELD_SURFACE_BUILDER = new PoppyFieldSurfaceBuilder(SurfaceBuilderConfig.CODEC); - public static final SurfaceBuilderConfig ASH_SURFACE = new SurfaceBuilderConfig(BOPBlocks.ash_block.defaultBlockState(), BOPBlocks.ash_block.defaultBlockState(), Blocks.GRAVEL.defaultBlockState()); + public static final SurfaceBuilderConfig BASALT_SURFACE = new SurfaceBuilderConfig(Blocks.BASALT.defaultBlockState(), Blocks.BASALT.defaultBlockState(), Blocks.GRAVEL.defaultBlockState()); public static final SurfaceBuilderConfig TERRACOTTA_SURFACE = new SurfaceBuilderConfig(Blocks.TERRACOTTA.defaultBlockState(), Blocks.TERRACOTTA.defaultBlockState(), Blocks.GRAVEL.defaultBlockState()); - public static final SurfaceBuilderConfig MAGMA_SURFACE = new SurfaceBuilderConfig(Blocks.MAGMA_BLOCK.defaultBlockState(), Blocks.MAGMA_BLOCK.defaultBlockState(), BOPBlocks.ash_block.defaultBlockState()); + public static final SurfaceBuilderConfig MAGMA_SURFACE = new SurfaceBuilderConfig(Blocks.MAGMA_BLOCK.defaultBlockState(), Blocks.MAGMA_BLOCK.defaultBlockState(), Blocks.BASALT.defaultBlockState()); public static final SurfaceBuilderConfig MUD_SURFACE = new SurfaceBuilderConfig(BOPBlocks.mud.defaultBlockState(), BOPBlocks.mud.defaultBlockState(), BOPBlocks.mud.defaultBlockState()); public static final SurfaceBuilderConfig RED_SAND_SURFACE = new SurfaceBuilderConfig(Blocks.RED_SAND.defaultBlockState(), Blocks.RED_SAND.defaultBlockState(), Blocks.RED_SAND.defaultBlockState()); public static final SurfaceBuilderConfig SNOW_SNOW_GRAVEL_SURFACE = new SurfaceBuilderConfig(Blocks.SNOW_BLOCK.defaultBlockState(), Blocks.SNOW_BLOCK.defaultBlockState(), Blocks.GRAVEL.defaultBlockState()); diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/VolcanoEdgeSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/feature/VolcanoEdgeSurfaceBuilder.java index db3bb96cd..769cffde6 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/VolcanoEdgeSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/VolcanoEdgeSurfaceBuilder.java @@ -27,7 +27,7 @@ public class VolcanoEdgeSurfaceBuilder extends SurfaceBuilder 2.6D) { - SurfaceBuilder.DEFAULT.apply(random, chunkIn, biomeIn, x, z, startHeight, noise, defaultBlock, defaultFluid, seaLevel, seed, BOPBiomeFeatures.ASH_SURFACE); + SurfaceBuilder.DEFAULT.apply(random, chunkIn, biomeIn, x, z, startHeight, noise, defaultBlock, defaultFluid, seaLevel, seed, BOPBiomeFeatures.BASALT_SURFACE); } else if (noise > 0.8F) { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/VolcanoSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/feature/VolcanoSurfaceBuilder.java index dbed9c8ad..cc2d40773 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/VolcanoSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/VolcanoSurfaceBuilder.java @@ -32,7 +32,7 @@ public class VolcanoSurfaceBuilder extends SurfaceBuilder } else { - BOPBiomeFeatures.DEEP_TOP_LAYER.apply(random, chunkIn, biomeIn, x, z, startHeight, noise, defaultBlock, defaultFluid, seaLevel, seed, BOPBiomeFeatures.ASH_SURFACE); + BOPBiomeFeatures.DEEP_TOP_LAYER.apply(random, chunkIn, biomeIn, x, z, startHeight, noise, defaultBlock, defaultFluid, seaLevel, seed, BOPBiomeFeatures.BASALT_SURFACE); } } } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/tree/BasicTreeFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/tree/BasicTreeFeature.java index 1f065cc95..bf0557e34 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/tree/BasicTreeFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/tree/BasicTreeFeature.java @@ -181,7 +181,7 @@ public class BasicTreeFeature extends TreeFeatureBase { if (random.nextInt(4) == 0) { - this.setAltLeaves(world, leavesPos); + this.setAltLeaves(world, leavesPos, changedLeaves, boundingBox); } else { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/tree/BushTreeFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/tree/BushTreeFeature.java index 43fbd52ee..8a8c4605d 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/tree/BushTreeFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/tree/BushTreeFeature.java @@ -89,7 +89,7 @@ public class BushTreeFeature extends TreeFeatureBase { if (random.nextInt(4) == 0) { - this.setAltLeaves(world, pos.offset(x, y, z)); + this.setAltLeaves(world, pos.offset(x, y, z), changedLeaves, boundingBox); } else { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/tree/TreeFeatureBase.java b/src/main/java/biomesoplenty/common/world/gen/feature/tree/TreeFeatureBase.java index cefced037..57cd8f847 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/tree/TreeFeatureBase.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/tree/TreeFeatureBase.java @@ -119,7 +119,6 @@ public abstract class TreeFeatureBase extends TreeFeature { if (this.replace.matches(world, pos)) { - this.setBlock(world, pos, this.leaves); this.placeBlock(world, pos, this.leaves, changedBlocks, boundingBox); return true; } @@ -177,11 +176,11 @@ public abstract class TreeFeatureBase extends TreeFeature return false; } - public boolean setAltLeaves(IWorld world, BlockPos pos) + public boolean setAltLeaves(IWorld world, BlockPos pos, Set changedBlocks, MutableBoundingBox boundingBox) { if (this.replace.matches(world, pos)) { - this.setBlock(world, pos, this.altLeaves); + this.placeBlock(world, pos, this.altLeaves, changedBlocks, boundingBox); return true; } return false; diff --git a/src/main/java/biomesoplenty/init/ModBlocks.java b/src/main/java/biomesoplenty/init/ModBlocks.java index faa53cc3a..27dca6301 100644 --- a/src/main/java/biomesoplenty/init/ModBlocks.java +++ b/src/main/java/biomesoplenty/init/ModBlocks.java @@ -55,9 +55,11 @@ public class ModBlocks mud_brick_wall = registerBlock(new WallBlock(Block.Properties.copy(mud_bricks)),"mud_brick_wall"); dried_salt = registerBlock(new DriedSaltBlock(AbstractBlock.Properties.of(Material.STONE, MaterialColor.WOOD).strength(1.0F).harvestLevel(0).harvestTool(ToolType.PICKAXE).sound(new SoundType(1.0F, 0.5F, SoundEvents.GRAVEL_BREAK, SoundEvents.GRAVEL_STEP, SoundEvents.GRAVEL_PLACE, SoundEvents.GRAVEL_HIT, SoundEvents.GRAVEL_FALL))), "dried_salt"); - ash_block = registerBlock(new AshBlock(AbstractBlock.Properties.of(Material.SAND, MaterialColor.TERRACOTTA_BLACK).strength(0.4F).harvestLevel(0).harvestTool(ToolType.SHOVEL).sound(SoundType.SAND)), "ash_block"); flesh = registerBlock(new FleshBlock(AbstractBlock.Properties.of(Material.SPONGE, MaterialColor.TERRACOTTA_RED).strength(0.4F).harvestLevel(0).harvestTool(ToolType.AXE).sound(new SoundType(1.0F, 0.5F, SoundEvents.CORAL_BLOCK_BREAK, SoundEvents.CORAL_BLOCK_STEP, SoundEvents.CORAL_BLOCK_PLACE, SoundEvents.CORAL_BLOCK_HIT, SoundEvents.CORAL_BLOCK_FALL))), "flesh"); + nether_crystal_block = registerBlock(new Block(AbstractBlock.Properties.of(Material.GLASS, MaterialColor.CRIMSON_STEM).strength(0.4F).harvestLevel(0).harvestTool(ToolType.PICKAXE).sound(new SoundType(1.0F, 0.75F, SoundEvents.GLASS_BREAK, SoundEvents.GLASS_STEP, SoundEvents.GLASS_PLACE, SoundEvents.GLASS_HIT, SoundEvents.GLASS_FALL)).lightLevel((state) -> 10)), "nether_crystal_block"); + nether_crystal = registerBlock(new NetherCrystalBlock(AbstractBlock.Properties.of(Material.GLASS, MaterialColor.CRIMSON_STEM).noCollission().strength(0.3F).harvestLevel(0).harvestTool(ToolType.PICKAXE).sound(new SoundType(1.0F, 0.75F, SoundEvents.GLASS_BREAK, SoundEvents.GLASS_STEP, SoundEvents.GLASS_PLACE, SoundEvents.GLASS_HIT, SoundEvents.GLASS_FALL)).lightLevel((state) -> 10)), "nether_crystal"); + toadstool_block = registerBlock(new HugeMushroomBlock(AbstractBlock.Properties.of(Material.WOOD, MaterialColor.COLOR_ORANGE).strength(0.2F).sound(SoundType.WOOD)), "toadstool_block"); glowshroom_block = registerBlock(new HugeMushroomBlock(AbstractBlock.Properties.of(Material.WOOD, MaterialColor.DIAMOND).strength(0.2F).sound(SoundType.WOOD).lightLevel((state) -> 10)), "glowshroom_block"); @@ -351,6 +353,7 @@ public class ModBlocks RenderTypeLookup.setRenderLayer(umbran_leaves, transparentRenderType); RenderTypeLookup.setRenderLayer(hellbark_leaves, transparentRenderType); + RenderTypeLookup.setRenderLayer(nether_crystal, cutoutRenderType); RenderTypeLookup.setRenderLayer(origin_sapling, cutoutRenderType); RenderTypeLookup.setRenderLayer(flowering_oak_sapling, cutoutRenderType); RenderTypeLookup.setRenderLayer(rainbow_birch_sapling, cutoutRenderType); diff --git a/src/main/java/biomesoplenty/init/ModFeatures.java b/src/main/java/biomesoplenty/init/ModFeatures.java index ea6834d4b..cd88cd267 100644 --- a/src/main/java/biomesoplenty/init/ModFeatures.java +++ b/src/main/java/biomesoplenty/init/ModFeatures.java @@ -127,7 +127,6 @@ public class ModFeatures registerFeatures(BOPBiomeFeatures.NETHER_VINES, "nether_vines"); registerFeatures(BOPBiomeFeatures.FLESH_SPLATTER, "flesh_splatter"); registerFeatures(BOPBiomeFeatures.BONE_SPINE, "bone_spine"); - registerFeatures(BOPBiomeFeatures.ASH_SPLATTER, "ash_splatter"); registerFeatures(BOPBiomeFeatures.PODZOL_SPLATTER, "podzol_splatter"); registerFeatures(BOPBiomeFeatures.MYCELIUM_SPLATTER, "mycelium_splatter"); registerFeatures(BOPBiomeFeatures.SMALL_RED_MUSHROOM, "small_red_mushroom"); diff --git a/src/main/resources/assets/biomesoplenty/blockstates/ash_block.json b/src/main/resources/assets/biomesoplenty/blockstates/ash_block.json deleted file mode 100644 index 67610ca4b..000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/ash_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "": [ - { "model": "biomesoplenty:block/ash_block" }, - { "model": "biomesoplenty:block/ash_block", "y": 90 }, - { "model": "biomesoplenty:block/ash_block", "y": 180 }, - { "model": "biomesoplenty:block/ash_block", "y": 270 } - ] - } -} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/nether_crystal.json b/src/main/resources/assets/biomesoplenty/blockstates/nether_crystal.json index 423e69a70..b6e4a5459 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/nether_crystal.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/nether_crystal.json @@ -46,7 +46,6 @@ "model": "biomesoplenty:block/nether_crystal", "y": 270, "x": 90 - }, } } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/lang/en_us.json b/src/main/resources/assets/biomesoplenty/lang/en_us.json index c1bd31745..b336cc77d 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_us.json +++ b/src/main/resources/assets/biomesoplenty/lang/en_us.json @@ -93,7 +93,6 @@ "item.biomesoplenty.umbran_boat": "Umbran Boat", "item.biomesoplenty.willow_boat": "Willow Boat", - "block.biomesoplenty.ash_block": "Ash Block", "block.biomesoplenty.blue_hydrangea": "Blue Hydrangea", "block.biomesoplenty.bramble": "Bramble", "block.biomesoplenty.burning_blossom": "Burning Blossom", diff --git a/src/main/resources/assets/biomesoplenty/models/block/ash_block.json b/src/main/resources/assets/biomesoplenty/models/block/ash_block.json deleted file mode 100644 index e3304b3f7..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/ash_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "biomesoplenty:block/ash_block" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/item/ash_block.json b/src/main/resources/assets/biomesoplenty/models/item/ash_block.json deleted file mode 100644 index a5d2b4a19..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/ash_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "biomesoplenty:block/ash_block" -} diff --git a/src/main/resources/assets/biomesoplenty/textures/block/ash_block.png b/src/main/resources/assets/biomesoplenty/textures/block/ash_block.png deleted file mode 100644 index 9ac7fc2163891a4a110988118f6544e54ca13e71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjGL736~_k^`TL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt3(J+r@loG*ZCR(rZQ zhFJLLPH^NpY#_k=dAZZVfTB~X$N&8|mNj+@ywkKPLpAr!*Kc-q4?bEQD7JSMnb2_U z*z!ca3>Co_c~V#IZ+UxYy|BqF_2qh!);F4;2}CViQFQyD6l?TR$@cZKJyMslkMhh= zKl1w4+RPIY9alsH?=c#zQ<)SebWwD@_C@W|s0(g8dABT-@Me0Z{q(y+Twj)5c?3`A t2GL>%wTZ#jcW2t4*IIO3_EB9O<8zliFXzanD*~O(;OXk;vd$@?2>`06Z~y=R diff --git a/src/main/resources/assets/biomesoplenty/textures/block/nether_crystal_block.png b/src/main/resources/assets/biomesoplenty/textures/block/nether_crystal_block.png index 6a9dfbbb4633e9685f5afc911fd93249375925c8..ac9e832c3ed679096700df093ef841f553a0a390 100644 GIT binary patch delta 39 ucmaFK_>ysg8_#|Q|Nr*+|LeQ{@83T$QFLMf8xXNGFffGvzB6xPRXzY@OA%K9 delta 39 ucmaFK_>ysg8_!Gz`~UX&|M&0z|MKa?MA3-_Y(T`$z`zg`ZuetiRXzY}0ucKE diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/ash_block.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/ash_block.json deleted file mode 100644 index 958901134..000000000 --- a/src/main/resources/data/biomesoplenty/loot_tables/blocks/ash_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "biomesoplenty:ash_block" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file