Skip to content

Commit

Permalink
Set every recipe in vanilla properly,
Browse files Browse the repository at this point in the history
Fixed issues and changed some recipe in mod
Added the fluid rendering to JEI
Added smeltery to JEI
Changed Armor and Tool materials, the only enchantment allowed is mending
Gave each sword unique effects
  • Loading branch information
drkhodakarami committed Nov 21, 2023
1 parent 72bce65 commit ffdd41e
Show file tree
Hide file tree
Showing 165 changed files with 1,590 additions and 285 deletions.
8 changes: 0 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,6 @@ dependencies {
modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}"
modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"

include modApi("teamreborn:energy:${project.energy_api_version}")
{
transitive = false
}

modImplementation include("io.github.cottonmc:LibGui:${project.libgui_version}")

include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${project.mixinextras_version}")))
Expand All @@ -83,9 +78,6 @@ dependencies {
include "io.github.ladysnake:PlayerAbilityLib:${pal_version}"

modImplementation "com.github.drkhodakarami:fluidutils:${fluidutils_version}"

modRuntimeOnly "curse.maven:reborncore-237903:4786770"
modRuntimeOnly "curse.maven:techreborn-233564:4786771"
}

processResources {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
// 1.20.2 2023-11-19T08:12:20.4905817 All That Matters/Tags for minecraft:block
// 1.20.2 2023-11-21T07:21:03.7665484 All That Matters/Tags for minecraft:block
1f9bdd1045dccd95466410e12579545b8cbca675 data\minecraft\tags\blocks\lapis_ores.json
1d31e2156524120781d25e2046706c128e9e445e data\minecraft\tags\blocks\needs_iron_tool.json
6895288c69659b400340acf63661097c3d574c87 data\minecraft\tags\blocks\diamond_ores.json
ccfcb5ecb24b5a9d5e0946cabb8cbbb308c8d5b6 data\minecraft\tags\blocks\copper_ores.json
6077b4e8cc4e148d19a5a4a5f3100cbcdec80b6d data\minecraft\tags\blocks\coal_ores.json
8a23702b05296c8af5014d6aa6e9265ded85c7d9 data\fabric\tags\blocks\needs_tool_level_5.json
2316588aa2ba5d989e83a7c566ef671efc7439ed data\minecraft\tags\blocks\mineable\pickaxe.json
1d31e2156524120781d25e2046706c128e9e445e data\minecraft\tags\blocks\needs_iron_tool.json
182f82d63057c1d8a902c82a6dd797e151f1726d data\c\tags\blocks\gem_blocks.json
6895288c69659b400340acf63661097c3d574c87 data\minecraft\tags\blocks\diamond_ores.json
b0d06695c3b27e22724b2d8ad70fd6ea964e5118 data\minecraft\tags\blocks\needs_stone_tool.json
be68c7cf758c4a85f2a636278e341e901714fc6a data\minecraft\tags\blocks\iron_ores.json
ccfcb5ecb24b5a9d5e0946cabb8cbbb308c8d5b6 data\minecraft\tags\blocks\copper_ores.json
495e39cd6637871f928d4a47f2fbe93cdf282cf5 data\minecraft\tags\blocks\redstone_ores.json
6077b4e8cc4e148d19a5a4a5f3100cbcdec80b6d data\minecraft\tags\blocks\coal_ores.json
09a2ae92540badc81ac57242964ad153ba18d077 data\minecraft\tags\blocks\needs_diamond_tool.json
8a23702b05296c8af5014d6aa6e9265ded85c7d9 data\fabric\tags\blocks\needs_tool_level_4.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.2 2023-11-19T08:12:20.4725926 All That Matters/Block Loot Tables
// 1.20.2 2023-11-21T07:21:03.755551 All That Matters/Block Loot Tables
f55017dc588353c031ec3b0e0bc97ba94d592c39 data\allthatmatters\loot_tables\blocks\ore_nether_iron.json
f887ca04c0dfcdb62e56c72d195c096b023061dc data\allthatmatters\loot_tables\blocks\ore_end_sapphire.json
85cb66e6c2b06d692e11e67c503ae5ef6cc53d1f data\allthatmatters\loot_tables\blocks\ore_nether_copper.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// 1.20.2 2023-11-19T08:12:20.4715926 All That Matters/Tags for minecraft:item
// 1.20.2 2023-11-21T07:21:03.7545515 All That Matters/Tags for minecraft:item
572d7d80d10f03c8d6f51e2925a9ea3b372fe5be data\c\tags\items\casts.json
3234976729a598e706a52e4c0b5936fd6dba9911 data\minecraft\tags\items\swords.json
78af564205e8c82467224b545583d00b3e08dc27 data\allthatmatters\tags\items\smeltery.json
5ba5f6e9cd828c5f7f8cc516587ac1fa46be5d69 data\allthatmatters\tags\items\only_mending_allowed.json
b72c8913e2ade469fc4c391401f39c9b141f344e data\c\tags\items\rods.json
6895288c69659b400340acf63661097c3d574c87 data\minecraft\tags\items\diamond_ores.json
495e39cd6637871f928d4a47f2fbe93cdf282cf5 data\minecraft\tags\items\redstone_ores.json
Expand All @@ -16,7 +17,7 @@ f0d8d4087862899e709bb28143208f1d014bb849 data\c\tags\items\hammers.json
99e1287e2d762554e51e38b7b1de025738495b49 data\minecraft\tags\items\shovels.json
a1d95bda43e07576d260c806cd8571ee5afa08d4 data\minecraft\tags\items\trimmable_armor.json
c401941011dc3e081e71e057e331ee5eb63a5cdb data\c\tags\items\gears.json
d6940f24cab418b9f31affe19368318c4c0a3274 data\c\tags\items\plates.json
3df55126d71c51c51f8571e15e9664d47956eb21 data\c\tags\items\plates.json
d572722fbbc22ca7856e70e1bcb3474a4db6342c data\minecraft\tags\items\axes.json
0e99304f0180d060bb1cd96555d4d56fa45a50f3 data\c\tags\items\wood_casts.json
1f9bdd1045dccd95466410e12579545b8cbca675 data\minecraft\tags\items\lapis_ores.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.2 2023-11-19T08:12:20.4765897 All That Matters/Model Definitions
// 1.20.2 2023-11-21T07:21:03.7565504 All That Matters/Model Definitions
b78797ac06939db80100f4503a8e82b10af97f8c assets\allthatmatters\models\item\tool_ruby_sword.json
a99398a6ba0eb50d349987ad956cc5521a8f9bc1 assets\allthatmatters\models\item\armor_copper_chestplate_copper_trim.json
ffea7bf5ed6426d9d81e5e15ff28d4eb9ae073dc assets\allthatmatters\models\item\armor_ruby_chestplate.json
Expand Down Expand Up @@ -266,8 +266,8 @@ b72c6f462fb949549321688c3856e3d53cb826af assets\allthatmatters\models\item\armor
4761ff585ccd7f9a9393853561e8007e23dbdabb assets\allthatmatters\models\item\armor_citrine_chestplate_redstone_trim.json
6ddd06cfcdf00db4f33de09aee4f3ec323d1d8c0 assets\allthatmatters\models\item\armor_amethyst_helmet_copper_trim.json
84fecc69d543316b924adc3303d42b556122e5a1 assets\allthatmatters\models\item\armor_citrine_helmet_lapis_trim.json
586d14e05e1123d0997c1811a42b0ccb0a1acfe4 assets\allthatmatters\blockstates\ore_end_citrine.json
0a11f1f80085fd4d85981bfad6ea90ba7e47b7b3 assets\allthatmatters\models\item\armor_emerald_boots_emerald_trim.json
586d14e05e1123d0997c1811a42b0ccb0a1acfe4 assets\allthatmatters\blockstates\ore_end_citrine.json
4f68d0615786c01b677d1848f036c0e73d9bb860 assets\allthatmatters\models\item\armor_amethyst_helmet_lapis_trim.json
88d490aa6551e9f340831d698924995f269f1b63 assets\allthatmatters\models\item\armor_ruby_leggings_lapis_trim.json
79ad8112dd60fbf7f9b6a1859e40f99df4fb3de3 assets\allthatmatters\models\item\armor_emerald_helmet_lapis_trim.json
Expand Down Expand Up @@ -321,6 +321,7 @@ c84767529ddf7ed977259da2a266a191fb5b5766 assets\allthatmatters\models\item\armor
e16c183d964dc14b8f2168680de017b3eea993aa assets\allthatmatters\models\item\armor_enderite_helmet_quartz_trim.json
350179d1df6b619e61e4d955a9904676ca3bdb2f assets\allthatmatters\models\item\plate_netherite.json
a6fbc183097adfb0dd5eb18ab0b0ade91e277cc5 assets\allthatmatters\blockstates\ore_end_ruby.json
6b1d3d1736176f86b4a951f91cb5ec6a5d92171f assets\allthatmatters\models\item\plate_stone.json
34b48279b8117eace5d667011f592ada913efab1 assets\allthatmatters\models\item\plate_sapphire.json
2e6a06ab15f3b4454d73c05a043d133265bbabd7 assets\allthatmatters\models\item\armor_ruby_boots_netherite_trim.json
ae79222e86734945bd367ee7f543cd72620f856f assets\allthatmatters\models\item\armor_copper_helmet_iron_trim.json
Expand Down Expand Up @@ -372,8 +373,8 @@ d2c6d7f27b74b1eb4467c9f1463313f259c87c89 assets\allthatmatters\models\item\armor
0376cf4ae467dce4f564e2a2af248af35cacff10 assets\allthatmatters\models\item\head_ruby_pickaxe.json
347a15b8030d056fdb1b4784d7dbeb7833ad9ae3 assets\allthatmatters\models\item\armor_emerald_leggings_iron_trim.json
81fe54b3c562961334b35544c2e84dd1d61ba43f assets\allthatmatters\models\block\ore_world_sapphire.json
e426b2244ff790b1a155f90a54c441be3fad19a0 assets\allthatmatters\models\item\armor_citrine_chestplate_lapis_trim.json
d31502f9038b9294de6146a03078afb9a5a5070e assets\allthatmatters\models\item\armor_citrine_leggings_lapis_trim.json
e426b2244ff790b1a155f90a54c441be3fad19a0 assets\allthatmatters\models\item\armor_citrine_chestplate_lapis_trim.json
78d62bbdf89c2bc29e9dc9913f920291c4093507 assets\allthatmatters\models\block\ore_nether_lapis.json
2125775c2cb55e94dd3837c0bc3c263e721504b3 assets\allthatmatters\models\item\armor_sapphire_boots_lapis_trim.json
4367cdca6b862463916ee187871bcf008f02cb52 assets\allthatmatters\models\item\armor_emerald_leggings_emerald_trim.json
Expand Down Expand Up @@ -421,8 +422,8 @@ a9b35cca05dfd422035dfd2f5637c214a18e1148 assets\allthatmatters\models\item\armor
505af0b11a86c5508aaeb171175624baeb1a252c assets\allthatmatters\models\item\ore_deep_citrine.json
90df57ccabfd52a2b1843451ea5a888c8f71153c assets\allthatmatters\models\item\gear_prismarine.json
0fa03d18f57eeb720af72c13fdddfa9df0231695 assets\allthatmatters\models\item\armor_citrine_leggings_netherite_trim.json
0654878a487dc14b3c373857d6bbb8833ef5cc4e assets\allthatmatters\models\item\head_netherite_sword.json
2b8983749fbef9e0d3fb50e24e46790746dfb099 assets\allthatmatters\models\block\ore_enderite.json
0654878a487dc14b3c373857d6bbb8833ef5cc4e assets\allthatmatters\models\item\head_netherite_sword.json
af65387e568dc60eb896b32e108a75a050a425a2 assets\allthatmatters\models\item\armor_ruby_chestplate_quartz_trim.json
fb51e8c3bfe0fca615814e81fae0bd20f350de3b assets\allthatmatters\models\block\ore_end_citrine.json
f16ea7340b439e8ff6b6f0c29785c5c18394fb94 assets\allthatmatters\models\item\ore_world_sapphire.json
Expand Down Expand Up @@ -465,8 +466,8 @@ df78d4ba2014128d15ab9b008c44dd00dd2d960b assets\allthatmatters\models\item\armor
36418495da5deed92f3110075592663c2eba5867 assets\allthatmatters\models\item\armor_emerald_boots_lapis_trim.json
1c36639f7df0fe739713cf17e9012b3a97aebe54 assets\allthatmatters\models\item\armor_enderite_leggings_emerald_trim.json
50ff7ea8f1a8f7cda7fb66081da0d204adba437d assets\allthatmatters\models\item\raw_ruby.json
85767b7c9b5c53c2aa0abf310a54fe5c59dee8d0 assets\allthatmatters\models\item\tool_sapphire_pickaxe.json
88f08612053ca00298e521dbeba1305505a63874 assets\allthatmatters\models\item\armor_amethyst_helmet_iron_trim.json
85767b7c9b5c53c2aa0abf310a54fe5c59dee8d0 assets\allthatmatters\models\item\tool_sapphire_pickaxe.json
5b808505948b7008d1f7f9249683359cfbec4a28 assets\allthatmatters\models\item\armor_ruby_boots_diamond_trim.json
d98cbc64c852bc79027e9f1bfa712cbc8665910d assets\allthatmatters\models\item\armor_ruby_helmet_netherite_trim.json
81f508fe87824cd49fcc555cf02b3d00f6808484 assets\allthatmatters\models\item\armor_amethyst_chestplate_netherite_trim.json
Expand All @@ -485,9 +486,9 @@ c018e919dfbe9d6735aeaad0fb5ca25ad7fc7b20 assets\allthatmatters\models\item\armor
0992e0cbec0a21e668e7c45276c49b530c349b3f assets\allthatmatters\models\item\plate_citrine.json
34255a045704a254fcf7fc17d49c8fef725e0c85 assets\allthatmatters\models\block\ore_nether_citrine.json
22d63818e4c94da17ccb42eb67a27838544d27f4 assets\allthatmatters\models\item\tool_sapphire_hoe.json
a96332af8c638597a4388c753cac2487748ed775 assets\allthatmatters\models\item\armor_citrine_boots.json
9ff7883992d7faa26a8ffebc07654238d742137a assets\allthatmatters\models\item\plate_emerald.json
4c63718563bbf9668c406a8d6964f6dee385d8f2 assets\allthatmatters\models\item\ore_enderite.json
a96332af8c638597a4388c753cac2487748ed775 assets\allthatmatters\models\item\armor_citrine_boots.json
19e575d1e7d8cfada0a2fa63d4b056cf31475837 assets\allthatmatters\models\item\reinforced_plate_gold.json
0b9db2059c5e9cc9e14c3575e41bcb86e8da8291 assets\allthatmatters\models\item\armor_citrine_leggings_amethyst_trim.json
6c31b76ca31b0d5aaecebe4adea701ac2f5eee25 assets\allthatmatters\models\item\armor_citrine_helmet_gold_trim.json
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// 1.20.2 2023-11-21T07:21:03.7675457 All That Matters/Tags for minecraft:entity_type
715085c1e8275acb77fe9b20a76712a6c9b5c069 data\allthatmatters\tags\entity_types\ruby_sword_ignites.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// 1.20.2 2023-11-19T08:12:20.468596 All That Matters/allthatmatters
// 1.20.2 2023-11-21T07:21:03.753552 All That Matters/allthatmatters
30f27ba590246e575f59f5cb66c03477dc8cc8de data\allthatmatters\worldgen\configured_feature\ore_ruby.json
0da71feddc9be599dd4bcd66c7244dee4a84c269 data\allthatmatters\worldgen\configured_feature\ore_nether_copper.json
470100bc579e10fa140dc24997ed3dae62afef07 data\allthatmatters\worldgen\configured_feature\ore_nether_copper.json
b74a342ad43adb06b8e2cdf2fc59fa4911133aa3 data\allthatmatters\worldgen\configured_feature\ore_nether_citrine.json
de6f6ae76db556402808b1553a8911f2b1500321 data\allthatmatters\worldgen\placed_feature\ore_nether_copper_placed.json
14dcf7eb241611ddb75110f1560b3953700a19e6 data\allthatmatters\worldgen\placed_feature\ore_nether_lapis_placed.json
11382de87a00a9333e79a291cebafcbb7f58d4ff data\allthatmatters\worldgen\configured_feature\ore_nether_coal.json
72c8b316609b420559cb145209deebbbdca89b7f data\allthatmatters\worldgen\configured_feature\ore_nether_coal.json
ec9cebd42a16d70b5341586f28b361c9653e5021 data\allthatmatters\worldgen\placed_feature\ore_nether_ruby_placed.json
26ee13003d071a804fd8f20f54b4efa9b29ac3fd data\allthatmatters\worldgen\configured_feature\ore_nether_ruby.json
928bcfe74e014e4f9b14e5a9eed9f15671095fa5 data\allthatmatters\worldgen\configured_feature\ore_nether_redstone.json
55beed96abdda1cb1e48a8b12a06567a9a9a0986 data\allthatmatters\worldgen\configured_feature\ore_nether_redstone.json
5f54f7a32631327e1725fd07f3e4e483524b36ef data\allthatmatters\worldgen\placed_feature\ore_ruby_placed.json
f905ed92d86c063cf330d4147389e8f7f4d8ec83 data\allthatmatters\worldgen\placed_feature\ore_citrine_placed.json
1a33752d25d47dd93fd2a0be066085b9e2ce8d08 data\allthatmatters\worldgen\placed_feature\ore_end_ruby_placed.json
Expand All @@ -16,17 +16,17 @@ f905ed92d86c063cf330d4147389e8f7f4d8ec83 data\allthatmatters\worldgen\placed_fea
bf323287250b8ae2cf97105275a4feea64b1a1db data\allthatmatters\worldgen\placed_feature\ore_nether_coal_placed.json
64dcb22ba925bdb79593c93e54f377dfbc590e0e data\allthatmatters\worldgen\placed_feature\ore_sapphire_placed.json
4d5259597125171be11db793f5be40fd3410e7fe data\allthatmatters\worldgen\configured_feature\ore_end_sapphire.json
0da71feddc9be599dd4bcd66c7244dee4a84c269 data\allthatmatters\worldgen\configured_feature\ore_nether_iron.json
33538d1397e77d237642d25d50e5873c3f30f4fd data\allthatmatters\worldgen\configured_feature\ore_nether_iron.json
37c6811b867fab0926bd3d44a9a185733a7a0137 data\allthatmatters\worldgen\configured_feature\ore_end_enderite.json
765a47e385bbe1c1dde278a312ce0c3033ca4d69 data\allthatmatters\worldgen\placed_feature\ore_end_enderite_placed.json
43c88d7eb6f47048a05870dd226a02ac29ea5efd data\allthatmatters\worldgen\placed_feature\ore_nether_redstone_placed.json
53c5faf3aadcf554ce3ff3a45142cd57222e3441 data\allthatmatters\worldgen\placed_feature\ore_nether_sapphire_placed.json
4e87c2f33de15818108776683a433290cc1541b3 data\allthatmatters\worldgen\configured_feature\ore_nether_diamond.json
43c88d7eb6f47048a05870dd226a02ac29ea5efd data\allthatmatters\worldgen\placed_feature\ore_nether_redstone_placed.json
b9d471712d16179f0a6e96a135ed982d3eb0ee32 data\allthatmatters\worldgen\configured_feature\ore_nether_diamond.json
7df4b5444a2dfa2775368bf75e4e37a5f061f993 data\allthatmatters\worldgen\placed_feature\ore_end_citrine_placed.json
2266bdcf2e39f4a6c5e2f44e9ff9e9ca92c55a39 data\allthatmatters\worldgen\configured_feature\ore_citrine.json
4e87c2f33de15818108776683a433290cc1541b3 data\allthatmatters\worldgen\configured_feature\ore_nether_sapphire.json
a62666a6b3f37932b0a559bd064195cb2825fac4 data\allthatmatters\worldgen\configured_feature\ore_end_ruby.json
0da71feddc9be599dd4bcd66c7244dee4a84c269 data\allthatmatters\worldgen\configured_feature\ore_nether_lapis.json
ede1bb3345afb0c5150cf5b701fce0f9b8ebe826 data\allthatmatters\worldgen\configured_feature\ore_nether_lapis.json
b8d97cacc078dc905d3cef712305e679b667d6a4 data\allthatmatters\worldgen\placed_feature\ore_nether_iron_placed.json
0ae63a45f0bd6b7a4dc256077570afa0e63c5aac data\allthatmatters\worldgen\configured_feature\ore_end_citrine.json
a1005f8541713bbbcece14f661346e3e02d047f4 data\allthatmatters\worldgen\placed_feature\ore_nether_citrine_placed.json
Expand Down
Loading

0 comments on commit ffdd41e

Please sign in to comment.