Skip to content

Commit

Permalink
Add jack-in-the-pulpit pt1, etc
Browse files Browse the repository at this point in the history
  • Loading branch information
Mechalopa committed Aug 18, 2024
1 parent 0395589 commit a26f346
Show file tree
Hide file tree
Showing 36 changed files with 403 additions and 214 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ public class ModBlocks
public static final Supplier<Block> WINTER_HEATH = REGISTRY.register("winter_heath", () -> new ModFlowerBlock(MobEffects.WEAKNESS, 9));
public static final Supplier<Block> BLUE_DAISY = REGISTRY.register("blue_daisy", () -> new ModFlowerBlock(MobEffects.MOVEMENT_SPEED, 5));
public static final Supplier<Block> CRIMSON_CLOVER = REGISTRY.register("crimson_clover", () -> new CrimsonCloverBlock(MobEffects.FIRE_RESISTANCE, 4));
// public static final Supplier<Block> SHOOTING_STAR = REGISTRY.register("shooting_star", () -> new ModFlowerBlock(MobEffects.REGENERATION, 8));
// public static final Supplier<Block> KIDNEYWORT = REGISTRY.register("kidneywort", () -> new ModFlowerBlock(MobEffects.DAMAGE_BOOST, 4))
public static final Supplier<Block> WHEEL_LILY = REGISTRY.register("wheel_lily", () -> new MediumFlowerBlock(MobEffects.SATURATION, 7));
public static final Supplier<Block> JACK_IN_THE_PULPIT = REGISTRY.register("jack_in_the_pulpit", () -> new MediumFlowerBlock(MobEffects.POISON, 12));
public static final Supplier<Block> RED_SPIDER_LILY = REGISTRY.register("red_spider_lily", () -> new RedSpiderLilyBlock(MobEffects.POISON, 12));
public static final Supplier<Block> BELLS_OF_IRELAND = REGISTRY.register("bells_of_ireland", () -> new MediumFlowerBlock(MobEffects.SATURATION, 7));
public static final Supplier<Block> BEACH_SPIDER_LILY = REGISTRY.register("beach_spider_lily", () -> new BeachSpiderLilyBlock(MobEffects.CONFUSION, 9));
Expand Down Expand Up @@ -100,6 +103,7 @@ public class ModBlocks
public static final Supplier<Block> POTTED_BLUE_DAISY = REGISTRY.register("potted_blue_daisy", () -> new ModFlowerPotBlock(BLUE_DAISY.get()));
public static final Supplier<Block> POTTED_CRIMSON_CLOVER = REGISTRY.register("potted_crimson_clover", () -> new ModFlowerPotBlock(CRIMSON_CLOVER.get()));
public static final Supplier<Block> POTTED_WHEEL_LILY = REGISTRY.register("potted_wheel_lily", () -> new ModFlowerPotBlock(WHEEL_LILY.get()));
public static final Supplier<Block> POTTED_JACK_IN_THE_PULPIT = REGISTRY.register("potted_jack_in_the_pulpit", () -> new ModFlowerPotBlock(JACK_IN_THE_PULPIT.get()));
public static final Supplier<Block> POTTED_RED_SPIDER_LILY = REGISTRY.register("potted_red_spider_lily", () -> new ModFlowerPotBlock(RED_SPIDER_LILY.get()));
public static final Supplier<Block> POTTED_BELLS_OF_IRELAND = REGISTRY.register("potted_bells_of_ireland", () -> new ModFlowerPotBlock(BELLS_OF_IRELAND.get()));
public static final Supplier<Block> POTTED_BEACH_SPIDER_LILY = REGISTRY.register("potted_beach_spider_lily", () -> new ModFlowerPotBlock(BEACH_SPIDER_LILY.get()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public class ModItems
public static final Supplier<Item> BLUE_DAISY = REGISTRY.register("blue_daisy", () -> new BlockItem(ModBlocks.BLUE_DAISY.get(), new Item.Properties()));
public static final Supplier<Item> CRIMSON_CLOVER = REGISTRY.register("crimson_clover", () -> new BlockItem(ModBlocks.CRIMSON_CLOVER.get(), new Item.Properties()));
public static final Supplier<Item> WHEEL_LILY = REGISTRY.register("wheel_lily", () -> new BlockItem(ModBlocks.WHEEL_LILY.get(), new Item.Properties()));
public static final Supplier<Item> 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<Item> RED_SPIDER_LILY = REGISTRY.register("red_spider_lily", () -> new BlockItem(ModBlocks.RED_SPIDER_LILY.get(), new Item.Properties()));
public static final Supplier<Item> BELLS_OF_IRELAND = REGISTRY.register("bells_of_ireland", () -> new BlockItem(ModBlocks.BELLS_OF_IRELAND.get(), new Item.Properties()));
public static final Supplier<Item> BEACH_SPIDER_LILY = REGISTRY.register("beach_spider_lily", () -> new BlockItem(ModBlocks.BEACH_SPIDER_LILY.get(), new Item.Properties()));
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "jafohana:block/jack_in_the_pulpit"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "jafohana:block/potted_jack_in_the_pulpit"
}
}
}
2 changes: 2 additions & 0 deletions src/main/resources/assets/jafohana/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/assets/jafohana/lang/ja_jp.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "ビーチスパイダーリリー",
Expand Down Expand Up @@ -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": "植えられたビーチスパイダーリリー",
Expand Down
Original file line number Diff line number Diff line change
@@ -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" }
}
}
]
}
}
Original file line number Diff line number Diff line change
@@ -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" }
}
}
]
}
}
Original file line number Diff line number Diff line change
@@ -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"
}
}
Original file line number Diff line number Diff line change
@@ -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" }
}
}
]
}
Original file line number Diff line number Diff line change
@@ -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" }
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/flower_pot_cross",
"render_type": "cutout",
"textures": {
"plant": "jafohana:block/jack_in_the_pulpit"
}
}
47 changes: 2 additions & 45 deletions src/main/resources/assets/jafohana/models/block/wheel_lily.json
Original file line number Diff line number Diff line change
@@ -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" }
}
}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "jafohana:block/jack_in_the_pulpit"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading

0 comments on commit a26f346

Please sign in to comment.