diff --git a/src/main/java/com/github/mechalopa/jafohana/registry/ModBlocks.java b/src/main/java/com/github/mechalopa/jafohana/registry/ModBlocks.java index 7fedf7df..c93b0040 100644 --- a/src/main/java/com/github/mechalopa/jafohana/registry/ModBlocks.java +++ b/src/main/java/com/github/mechalopa/jafohana/registry/ModBlocks.java @@ -52,7 +52,10 @@ public class ModBlocks public static final Supplier WINTER_HEATH = REGISTRY.register("winter_heath", () -> new ModFlowerBlock(MobEffects.WEAKNESS, 9)); public static final Supplier BLUE_DAISY = REGISTRY.register("blue_daisy", () -> new ModFlowerBlock(MobEffects.MOVEMENT_SPEED, 5)); public static final Supplier CRIMSON_CLOVER = REGISTRY.register("crimson_clover", () -> new CrimsonCloverBlock(MobEffects.FIRE_RESISTANCE, 4)); +// public static final Supplier SHOOTING_STAR = REGISTRY.register("shooting_star", () -> new ModFlowerBlock(MobEffects.REGENERATION, 8)); +// public static final Supplier KIDNEYWORT = REGISTRY.register("kidneywort", () -> new ModFlowerBlock(MobEffects.DAMAGE_BOOST, 4)) public static final Supplier WHEEL_LILY = REGISTRY.register("wheel_lily", () -> new MediumFlowerBlock(MobEffects.SATURATION, 7)); + public static final Supplier JACK_IN_THE_PULPIT = REGISTRY.register("jack_in_the_pulpit", () -> new MediumFlowerBlock(MobEffects.POISON, 12)); public static final Supplier RED_SPIDER_LILY = REGISTRY.register("red_spider_lily", () -> new RedSpiderLilyBlock(MobEffects.POISON, 12)); public static final Supplier BELLS_OF_IRELAND = REGISTRY.register("bells_of_ireland", () -> new MediumFlowerBlock(MobEffects.SATURATION, 7)); public static final Supplier BEACH_SPIDER_LILY = REGISTRY.register("beach_spider_lily", () -> new BeachSpiderLilyBlock(MobEffects.CONFUSION, 9)); @@ -100,6 +103,7 @@ public class ModBlocks public static final Supplier POTTED_BLUE_DAISY = REGISTRY.register("potted_blue_daisy", () -> new ModFlowerPotBlock(BLUE_DAISY.get())); public static final Supplier POTTED_CRIMSON_CLOVER = REGISTRY.register("potted_crimson_clover", () -> new ModFlowerPotBlock(CRIMSON_CLOVER.get())); public static final Supplier POTTED_WHEEL_LILY = REGISTRY.register("potted_wheel_lily", () -> new ModFlowerPotBlock(WHEEL_LILY.get())); + public static final Supplier POTTED_JACK_IN_THE_PULPIT = REGISTRY.register("potted_jack_in_the_pulpit", () -> new ModFlowerPotBlock(JACK_IN_THE_PULPIT.get())); public static final Supplier POTTED_RED_SPIDER_LILY = REGISTRY.register("potted_red_spider_lily", () -> new ModFlowerPotBlock(RED_SPIDER_LILY.get())); public static final Supplier POTTED_BELLS_OF_IRELAND = REGISTRY.register("potted_bells_of_ireland", () -> new ModFlowerPotBlock(BELLS_OF_IRELAND.get())); public static final Supplier POTTED_BEACH_SPIDER_LILY = REGISTRY.register("potted_beach_spider_lily", () -> new ModFlowerPotBlock(BEACH_SPIDER_LILY.get())); diff --git a/src/main/java/com/github/mechalopa/jafohana/registry/ModItems.java b/src/main/java/com/github/mechalopa/jafohana/registry/ModItems.java index 0afe9194..a1ddf24f 100644 --- a/src/main/java/com/github/mechalopa/jafohana/registry/ModItems.java +++ b/src/main/java/com/github/mechalopa/jafohana/registry/ModItems.java @@ -44,6 +44,7 @@ public class ModItems public static final Supplier BLUE_DAISY = REGISTRY.register("blue_daisy", () -> new BlockItem(ModBlocks.BLUE_DAISY.get(), new Item.Properties())); public static final Supplier CRIMSON_CLOVER = REGISTRY.register("crimson_clover", () -> new BlockItem(ModBlocks.CRIMSON_CLOVER.get(), new Item.Properties())); public static final Supplier WHEEL_LILY = REGISTRY.register("wheel_lily", () -> new BlockItem(ModBlocks.WHEEL_LILY.get(), new Item.Properties())); + public static final Supplier JACK_IN_THE_PULPIT = REGISTRY.register("jack_in_the_pulpit", () -> new BlockItem(ModBlocks.JACK_IN_THE_PULPIT.get(), new Item.Properties())); public static final Supplier RED_SPIDER_LILY = REGISTRY.register("red_spider_lily", () -> new BlockItem(ModBlocks.RED_SPIDER_LILY.get(), new Item.Properties())); public static final Supplier BELLS_OF_IRELAND = REGISTRY.register("bells_of_ireland", () -> new BlockItem(ModBlocks.BELLS_OF_IRELAND.get(), new Item.Properties())); public static final Supplier BEACH_SPIDER_LILY = REGISTRY.register("beach_spider_lily", () -> new BlockItem(ModBlocks.BEACH_SPIDER_LILY.get(), new Item.Properties())); diff --git a/src/main/resources/assets/jafohana/blockstates/jack_in_the_pulpit.json b/src/main/resources/assets/jafohana/blockstates/jack_in_the_pulpit.json new file mode 100644 index 00000000..d51a3915 --- /dev/null +++ b/src/main/resources/assets/jafohana/blockstates/jack_in_the_pulpit.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "jafohana:block/jack_in_the_pulpit" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/blockstates/potted_jack_in_the_pulpit.json b/src/main/resources/assets/jafohana/blockstates/potted_jack_in_the_pulpit.json new file mode 100644 index 00000000..b594d6b0 --- /dev/null +++ b/src/main/resources/assets/jafohana/blockstates/potted_jack_in_the_pulpit.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "jafohana:block/potted_jack_in_the_pulpit" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/lang/en_us.json b/src/main/resources/assets/jafohana/lang/en_us.json index c2aefe68..382ef97d 100644 --- a/src/main/resources/assets/jafohana/lang/en_us.json +++ b/src/main/resources/assets/jafohana/lang/en_us.json @@ -26,6 +26,7 @@ "block.jafohana.blue_daisy": "Blue Daisy", "block.jafohana.crimson_clover": "Crimson Clovers", "block.jafohana.wheel_lily": "Wheel Lily", + "block.jafohana.jack_in_the_pulpit": "Jack-in-the-Pulpit", "block.jafohana.red_spider_lily": "Red Spider Lily", "block.jafohana.bells_of_ireland": "Bells of Ireland", "block.jafohana.beach_spider_lily": "Beach Spider Lily", @@ -73,6 +74,7 @@ "block.jafohana.potted_blue_daisy": "Potted Blue Daisy", "block.jafohana.potted_crimson_clover": "Potted Crimson Clovers", "block.jafohana.potted_wheel_lily": "Potted Wheel Lily", + "block.jafohana.potted_jack_in_the_pulpit": "Potted Jack-in-the-Pulpit", "block.jafohana.potted_red_spider_lily": "Potted Red Spider Lily", "block.jafohana.potted_bells_of_ireland": "Potted Bells of Ireland", "block.jafohana.potted_beach_spider_lily": "Potted Beach Spider Lily", diff --git a/src/main/resources/assets/jafohana/lang/ja_jp.json b/src/main/resources/assets/jafohana/lang/ja_jp.json index 5e88b1f3..0e1bfd53 100644 --- a/src/main/resources/assets/jafohana/lang/ja_jp.json +++ b/src/main/resources/assets/jafohana/lang/ja_jp.json @@ -26,6 +26,7 @@ "block.jafohana.blue_daisy": "ブルーデイジー", "block.jafohana.crimson_clover": "ベニバナツメクサ", "block.jafohana.wheel_lily": "クルマユリ", + "block.jafohana.jack_in_the_pulpit": "テンナンショウ", "block.jafohana.red_spider_lily": "彼岸花", "block.jafohana.bells_of_ireland": "カイガラサルビア", "block.jafohana.beach_spider_lily": "ビーチスパイダーリリー", @@ -73,6 +74,7 @@ "block.jafohana.potted_blue_daisy": "植えられたブルーデイジー", "block.jafohana.potted_crimson_clover": "植えられたベニバナツメクサ", "block.jafohana.potted_wheel_lily": "植えられたクルマユリ", + "block.jafohana.potted_jack_in_the_pulpit": "植えられたテンナンショウ", "block.jafohana.potted_red_spider_lily": "植えられた彼岸花", "block.jafohana.potted_bells_of_ireland": "植えられたカイガラサルビア", "block.jafohana.potted_beach_spider_lily": "植えられたビーチスパイダーリリー", diff --git a/src/main/resources/assets/jafohana/models/block/beach_spider_lily.json b/src/main/resources/assets/jafohana/models/block/beach_spider_lily.json index 10525543..c7911c44 100644 --- a/src/main/resources/assets/jafohana/models/block/beach_spider_lily.json +++ b/src/main/resources/assets/jafohana/models/block/beach_spider_lily.json @@ -1,51 +1,8 @@ { - "ambientocclusion": false, - "render_type": "cutout", + "parent": "jafohana:block/medium_flower_height_20", "textures": { "particle": "jafohana:block/beach_spider_lily", "cross": "jafohana:block/beach_spider_lily", "stem": "jafohana:block/beach_spider_lily_stem" - }, - "elements": [ - { - "from": [ 0.8, 0, 8 ], - "to": [ 15.2, 4, 8 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" }, - "south": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" } - } - }, - { - "from": [ 8, 0, 0.8 ], - "to": [ 8, 4, 15.2 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" }, - "east": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" } - } - }, - { - "from": [ 0.8, 4, 8 ], - "to": [ 15.2, 20, 8 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } - } - }, - { - "from": [ 8, 4, 0.8 ], - "to": [ 8, 20, 15.2 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } - } - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/block/bells_of_ireland.json b/src/main/resources/assets/jafohana/models/block/bells_of_ireland.json index 44cbba89..6a9752fe 100644 --- a/src/main/resources/assets/jafohana/models/block/bells_of_ireland.json +++ b/src/main/resources/assets/jafohana/models/block/bells_of_ireland.json @@ -1,51 +1,8 @@ { - "ambientocclusion": false, - "render_type": "cutout", + "parent": "jafohana:block/medium_flower_height_20", "textures": { "particle": "jafohana:block/bells_of_ireland", "cross": "jafohana:block/bells_of_ireland", "stem": "jafohana:block/bells_of_ireland_stem" - }, - "elements": [ - { - "from": [ 0.8, 0, 8 ], - "to": [ 15.2, 4, 8 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" }, - "south": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" } - } - }, - { - "from": [ 8, 0, 0.8 ], - "to": [ 8, 4, 15.2 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" }, - "east": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" } - } - }, - { - "from": [ 0.8, 4, 8 ], - "to": [ 15.2, 20, 8 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } - } - }, - { - "from": [ 8, 4, 0.8 ], - "to": [ 8, 20, 15.2 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } - } - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/block/jack_in_the_pulpit.json b/src/main/resources/assets/jafohana/models/block/jack_in_the_pulpit.json new file mode 100644 index 00000000..17424d3c --- /dev/null +++ b/src/main/resources/assets/jafohana/models/block/jack_in_the_pulpit.json @@ -0,0 +1,8 @@ +{ + "parent": "jafohana:block/medium_flower_height_18", + "textures": { + "particle": "jafohana:block/jack_in_the_pulpit", + "cross": "jafohana:block/jack_in_the_pulpit", + "stem": "jafohana:block/jack_in_the_pulpit_stem" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/block/medium_flower_height_18.json b/src/main/resources/assets/jafohana/models/block/medium_flower_height_18.json new file mode 100644 index 00000000..e315352f --- /dev/null +++ b/src/main/resources/assets/jafohana/models/block/medium_flower_height_18.json @@ -0,0 +1,46 @@ +{ + "ambientocclusion": false, + "render_type": "cutout", + "elements": [ + { + "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 2, 8 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" }, + "south": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" } + } + }, + { + "from": [ 8, 0, 0.8 ], + "to": [ 8, 2, 15.2 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 2 ], "texture": "#stem" }, + "east": { "uv": [ 0, 0, 16, 2 ], "texture": "#stem" } + } + }, + { + "from": [ 0.8, 2, 8 ], + "to": [ 15.2, 18, 8 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } + } + }, + { + "from": [ 8, 2, 0.8 ], + "to": [ 8, 18, 15.2 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/block/medium_flower_height_20.json b/src/main/resources/assets/jafohana/models/block/medium_flower_height_20.json new file mode 100644 index 00000000..05c63243 --- /dev/null +++ b/src/main/resources/assets/jafohana/models/block/medium_flower_height_20.json @@ -0,0 +1,46 @@ +{ + "ambientocclusion": false, + "render_type": "cutout", + "elements": [ + { + "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 4, 8 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" }, + "south": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" } + } + }, + { + "from": [ 8, 0, 0.8 ], + "to": [ 8, 4, 15.2 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" }, + "east": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" } + } + }, + { + "from": [ 0.8, 4, 8 ], + "to": [ 15.2, 20, 8 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } + } + }, + { + "from": [ 8, 4, 0.8 ], + "to": [ 8, 20, 15.2 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/block/potted_jack_in_the_pulpit.json b/src/main/resources/assets/jafohana/models/block/potted_jack_in_the_pulpit.json new file mode 100644 index 00000000..910002f2 --- /dev/null +++ b/src/main/resources/assets/jafohana/models/block/potted_jack_in_the_pulpit.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "render_type": "cutout", + "textures": { + "plant": "jafohana:block/jack_in_the_pulpit" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/block/wheel_lily.json b/src/main/resources/assets/jafohana/models/block/wheel_lily.json index 1ce95164..0fda6b74 100644 --- a/src/main/resources/assets/jafohana/models/block/wheel_lily.json +++ b/src/main/resources/assets/jafohana/models/block/wheel_lily.json @@ -1,51 +1,8 @@ { - "ambientocclusion": false, - "render_type": "cutout", + "parent": "jafohana:block/medium_flower_height_18", "textures": { "particle": "jafohana:block/wheel_lily", "cross": "jafohana:block/wheel_lily", "stem": "jafohana:block/wheel_lily_stem" - }, - "elements": [ - { - "from": [ 0.8, 0, 8 ], - "to": [ 15.2, 2, 8 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" }, - "south": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" } - } - }, - { - "from": [ 8, 0, 0.8 ], - "to": [ 8, 2, 15.2 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 2 ], "texture": "#stem" }, - "east": { "uv": [ 0, 0, 16, 2 ], "texture": "#stem" } - } - }, - { - "from": [ 0.8, 2, 8 ], - "to": [ 15.2, 18, 8 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } - } - }, - { - "from": [ 8, 2, 0.8 ], - "to": [ 8, 18, 15.2 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } - } - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/models/item/jack_in_the_pulpit.json b/src/main/resources/assets/jafohana/models/item/jack_in_the_pulpit.json new file mode 100644 index 00000000..344b6d58 --- /dev/null +++ b/src/main/resources/assets/jafohana/models/item/jack_in_the_pulpit.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "jafohana:block/jack_in_the_pulpit" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jafohana/textures/block/beach_spider_lily.png b/src/main/resources/assets/jafohana/textures/block/beach_spider_lily.png index be82f2af..1e610f08 100644 Binary files a/src/main/resources/assets/jafohana/textures/block/beach_spider_lily.png and b/src/main/resources/assets/jafohana/textures/block/beach_spider_lily.png differ diff --git a/src/main/resources/assets/jafohana/textures/block/beach_spider_lily_stem.png b/src/main/resources/assets/jafohana/textures/block/beach_spider_lily_stem.png index be82f2af..7b8ebc20 100644 Binary files a/src/main/resources/assets/jafohana/textures/block/beach_spider_lily_stem.png and b/src/main/resources/assets/jafohana/textures/block/beach_spider_lily_stem.png differ diff --git a/src/main/resources/data/jafohana/loot_table/additions/chests/buried_treasure.json b/src/main/resources/data/jafohana/loot_table/additions/chests/buried_treasure.json index 6d984719..a219ed47 100644 --- a/src/main/resources/data/jafohana/loot_table/additions/chests/buried_treasure.json +++ b/src/main/resources/data/jafohana/loot_table/additions/chests/buried_treasure.json @@ -41,13 +41,13 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 3.0, + "max": 5.0, "min": 1.0 }, "function": "minecraft:set_count" } ], - "name": "jafohana:oakleaf_hydrangea" + "name": "jafohana:jack_in_the_pulpit" }, { "type": "minecraft:item", diff --git a/src/main/resources/data/jafohana/loot_table/additions/chests/woodland_mansion.json b/src/main/resources/data/jafohana/loot_table/additions/chests/woodland_mansion.json index 758ea9c6..66906fc9 100644 --- a/src/main/resources/data/jafohana/loot_table/additions/chests/woodland_mansion.json +++ b/src/main/resources/data/jafohana/loot_table/additions/chests/woodland_mansion.json @@ -66,9 +66,25 @@ "name": "jafohana:green_tulip", "weight": 5 }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 3.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "jafohana:jack_in_the_pulpit", + "weight": 2 + }, { "type": "minecraft:empty", - "weight": 20 + "weight": 18 } ], "rolls": { diff --git a/src/main/resources/data/jafohana/loot_table/blocks/jack_in_the_pulpit.json b/src/main/resources/data/jafohana/loot_table/blocks/jack_in_the_pulpit.json new file mode 100644 index 00000000..2369ce2b --- /dev/null +++ b/src/main/resources/data/jafohana/loot_table/blocks/jack_in_the_pulpit.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "jafohana:jack_in_the_pulpit" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "jafohana:blocks/jack_in_the_pulpit" +} \ No newline at end of file diff --git a/src/main/resources/data/jafohana/loot_table/blocks/potted_jack_in_the_pulpit.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_jack_in_the_pulpit.json new file mode 100644 index 00000000..8b5e1c28 --- /dev/null +++ b/src/main/resources/data/jafohana/loot_table/blocks/potted_jack_in_the_pulpit.json @@ -0,0 +1,36 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "jafohana:jack_in_the_pulpit" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "jafohana:blocks/potted_jack_in_the_pulpit" +} \ No newline at end of file diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/beach_spider_lily_features.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/beach_spider_lily_features.json index c5c756c2..194e7f2f 100644 --- a/src/main/resources/data/jafohana/neoforge/biome_modifier/beach_spider_lily_features.json +++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/beach_spider_lily_features.json @@ -5,38 +5,6 @@ { "name": "#jafohana:is_overworld" }, - { - "name": "minecraft:sunflower_plains", - "negate": true - }, - { - "name": "#jafohana:is_dry", - "negate": true - }, - { - "name": "#jafohana:is_snowy", - "negate": true - }, - { - "name": "#jafohana:is_hill_or_mountain", - "negate": true - }, - { - "name": "#jafohana:is_dead_or_wasteland", - "negate": true - }, - { - "name": "#jafohana:is_plains" - } - ], - [ - { - "name": "#jafohana:is_overworld" - }, - { - "name": "#jafohana:is_dry", - "negate": true - }, { "name": "#jafohana:is_snowy", "negate": true diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/beach_spider_lily_features_in_beach.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/beach_spider_lily_features_in_beach.json index 5b8ffb32..5e03d5c7 100644 --- a/src/main/resources/data/jafohana/neoforge/biome_modifier/beach_spider_lily_features_in_beach.json +++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/beach_spider_lily_features_in_beach.json @@ -20,41 +20,6 @@ { "name": "#jafohana:is_beach" } - ], - [ - { - "name": "#jafohana:is_overworld" - }, - { - "name": "#jafohana:is_cold", - "negate": true - }, - { - "name": "#jafohana:is_dead_or_wasteland", - "negate": true - }, - { - "name": "#jafohana:is_river" - } - ], - [ - { - "name": "#jafohana:is_overworld" - }, - { - "name": "#jafohana:is_cold", - "negate": true - }, - { - "name": "#jafohana:is_dead_or_wasteland", - "negate": true - }, - { - "name": "#jafohana:is_jungle" - }, - { - "name": "#jafohana:is_aquatic" - } ] ], "features": "jafohana:beach_spider_lily_beach", diff --git a/src/main/resources/data/jafohana/neoforge/biome_modifier/beach_spider_lily_features_in_river.json b/src/main/resources/data/jafohana/neoforge/biome_modifier/beach_spider_lily_features_in_river.json new file mode 100644 index 00000000..c222d385 --- /dev/null +++ b/src/main/resources/data/jafohana/neoforge/biome_modifier/beach_spider_lily_features_in_river.json @@ -0,0 +1,50 @@ +{ + "type": "jafohana:add_features", + "biomes": [ + [ + { + "name": "#jafohana:is_overworld" + }, + { + "name": "#jafohana:is_cold", + "negate": true + }, + { + "name": "#jafohana:is_dead_or_wasteland", + "negate": true + }, + { + "name": "#jafohana:is_beach", + "negate": true + }, + { + "name": "#jafohana:is_river" + } + ], + [ + { + "name": "#jafohana:is_overworld" + }, + { + "name": "#jafohana:is_cold", + "negate": true + }, + { + "name": "#jafohana:is_dead_or_wasteland", + "negate": true + }, + { + "name": "#jafohana:is_beach", + "negate": true + }, + { + "name": "#jafohana:is_jungle" + }, + { + "name": "#jafohana:is_aquatic" + } + ] + ], + "features": "jafohana:beach_spider_lily_river", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/resources/data/jafohana/recipe/green_dye_from_jack_in_the_pulpit.json b/src/main/resources/data/jafohana/recipe/green_dye_from_jack_in_the_pulpit.json new file mode 100644 index 00000000..f2cfe835 --- /dev/null +++ b/src/main/resources/data/jafohana/recipe/green_dye_from_jack_in_the_pulpit.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "green_dye", + "ingredients": [ + { + "item": "jafohana:jack_in_the_pulpit" + } + ], + "result": { + "count": 1, + "id": "minecraft:green_dye" + } +} \ No newline at end of file diff --git a/src/main/resources/data/jafohana/recipe/mekanism/enriching/dye/small_green.json b/src/main/resources/data/jafohana/recipe/mekanism/enriching/dye/small_green.json index ffdcb748..6270807c 100644 --- a/src/main/resources/data/jafohana/recipe/mekanism/enriching/dye/small_green.json +++ b/src/main/resources/data/jafohana/recipe/mekanism/enriching/dye/small_green.json @@ -7,8 +7,16 @@ ], "type": "mekanism:enriching", "input": { - "count": 1, - "item": "jafohana:creepansy" + "type": "neoforge:compound", + "children": [ + { + "item": "jafohana:creepansy" + }, + { + "item": "jafohana:jack_in_the_pulpit" + } + ], + "count": 1 }, "output": { "count": 2, diff --git a/src/main/resources/data/jafohana/recipe/mekanism/pigment_extracting/flower/small_green.json b/src/main/resources/data/jafohana/recipe/mekanism/pigment_extracting/flower/small_green.json index 48e6cd50..7a31c59e 100644 --- a/src/main/resources/data/jafohana/recipe/mekanism/pigment_extracting/flower/small_green.json +++ b/src/main/resources/data/jafohana/recipe/mekanism/pigment_extracting/flower/small_green.json @@ -7,8 +7,16 @@ ], "type": "mekanism:pigment_extracting", "input": { - "count": 1, - "item": "jafohana:creepansy" + "type": "neoforge:compound", + "children": [ + { + "item": "jafohana:creepansy" + }, + { + "item": "jafohana:jack_in_the_pulpit" + } + ], + "count": 1 }, "output": { "amount": 768, diff --git a/src/main/resources/data/jafohana/tags/block/flower_pots.json b/src/main/resources/data/jafohana/tags/block/flower_pots.json index 33b0d15a..4d95a092 100644 --- a/src/main/resources/data/jafohana/tags/block/flower_pots.json +++ b/src/main/resources/data/jafohana/tags/block/flower_pots.json @@ -28,6 +28,7 @@ "jafohana:potted_blue_daisy", "jafohana:potted_crimson_clover", "jafohana:potted_wheel_lily", + "jafohana:potted_jack_in_the_pulpit", "jafohana:potted_red_spider_lily", "jafohana:potted_bells_of_ireland", "jafohana:potted_beach_spider_lily", diff --git a/src/main/resources/data/jafohana/tags/block/small_flowers.json b/src/main/resources/data/jafohana/tags/block/small_flowers.json index 50d0198e..d901f431 100644 --- a/src/main/resources/data/jafohana/tags/block/small_flowers.json +++ b/src/main/resources/data/jafohana/tags/block/small_flowers.json @@ -28,6 +28,7 @@ "jafohana:blue_daisy", "jafohana:crimson_clover", "jafohana:wheel_lily", + "jafohana:jack_in_the_pulpit", "jafohana:red_spider_lily", "jafohana:bells_of_ireland", "jafohana:beach_spider_lily", diff --git a/src/main/resources/data/jafohana/tags/item/small_flowers.json b/src/main/resources/data/jafohana/tags/item/small_flowers.json index 50d0198e..d901f431 100644 --- a/src/main/resources/data/jafohana/tags/item/small_flowers.json +++ b/src/main/resources/data/jafohana/tags/item/small_flowers.json @@ -28,6 +28,7 @@ "jafohana:blue_daisy", "jafohana:crimson_clover", "jafohana:wheel_lily", + "jafohana:jack_in_the_pulpit", "jafohana:red_spider_lily", "jafohana:bells_of_ireland", "jafohana:beach_spider_lily", diff --git a/src/main/resources/data/jafohana/worldgen/configured_feature/beach_spider_lily_beach.json b/src/main/resources/data/jafohana/worldgen/configured_feature/beach_spider_lily_beach.json index ba6428bb..e6a5e2f9 100644 --- a/src/main/resources/data/jafohana/worldgen/configured_feature/beach_spider_lily_beach.json +++ b/src/main/resources/data/jafohana/worldgen/configured_feature/beach_spider_lily_beach.json @@ -23,8 +23,8 @@ } ] }, - "tries": 80, - "xz_spread": 9, + "tries": 96, + "xz_spread": 7, "y_spread": 3 } } \ No newline at end of file diff --git a/src/main/resources/data/jafohana/worldgen/configured_feature/flower_bamboo_jungle.json b/src/main/resources/data/jafohana/worldgen/configured_feature/flower_bamboo_jungle.json index 536fda50..0a1554d3 100644 --- a/src/main/resources/data/jafohana/worldgen/configured_feature/flower_bamboo_jungle.json +++ b/src/main/resources/data/jafohana/worldgen/configured_feature/flower_bamboo_jungle.json @@ -35,6 +35,39 @@ }, "placement": [] }, + { + "feature": { + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "jafohana:jack_in_the_pulpit" + } + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + } + ] + }, + "tries": 64, + "xz_spread": 7, + "y_spread": 3 + } + }, + "placement": [] + }, { "feature": { "type": "minecraft:random_patch", diff --git a/src/main/resources/data/jafohana/worldgen/configured_feature/flower_spooky_forest.json b/src/main/resources/data/jafohana/worldgen/configured_feature/flower_spooky_forest.json index f69d9ee8..4131dcca 100644 --- a/src/main/resources/data/jafohana/worldgen/configured_feature/flower_spooky_forest.json +++ b/src/main/resources/data/jafohana/worldgen/configured_feature/flower_spooky_forest.json @@ -155,6 +155,39 @@ } }, "placement": [] + }, + { + "feature": { + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "jafohana:jack_in_the_pulpit" + } + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + } + ] + }, + "tries": 64, + "xz_spread": 7, + "y_spread": 3 + } + }, + "placement": [] } ] } diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_beach.json b/src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_beach.json index aabf246a..753f80f3 100644 --- a/src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_beach.json +++ b/src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_beach.json @@ -11,7 +11,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 64 + "chance": 32 }, { "type": "minecraft:in_square" diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_river.json b/src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_river.json new file mode 100644 index 00000000..e01c2b0f --- /dev/null +++ b/src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_river.json @@ -0,0 +1,27 @@ +{ + "feature": "jafohana:beach_spider_lily_beach", + "placement": [ + { + "type": "minecraft:count", + "count": { + "type": "minecraft:uniform", + "max_inclusive": 2, + "min_inclusive": 1 + } + }, + { + "type": "minecraft:rarity_filter", + "chance": 64 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_waterside.json b/src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_waterside.json index 23df1990..8b71fcb1 100644 --- a/src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_waterside.json +++ b/src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_waterside.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 8 + "chance": 6 }, { "type": "minecraft:in_square" diff --git a/src/main/resources/data/jafohana/worldgen/placed_feature/flower_bamboo_jungle.json b/src/main/resources/data/jafohana/worldgen/placed_feature/flower_bamboo_jungle.json index f2c8552c..dc5a8348 100644 --- a/src/main/resources/data/jafohana/worldgen/placed_feature/flower_bamboo_jungle.json +++ b/src/main/resources/data/jafohana/worldgen/placed_feature/flower_bamboo_jungle.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 56 + "chance": 36 }, { "type": "minecraft:in_square"