diff --git a/src/main/java/biomesoplenty/api/block/BOPBlocks.java b/src/main/java/biomesoplenty/api/block/BOPBlocks.java index 5ecd8dd5c..f76814844 100644 --- a/src/main/java/biomesoplenty/api/block/BOPBlocks.java +++ b/src/main/java/biomesoplenty/api/block/BOPBlocks.java @@ -259,8 +259,7 @@ public class BOPBlocks public static Block desert_grass; public static Block dead_grass; public static Block spectral_fern; - - public static Block tiny_cactus; + public static Block cattail; public static Block tall_cattail; diff --git a/src/main/java/biomesoplenty/api/entity/BOPEntities.java b/src/main/java/biomesoplenty/api/entity/BOPEntities.java index 0aefaaf25..9abe3b7f5 100644 --- a/src/main/java/biomesoplenty/api/entity/BOPEntities.java +++ b/src/main/java/biomesoplenty/api/entity/BOPEntities.java @@ -11,6 +11,5 @@ import net.minecraft.entity.EntityType; public class BOPEntities { - public static EntityType mud_ball; public static EntityType boat_bop; } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BrushlandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/BrushlandBiome.java index f4df35004..e8b5e10f7 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BrushlandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BrushlandBiome.java @@ -66,7 +66,6 @@ public class BrushlandBiome extends BiomeBOP this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.DEAD_BUSH, IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(7))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.CACTUS, IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(5))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.BUSH, new BushConfig(BOPBlocks.bush.getDefaultState()), Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(15))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.BUSH, new BushConfig(BOPBlocks.tiny_cactus.getDefaultState()), Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(4))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.BUSH, new BushConfig(BOPBlocks.dune_grass.getDefaultState()), Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(9))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.BUSH, new BushConfig(BOPBlocks.desert_grass.getDefaultState()), Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(10))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.BUSH, new BushConfig(BOPBlocks.dead_grass.getDefaultState()), Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(5))); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OasisBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OasisBiome.java index 1ed363d46..903c3de3b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OasisBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OasisBiome.java @@ -49,7 +49,6 @@ public class OasisBiome extends BiomeBOP // Vegetation this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.RANDOM_SELECTOR, new MultipleRandomFeatureConfig(new Feature[]{BOPBiomeFeatures.PALM_TREE}, new IFeatureConfig[]{IFeatureConfig.NO_FEATURE_CONFIG}, new float[]{0.3F}, BOPBiomeFeatures.OASIS_JUNGLE_TWIGLET_TREE, IFeatureConfig.NO_FEATURE_CONFIG), Placement.COUNT_EXTRA_HEIGHTMAP, new AtSurfaceWithExtraConfig(5, 0.2F, 1))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.BUSH, new BushConfig(BOPBlocks.tiny_cactus.getDefaultState()), Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(1))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.BUSH, new BushConfig(BOPBlocks.dune_grass.getDefaultState()), Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(20))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.BUSH, new BushConfig(BOPBlocks.desert_grass.getDefaultState()), Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(10))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.REED, IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(12))); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java index 15aa2de8f..d1ec0b8a0 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OrchardBiome.java @@ -54,10 +54,9 @@ public class OrchardBiome extends BiomeBOP // Vegetation this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.RANDOM_SELECTOR, new MultipleRandomFeatureConfig(new Feature[]{BOPBiomeFeatures.BIG_FLOWERING_OAK_TREE}, new IFeatureConfig[]{IFeatureConfig.NO_FEATURE_CONFIG}, new float[]{0.1F}, BOPBiomeFeatures.FLOWERING_OAK_TREE, IFeatureConfig.NO_FEATURE_CONFIG), Placement.COUNT_EXTRA_HEIGHTMAP, new AtSurfaceWithExtraConfig(2, 0.3F, 1))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(BOPBiomeFeatures.MEADOW_FLOWERS, IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_32, new FrequencyConfig(15))); + this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(BOPBiomeFeatures.EXTENDED_FLOWERS, IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_32, new FrequencyConfig(15))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(new StandardGrassFeature(NoFeatureConfig::deserialize), IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(10))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.DOUBLE_PLANT, new DoublePlantConfig(Blocks.ROSE_BUSH.getDefaultState()), Placement.COUNT_HEIGHTMAP_32, new FrequencyConfig(1))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.BUSH, new BushConfig(BOPBlocks.bush.getDefaultState()), Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(8))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.REED, IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(10))); //////////////////////////////////////////////////////////// diff --git a/src/main/java/biomesoplenty/common/biome/overworld/OutbackBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/OutbackBiome.java index 29e4fc3c5..fb6294529 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/OutbackBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/OutbackBiome.java @@ -59,7 +59,6 @@ public class OutbackBiome extends BiomeBOP this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.RANDOM_SELECTOR, new MultipleRandomFeatureConfig(new Feature[]{BOPBiomeFeatures.ACACIA_BUSH}, new IFeatureConfig[]{IFeatureConfig.NO_FEATURE_CONFIG}, new float[]{0.1F}, BOPBiomeFeatures.ACACIA_TWIGLET_TREE, IFeatureConfig.NO_FEATURE_CONFIG), Placement.COUNT_EXTRA_HEIGHTMAP, new AtSurfaceWithExtraConfig((int)0.5F, 0.3F, 1))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.DEAD_BUSH, IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(3))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.CACTUS, IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(25))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.BUSH, new BushConfig(BOPBlocks.tiny_cactus.getDefaultState()), Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(5))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.BUSH, new BushConfig(BOPBlocks.desert_grass.getDefaultState()), Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(10))); //////////////////////////////////////////////////////////// diff --git a/src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java index c0fe42995..f430a7b99 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/XericShrublandBiome.java @@ -63,7 +63,6 @@ public class XericShrublandBiome extends BiomeBOP this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(BOPBiomeFeatures.XERIC_SHRUBLAND_FLOWERS, IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_32, new FrequencyConfig(7))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.DEAD_BUSH, IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(7))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.CACTUS, IFeatureConfig.NO_FEATURE_CONFIG, Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(5))); - this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.BUSH, new BushConfig(BOPBlocks.tiny_cactus.getDefaultState()), Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(4))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.BUSH, new BushConfig(BOPBlocks.dune_grass.getDefaultState()), Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(275))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.BUSH, new BushConfig(BOPBlocks.desert_grass.getDefaultState()), Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(30))); this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(Feature.BUSH, new BushConfig(BOPBlocks.dead_grass.getDefaultState()), Placement.COUNT_HEIGHTMAP_DOUBLE, new FrequencyConfig(5))); diff --git a/src/main/java/biomesoplenty/common/block/BlockPlantBOP.java b/src/main/java/biomesoplenty/common/block/BlockPlantBOP.java index 44f97bd3c..645fa5fd0 100644 --- a/src/main/java/biomesoplenty/common/block/BlockPlantBOP.java +++ b/src/main/java/biomesoplenty/common/block/BlockPlantBOP.java @@ -49,11 +49,6 @@ public class BlockPlantBOP extends BushBlock implements IPlantable { Block ground = worldIn.getBlockState(pos.down()).getBlock(); - if (this == BOPBlocks.tiny_cactus) - { - return ground == Blocks.SAND || ground == Blocks.RED_SAND || ground == BOPBlocks.white_sand || super.isValidPosition(state, worldIn, pos); - } - return super.isValidPosition(state, worldIn, pos); } @@ -62,22 +57,6 @@ public class BlockPlantBOP extends BushBlock implements IPlantable { Block block = world.getBlockState(pos).getBlock(); - if (block == BOPBlocks.tiny_cactus) - { - return PlantType.Desert; - } - return PlantType.Plains; } - - @Override - public void onEntityCollision(BlockState stateIn, World worldIn, BlockPos pos, Entity entityIn) - { - Block block = stateIn.getBlock(); - - if (block == BOPBlocks.tiny_cactus) - { - entityIn.attackEntityFrom(DamageSource.CACTUS, 1.0F); - } - } } diff --git a/src/main/java/biomesoplenty/common/item/ItemMusicDiscBOP.java b/src/main/java/biomesoplenty/common/item/ItemMusicDiscBOP.java index b25f9d501..e2510946a 100644 --- a/src/main/java/biomesoplenty/common/item/ItemMusicDiscBOP.java +++ b/src/main/java/biomesoplenty/common/item/ItemMusicDiscBOP.java @@ -17,6 +17,6 @@ public class ItemMusicDiscBOP extends MusicDiscItem { public ItemMusicDiscBOP(SoundEvent record) { - super(0, record, new Item.Properties().group(ItemGroupBOP.instance).rarity(Rarity.RARE)); + super(0, record, new Item.Properties().group(ItemGroupBOP.instance).rarity(Rarity.RARE).maxStackSize(1)); } } diff --git a/src/main/java/biomesoplenty/common/world/WorldTypeBOP.java b/src/main/java/biomesoplenty/common/world/WorldTypeBOP.java index 2cab36393..7bbcb17fd 100644 --- a/src/main/java/biomesoplenty/common/world/WorldTypeBOP.java +++ b/src/main/java/biomesoplenty/common/world/WorldTypeBOP.java @@ -26,7 +26,7 @@ public class WorldTypeBOP extends WorldType { if (world.getDimension().getType() == DimensionType.OVERWORLD) { - // Mojang does this through a billion builders. Fuck that. + // Mojang does this through a billion builders. OverworldGenSettings overworldGenSettings = new OverworldGenSettings(); OverworldBiomeProviderSettings biomeProviderSettings = new OverworldBiomeProviderSettings(); biomeProviderSettings.setWorldInfo(world.getWorldInfo()); diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/tree/BigTreeFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/tree/BigTreeFeature.java index 6fd044b32..fd2c07ef6 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/tree/BigTreeFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/tree/BigTreeFeature.java @@ -456,7 +456,7 @@ public class BigTreeFeature extends TreeFeatureBase @Override protected boolean place(Set changedBlocks, IWorldGenerationReader world, Random random, BlockPos startPos, MutableBoundingBox boundingBox) { - this.world = (IWorld)world; // Fuck this bullshit, we want an IWorld + this.world = (IWorld)world; // We want an IWorld this.origin = startPos; this.random = new Random(random.nextLong()); diff --git a/src/main/java/biomesoplenty/core/ClientProxy.java b/src/main/java/biomesoplenty/core/ClientProxy.java index d28feca32..cdd8c4da7 100644 --- a/src/main/java/biomesoplenty/core/ClientProxy.java +++ b/src/main/java/biomesoplenty/core/ClientProxy.java @@ -57,31 +57,4 @@ public class ClientProxy extends CommonProxy BOPBlocks.bush, BOPBlocks.flowering_oak_leaves, BOPBlocks.mahogany_leaves, BOPBlocks.palm_leaves, BOPBlocks.willow_leaves, BOPBlocks.willow_vine); } - - @Override - public void spawnParticle(BOPParticleTypes type, World parWorld, double x, double y, double z, Object... info) - { - Minecraft minecraft = Minecraft.getInstance(); - Particle entityFx = null; - switch (type) - { - case MUD: - int itemId = Item.getIdFromItem(BOPItems.mud_ball); - minecraft.world.addParticle(new ItemParticleData(ParticleTypes.ITEM, new ItemStack(BOPItems.mud_ball)), x, y, z, MathHelper.nextDouble(parWorld.rand, -0.08D, 0.08D), MathHelper.nextDouble(parWorld.rand, -0.08D, 0.08D), MathHelper.nextDouble(parWorld.rand, -0.08D, 0.08D)); - return; - /*case PLAYER_TRAIL: - if (info.length < 1) - throw new RuntimeException("Missing argument for trail name!"); - - entityFx = new EntityTrailFX(parWorld, x, y, z, (String)info[0]); - break; - case CURSE: - entityFx = new EntityCurseFX(parWorld, x, y, z, MathHelper.nextDouble(parWorld.rand, -0.03, 0.03), 0.05D, MathHelper.nextDouble(parWorld.rand, -0.03, 0.03)); - break;*/ - default: - break; - } - - //if (entityFx != null) {minecraft.effectRenderer.addEffect(entityFx);} - } } diff --git a/src/main/java/biomesoplenty/init/ModBlocks.java b/src/main/java/biomesoplenty/init/ModBlocks.java index afe871c88..4bf49cb6e 100644 --- a/src/main/java/biomesoplenty/init/ModBlocks.java +++ b/src/main/java/biomesoplenty/init/ModBlocks.java @@ -273,8 +273,7 @@ public class ModBlocks desert_grass = registerBlock(new BlockFoliageBOP(Block.Properties.create(Material.TALL_PLANTS, MaterialColor.ORANGE_TERRACOTTA).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "desert_grass"); dead_grass = registerBlock(new BlockFoliageBOP(Block.Properties.create(Material.TALL_PLANTS, MaterialColor.WOOD).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "dead_grass"); spectral_fern = registerBlock(new BlockFoliageBOP(Block.Properties.create(Material.TALL_PLANTS, MaterialColor.RED).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "spectral_fern"); - - tiny_cactus = registerBlock(new BlockPlantBOP(Block.Properties.create(Material.PLANTS).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "tiny_cactus"); + cattail = registerBlock(new BlockWatersidePlant(Block.Properties.create(Material.PLANTS, MaterialColor.DIRT).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "cattail"); tall_cattail = registerBlock(new BlockDoubleWatersidePlant(cattail, Block.Properties.create(Material.PLANTS, MaterialColor.DIRT).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "tall_cattail"); diff --git a/src/main/java/biomesoplenty/init/ModEntities.java b/src/main/java/biomesoplenty/init/ModEntities.java index cff1ad701..89bf222b8 100644 --- a/src/main/java/biomesoplenty/init/ModEntities.java +++ b/src/main/java/biomesoplenty/init/ModEntities.java @@ -7,27 +7,20 @@ ******************************************************************************/ package biomesoplenty.init; -import biomesoplenty.api.entity.BOPEntities; -import biomesoplenty.common.entity.projectile.EntityMudBall; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.entity.SpriteRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.registries.ForgeRegistries; public class ModEntities { public static void init() { - EntityType mud_ball = createEntity(EntityMudBall::new, EntityClassification.MISC, "mud_ball", 64, 10, true); //EntityType boat_bop = createEntity(EntityBoatBOP::new, EntityClassification.MISC, "boat_bop", 80, 3, true); - BOPEntities.mud_ball = mud_ball; //BOPEntities.boat_bop = boat_bop; } @@ -43,7 +36,6 @@ public class ModEntities @OnlyIn(Dist.CLIENT) public static void registerRendering() { - RenderingRegistry.registerEntityRenderingHandler(EntityMudBall.class, manager -> new SpriteRenderer<>(manager, Minecraft.getInstance().getItemRenderer())); //RenderingRegistry.registerEntityRenderingHandler(EntityBoatBOP.class, manager -> new RenderBoatBOP(manager)); } } diff --git a/src/main/java/biomesoplenty/init/ModItems.java b/src/main/java/biomesoplenty/init/ModItems.java index 36cebfc91..fca78b385 100644 --- a/src/main/java/biomesoplenty/init/ModItems.java +++ b/src/main/java/biomesoplenty/init/ModItems.java @@ -8,7 +8,6 @@ package biomesoplenty.init; import biomesoplenty.api.sound.BOPSounds; -import biomesoplenty.common.item.ItemMudBall; import biomesoplenty.common.item.ItemMusicDiscBOP; import biomesoplenty.common.util.inventory.ItemGroupBOP; import net.minecraft.item.Item; @@ -20,7 +19,7 @@ public class ModItems { public static void init() { - mud_ball = registerItem(new ItemMudBall(), "mud_ball"); + mud_ball = registerItem(new Item(new Item.Properties().group(ItemGroupBOP.instance)), "mud_ball"); mud_brick = registerItem(new Item(new Item.Properties().group(ItemGroupBOP.instance)), "mud_brick"); music_disc_wanderer = registerItem(new ItemMusicDiscBOP(BOPSounds.music_disc_wanderer), "music_disc_wanderer"); diff --git a/src/main/resources/assets/biomesoplenty/blockstates/tiny_cactus.json b/src/main/resources/assets/biomesoplenty/blockstates/tiny_cactus.json deleted file mode 100644 index be687ca8b..000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/tiny_cactus.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "biomesoplenty:block/tiny_cactus" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/lang/en_us.json b/src/main/resources/assets/biomesoplenty/lang/en_us.json index 5ba055d52..8424b32d6 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_us.json +++ b/src/main/resources/assets/biomesoplenty/lang/en_us.json @@ -1,6 +1,6 @@ { "advancements.biomesoplenty.root.title": "Biomes O' Plenty", - "advancements.biomesoplenty.root.description": "The explorer's dream...", + "advancements.biomesoplenty.root.description": "Explore the world around you", "advancements.biomesoplenty.all_biomes.title": "Wanderer", "advancements.biomesoplenty.all_biomes.description": "Discover every biome in Biomes O' Plenty", @@ -313,7 +313,6 @@ "block.biomesoplenty.stripped_willow_log": "Stripped Willow Log", "block.biomesoplenty.stripped_willow_wood": "Stripped Willow Wood", "block.biomesoplenty.tall_cattail": "Tall Cattail", - "block.biomesoplenty.tiny_cactus": "Tiny Cactus", "block.biomesoplenty.toadstool": "Toadstool", "block.biomesoplenty.umbran_button": "Umbran Button", "block.biomesoplenty.umbran_door": "Umbran Door", @@ -366,6 +365,5 @@ "commands.biomesoplenty.tpbiome.success": "Teleported %s to biome %s at (%s, %s, %s)", "commands.biomesoplenty.tpbiome.error": "Couldn't find biome %s!", - "entity.biomesoplenty.mud_ball": "Mud Ball", "entity.biomesoplenty.boat_bop": "Boat" } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/tiny_cactus.json b/src/main/resources/assets/biomesoplenty/models/block/tiny_cactus.json deleted file mode 100644 index 2a6322ec0..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/tiny_cactus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "biomesoplenty:blocks/tiny_cactus" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/item/tiny_cactus.json b/src/main/resources/assets/biomesoplenty/models/item/tiny_cactus.json deleted file mode 100644 index d9366f95d..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/tiny_cactus.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "biomesoplenty:blocks/tiny_cactus" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - } -} - diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/tiny_cactus.png b/src/main/resources/assets/biomesoplenty/textures/blocks/tiny_cactus.png deleted file mode 100644 index 12b8ee12e..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/tiny_cactus.png and /dev/null differ diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/misc/cactus_green_from_tiny_cactus.json b/src/main/resources/data/biomesoplenty/advancements/recipes/misc/cactus_green_from_tiny_cactus.json deleted file mode 100644 index 78fef41e3..000000000 --- a/src/main/resources/data/biomesoplenty/advancements/recipes/misc/cactus_green_from_tiny_cactus.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "biomesoplenty:cactus_green_from_tiny_cactus" - ] - }, - "criteria": { - "has_tiny_cactus": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "biomesoplenty:tiny_cactus" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "biomesoplenty:cactus_green_from_tiny_cactus" - } - } - }, - "requirements": [ - [ - "has_tiny_cactus", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/misc/mud_brick.json b/src/main/resources/data/biomesoplenty/advancements/recipes/misc/mud_brick_from_smelting.json similarity index 82% rename from src/main/resources/data/biomesoplenty/advancements/recipes/misc/mud_brick.json rename to src/main/resources/data/biomesoplenty/advancements/recipes/misc/mud_brick_from_smelting.json index 8b11ecde4..6f74d0ab2 100644 --- a/src/main/resources/data/biomesoplenty/advancements/recipes/misc/mud_brick.json +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/misc/mud_brick_from_smelting.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "biomesoplenty:mud_brick" + "biomesoplenty:mud_brick_from_smelting" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "biomesoplenty:mud_brick" + "recipe": "biomesoplenty:mud_brick_from_smelting" } } }, diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/tiny_cactus.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/tiny_cactus.json deleted file mode 100644 index 961212e3d..000000000 --- a/src/main/resources/data/biomesoplenty/loot_tables/blocks/tiny_cactus.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "biomesoplenty:tiny_cactus" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/green_dye_from_tiny_cactus.json b/src/main/resources/data/biomesoplenty/recipes/green_dye_from_tiny_cactus.json deleted file mode 100644 index c682c9b97..000000000 --- a/src/main/resources/data/biomesoplenty/recipes/green_dye_from_tiny_cactus.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "smelting", - "ingredient": { - "item": "biomesoplenty:tiny_cactus" - }, - "result": "minecraft:green_dye", - "experience": 1.0, - "cookingtime": 200 -} \ No newline at end of file