diff --git a/src/main/java/biomesoplenty/api/block/BOPBlocks.java b/src/main/java/biomesoplenty/api/block/BOPBlocks.java index 18e337da8..39c1f242f 100644 --- a/src/main/java/biomesoplenty/api/block/BOPBlocks.java +++ b/src/main/java/biomesoplenty/api/block/BOPBlocks.java @@ -113,11 +113,8 @@ public class BOPBlocks public static Block waterlily; public static Block dirt; public static Block stone_formations; - public static Block ash_stone; - public static Block hard_sand; - public static Block hard_dirt; public static Block hard_ice; - public static Block dried_dirt; + public static Block dried_sand; public static Block crag_rock; public static Block mud_brick_block; public static Block crystal; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCanyon.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCanyon.java index 346f5e23b..b75e6d532 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCanyon.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCanyon.java @@ -1,5 +1,6 @@ package biomesoplenty.common.biome.overworld; +import net.minecraft.block.BlockDirt; import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; @@ -8,6 +9,7 @@ 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.enums.BOPClimates; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; @@ -50,18 +52,18 @@ public class BiomeGenCanyon extends BOPBiome this.spawnableCreatureList.clear(); - this.topBlock = BOPBlocks.hard_dirt.getDefaultState(); - this.fillerBlock = BOPBlocks.hard_dirt.getDefaultState(); + this.topBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SANDY).withProperty(BlockBOPDirt.COARSE, true); + this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SANDY).withProperty(BlockBOPDirt.COARSE, true); // splatter top blocks - IBlockPosQuery emptyHardDirt = BlockQuery.buildAnd().withAirAbove().states(this.topBlock).create(); - this.addGenerator("grass_splatter", GeneratorStage.SAND, (new GeneratorSplatter.Builder()).amountPerChunk(4.0F).generationAttempts(128).replace(emptyHardDirt).with(Blocks.grass.getDefaultState()).create()); + IBlockPosQuery emptyCoarseDirt = BlockQuery.buildAnd().withAirAbove().states(this.topBlock).create(); + this.addGenerator("grass_splatter", GeneratorStage.SAND, (new GeneratorSplatter.Builder()).amountPerChunk(4.0F).generationAttempts(128).replace(emptyCoarseDirt).with(Blocks.grass.getDefaultState()).create()); // trees and logs GeneratorWeighted treeGenerator = new GeneratorWeighted(5); this.addGenerator("trees", GeneratorStage.TREE, treeGenerator); - treeGenerator.add("pine", 1, (new GeneratorPineTree.Builder()).minHeight(6).maxHeight(18).placeOn(emptyHardDirt).create()); - treeGenerator.add("brush", 2, (new GeneratorBush.Builder()).log(BlockPlanks.EnumType.ACACIA).leaves(BlockPlanks.EnumType.ACACIA).placeOn(emptyHardDirt).create()); + treeGenerator.add("pine", 1, (new GeneratorPineTree.Builder()).minHeight(6).maxHeight(18).placeOn(emptyCoarseDirt).create()); + treeGenerator.add("brush", 2, (new GeneratorBush.Builder()).log(BlockPlanks.EnumType.ACACIA).leaves(BlockPlanks.EnumType.ACACIA).placeOn(emptyCoarseDirt).create()); // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.5F); @@ -72,7 +74,7 @@ public class BiomeGenCanyon extends BOPBiome this.addGenerator("water_reeds", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(2.0F).with(BOPPlants.REED).generationAttempts(32).create()); // grasses (note weighting must be quite high as the grasses will only grow on the splattered grass blocks) - GeneratorWeighted grassGenerator = new GeneratorWeighted(12.0F); + GeneratorWeighted grassGenerator = new GeneratorWeighted(4.0F); this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator); grassGenerator.add("mediumgrass", 1, (new GeneratorGrass.Builder()).with(BOPPlants.MEDIUMGRASS).create()); grassGenerator.add("tallgrass", 2, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create()); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java index 7f04e6679..22e7025dd 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java @@ -36,8 +36,8 @@ public class BiomeGenOutback extends BOPBiome this.setTemperatureRainfall(1.3F, 0.05F); this.setColor(0xA57644); - this.topBlock = BOPBlocks.hard_sand.getDefaultState(); - this.fillerBlock = BOPBlocks.hard_sand.getDefaultState(); + this.topBlock = Blocks.sand.getDefaultState().withProperty(BlockSand.VARIANT, BlockSand.EnumType.RED_SAND); + this.fillerBlock = Blocks.sand.getDefaultState().withProperty(BlockSand.VARIANT, BlockSand.EnumType.RED_SAND); this.addWeight(BOPClimates.HOT_DESERT, 7); @@ -47,9 +47,8 @@ public class BiomeGenOutback extends BOPBiome this.spawnableWaterCreatureList.clear(); // splatter top blocks - IBlockPosQuery emptyHardSand = BlockQuery.buildAnd().withAirAbove().states(this.topBlock).create(); - this.addGenerator("grass_splatter", GeneratorStage.SAND, (new GeneratorSplatter.Builder()).amountPerChunk(8.0F).generationAttempts(128).replace(emptyHardSand).with(BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.SANDY)).create()); - this.addGenerator("red_sand_splatter", GeneratorStage.SAND, (new GeneratorSplatter.Builder()).amountPerChunk(6.0F).replace(emptyHardSand).with(Blocks.sand.getDefaultState().withProperty(BlockSand.VARIANT, BlockSand.EnumType.RED_SAND)).create()); + IBlockPosQuery emptyRedSand = BlockQuery.buildAnd().withAirAbove().states(this.topBlock).create(); + this.addGenerator("grass_splatter", GeneratorStage.SAND, (new GeneratorSplatter.Builder()).amountPerChunk(8.0F).generationAttempts(128).replace(emptyRedSand).with(BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.SANDY)).create()); // trees GeneratorWeighted treeGenerator = new GeneratorWeighted(3); @@ -70,6 +69,7 @@ public class BiomeGenOutback extends BOPBiome this.addGenerator("tiny_cacti", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.0F).with(BOPPlants.TINYCACTUS).create()); this.addGenerator("dead_bushes", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(2.0F).with(Blocks.deadbush.getDefaultState()).create()); this.addGenerator("cacti", GeneratorStage.FLOWERS,(new GeneratorColumns.Builder()).amountPerChunk(0.5F).generationAttempts(24).placeOn(this.topBlock).with(Blocks.cactus.getDefaultState()).minHeight(1).maxHeight(2).create()); + this.addGenerator("desertgrass", GeneratorStage.GRASS, (new GeneratorGrass.Builder()).amountPerChunk(10.0F).with(BOPPlants.DESERTGRASS).generationAttempts(8).create()); // gem this.addGenerator("ruby", GeneratorStage.SAND, (new GeneratorOreSingle.Builder()).amountPerChunk(12).with(BOPGems.RUBY).create()); @@ -82,15 +82,15 @@ public class BiomeGenOutback extends BOPBiome { if (!settings.generateBopGems) {this.removeGenerator("ruby");} - IBlockPosQuery emptyHardSand = BlockQuery.buildAnd().withAirAbove().states(this.topBlock).create(); - if (!settings.generateBopSoils) {this.removeGenerator("grass_splatter"); this.addGenerator("grass_splatter_new", GeneratorStage.SAND, (new GeneratorSplatter.Builder()).amountPerChunk(8.0F).generationAttempts(128).replace(emptyHardSand).with(Blocks.grass.getDefaultState()).create());} + IBlockPosQuery emptyRedSand = BlockQuery.buildAnd().withAirAbove().states(this.topBlock).create(); + if (!settings.generateBopSoils) {this.removeGenerator("grass_splatter"); this.addGenerator("grass_splatter_new", GeneratorStage.SAND, (new GeneratorSplatter.Builder()).amountPerChunk(8.0F).generationAttempts(128).replace(emptyRedSand).with(Blocks.grass.getDefaultState()).create());} if (!settings.generateBopFoliage) {this.removeGenerator("caveweed"); this.removeGenerator("bushes"); this.removeGenerator("koru"); this.removeGenerator("shrubs"); this.removeGenerator("leaf_piles"); this.removeGenerator("dead_leaf_piles"); this.removeGenerator("clover_patches"); this.removeGenerator("sprouts");} if (!settings.generateBopPlants) {this.removeGenerator("cattail"); this.removeGenerator("double_cattail"); this.removeGenerator("river_cane"); this.removeGenerator("tiny_cacti"); this.removeGenerator("roots"); this.removeGenerator("rafflesia"); this.removeGenerator("desert_sprouts");} GeneratorWeighted grassGen = (GeneratorWeighted)this.getGenerator("grass"); - if (!settings.generateBopGrasses) {grassGen.removeGenerator("shortgrass"); grassGen.removeGenerator("mediumgrass"); grassGen.removeGenerator("wheatgrass"); grassGen.removeGenerator("dampgrass");} + if (!settings.generateBopGrasses) {grassGen.removeGenerator("shortgrass"); grassGen.removeGenerator("mediumgrass"); grassGen.removeGenerator("wheatgrass"); grassGen.removeGenerator("dampgrass"); this.removeGenerator("desertgrass");} } } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java index 7de463776..b50f9cd68 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java @@ -51,12 +51,12 @@ public class BiomeGenWasteland extends BOPBiome this.setColor(0x5A5440); this.setTemperatureRainfall(0.9F, 0.05F); - this.topBlock = BOPBlocks.dried_dirt.getDefaultState(); - this.fillerBlock = BOPBlocks.dried_dirt.getDefaultState(); + this.topBlock = BOPBlocks.dried_sand.getDefaultState(); + this.fillerBlock = BOPBlocks.dried_sand.getDefaultState(); this.waterColorMultiplier = 0xE5FF00; this.skyColor = 0x909E70; this.setDisableRain(); - this.seaFloorBlock = BOPBlocks.dried_dirt.getDefaultState(); + this.seaFloorBlock = BOPBlocks.dried_sand.getDefaultState(); this.canGenerateRivers = false; this.canGenerateVillages = false; @@ -68,11 +68,11 @@ public class BiomeGenWasteland extends BOPBiome this.spawnableWaterCreatureList.clear(); // trees - IBlockPosQuery emptyDriedDirt = BlockQuery.buildAnd().withAirAbove().states(this.topBlock).create(); + IBlockPosQuery emptyDriedSand = BlockQuery.buildAnd().withAirAbove().states(this.topBlock).create(); GeneratorWeighted treeGenerator = new GeneratorWeighted(0.3F); this.addGenerator("trees", GeneratorStage.TREE, treeGenerator); - treeGenerator.add("dead_tree", 3, (new GeneratorBigTree.Builder()).placeOn(emptyDriedDirt).minHeight(5).maxHeight(12).foliageHeight(0).foliageDensity(0.5D).log(BOPWoods.DEAD).leaves(Blocks.air.getDefaultState()).create()); - treeGenerator.add("dying_tree", 1, (new GeneratorBigTree.Builder()).placeOn(emptyDriedDirt).minHeight(5).maxHeight(12).foliageHeight(1).log(BOPWoods.DEAD).leaves(BOPTrees.DEAD).create()); + treeGenerator.add("dead_tree", 3, (new GeneratorBigTree.Builder()).placeOn(emptyDriedSand).minHeight(5).maxHeight(12).foliageHeight(0).foliageDensity(0.5D).log(BOPWoods.DEAD).leaves(Blocks.air.getDefaultState()).create()); + treeGenerator.add("dying_tree", 1, (new GeneratorBigTree.Builder()).placeOn(emptyDriedSand).minHeight(5).maxHeight(12).foliageHeight(1).log(BOPWoods.DEAD).leaves(BOPTrees.DEAD).create()); // other plants this.addGenerator("dead_grass", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.0F).with(BOPPlants.DEADGRASS).create()); diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java b/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java index 57f4dbf28..d93a6dbaf 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java @@ -253,10 +253,10 @@ public class BlockBOPFlower extends BlockBOPDecoration implements IShearable Block groundBlock = groundState.getBlock(); boolean onFertile = (groundBlock == Blocks.dirt || groundBlock == Blocks.farmland || groundBlock == BOPBlocks.dirt || groundBlock == Blocks.grass); - boolean onDry = (groundBlock == BOPBlocks.hard_dirt || groundBlock == Blocks.hardened_clay || groundBlock == BOPBlocks.sand || groundBlock == Blocks.sand || groundBlock == BOPBlocks.hard_sand); + boolean onDry = (groundBlock == Blocks.hardened_clay || groundBlock == BOPBlocks.sand || groundBlock == Blocks.sand); boolean onNetherrack = (groundBlock == Blocks.netherrack); boolean onStone = (groundBlock == Blocks.stone); - boolean onDriedDirt = (groundBlock == BOPBlocks.dried_dirt); + boolean onDriedSand = (groundBlock == BOPBlocks.dried_sand); boolean onSpectralMoss = false; if (groundBlock instanceof BlockBOPGrass) @@ -284,7 +284,7 @@ public class BlockBOPFlower extends BlockBOPDecoration implements IShearable case BROMELIAD: return onDry; case WILTED_LILY: - return onDriedDirt; + return onDriedSand; case BURNING_BLOSSOM: return onNetherrack; case MINERS_DELIGHT: diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java b/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java index 018222c05..2335cfbde 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java @@ -36,7 +36,7 @@ public class BlockBOPHalfOtherSlab extends BlockSlab implements IBOPBlock // add properties public static enum SlabType implements IStringSerializable { - LIMESTONE, SILTSTONE, SHALE, POLISHED_LIMESTONE, POLISHED_SILTSTONE, POLISHED_SHALE, CRAG_ROCK, MUD_BRICK; + MUD_BRICK; @Override public String getName() { @@ -54,27 +54,6 @@ public class BlockBOPHalfOtherSlab extends BlockSlab implements IBOPBlock IBlockState state = null; switch (this) { - case LIMESTONE: - state = BOPBlocks.stone.getDefaultState().withProperty(BlockBOPStone.POLISHED, Boolean.valueOf(false)).withProperty(BlockBOPStone.VARIANT, BlockBOPStone.StoneType.LIMESTONE); - break; - case SILTSTONE: - state = BOPBlocks.stone.getDefaultState().withProperty(BlockBOPStone.POLISHED, Boolean.valueOf(false)).withProperty(BlockBOPStone.VARIANT, BlockBOPStone.StoneType.SILTSTONE); - break; - case SHALE: - state = BOPBlocks.stone.getDefaultState().withProperty(BlockBOPStone.POLISHED, Boolean.valueOf(false)).withProperty(BlockBOPStone.VARIANT, BlockBOPStone.StoneType.SHALE); - break; - case POLISHED_LIMESTONE: - state = BOPBlocks.stone.getDefaultState().withProperty(BlockBOPStone.POLISHED, Boolean.valueOf(true)).withProperty(BlockBOPStone.VARIANT, BlockBOPStone.StoneType.LIMESTONE); - break; - case POLISHED_SILTSTONE: - state = BOPBlocks.stone.getDefaultState().withProperty(BlockBOPStone.POLISHED, Boolean.valueOf(true)).withProperty(BlockBOPStone.VARIANT, BlockBOPStone.StoneType.SILTSTONE); - break; - case POLISHED_SHALE: - state = BOPBlocks.stone.getDefaultState().withProperty(BlockBOPStone.POLISHED, Boolean.valueOf(true)).withProperty(BlockBOPStone.VARIANT, BlockBOPStone.StoneType.SHALE); - break; - case CRAG_ROCK: - state = BOPBlocks.crag_rock.getDefaultState(); - break; case MUD_BRICK: state = BOPBlocks.mud_brick_block.getDefaultState(); break; diff --git a/src/main/java/biomesoplenty/common/init/ModBlocks.java b/src/main/java/biomesoplenty/common/init/ModBlocks.java index be6494feb..b34085116 100644 --- a/src/main/java/biomesoplenty/common/init/ModBlocks.java +++ b/src/main/java/biomesoplenty/common/init/ModBlocks.java @@ -122,12 +122,9 @@ public class ModBlocks // generics bamboo_thatching = registerBlock( (new BlockBOPGeneric(Material.wood)).setStepSound(Block.soundTypeWood).setHardness(2.0F), "bamboo_thatching"); bamboo_thatching.setHarvestLevel("axe", 0); - ash_stone = registerBlock( new BlockBOPGeneric(), "ash_stone" ); crag_rock = registerBlock( (new BlockBOPGeneric()).setStepSound(Block.soundTypeStone), "crag_rock" ); - dried_dirt = registerBlock( (new BlockBOPGeneric()).addSupportedPlantType(EnumPlantType.Desert), "dried_dirt"); dried_dirt.setHarvestLevel("pickaxe",0); - hard_dirt = registerBlock( (new BlockBOPGeneric()).setHardness(0.7F), "hard_dirt" ); + dried_sand = registerBlock( (new BlockBOPGeneric()).addSupportedPlantType(EnumPlantType.Desert), "dried_sand"); dried_sand.setHarvestLevel("pickaxe",0); hard_ice = registerBlock( (new BlockBOPGeneric(Material.packedIce)).setHardness(0.75F), "hard_ice" ); - hard_sand = registerBlock( (new BlockBOPGeneric(Material.sand)).addSupportedPlantType(EnumPlantType.Desert).setHardness(0.9F).setStepSound(Block.soundTypeSand), "hard_sand" ); mud_brick_block = registerBlock( (new BlockBOPGeneric()).setResistance(2.0F), "mud_brick_block" ); mud_brick_stairs = registerBlock( BOPReflectionHelper.construct(BlockStairs.class, (IBlockState)mud_brick_block.getDefaultState()), "mud_brick_stairs"); diff --git a/src/main/java/biomesoplenty/common/init/ModCrafting.java b/src/main/java/biomesoplenty/common/init/ModCrafting.java index a0b8293d7..3049a0419 100644 --- a/src/main/java/biomesoplenty/common/init/ModCrafting.java +++ b/src/main/java/biomesoplenty/common/init/ModCrafting.java @@ -298,7 +298,7 @@ public class ModCrafting GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(BOPBlocks.terrarium, 1, BlockBOPTerrarium.TerrariumType.MYSTIC.ordinal()), new Object[] {"blockGrass", BlockBOPFlower.paging.getVariantItem(BOPFlowers.GLOWFLOWER), new ItemStack(BOPItems.jar_empty)})); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(BOPBlocks.terrarium, 1, BlockBOPTerrarium.TerrariumType.OMINOUS.ordinal()), new Object[] {"blockGrass", BlockBOPFlower.paging.getVariantItem(BOPFlowers.DEATHBLOOM), new ItemStack(BOPItems.jar_empty)})); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(BOPBlocks.terrarium, 1, BlockBOPTerrarium.TerrariumType.ORIGIN.ordinal()), new Object[] {new ItemStack(BOPBlocks.grass, 1, BlockBOPGrass.BOPGrassType.ORIGIN.ordinal()), BlockBOPFlower.paging.getVariantItem(BOPFlowers.ROSE), new ItemStack(BOPItems.jar_empty)})); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(BOPBlocks.terrarium, 1, BlockBOPTerrarium.TerrariumType.WASTELAND.ordinal()), new Object[] {new ItemStack(BOPBlocks.dried_dirt), BlockBOPFlower.paging.getVariantItem(BOPFlowers.WILTED_LILY), new ItemStack(BOPItems.jar_empty)})); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(BOPBlocks.terrarium, 1, BlockBOPTerrarium.TerrariumType.WASTELAND.ordinal()), new Object[] {new ItemStack(BOPBlocks.dried_sand), BlockBOPFlower.paging.getVariantItem(BOPFlowers.WILTED_LILY), new ItemStack(BOPItems.jar_empty)})); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(BOPBlocks.terrarium, 1, BlockBOPTerrarium.TerrariumType.NETHER.ordinal()), new Object[] {new ItemStack(BOPBlocks.grass, 1, BlockBOPGrass.BOPGrassType.OVERGROWN_NETHERRACK.ordinal()), BlockBOPFlower.paging.getVariantItem(BOPFlowers.BURNING_BLOSSOM), new ItemStack(BOPItems.jar_empty)})); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(BOPBlocks.terrarium, 1, BlockBOPTerrarium.TerrariumType.ENDER.ordinal()), new Object[] {new ItemStack(BOPBlocks.grass, 1, BlockBOPGrass.BOPGrassType.SPECTRAL_MOSS.ordinal()), BlockBOPPlant.paging.getVariantItem(BOPPlants.SPECTRALFERN), new ItemStack(BOPItems.jar_empty)})); } @@ -308,7 +308,6 @@ public class ModCrafting { // Register smelting recipes - GameRegistry.addSmelting(Blocks.dirt, new ItemStack(BOPBlocks.dried_dirt), 0F); GameRegistry.addSmelting(new ItemStack(BOPBlocks.mud), new ItemStack(Blocks.dirt), 0F); GameRegistry.addSmelting(BlockBOPPlant.paging.getVariantItem(BOPPlants.TINYCACTUS), new ItemStack(Items.dye, 1, EnumDyeColor.GREEN.getDyeDamage()), 0.2F); GameRegistry.addSmelting(BOPItems.mudball, new ItemStack(BOPItems.mud_brick), 0F); diff --git a/src/main/java/biomesoplenty/common/integration/ThaumcraftCompat.java b/src/main/java/biomesoplenty/common/integration/ThaumcraftCompat.java index 4d9898990..b284d1cf6 100644 --- a/src/main/java/biomesoplenty/common/integration/ThaumcraftCompat.java +++ b/src/main/java/biomesoplenty/common/integration/ThaumcraftCompat.java @@ -88,12 +88,9 @@ public class ThaumcraftCompat //Blocks addAspectsToBlock(BOPBlocks.mud, new Aspect[] { Aspect.WATER, Aspect.EARTH }, new int[] { 2, 5 }); - addAspectsToBlock(BOPBlocks.dried_dirt, new Aspect[] { Aspect.ENTROPY, Aspect.EARTH }, new int[] { 1, 1 }); + addAspectsToBlock(BOPBlocks.dried_sand, new Aspect[] { Aspect.ENTROPY, Aspect.EARTH }, new int[] { 1, 1 }); addAspectsToBlock(BOPBlocks.hard_ice, new Aspect[] { Aspect.EARTH, Aspect.COLD }, new int[] { 2, 2 }); addAspectsToState(BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BOPGrassType.ORIGIN), new Aspect[] { Aspect.EARTH, Aspect.PLANT }, new int[] { 1, 2 }); - addAspectsToBlock(BOPBlocks.ash_stone, new Aspect[] { Aspect.EARTH, Aspect.FIRE }, new int[] { 1, 1 }); - addAspectsToBlock(BOPBlocks.hard_sand, new Aspect[] { Aspect.EARTH, Aspect.ENTROPY }, new int[] { 1, 2 }); - addAspectsToBlock(BOPBlocks.hard_dirt, new Aspect[] { Aspect.EARTH }, new int[] { 2 }); addAspectsToBlock(BOPBlocks.crystal, new Aspect[] { Aspect.DESIRE, Aspect.LIGHT, Aspect.CRYSTAL }, new int[] { 5, 5, 5 }); addAspectsToBlock(BOPBlocks.crag_rock, new Aspect[] { Aspect.EARTH }, new int[] { 2 }); addAspectsToState(BOPBlocks.sand.getDefaultState().withProperty(BlockBOPSand.VARIANT, BlockBOPSand.SandType.QUICKSAND), new Aspect[] { Aspect.EARTH, Aspect.TRAP }, new int[] { 2, 4 }); diff --git a/src/main/java/biomesoplenty/common/world/feature/GeneratorSpike.java b/src/main/java/biomesoplenty/common/world/feature/GeneratorSpike.java index 171bdaced..9167ea324 100644 --- a/src/main/java/biomesoplenty/common/world/feature/GeneratorSpike.java +++ b/src/main/java/biomesoplenty/common/world/feature/GeneratorSpike.java @@ -43,7 +43,7 @@ public class GeneratorSpike extends GeneratorReplacing this.amountPerChunk = 1.0F; this.placeOn = BlockQueries.solid; this.replace = new BlockQueryMaterial(Material.air); - this.with = BOPBlocks.dried_dirt.getDefaultState(); + this.with = BOPBlocks.dried_sand.getDefaultState(); this.scatterYMethod = ScatterYMethod.AT_SURFACE; this.minHeight = 8; this.maxHeight = 12; diff --git a/src/main/resources/assets/biomesoplenty/blockstates/ash_stone.json b/src/main/resources/assets/biomesoplenty/blockstates/ash_stone.json deleted file mode 100644 index 2e792333e..000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/ash_stone.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "biomesoplenty:ash_stone" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/double_other_slab.json b/src/main/resources/assets/biomesoplenty/blockstates/double_other_slab.json index 1339afd65..66c2d12b0 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/double_other_slab.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/double_other_slab.json @@ -1,12 +1,5 @@ { "variants": { - "variant=limestone": { "model": "biomesoplenty:limestone" }, - "variant=siltstone": { "model": "biomesoplenty:siltstone" }, - "variant=shale": { "model": "biomesoplenty:shale" }, - "variant=polished_limestone": { "model": "biomesoplenty:polished_limestone" }, - "variant=polished_siltstone": { "model": "biomesoplenty:polished_siltstone" }, - "variant=polished_shale": { "model": "biomesoplenty:polished_shale" }, - "variant=crag_rock": { "model": "biomesoplenty:crag_rock" }, "variant=mud_brick": { "model": "biomesoplenty:mud_brick_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/blockstates/dried_dirt.json b/src/main/resources/assets/biomesoplenty/blockstates/dried_dirt.json deleted file mode 100644 index 8b98cb633..000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/dried_dirt.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "biomesoplenty:dried_dirt" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/dried_sand.json b/src/main/resources/assets/biomesoplenty/blockstates/dried_sand.json new file mode 100644 index 000000000..ae4fb041c --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/dried_sand.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "biomesoplenty:dried_sand" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/hard_dirt.json b/src/main/resources/assets/biomesoplenty/blockstates/hard_dirt.json deleted file mode 100644 index ef44e17dc..000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/hard_dirt.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "biomesoplenty:hard_dirt" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/hard_sand.json b/src/main/resources/assets/biomesoplenty/blockstates/hard_sand.json deleted file mode 100644 index debeafcd7..000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/hard_sand.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "biomesoplenty:hard_sand" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/other_slab.json b/src/main/resources/assets/biomesoplenty/blockstates/other_slab.json index 73b07f276..6b481fef1 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/other_slab.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/other_slab.json @@ -1,19 +1,5 @@ { "variants": { - "half=bottom,variant=limestone": { "model": "biomesoplenty:half_slab_limestone" }, - "half=top,variant=limestone": { "model": "biomesoplenty:upper_slab_limestone" }, - "half=bottom,variant=siltstone": { "model": "biomesoplenty:half_slab_siltstone" }, - "half=top,variant=siltstone": { "model": "biomesoplenty:upper_slab_siltstone" }, - "half=bottom,variant=shale": { "model": "biomesoplenty:half_slab_shale" }, - "half=top,variant=shale": { "model": "biomesoplenty:upper_slab_shale" }, - "half=bottom,variant=polished_limestone": { "model": "biomesoplenty:half_slab_polished_limestone" }, - "half=top,variant=polished_limestone": { "model": "biomesoplenty:upper_slab_polished_limestone" }, - "half=bottom,variant=polished_siltstone": { "model": "biomesoplenty:half_slab_polished_siltstone" }, - "half=top,variant=polished_siltstone": { "model": "biomesoplenty:upper_slab_polished_siltstone" }, - "half=bottom,variant=polished_shale": { "model": "biomesoplenty:half_slab_polished_shale" }, - "half=top,variant=polished_shale": { "model": "biomesoplenty:upper_slab_polished_shale" }, - "half=bottom,variant=crag_rock": { "model": "biomesoplenty:half_slab_crag_rock" }, - "half=top,variant=crag_rock": { "model": "biomesoplenty:upper_slab_crag_rock" }, "half=bottom,variant=mud_brick": { "model": "biomesoplenty:half_slab_mud_brick" }, "half=top,variant=mud_brick": { "model": "biomesoplenty:upper_slab_mud_brick" } } diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index e72867ee5..08941995a 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -193,7 +193,6 @@ tile.coral.orange_coral.name=Orange Coral tile.coral.blue_coral.name=Blue Coral tile.coral.glowing_coral.name=Glowing Coral tile.coral.algae.name=Algae -tile.crag_rock_slab.name=Crag Rock Slab tile.dirt.loamy_dirt.name=Loamy Dirt tile.dirt.sandy_dirt.name=Sandy Dirt tile.dirt.silty_dirt.name=Silty Dirt @@ -297,7 +296,6 @@ tile.leaves_5.pine_leaves.name=Pine Leaves tile.leaves_5.mahogany_leaves.name=Mahogany Leaves tile.leaves_5.red_big_flower_petal.name=Giant Red Flower Petal tile.leaves_5.yellow_big_flower_petal.name=Giant Yellow Flower Petal -tile.limestone_slab.name=Limestone Slab tile.log_0.sacred_oak_log.name=Sacred Oak Wood tile.log_0.cherry_log.name=Cherry Wood tile.log_0.umbran_log.name=Umbran Wood @@ -390,9 +388,6 @@ tile.plant_1.reed.name=Reed tile.plant_1.root.name=Root tile.plant_1.rafflesia.name=Rafflesia tile.plant_1.wisteria.name=Wisteria -tile.polished_limestone_slab.name=Polished Limestone Slab -tile.polished_siltstone_slab.name=Polished Siltstone Slab -tile.polished_shale_slab.name=Polished Shale Slab tile.redwood_fence.name=Redwood Fence tile.redwood_fence_gate.name=Redwood Fence Gate tile.redwood_wood_slab.name=Redwood Wood Slab @@ -424,8 +419,6 @@ tile.sapling_2.willow_sapling.name=Willow Sapling tile.sapling_2.pine_sapling.name=Pine Sapling tile.sapling_2.mahogany_sapling.name=Mahogany Sapling tile.seaweed.kelp.name=Kelp -tile.shale_slab.name=Shale Slab -tile.siltstone_slab.name=Siltstone Slab tile.stone.limestone.name=Limestone tile.stone.polished_limestone.name=Polished Limestone tile.stone.siltstone.name=Siltstone @@ -464,11 +457,8 @@ tile.willow_fence.name=Willow Fence tile.willow_fence_gate.name=Willow Fence Gate tile.willow_wood_slab.name=Willow Wood Slab tile.willow_stairs.name=Willow Wood Stairs -tile.ash_stone.name=Ash Stone -tile.hard_sand.name=Hardened Sand -tile.hard_dirt.name=Hardened Dirt tile.hard_ice.name=Hardened Ice -tile.dried_dirt.name=Dried Dirt +tile.dried_sand.name=Dried Sand tile.crag_rock.name=Crag Rock tile.mud_brick.name=Mud Bricks tile.crystal.name=Celestial Crystal \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/dried_dirt.json b/src/main/resources/assets/biomesoplenty/models/block/dried_dirt.json deleted file mode 100644 index 20716bf46..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/dried_dirt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "biomesoplenty:blocks/dried_dirt" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/ash_stone.json b/src/main/resources/assets/biomesoplenty/models/block/dried_sand.json similarity index 55% rename from src/main/resources/assets/biomesoplenty/models/block/ash_stone.json rename to src/main/resources/assets/biomesoplenty/models/block/dried_sand.json index e014a9d04..a332c51d0 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/ash_stone.json +++ b/src/main/resources/assets/biomesoplenty/models/block/dried_sand.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "biomesoplenty:blocks/ash_stone" + "all": "biomesoplenty:blocks/dried_sand" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/half_slab_crag_rock.json b/src/main/resources/assets/biomesoplenty/models/block/half_slab_crag_rock.json deleted file mode 100644 index 75946c63f..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/half_slab_crag_rock.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "bottom": "biomesoplenty:blocks/crag_rock", - "top": "biomesoplenty:blocks/crag_rock", - "side": "biomesoplenty:blocks/crag_rock" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/half_slab_limestone.json b/src/main/resources/assets/biomesoplenty/models/block/half_slab_limestone.json deleted file mode 100644 index cf6a8b6ec..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/half_slab_limestone.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "bottom": "biomesoplenty:blocks/limestone", - "top": "biomesoplenty:blocks/limestone", - "side": "biomesoplenty:blocks/limestone" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/half_slab_polished_limestone.json b/src/main/resources/assets/biomesoplenty/models/block/half_slab_polished_limestone.json deleted file mode 100644 index b8e21a050..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/half_slab_polished_limestone.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "bottom": "biomesoplenty:blocks/polished_limestone", - "top": "biomesoplenty:blocks/polished_limestone", - "side": "biomesoplenty:blocks/polished_limestone" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/half_slab_polished_shale.json b/src/main/resources/assets/biomesoplenty/models/block/half_slab_polished_shale.json deleted file mode 100644 index 39cb025bb..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/half_slab_polished_shale.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "bottom": "biomesoplenty:blocks/polished_shale", - "top": "biomesoplenty:blocks/polished_shale", - "side": "biomesoplenty:blocks/polished_shale" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/half_slab_polished_siltstone.json b/src/main/resources/assets/biomesoplenty/models/block/half_slab_polished_siltstone.json deleted file mode 100644 index a9128ee80..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/half_slab_polished_siltstone.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "bottom": "biomesoplenty:blocks/polished_siltstone", - "top": "biomesoplenty:blocks/polished_siltstone", - "side": "biomesoplenty:blocks/polished_siltstone" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/half_slab_shale.json b/src/main/resources/assets/biomesoplenty/models/block/half_slab_shale.json deleted file mode 100644 index f5616b002..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/half_slab_shale.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "bottom": "biomesoplenty:blocks/shale", - "top": "biomesoplenty:blocks/shale", - "side": "biomesoplenty:blocks/shale" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/half_slab_siltstone.json b/src/main/resources/assets/biomesoplenty/models/block/half_slab_siltstone.json deleted file mode 100644 index 48abff5d8..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/half_slab_siltstone.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "bottom": "biomesoplenty:blocks/siltstone", - "top": "biomesoplenty:blocks/siltstone", - "side": "biomesoplenty:blocks/siltstone" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/hard_dirt.json b/src/main/resources/assets/biomesoplenty/models/block/hard_dirt.json deleted file mode 100644 index 93e0b76d7..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/hard_dirt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "biomesoplenty:blocks/hard_dirt" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/hard_sand.json b/src/main/resources/assets/biomesoplenty/models/block/hard_sand.json deleted file mode 100644 index 587489107..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/hard_sand.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "biomesoplenty:blocks/hard_sand" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/upper_slab_crag_rock.json b/src/main/resources/assets/biomesoplenty/models/block/upper_slab_crag_rock.json deleted file mode 100644 index 72088abfc..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/upper_slab_crag_rock.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "bottom": "biomesoplenty:blocks/crag_rock", - "top": "biomesoplenty:blocks/crag_rock", - "side": "biomesoplenty:blocks/crag_rock" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/upper_slab_limestone.json b/src/main/resources/assets/biomesoplenty/models/block/upper_slab_limestone.json deleted file mode 100644 index 0585123b7..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/upper_slab_limestone.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "bottom": "biomesoplenty:blocks/limestone", - "top": "biomesoplenty:blocks/limestone", - "side": "biomesoplenty:blocks/limestone" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/upper_slab_polished_limestone.json b/src/main/resources/assets/biomesoplenty/models/block/upper_slab_polished_limestone.json deleted file mode 100644 index f3bef9e63..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/upper_slab_polished_limestone.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "bottom": "biomesoplenty:blocks/polished_limestone", - "top": "biomesoplenty:blocks/polished_limestone", - "side": "biomesoplenty:blocks/polished_limestone" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/upper_slab_polished_shale.json b/src/main/resources/assets/biomesoplenty/models/block/upper_slab_polished_shale.json deleted file mode 100644 index b12ae501c..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/upper_slab_polished_shale.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "bottom": "biomesoplenty:blocks/polished_shale", - "top": "biomesoplenty:blocks/polished_shale", - "side": "biomesoplenty:blocks/polished_shale" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/upper_slab_polished_siltstone.json b/src/main/resources/assets/biomesoplenty/models/block/upper_slab_polished_siltstone.json deleted file mode 100644 index e48cc4e0e..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/upper_slab_polished_siltstone.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "bottom": "biomesoplenty:blocks/polished_siltstone", - "top": "biomesoplenty:blocks/polished_siltstone", - "side": "biomesoplenty:blocks/polished_siltstone" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/upper_slab_shale.json b/src/main/resources/assets/biomesoplenty/models/block/upper_slab_shale.json deleted file mode 100644 index 8619f6d95..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/upper_slab_shale.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "bottom": "biomesoplenty:blocks/shale", - "top": "biomesoplenty:blocks/shale", - "side": "biomesoplenty:blocks/shale" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/upper_slab_siltstone.json b/src/main/resources/assets/biomesoplenty/models/block/upper_slab_siltstone.json deleted file mode 100644 index 9a9e3946b..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/upper_slab_siltstone.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "bottom": "biomesoplenty:blocks/siltstone", - "top": "biomesoplenty:blocks/siltstone", - "side": "biomesoplenty:blocks/siltstone" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/item/crag_rock_slab.json b/src/main/resources/assets/biomesoplenty/models/item/crag_rock_slab.json deleted file mode 100644 index cdeefcfd7..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/crag_rock_slab.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "biomesoplenty:block/half_slab_crag_rock", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/biomesoplenty/models/item/dried_dirt.json b/src/main/resources/assets/biomesoplenty/models/item/dried_dirt.json deleted file mode 100644 index eed489321..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/dried_dirt.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "biomesoplenty:block/dried_dirt", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/item/ash_stone.json b/src/main/resources/assets/biomesoplenty/models/item/dried_sand.json similarity index 80% rename from src/main/resources/assets/biomesoplenty/models/item/ash_stone.json rename to src/main/resources/assets/biomesoplenty/models/item/dried_sand.json index fc4394d94..ea2ae72a7 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/ash_stone.json +++ b/src/main/resources/assets/biomesoplenty/models/item/dried_sand.json @@ -1,5 +1,5 @@ { - "parent": "biomesoplenty:block/ash_stone", + "parent": "biomesoplenty:block/dried_sand", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/biomesoplenty/models/item/hard_dirt.json b/src/main/resources/assets/biomesoplenty/models/item/hard_dirt.json deleted file mode 100644 index 50c9ad3ed..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/hard_dirt.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "biomesoplenty:block/hard_dirt", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/item/hard_sand.json b/src/main/resources/assets/biomesoplenty/models/item/hard_sand.json deleted file mode 100644 index 7f39fb00f..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/hard_sand.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "biomesoplenty:block/hard_sand", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/item/limestone_slab.json b/src/main/resources/assets/biomesoplenty/models/item/limestone_slab.json deleted file mode 100644 index 69b6db9dd..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/limestone_slab.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "biomesoplenty:block/half_slab_limestone", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/biomesoplenty/models/item/polished_limestone_slab.json b/src/main/resources/assets/biomesoplenty/models/item/polished_limestone_slab.json deleted file mode 100644 index 6723b86d6..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/polished_limestone_slab.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "biomesoplenty:block/half_slab_polished_limestone", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/biomesoplenty/models/item/polished_shale_slab.json b/src/main/resources/assets/biomesoplenty/models/item/polished_shale_slab.json deleted file mode 100644 index 6674af219..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/polished_shale_slab.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "biomesoplenty:block/half_slab_polished_shale", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/biomesoplenty/models/item/polished_siltstone_slab.json b/src/main/resources/assets/biomesoplenty/models/item/polished_siltstone_slab.json deleted file mode 100644 index 6b5cd35ab..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/polished_siltstone_slab.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "biomesoplenty:block/half_slab_polished_siltstone", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/biomesoplenty/models/item/shale_slab.json b/src/main/resources/assets/biomesoplenty/models/item/shale_slab.json deleted file mode 100644 index 8be0a5abd..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/shale_slab.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "biomesoplenty:block/half_slab_shale", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/biomesoplenty/models/item/siltstone_slab.json b/src/main/resources/assets/biomesoplenty/models/item/siltstone_slab.json deleted file mode 100644 index bd8bda171..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/siltstone_slab.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "biomesoplenty:block/half_slab_siltstone", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dried_dirt.png b/src/main/resources/assets/biomesoplenty/textures/blocks/dried_sand.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/dried_dirt.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/dried_sand.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hard_dirt.png b/src/main/resources/assets/biomesoplenty/textures/blocks/hard_dirt.png deleted file mode 100644 index 2bc15b2ce..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/hard_dirt.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hard_sand.png b/src/main/resources/assets/biomesoplenty/textures/blocks/hard_sand.png deleted file mode 100644 index adfe20302..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/hard_sand.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/quicksand.png b/src/main/resources/assets/biomesoplenty/textures/blocks/quicksand.png index 1a7f37809..85aba0fe6 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/quicksand.png and b/src/main/resources/assets/biomesoplenty/textures/blocks/quicksand.png differ