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

Changed foliage/leaf block loot tables to use the Forge shears tag (Closes #1689)

Browse source
This commit is contained in:
Forstride 2020-11-09 00:47:01 -05:00
parent b8bbadd73a
commit f66a7f349e
30 changed files with 54 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/biomesoplenty/common/biome/overworld/WoodedScrublandBiome.java
View file

@ -56,6 +56,7 @@ public class WoodedScrublandBiome extends BiomeTemplate
// Vegetation // Vegetation
builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.WOODED_SCRUBLAND_TREES); builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.WOODED_SCRUBLAND_TREES);
builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.SCRUBLAND_FLOWERS);
builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.DESERT_GRASS_10); builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.DESERT_GRASS_10);
builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.SCRUB_EXTRA); builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.SCRUB_EXTRA);

1
src/main/java/biomesoplenty/common/world/gen/feature/BOPConfiguredFeatures.java
View file

@ -189,6 +189,7 @@ public class BOPConfiguredFeatures
public static final ConfiguredFeature<?, ?> UNDERGROWTH_FLOWERS = register("undergrowth_flowers", Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfiguration(BOPBlocks.burning_blossom.defaultBlockState())).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(8))); public static final ConfiguredFeature<?, ?> UNDERGROWTH_FLOWERS = register("undergrowth_flowers", Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfiguration(BOPBlocks.burning_blossom.defaultBlockState())).decorated(Features.Placements.HEIGHTMAP_DOUBLE_SQUARE.count(8)));
public static final ConfiguredFeature<?, ?> WASTELAND_FLOWERS = register("wasteland_flowers", BOPFeatures.WASTELAND_FLOWERS.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(1))); public static final ConfiguredFeature<?, ?> WASTELAND_FLOWERS = register("wasteland_flowers", BOPFeatures.WASTELAND_FLOWERS.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(1)));
public static final ConfiguredFeature<?, ?> WETLAND_FLOWERS = register("wetland_flowers", BOPFeatures.WETLAND_FLOWERS.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(3))); public static final ConfiguredFeature<?, ?> WETLAND_FLOWERS = register("wetland_flowers", BOPFeatures.WETLAND_FLOWERS.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(3)));
public static final ConfiguredFeature<?, ?> SCRUBLAND_FLOWERS = register("scrubland_flowers", BOPFeatures.WILDFLOWER_FEATURE.configured(IFeatureConfig.NONE).decorated(Features.Placements.ADD_32).decorated(Features.Placements.HEIGHTMAP_SQUARE.count(2)));
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////

2
src/main/resources/data/biomesoplenty/loot_tables/blocks/barley.json
View file

@ -13,7 +13,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
} }
], ],

2
src/main/resources/data/biomesoplenty/loot_tables/blocks/bush.json
View file

@ -13,7 +13,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
} }
] ]

2
src/main/resources/data/biomesoplenty/loot_tables/blocks/dead_branch.json
View file

@ -13,7 +13,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
} }
], ],

2
src/main/resources/data/biomesoplenty/loot_tables/blocks/dead_grass.json
View file

@ -13,7 +13,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
} }
] ]

4
src/main/resources/data/biomesoplenty/loot_tables/blocks/dead_leaves.json
View file

@ -16,7 +16,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -103,7 +103,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {

2
src/main/resources/data/biomesoplenty/loot_tables/blocks/desert_grass.json
View file

@ -13,7 +13,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
} }
] ]

2
src/main/resources/data/biomesoplenty/loot_tables/blocks/dune_grass.json
View file

@ -13,7 +13,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
} }
] ]

4
src/main/resources/data/biomesoplenty/loot_tables/blocks/fir_leaves.json
View file

@ -16,7 +16,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -103,7 +103,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {

6
src/main/resources/data/biomesoplenty/loot_tables/blocks/flowering_oak_leaves.json
View file

@ -16,7 +16,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -103,7 +103,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -157,7 +157,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {

4
src/main/resources/data/biomesoplenty/loot_tables/blocks/hellbark_leaves.json
View file

@ -16,7 +16,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -103,7 +103,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {

4
src/main/resources/data/biomesoplenty/loot_tables/blocks/jacaranda_leaves.json
View file

@ -16,7 +16,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -103,7 +103,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {

4
src/main/resources/data/biomesoplenty/loot_tables/blocks/magic_leaves.json
View file

@ -16,7 +16,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -103,7 +103,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {

4
src/main/resources/data/biomesoplenty/loot_tables/blocks/mahogany_leaves.json
View file

@ -16,7 +16,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -103,7 +103,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {

6
src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_leaves.json
View file

@ -16,7 +16,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -103,7 +103,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -157,7 +157,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {

6
src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_autumn_leaves.json
View file

@ -16,7 +16,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -103,7 +103,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -157,7 +157,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {

6
src/main/resources/data/biomesoplenty/loot_tables/blocks/origin_leaves.json
View file

@ -16,7 +16,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -103,7 +103,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -157,7 +157,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {

4
src/main/resources/data/biomesoplenty/loot_tables/blocks/palm_leaves.json
View file

@ -16,7 +16,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -103,7 +103,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {

4
src/main/resources/data/biomesoplenty/loot_tables/blocks/pink_cherry_leaves.json
View file

@ -16,7 +16,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -103,7 +103,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {

6
src/main/resources/data/biomesoplenty/loot_tables/blocks/rainbow_birch_leaves.json
View file

@ -16,7 +16,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -103,7 +103,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -157,7 +157,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {

4
src/main/resources/data/biomesoplenty/loot_tables/blocks/redwood_leaves.json
View file

@ -16,7 +16,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -103,7 +103,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {

2
src/main/resources/data/biomesoplenty/loot_tables/blocks/reed.json
View file

@ -22,7 +22,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
} }
] ]

2
src/main/resources/data/biomesoplenty/loot_tables/blocks/sprout.json
View file

@ -13,7 +13,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
} }
] ]

4
src/main/resources/data/biomesoplenty/loot_tables/blocks/umbran_leaves.json
View file

@ -16,7 +16,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -103,7 +103,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {

2
src/main/resources/data/biomesoplenty/loot_tables/blocks/watergrass.json
View file

@ -22,7 +22,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
} }
] ]

4
src/main/resources/data/biomesoplenty/loot_tables/blocks/white_cherry_leaves.json
View file

@ -16,7 +16,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -103,7 +103,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {

4
src/main/resources/data/biomesoplenty/loot_tables/blocks/willow_leaves.json
View file

@ -16,7 +16,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -103,7 +103,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {

2
src/main/resources/data/biomesoplenty/loot_tables/blocks/willow_vine.json
View file

@ -13,7 +13,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
} }
] ]

6
src/main/resources/data/biomesoplenty/loot_tables/blocks/yellow_autumn_leaves.json
View file

@ -16,7 +16,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -103,7 +103,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {
@ -157,7 +157,7 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"item": "minecraft:shears" "tag": "forge:shears"
} }
}, },
{ {