Skip to content

Commit

Permalink
I need to sleep on boyfriend's chest
Browse files Browse the repository at this point in the history
  • Loading branch information
SammySemicolon committed Jan 28, 2024
1 parent deb8a6b commit b9d7484
Show file tree
Hide file tree
Showing 37 changed files with 486 additions and 231 deletions.
1 change: 1 addition & 0 deletions src/generated/resources/assets/malum/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@
"item.malum.crushed_brilliance": "Crushed Brilliance",
"item.malum.crushed_soulstone": "Crushed Soulstone",
"item.malum.cthonic_gold": "Cthonic Gold",
"item.malum.cthonic_gold_fragment": "Cthonic Gold Fragment",
"item.malum.cursed_grit": "Cursed Grit",
"item.malum.cursed_sap": "Cursed Sap",
"item.malum.cursed_sapball": "Cursed Sapball",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "malum:block/ores/cthonic_gold_cluster"
"layer0": "malum:item/cthonic_gold_fragment"
}
}
2 changes: 0 additions & 2 deletions src/generated/resources/data/forge/tags/blocks/ores.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
"values": [
"malum:blazing_quartz_ore",
"malum:soulstone_ore",
"malum:block_of_cthonic_gold",
"malum:brilliant_stone",
"malum:natural_quartz_ore",
"malum:cthonic_gold_ore",
"malum:brilliant_deepslate",
"malum:deepslate_quartz_ore",
"malum:cthonic_gold_cluster",
"malum:deepslate_soulstone_ore"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"malum:block_of_astral_weave",
"malum:block_of_mnemonic_fragment",
"malum:block_of_cursed_grit",
"malum:block_of_cthonic_gold",
"malum:block_of_alchemical_calx",
"malum:mass_of_blighted_gunk",
"malum:block_of_blazing_quartz",
Expand Down
2 changes: 0 additions & 2 deletions src/generated/resources/data/forge/tags/items/ores.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
"values": [
"malum:blazing_quartz_ore",
"malum:soulstone_ore",
"malum:block_of_cthonic_gold",
"malum:brilliant_stone",
"malum:natural_quartz_ore",
"malum:cthonic_gold_ore",
"malum:brilliant_deepslate",
"malum:deepslate_quartz_ore",
"malum:cthonic_gold_cluster",
"malum:deepslate_soulstone_ore"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"malum:block_of_astral_weave",
"malum:block_of_mnemonic_fragment",
"malum:block_of_cursed_grit",
"malum:block_of_cthonic_gold",
"malum:block_of_alchemical_calx",
"malum:mass_of_blighted_gunk",
"malum:block_of_blazing_quartz",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "malum:cthonic_gold_from_blasting"
"recipe": "malum:block_of_cthonic_gold"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"malum:cthonic_gold_from_blasting"
"malum:block_of_cthonic_gold"
]
},
"sends_telemetry_event": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "malum:cthonic_gold_from_smelting"
"recipe": "malum:cthonic_gold_fragment"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"malum:cthonic_gold_from_smelting"
"malum:cthonic_gold_fragment"
]
},
"sends_telemetry_event": false
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_cthonic_gold": {
"conditions": {
"items": [
{
"items": [
"malum:cthonic_gold"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "malum:cthonic_gold_from_block"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_cthonic_gold",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"malum:cthonic_gold_from_block"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_cthonic_gold": {
"conditions": {
"items": [
{
"items": [
"malum:cthonic_gold"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "malum:cthonic_gold_from_fragment"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_cthonic_gold",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"malum:cthonic_gold_from_fragment"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "malum:cthonic_gold_cluster"
"name": "malum:cthonic_gold_fragment"
}
],
"rolls": 1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,21 @@
},
{
"type": "minecraft:item",
"conditions": [
"functions": [
{
"add": false,
"count": {
"type": "minecraft:uniform",
"max": 4.0,
"min": 3.0
},
"function": "minecraft:set_count"
},
{
"condition": "minecraft:survives_explosion"
"function": "minecraft:explosion_decay"
}
],
"name": "malum:cthonic_gold"
"name": "malum:cthonic_gold_fragment"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"#": {
"item": "malum:cthonic_gold"
}
},
"pattern": [
"###",
"###",
"###"
],
"result": {
"item": "malum:block_of_cthonic_gold"
},
"show_notification": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "malum:cthonic_gold"
}
],
"result": {
"count": 8,
"item": "malum:cthonic_gold_fragment"
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "malum:block_of_cthonic_gold"
}
],
"result": {
"count": 9,
"item": "malum:cthonic_gold"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "malum:cthonic_gold_fragment"
},
{
"item": "malum:cthonic_gold_fragment"
},
{
"item": "malum:cthonic_gold_fragment"
},
{
"item": "malum:cthonic_gold_fragment"
},
{
"item": "malum:cthonic_gold_fragment"
},
{
"item": "malum:cthonic_gold_fragment"
},
{
"item": "malum:cthonic_gold_fragment"
},
{
"item": "malum:cthonic_gold_fragment"
}
],
"result": {
"item": "malum:cthonic_gold"
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"type": "malum:cthonic_gold_ore",
"config": {
"discard_chance_on_air_exposure": 0.0,
"size": 16,
"size": 8,
"targets": [
{
"state": {
"Name": "minecraft:deepslate_gold_ore"
"Name": "malum:cthonic_gold_ore"
},
"target": {
"predicate_type": "minecraft:tag_match",
Expand All @@ -15,11 +15,11 @@
},
{
"state": {
"Name": "malum:cthonic_gold_ore"
"Name": "minecraft:deepslate_gold_ore"
},
"target": {
"block": "minecraft:deepslate_gold_ore",
"predicate_type": "minecraft:block_match"
"predicate_type": "minecraft:tag_match",
"tag": "minecraft:deepslate_ore_replaceables"
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"height": {
"type": "minecraft:trapezoid",
"max_inclusive": {
"absolute": 40
"absolute": -10
},
"min_inclusive": {
"absolute": -64
Expand All @@ -15,13 +15,17 @@
},
{
"type": "minecraft:count",
"count": 2
"count": 1
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:biome"
},
{
"type": "minecraft:rarity_filter",
"chance": 4
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
{
"type": "minecraft:rarity_filter",
"chance": 5
"chance": 10
},
{
"type": "minecraft:in_square"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
{
"type": "minecraft:rarity_filter",
"chance": 10
"chance": 5
},
{
"type": "minecraft:in_square"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"values": [
"malum:block_of_mnemonic_fragment",
"malum:block_of_cthonic_gold",
"malum:block_of_blazing_quartz",
"malum:block_of_soulstone",
"malum:block_of_null_slate",
Expand Down
Loading

0 comments on commit b9d7484

Please sign in to comment.