Skip to content

Commit

Permalink
switched to tag based recipes & balance changes
Browse files Browse the repository at this point in the history
- tweaked the damage of gem and obsidian tools/weapons
- switched most recipes to be tag based making resources from other mods usable
  • Loading branch information
CamoMano committed Jul 11, 2024
1 parent 783fe04 commit 912eabf
Show file tree
Hide file tree
Showing 150 changed files with 1,838 additions and 1,881 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ yarn_mappings_version=1.21+build.8
fabric_loader_version=0.15.11
fabric_api_version=0.100.6+1.21
# Mod Properties
mod_version=4.1.1
mod_version=4.2
maven_group=com.enrichedmc
archives_base_name=enriched
# Dependencies
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21 2024-07-10T20:01:05.2310825 Enriched/Tags for minecraft:block
// 1.21 2024-07-11T12:11:44.4481851 Enriched/Tags for minecraft:block
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\enriched\tags\block\incorrect_for_ruby_tool.json
5130353929cba072dacb3ab075642e95f0f7746f data\enriched\tags\block\redwood_logs.json
cbffea030c16b76cef765b05e3c84e50fb62855a data\minecraft\tags\block\mineable\axe.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21 2024-07-10T20:01:05.2300839 Enriched/Block Loot Tables
// 1.21 2024-07-11T12:11:44.4470996 Enriched/Block Loot Tables
de886d29608aa25104c1b2e8d6f056a55c95549a data\enriched\loot_table\blocks\polished_dark_granite_stairs.json
58b8c0cbcc1f69bf41c5952003634e84f9b358f6 data\enriched\loot_table\blocks\steel_block.json
c2ea10b722d238b6880fb7a966b95763936ee841 data\enriched\loot_table\blocks\stripped_redwood_log.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// 1.21 2024-07-10T20:01:05.2310825 Enriched/Tags for minecraft:item
// 1.21 2024-07-11T12:11:44.4481851 Enriched/Tags for minecraft:item
eb373d02e484b65c3e3cb5422b23771fbca65004 data\minecraft\tags\item\foot_armor.json
a94b97d224da0464fc2bd7209ff67b8238e3302d data\c\tags\item\tools\melee_weapon.json
0b2f1d30056526fbfe5629d2129f3ca7cdb48107 data\minecraft\tags\item\enchantable\chest_armor.json
1c18a5b8f73fd8d4df1792cfa57fbae974afa729 data\minecraft\tags\item\head_armor.json
5130353929cba072dacb3ab075642e95f0f7746f data\enriched\tags\item\redwood_logs.json
89c60d3304c60899777e0814e2f178bc98f1b380 data\c\tags\item\tools.json
b89af94e429e603debbebc6dcec828fc2d9ef067 data\minecraft\tags\item\swords.json
0b2f1d30056526fbfe5629d2129f3ca7cdb48107 data\minecraft\tags\item\chest_armor.json
a0832f2b1b7bfd1de4a1b4feb89a7730edcae454 data\c\tags\item\gems\tanzanite.json
1c18a5b8f73fd8d4df1792cfa57fbae974afa729 data\minecraft\tags\item\enchantable\head_armor.json
38905499eb1a4ab8f18dcfee4abc53455ea0d261 data\minecraft\tags\item\enchantable\leg_armor.json
4d1a35e2634756e0e1191a849f4932e5ca07752d data\c\tags\item\tools\mining_tool.json
4d1a35e2634756e0e1191a849f4932e5ca07752d data\minecraft\tags\item\pickaxes.json
863ffe88aba59791de3bc9fd39e1c36c3fdac1ef data\c\tags\item\dusts.json
Expand All @@ -16,9 +16,9 @@ a0832f2b1b7bfd1de4a1b4feb89a7730edcae454 data\c\tags\item\gems\tanzanite.json
afd9f339d9248b99c08d36d0874492cf0130adc4 data\c\tags\item\gems\sapphire.json
681323bde66d0fca08ab3237aac95c10dac774ba data\minecraft\tags\item\planks.json
540cf1c4151d4a6c01ff37e8065ec60792fa96d0 data\minecraft\tags\item\hoes.json
eb373d02e484b65c3e3cb5422b23771fbca65004 data\minecraft\tags\item\enchantable\foot_armor.json
75832a99d368173979e7472d527816181cd32b23 data\minecraft\tags\item\logs_that_burn.json
f420eabd249474adaa2edb447f783413d7304ecd data\c\tags\item\ingots\steel.json
38905499eb1a4ab8f18dcfee4abc53455ea0d261 data\minecraft\tags\item\leg_armor.json
889c361c029c8f8047f632df4b12fa545b8cafdc data\minecraft\tags\item\shovels.json
c37ab60b454a016b81870fc27d9faf275989096c data\c\tags\item\ingots\obsidian_alloy.json
319a81d192361fb43916d37d5ec64108ff99836d data\c\tags\item\ingots.json
Expand Down
202 changes: 101 additions & 101 deletions src/main/generated/.cache/53358fbdef77ef1af7355d18669e01bbae7a80f8

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21 2024-07-10T20:01:05.2290765 Enriched/Language (en_us)
// 1.21 2024-07-11T12:11:44.4470996 Enriched/Language (en_us)
79487a92233ca9f21befb04ba747522c65fb9b4f assets\enriched\lang\en_us.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21 2024-07-10T20:01:05.2250552 Enriched/Model Definitions
// 1.21 2024-07-11T12:11:44.4429808 Enriched/Model Definitions
edf46cfca1cc6e5d65214045edbf116e3e42645b assets\enriched\models\item\obsidian_sword.json
b1f2d95256cfcb699a1dac06b306ed086db40f7c assets\enriched\models\block\redwood_log_horizontal.json
95d2f1008dc3460e4132fbfcc5f3e3aacf37236c assets\enriched\models\item\emerald_chestplate_netherite_trim.json
Expand Down Expand Up @@ -164,8 +164,8 @@ fb370d900104d8a9b2f860632855234531f77ddc assets\enriched\blockstates\marble_slab
5a81db71bd7c09a9f274bbec71300be22bac5023 assets\enriched\blockstates\stripped_redwood_wood.json
9c604fd9699edc193029306d720ed3b94e963c2d assets\enriched\models\block\polished_dark_granite_stairs_outer.json
53cf037f5dc469c8f597aee0187e9357cb59101f assets\enriched\models\block\redwood_fence_inventory.json
37f203a2e38bdc8559be39ccb40458e0a3e87b70 assets\enriched\models\block\redwood_stairs_outer.json
b9db21ceea2a68098f771942b2488de9fa330cf2 assets\enriched\blockstates\steel_block.json
37f203a2e38bdc8559be39ccb40458e0a3e87b70 assets\enriched\models\block\redwood_stairs_outer.json
bcc8b059a47fb5b4ee7a23e7e7a7e41ed4f369f4 assets\enriched\models\item\steel_boots_quartz_trim.json
8c92d52ef857146824ca81a835f92f4f1507b601 assets\enriched\models\item\emerald_axe.json
951218e0ff94ea7d136b7ad3ffb49e9755249788 assets\enriched\models\item\emerald_helmet_gold_trim.json
Expand Down Expand Up @@ -389,8 +389,8 @@ fffe559c4f1ddf08506ffe96d975f714d04bccd6 assets\enriched\models\block\redwood_fe
c9b42568694f9d521b4a575c54203b3da8080450 assets\enriched\models\item\ruby_helmet_copper_trim.json
94d3b592ea548630bda8345126e2fd35f2a6ef70 assets\enriched\models\item\ruby_boots_gold_trim.json
fc9095739c942b03fbf95fe818379643397f1152 assets\enriched\models\block\redwood_button_pressed.json
c1019f4cf13f71eecf37d82f1f1a91dc9c074bfb assets\enriched\models\item\deepslate_sapphire_ore.json
1f1f40fa0c633242516bfee33d08c4921ed2f9d4 assets\enriched\models\item\emerald_boots_lapis_trim.json
c1019f4cf13f71eecf37d82f1f1a91dc9c074bfb assets\enriched\models\item\deepslate_sapphire_ore.json
86193dc1760bb83f409fe09d71df5cf189a61171 assets\enriched\models\item\tanzanite_chestplate_copper_trim.json
9c3f7d8e7b81aadeca989af316944a697ad916c3 assets\enriched\blockstates\dark_granite_wall.json
5ca07a07f28aca89c6809e05877ffc7a1e135814 assets\enriched\models\block\marble_wall_side_tall.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// 1.21 2024-07-10T20:01:05.2290765 Enriched/World Gen
// 1.21 2024-07-11T12:11:44.446099 Enriched/World Gen
7f3ba33122767010a50baac5de81e114e519f6ad data\enriched\worldgen\placed_feature\tanzanite_ore_placed.json
74b8741399af43f74b822c4871969e5bca17f806 data\enriched\worldgen\placed_feature\redwood_placed.json
bf917c1184cf2a02e434ed262654531dd877225c data\enriched\worldgen\placed_feature\sapphire_ore_placed.json
74b8741399af43f74b822c4871969e5bca17f806 data\enriched\worldgen\placed_feature\redwood_placed.json
1e0d2c46894af28171bc45a4a0cabe72e3e83d5b data\enriched\worldgen\configured_feature\tanzanite_ore.json
dc709effa46006bf8f8d186cd3cb7fa52ed4c50a data\enriched\worldgen\placed_feature\dark_granite_lower_placed.json
f871d327d8f1cc783a40b002ffa4824912b6dcd7 data\enriched\worldgen\configured_feature\redwood.json
Expand All @@ -12,10 +12,10 @@ e14b485532e4520e024c038297232c9bbecd12cd data\enriched\worldgen\placed_feature\m
fb55d37a9c27a27debdbdfaac638816b0cd9915e data\enriched\worldgen\configured_feature\ruby_ore_common.json
efc4a8da1d3e5c6535274e05465cfdb03daf2f10 data\enriched\worldgen\configured_feature\ruby_ore.json
42eb2267c6afffd304729ea09b31e5c42aa68393 data\enriched\worldgen\placed_feature\ruby_ore_common_placed.json
780bf5f5dca2f620ac3964ff550e66065ac2a2b5 data\enriched\worldgen\placed_feature\marble_upper_placed.json
5ae3c672f50e49f6121c1ef849f60ffca065eb86 data\enriched\worldgen\placed_feature\dark_granite_upper_placed.json
0debc68e92df367fabafe5de0b1151d890a44649 data\enriched\worldgen\configured_feature\tanzanite_ore_common.json
780bf5f5dca2f620ac3964ff550e66065ac2a2b5 data\enriched\worldgen\placed_feature\marble_upper_placed.json
907434c3f07db69fe016bfe09d10772d5dea43e9 data\enriched\worldgen\configured_feature\marble.json
0debc68e92df367fabafe5de0b1151d890a44649 data\enriched\worldgen\configured_feature\tanzanite_ore_common.json
30dd6b9471bab1ed1a1a1698b8d1c2662050496c data\enriched\worldgen\placed_feature\ruby_ore_placed.json
12a7c9d3432dd5351d59c00067565b80af894cfe data\enriched\worldgen\configured_feature\sapphire_ore_common.json
71248373ac42abaa325429bbf4bc62a5c8990ebb data\enriched\worldgen\configured_feature\sapphire_ore.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"fabric:load_conditions": [
{
"condition": "enriched:copper_enabled"
}
],
"parent": "minecraft:recipes/root",
"criteria": {
"has_ingots/copper": {
"conditions": {
"items": [
{
"items": "#c:ingots/copper"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "enriched:copper_tag_axe"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_ingots/copper"
]
],
"rewards": {
"recipes": [
"enriched:copper_tag_axe"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"fabric:load_conditions": [
{
"condition": "enriched:copper_enabled"
}
],
"parent": "minecraft:recipes/root",
"criteria": {
"has_ingots/copper": {
"conditions": {
"items": [
{
"items": "#c:ingots/copper"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "enriched:copper_tag_sword"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_ingots/copper"
]
],
"rewards": {
"recipes": [
"enriched:copper_tag_sword"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@
],
"parent": "minecraft:recipes/root",
"criteria": {
"has_obsidian_alloy_ingot": {
"has_ingots/obsidian_alloy": {
"conditions": {
"items": [
{
"items": "enriched:obsidian_alloy_ingot"
"items": "#c:ingots/obsidian_alloy"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "enriched:obsidian_leggings"
"recipe": "enriched:obsidian_alloy_tag_axe"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_obsidian_alloy_ingot"
"has_ingots/obsidian_alloy"
]
],
"rewards": {
"recipes": [
"enriched:obsidian_leggings"
"enriched:obsidian_alloy_tag_axe"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@
],
"parent": "minecraft:recipes/root",
"criteria": {
"has_obsidian_alloy_ingot": {
"has_ingots/obsidian_alloy": {
"conditions": {
"items": [
{
"items": "enriched:obsidian_alloy_ingot"
"items": "#c:ingots/obsidian_alloy"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "enriched:obsidian_chestplate"
"recipe": "enriched:obsidian_alloy_tag_boots"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_obsidian_alloy_ingot"
"has_ingots/obsidian_alloy"
]
],
"rewards": {
"recipes": [
"enriched:obsidian_chestplate"
"enriched:obsidian_alloy_tag_boots"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"fabric:load_conditions": [
{
"condition": "enriched:obsidian_enabled"
}
],
"parent": "minecraft:recipes/root",
"criteria": {
"has_ingots/obsidian_alloy": {
"conditions": {
"items": [
{
"items": "#c:ingots/obsidian_alloy"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "enriched:obsidian_alloy_tag_chestplate"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_ingots/obsidian_alloy"
]
],
"rewards": {
"recipes": [
"enriched:obsidian_alloy_tag_chestplate"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"fabric:load_conditions": [
{
"condition": "enriched:obsidian_enabled"
}
],
"parent": "minecraft:recipes/root",
"criteria": {
"has_ingots/obsidian_alloy": {
"conditions": {
"items": [
{
"items": "#c:ingots/obsidian_alloy"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "enriched:obsidian_alloy_tag_helmet"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_ingots/obsidian_alloy"
]
],
"rewards": {
"recipes": [
"enriched:obsidian_alloy_tag_helmet"
]
}
}
Loading

0 comments on commit 912eabf

Please sign in to comment.