Skip to content

Commit

Permalink
Texture updates, etc(2)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mechalopa
Mechalopa committed Sep 15, 2024
1 parent c1f64c5 commit 063606b
Show file tree
Hide file tree
Showing 13 changed files with 200 additions and 25 deletions.
2 changes: 1 addition & 1 deletion src/main/resources/assets/jafohana/models/block/potted_jack_in_the_pulpit.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"parent": "minecraft:block/flower_pot_cross",
"render_type": "cutout",
"textures": {
"plant": "jafohana:block/jack_in_the_pulpit"
"plant": "jafohana:block/potted_jack_in_the_pulpit"
}
}
Binary file modified src/main/resources/assets/jafohana/textures/block/ceanothus_bottom.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/assets/jafohana/textures/block/ceanothus_top.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/jafohana/textures/block/jack_in_the_pulpit.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/jafohana/textures/block/jack_in_the_pulpit_stem.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/jafohana/textures/block/potted_jack_in_the_pulpit.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 31 additions & 1 deletion src/main/resources/data/jafohana/loot_table/additions/chests/pillager_outpost.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,39 @@
],
"name": "jafohana:wheel_lily"
},
{
"type": "minecraft:item",
"functions": [
{
"add": false,
"count": {
"type": "minecraft:uniform",
"max": 3.0,
"min": 1.0
},
"function": "minecraft:set_count"
}
],
"name": "jafohana:fireweed"
},
{
"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"
},
{
"type": "minecraft:empty",
"weight": 8
"weight": 10
}
],
"rolls": {
Expand Down
22 changes: 1 addition & 21 deletions src/main/resources/data/jafohana/neoforge/biome_modifier/marigold_features.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,9 @@
"name": "#jafohana:is_overworld"
},
{
"name": "#jafohana:is_birch_forest",
"name": "#jafohana:is_forest",
"negate": true
},
{
"name": "minecraft:flower_forest",
"negate": true
},
{
"name": "#jafohana:is_cold",
"negate": true
},
{
"name": "#jafohana:is_dead_or_wasteland",
"negate": true
},
{
"name": "#jafohana:is_forest"
}
],
[
{
"name": "#jafohana:is_overworld"
},
{
"name": "#jafohana:is_windswept"
},
Expand Down
31 changes: 31 additions & 0 deletions src/main/resources/data/jafohana/neoforge/biome_modifier/tall_flower_features_in_forest.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"type": "jafohana:add_features",
"biomes": [
[
{
"name": "#jafohana:is_overworld"
},
{
"name": "#jafohana:is_birch_forest",
"negate": true
},
{
"name": "minecraft:flower_forest",
"negate": true
},
{
"name": "#jafohana:is_cold",
"negate": true
},
{
"name": "#jafohana:is_dead_or_wasteland",
"negate": true
},
{
"name": "#jafohana:is_forest"
}
]
],
"features": "jafohana:tall_flower_forest",
"step": "vegetal_decoration"
}
115 changes: 115 additions & 0 deletions src/main/resources/data/jafohana/worldgen/configured_feature/tall_flower_forest.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
{
"type": "minecraft:simple_random_selector",
"config": {
"features": [
{
"feature": {
"type": "minecraft:random_patch",
"config": {
"feature": {
"feature": {
"type": "minecraft:simple_block",
"config": {
"to_place": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "jafohana:orange_marigold",
"Properties": {
"half": "lower"
}
}
}
}
},
"placement": [
{
"type": "minecraft:block_predicate_filter",
"predicate": {
"type": "minecraft:matching_blocks",
"blocks": "minecraft:air"
}
}
]
},
"tries": 96,
"xz_spread": 7,
"y_spread": 3
}
},
"placement": []
},
{
"feature": {
"type": "minecraft:random_patch",
"config": {
"feature": {
"feature": {
"type": "minecraft:simple_block",
"config": {
"to_place": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "jafohana:yellow_marigold",
"Properties": {
"half": "lower"
}
}
}
}
},
"placement": [
{
"type": "minecraft:block_predicate_filter",
"predicate": {
"type": "minecraft:matching_blocks",
"blocks": "minecraft:air"
}
}
]
},
"tries": 96,
"xz_spread": 7,
"y_spread": 3
}
},
"placement": []
},
{
"feature": {
"type": "minecraft:random_patch",
"config": {
"feature": {
"feature": {
"type": "minecraft:simple_block",
"config": {
"to_place": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "jafohana:ceanothus",
"Properties": {
"half": "lower"
}
}
}
}
},
"placement": [
{
"type": "minecraft:block_predicate_filter",
"predicate": {
"type": "minecraft:matching_blocks",
"blocks": "minecraft:air"
}
}
]
},
"tries": 96,
"xz_spread": 7,
"y_spread": 3
}
},
"placement": []
}
]
}
}
2 changes: 1 addition & 1 deletion src/main/resources/data/jafohana/worldgen/placed_feature/beach_spider_lily_beach.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
{
"type": "minecraft:rarity_filter",
"chance": 32
"chance": 64
},
{
"type": "minecraft:in_square"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/data/jafohana/worldgen/placed_feature/red_spider_lily_waterside.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 16
"chance": 20
},
{
"type": "minecraft:in_square"
Expand Down
19 changes: 19 additions & 0 deletions src/main/resources/data/jafohana/worldgen/placed_feature/tall_flower_forest.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"feature": "jafohana:tall_flower_forest",
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 56
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:heightmap",
"heightmap": "MOTION_BLOCKING"
},
{
"type": "minecraft:biome"
}
]
}

0 comments on commit 063606b

Please sign in to comment.