Skip to content

Commit

Permalink
BOYFRIEND TODAY :3
Browse files Browse the repository at this point in the history
  • Loading branch information
@SammySemicolon
SammySemicolon committed Jan 15, 2024
1 parent 104a67b commit 4081447
Show file tree
Hide file tree
Showing 34 changed files with 817 additions and 189 deletions.
51 changes: 51 additions & 0 deletions src/generated/resources/assets/malum/blockstates/hanging_runewood_leaves.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"variants": {
"": [
{
"model": "malum:block/hanging_runewood_leaves_0"
},
{
"model": "malum:block/hanging_runewood_leaves_0",
"y": 90
},
{
"model": "malum:block/hanging_runewood_leaves_0",
"y": 180
},
{
"model": "malum:block/hanging_runewood_leaves_0",
"y": 270
},
{
"model": "malum:block/hanging_runewood_leaves_1"
},
{
"model": "malum:block/hanging_runewood_leaves_1",
"y": 90
},
{
"model": "malum:block/hanging_runewood_leaves_1",
"y": 180
},
{
"model": "malum:block/hanging_runewood_leaves_1",
"y": 270
},
{
"model": "malum:block/hanging_runewood_leaves_2"
},
{
"model": "malum:block/hanging_runewood_leaves_2",
"y": 90
},
{
"model": "malum:block/hanging_runewood_leaves_2",
"y": 180
},
{
"model": "malum:block/hanging_runewood_leaves_2",
"y": 270
}
]
}
}
1 change: 1 addition & 0 deletions src/generated/resources/assets/malum/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"block.malum.exposed_runewood_log": "Exposed Runewood Log",
"block.malum.exposed_soulwood_log": "Exposed Soulwood Log",
"block.malum.hanging_mystic_soulwood_leaves": "Hanging Mystic Soulwood Leaves",
"block.malum.hanging_runewood_leaves": "Hanging Runewood Leaves",
"block.malum.iridescent_ether": "Iridescent Ether",
"block.malum.iridescent_ether_torch": "Iridescent Ether Torch",
"block.malum.mass_of_blighted_gunk": "Mass of Blighted Gunk",
Expand Down
7 changes: 7 additions & 0 deletions src/generated/resources/assets/malum/models/block/hanging_runewood_leaves_0.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "malum:block/templates/template_hanging_leaves",
"textures": {
"hanging_leaves": "malum:block/runewood/hanging_runewood_leaves_0",
"particle": "malum:block/runewood/hanging_runewood_leaves_0"
}
}
7 changes: 7 additions & 0 deletions src/generated/resources/assets/malum/models/block/hanging_runewood_leaves_1.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "malum:block/templates/template_hanging_leaves",
"textures": {
"hanging_leaves": "malum:block/runewood/hanging_runewood_leaves_1",
"particle": "malum:block/runewood/hanging_runewood_leaves_1"
}
}
7 changes: 7 additions & 0 deletions src/generated/resources/assets/malum/models/block/hanging_runewood_leaves_2.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "malum:block/templates/template_hanging_leaves",
"textures": {
"hanging_leaves": "malum:block/runewood/hanging_runewood_leaves_2",
"particle": "malum:block/runewood/hanging_runewood_leaves_2"
}
}
3 changes: 3 additions & 0 deletions src/generated/resources/assets/malum/models/item/hanging_runewood_leaves.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "malum:block/hanging_runewood_leaves_0"
}
119 changes: 117 additions & 2 deletions src/generated/resources/data/malum/loot_tables/blocks/hanging_mystic_soulwood_leaves.json
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,132 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:any_of",
"terms": [
{
"condition": "minecraft:match_tool",
"predicate": {
"items": [
"minecraft:shears"
]
}
},
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
}
],
"name": "malum:hanging_mystic_soulwood_leaves"
},
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
},
{
"chances": [
0.015,
0.0225,
0.033333335,
0.05
],
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune"
}
],
"name": "malum:soulwood_growth"
}
]
}
],
"rolls": 1.0
},
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:any_of",
"terms": [
{
"condition": "minecraft:match_tool",
"predicate": {
"items": [
"minecraft:shears"
]
}
},
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
}
}
],
"entries": [
{
"type": "minecraft:item",
"name": "malum:hanging_mystic_soulwood_leaves"
"conditions": [
{
"chances": [
0.02,
0.022222223,
0.025,
0.033333335,
0.1
],
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune"
}
],
"functions": [
{
"add": false,
"count": {
"type": "minecraft:uniform",
"max": 2.0,
"min": 1.0
},
"function": "minecraft:set_count"
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "minecraft:stick"
}
],
"rolls": 1.0
Expand Down
136 changes: 136 additions & 0 deletions src/generated/resources/data/malum/loot_tables/blocks/hanging_runewood_leaves.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:any_of",
"terms": [
{
"condition": "minecraft:match_tool",
"predicate": {
"items": [
"minecraft:shears"
]
}
},
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
}
],
"name": "malum:hanging_runewood_leaves"
},
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
},
{
"chances": [
0.015,
0.0225,
0.033333335,
0.05
],
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune"
}
],
"name": "malum:runewood_sapling"
}
]
}
],
"rolls": 1.0
},
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:any_of",
"terms": [
{
"condition": "minecraft:match_tool",
"predicate": {
"items": [
"minecraft:shears"
]
}
},
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
}
}
],
"entries": [
{
"type": "minecraft:item",
"conditions": [
{
"chances": [
0.02,
0.022222223,
0.025,
0.033333335,
0.1
],
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune"
}
],
"functions": [
{
"add": false,
"count": {
"type": "minecraft:uniform",
"max": 2.0,
"min": 1.0
},
"function": "minecraft:set_count"
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "minecraft:stick"
}
],
"rolls": 1.0
}
],
"random_sequence": "malum:blocks/hanging_runewood_leaves"
}
Loading

0 comments on commit 4081447

Please sign in to comment.