Skip to content

Commit

Permalink
Fixed some problems.
Browse files Browse the repository at this point in the history
  • Loading branch information
python-bear committed Feb 3, 2024
1 parent ee5bd56 commit 118f724
Show file tree
Hide file tree
Showing 86 changed files with 1,374 additions and 372 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G
org.gradle.jvmargs=-Xmx3G
org.gradle.parallel=true

# Fabric Properties
Expand Down
396 changes: 210 additions & 186 deletions src/main/generated/.cache/2d9e9705c09fddda27f0fab2a98c15a5511271f4

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-01-29T18:25:38.1536393 tead/Block Loot Tables
// 1.20.1 2024-02-03T14:49:48.5089007 tead/Block Loot Tables
58a52e751a1a99f81be70af5c1035edcfa01bd89 data\tead\loot_tables\blocks\clayish_mud.json
921ac0bd13ba01497f064a862b7d0d7e921dd6ad data\tead\loot_tables\blocks\sick_pumpkin.json
af455ebaddb213c26102a3ddb413b5865ab94560 data\tead\loot_tables\blocks\ruby_ore.json
Expand All @@ -7,11 +7,11 @@ e7d4eb4ff8c2213eefb66e481f35cb334381a0e0 data\tead\loot_tables\blocks\stone_plaq
555ee1782d3e1868042e2af860b5e34c595a978e data\tead\loot_tables\blocks\dirty_cobblestone.json
17a91c1c75fd00de73f28a65724670f7db7b3b2e data\tead\loot_tables\blocks\lead_ore.json
a554d110681080ba8938e6070e2f79b67f144db8 data\tead\loot_tables\blocks\sandy_cobblestone.json
1d6382ff683993db839e2b230bc268542efb115c data\tead\loot_tables\blocks\block_of_ruby.json
3e1a08bda0fb83234114f78658a50d0e9a8edd9a data\tead\loot_tables\blocks\brown_dry_grass.json
1d6382ff683993db839e2b230bc268542efb115c data\tead\loot_tables\blocks\block_of_ruby.json
4d29ce526cb5fc23958ace9f6ba0f9eb7150b717 data\tead\loot_tables\blocks\sparse_grass.json
15b069c8bcca778679e2f999985565e5eb24c8a6 data\tead\loot_tables\blocks\block_of_galena.json
aa4459890e8211d32c443514972b07c7ad02708e data\tead\loot_tables\blocks\dirty_stone_plaque.json
15b069c8bcca778679e2f999985565e5eb24c8a6 data\tead\loot_tables\blocks\block_of_galena.json
579db7732e8913f3b95d54fe74ae29e2eb3f630d data\tead\loot_tables\blocks\sludge.json
b7bdf6c99e5ba47adfe7a6c8e2437f007303879a data\tead\loot_tables\blocks\very_sparse_grass.json
cfa3cc8c0d19d2a51aa9946c206f55b437d8bfe6 data\tead\loot_tables\blocks\dark_bricks.json
Expand Down
21 changes: 12 additions & 9 deletions src/main/generated/.cache/995f6549a623150a79e600170b60abb50bce24e1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-01-29T18:25:38.1486283 tead/Model Definitions
// 1.20.1 2024-02-03T14:49:48.5029042 tead/Model Definitions
3c50dd955f99ca46d6a9f6a101ea3c1bd92a7c2b assets\tead\models\item\lead_pickaxe.json
9ce48b5cf00c0c19f7b7ba625ecde5fd23af242d assets\tead\models\item\grenade.json
88d7d9edfbc905db45cc776a0773f5f1477b721c assets\tead\models\item\netherite_royal_helmet_amethyst_trim.json
Expand All @@ -20,6 +20,7 @@ eba6ba78305eb26c436463ac762c774c811f40bd assets\tead\models\item\wood_double_axe
eeb801d66ec65c243807d6b4f22849b2536240d6 assets\tead\blockstates\dry_dirt.json
d0ea1efcb8b84e3b7ca522ab701cbf64095c7c0a assets\tead\models\item\diamond_highland_helmet_emerald_trim.json
c12b80d6b72aa801724bb936ec917d71854d98a0 assets\tead\models\item\gold_chainmail_boots_iron_trim.json
2e882b16e2281dfe5c848f4d2aedfa8f6abde700 assets\tead\models\item\torch_arrow.json
4ccb37eb5a87903a16f021a6069b6afd846bbe39 assets\tead\models\item\iron_stalwart_helmet_iron_trim.json
6af590556e00cfd7b9cb92ba9aa04c555c0463d9 assets\tead\blockstates\dirty_stone_plaque.json
7a75cf49ce17129b951cc31bfff3f8bca35ceddf assets\tead\models\item\gold_stalwart_helmet_redstone_trim.json
Expand Down Expand Up @@ -47,8 +48,8 @@ a1399170c06397c31727f020a43aebc3d9d84d02 assets\tead\models\item\gold_highland_h
eb49985fc4f43bcf3a7da9019ffbfeab87f09313 assets\tead\blockstates\deepslate_ruby_ore.json
92192a47bc55e7599adbe22d3d02adac3b28d5a9 assets\tead\models\item\gold_chainmail_chestplate.json
23d9c7e8c82341cfa0e21e4ef7bac3273d70ea2c assets\tead\models\item\diamond_highland_helmet_diamond_trim.json
b991d80e1011954db64fae86b98e62ba196e77cb assets\tead\models\item\music_disc_hail_and_kill.json
70e0c359fb85682759bee590633c4ec3ed3b2346 assets\tead\models\item\netherite_dagger.json
b991d80e1011954db64fae86b98e62ba196e77cb assets\tead\models\item\music_disc_hail_and_kill.json
9e365bc883ff676454e94188fb3836f23c5b190e assets\tead\models\item\diamond_royal_helmet_copper_trim.json
46b6fe25e330cae8e798483ae419dc779852714a assets\tead\models\item\netherite_stalwart_helmet_quartz_trim.json
ba47d5e31c355a1c4785d90ddc716d2ca97ab917 assets\tead\models\item\gold_stalwart_chestplate_emerald_trim.json
Expand All @@ -64,6 +65,7 @@ de098bc78312cf23f1de401e14b46aaaa950e074 assets\tead\models\item\gold_highland_h
bd65261164da3294b75f6871dc14b14217475445 assets\tead\models\item\gold_stalwart_helmet.json
e4e393006f6251a448d14eca09bbe48a9051fecc assets\tead\models\item\diamond_highland_helmet_iron_trim.json
4b9d1588417d47139b343e9d15ce98ee7a76314a assets\tead\models\block\dirty_cobblestone.json
6093e59e04de889e0332e352b19df587e0fdba41 assets\tead\models\item\soul_torch_arrow.json
df403cfdcae8520e563d61d3874019d8ebaf1353 assets\tead\models\item\iron_highland_helmet_netherite_trim.json
544fae509e1529ac672239b179e59a2c8b6be593 assets\tead\models\block\ruby_ore.json
0161514d3c88da65225b6a1c29973df8bfd8de32 assets\tead\models\item\iron_tempest_knife.json
Expand Down Expand Up @@ -103,8 +105,8 @@ abaa14c11ef102de667e10f7562830fb5e61fe3b assets\tead\models\item\gold_royal_helm
d9012edb32d53a41e513867a89fb06864f5c0137 assets\tead\models\item\iron_royal_helmet_amethyst_trim.json
69f4d306c797c5bb38d9b0641157101afe30b54a assets\tead\models\item\diamond_highland_helmet_quartz_trim.json
4168f0d71aab47178e392503253b19a099f31d5e assets\tead\models\block\block_of_ruby.json
cef38c64291ada5b94ba6dd7cd583249e788c5fa assets\tead\models\item\music_disc_day_one.json
b652b55e8fe7737c61e067d4abc72535cd40b821 assets\tead\models\item\swiftness_boots_copper_trim.json
cef38c64291ada5b94ba6dd7cd583249e788c5fa assets\tead\models\item\music_disc_day_one.json
9180e1a07898031322bc350c9dd4602cc261b9e8 assets\tead\models\block\dark_cobblestone.json
668790842952bd2cb0e4e4c4b8fa84409ee27ee3 assets\tead\models\item\iron_stalwart_chestplate_iron_trim.json
be035de9630702f153bdcf601d2039fafe73fc3b assets\tead\models\item\iron_highland_helmet_gold_trim.json
Expand Down Expand Up @@ -133,8 +135,8 @@ f6be128e0d0a59b8dfad0007396225e6bc4fd243 assets\tead\models\item\netherite_highl
ae37702090220ed7b6c6f1093da61e29596065c9 assets\tead\models\item\diamond_stalwart_chestplate.json
48375906c8e45c2dfea02c16d164fcfaea8b3c7a assets\tead\models\item\netherite_stalwart_helmet_iron_trim.json
d0834bd3cb01b31dd934fa666f93307909f6f68b assets\tead\models\item\very_sparse_grass.json
d401026e71b53825c45f0eae3c1a9cd8527ac7d6 assets\tead\models\item\gold_stalwart_chestplate_lapis_trim.json
03390ef15f0141b0d9e939fb884af26e5d6abb8e assets\tead\models\item\swiftness_boots_gold_trim.json
d401026e71b53825c45f0eae3c1a9cd8527ac7d6 assets\tead\models\item\gold_stalwart_chestplate_lapis_trim.json
ca093851665d8aaf5b34d65d480051f42648fae5 assets\tead\models\item\iron_highland_helmet_diamond_trim.json
c5771d3aa8485302f2f75f826431f36fde7f91f2 assets\tead\models\item\gold_chainmail_chestplate_emerald_trim.json
164e57d1f6e059ed8043883dd85a504bf7a33c79 assets\tead\models\item\gold_chainmail_boots_emerald_trim.json
Expand Down Expand Up @@ -211,8 +213,8 @@ e96d569a129c6c945075becd2ef0c146a707ac8b assets\tead\models\item\iron_stalwart_h
0411d850f72f34c06d61e6710d4be27ff728c16b assets\tead\models\item\gold_chainmail_leggings_netherite_trim.json
9fe5b647de0bde7a64f5ce9756d6077e14e6ac5b assets\tead\models\item\swiftness_boots_netherite_trim.json
67d4273a6cc89155cb8a032f8a04f01f4d17a5df assets\tead\models\item\iron_double_axe.json
152be24982529fbab86cb7fdf604557b3e9c313f assets\tead\models\item\diamond_stalwart_helmet_lapis_trim.json
fa858d405cec4b005a342a192f1b21e711ad3647 assets\tead\models\item\netherite_stalwart_chestplate_emerald_trim.json
152be24982529fbab86cb7fdf604557b3e9c313f assets\tead\models\item\diamond_stalwart_helmet_lapis_trim.json
f95d03a65cc5660eff34c4147327418bd8c5409e assets\tead\models\item\netherite_highland_helmet_emerald_trim.json
e69cea046a6481f946cf77e6f7bd357ed1da06ba assets\tead\models\item\gold_chainmail_leggings_iron_trim.json
acb6a32cd7619cb910268e048a27526c8fce629a assets\tead\models\item\netherite_highland_helmet_redstone_trim.json
Expand Down Expand Up @@ -257,8 +259,8 @@ f6867a83c299a4eab7ae2f27432df6655be519e1 assets\tead\models\item\gold_chainmail_
ab17c73d6eeb10781efca46f2dbcd7371e76b731 assets\tead\models\item\gold_chainmail_helmet_redstone_trim.json
3943aa89a8ba402bef372cd8af8eef0e56923a48 assets\tead\models\item\diamond_highland_helmet_netherite_trim.json
d31ee17474d4db40128e3495538aaf9a0f96e8d1 assets\tead\models\item\lead_double_axe.json
d75e70365ae7feebd149f4efbbb275780dca5528 assets\tead\models\item\netherite_stalwart_chestplate_iron_trim.json
5e0d887b30158525b6cd9856e83bdea8847188bb assets\tead\models\item\diamond_royal_helmet_amethyst_trim.json
d75e70365ae7feebd149f4efbbb275780dca5528 assets\tead\models\item\netherite_stalwart_chestplate_iron_trim.json
dcbc09a25d4307fb3d99d9220e8cd1978e7dfde6 assets\tead\models\item\iron_royal_helmet_lapis_trim.json
aff39e96712698c8761e6daab1664d5d601ab224 assets\tead\models\item\iron_royal_helmet.json
8dc5745d9c235cca2256df49b46d300be0c44a88 assets\tead\models\item\gold_chainmail_chestplate_redstone_trim.json
Expand Down Expand Up @@ -314,15 +316,16 @@ a0f2c7a5f286f7542909624acfa39a670c42dd1f assets\tead\models\item\iron_royal_helm
7eabed1c2f21dcdbb7df8164c42c3bcb8ddbc833 assets\tead\models\item\swiftness_boots_amethyst_trim.json
8764750eb6ab777c7e3406a590888f948a34ee5e assets\tead\models\item\music_disc_lose_yourself.json
8c561d1114c2474c4f360a34b6fde7d3ccac8899 assets\tead\models\block\dark_bricks.json
20723b4a7fb314d4077b2dc1fa9573d8160776df assets\tead\models\item\redstone_torch_arrow.json
0e600f052a4ab797636f5b94c12bab31e494ebe3 assets\tead\models\block\deepslate_ruby_ore.json
8d3bba068594f98dc0b4eb87ad40d0a748a70d73 assets\tead\models\item\diamond_royal_helmet_diamond_trim.json
d427c607661b73a6b9b25ac742bae41efa764362 assets\tead\models\item\shotgun_projectile.json
e2c07333f978935dda670919f51afc1ab0566c7f assets\tead\models\item\diamond_royal_helmet.json
3b9cec2dd155bd39acd4236e9abf348814795a29 assets\tead\models\item\gold_highland_helmet_gold_trim.json
94be0d0439105f698cd9c0674a7ba82844e61649 assets\tead\models\item\dark_cobblestone.json
d59472b4099c798fb614b349a87804ed62d7c659 assets\tead\models\item\gold_chainmail_helmet_netherite_trim.json
02d21d7298dc98a66b4592ffd41a9a0eaed558b7 assets\tead\models\item\iron_stalwart_helmet_quartz_trim.json
20390bf97fe8a8eec9e5bc73517c0814ae9ec19d assets\tead\models\item\lead_ore.json
02d21d7298dc98a66b4592ffd41a9a0eaed558b7 assets\tead\models\item\iron_stalwart_helmet_quartz_trim.json
2c98800f3fa466378aa7582ec93d0c16de69f02a assets\tead\blockstates\sick_pumpkin.json
efedb419dd1a5e67d4e87d6b2d2c20e2638f2836 assets\tead\models\item\gold_chainmail_boots.json
778d9f0a3001155971af52c3693e8522f821af7a assets\tead\models\item\gold_chainmail_leggings_gold_trim.json
Expand All @@ -345,9 +348,9 @@ bb7326361d25aeac967bbc5574ed6cd5e5dee3f4 assets\tead\models\item\block_of_ruby.j
58c4d0754909c535307f7b27ff7e887cfc3ae599 assets\tead\models\item\gold_highland_helmet_diamond_trim.json
df38f90b1ba47d7804910c317fd9497c82c7f125 assets\tead\blockstates\ruby_ore.json
46bb9e099a6e39be261e6cc213aebfd8567595ae assets\tead\models\item\gold_chainmail_boots_redstone_trim.json
dad6aa545b142df4c18ee7fbe5905310c82304ed assets\tead\models\item\netherite_royal_helmet_diamond_trim.json
9f70e8969029c61e7ab094ea97a361b91c9f5c43 assets\tead\models\item\swiftness_boots_emerald_trim.json
d57cb769fd7869ef8d17827782ab72814b77096f assets\tead\blockstates\sandy_cobblestone.json
9f70e8969029c61e7ab094ea97a361b91c9f5c43 assets\tead\models\item\swiftness_boots_emerald_trim.json
dad6aa545b142df4c18ee7fbe5905310c82304ed assets\tead\models\item\netherite_royal_helmet_diamond_trim.json
e68562d44c0763dae98d91523e43170e792ffeb1 assets\tead\models\item\gold_stalwart_helmet_gold_trim.json
8d460e8791cdf6330a59365886efa6c0316f34a7 assets\tead\models\item\sandy_cobblestone.json
088f9130b090f76dee2311b5bb1fb0cc719c5531 assets\tead\models\item\lead_dagger.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// 1.20.1 2024-01-29T18:25:38.1540488 tead/World Gen
d7f4bb28cf229769332d150ff934c91638a2054b data\tead\worldgen\placed_feature\lead_ore_placed.json
// 1.20.1 2024-02-03T14:49:48.5109911 tead/World Gen
0a3d8090864dfb97a05d630c53f6ffc07c9ad0cb data\tead\worldgen\placed_feature\lead_ore_placed.json
2352a497ac661c664d2b39567cc1e326ef934970 data\tead\worldgen\placed_feature\ruby_ore_placed.json
2b11d6f824f2ef76f64daf15d6300c3f746dd3b6 data\tead\worldgen\configured_feature\deepslate_ruby_ore.json
8c44bb0b20982964985000004b4528ca75ecf35c data\tead\worldgen\configured_feature\ruby_ore.json
5daae181466ff06e914b54530b2de325b9181f35 data\tead\worldgen\configured_feature\deepslate_ruby_ore.json
0f4e1286cee7972dee44ec24cbca50797011b404 data\tead\worldgen\configured_feature\ruby_ore.json
91eb6fd37f1063abfdbaa3227383cd9ca0f97540 data\tead\worldgen\placed_feature\deepslate_ruby_ore_placed.json
1478ae860538f7c25c70429ac03d541134c96880 data\tead\worldgen\configured_feature\lead_ore.json
d2ee5e3af93fe00a3f08ad76bb9a97f56729171a data\tead\worldgen\configured_feature\lead_ore.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-01-29T18:25:38.1395895 tead/Tags for minecraft:item
// 1.20.1 2024-02-03T14:49:48.4938829 tead/Tags for minecraft:item
9a8b88cdbfd6ad375dbea98c45eb304315449842 data\minecraft\tags\items\trimmable_armor.json
870daac12e447cf4e4d8be5e8ac2bbfca009c33f data\minecraft\tags\items\creeper_drop_music_discs.json
870daac12e447cf4e4d8be5e8ac2bbfca009c33f data\minecraft\tags\items\music_discs.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-01-29T18:25:38.137587 tead/Tags for minecraft:block
// 1.20.1 2024-02-03T14:49:48.4894007 tead/Tags for minecraft:block
a7bed1c69a0776fb68eb189877fde38060a9bac4 data\minecraft\tags\blocks\needs_diamond_tool.json
a29a401919d5905bd706e6010cbf590fd32c34e7 data\minecraft\tags\blocks\mineable\pickaxe.json
06a698369cbe90b291874c870defaeadb1cfd018 data\minecraft\tags\blocks\mineable\shovel.json
Expand Down
6 changes: 0 additions & 6 deletions src/main/generated/assets/tead/models/item/battle_staff.json

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions src/main/generated/assets/tead/models/item/quarterstaff.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "tead:item/redstone_torch_arrow"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "tead:item/soul_torch_arrow"
}
}
6 changes: 6 additions & 0 deletions src/main/generated/assets/tead/models/item/torch_arrow.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "tead:item/torch_arrow"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,6 @@
},
"trigger": "minecraft:inventory_changed"
},
"has_feather": {
"conditions": {
"items": [
{
"items": [
"minecraft:feather"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tead:amethyst_arrow_1"
Expand All @@ -34,7 +22,6 @@
},
"requirements": [
[
"has_feather",
"has_amethyst_shard",
"has_the_recipe"
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,6 @@
},
"trigger": "minecraft:inventory_changed"
},
"has_feather": {
"conditions": {
"items": [
{
"items": [
"minecraft:feather"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tead:amethyst_arrow_2"
Expand All @@ -34,7 +22,6 @@
},
"requirements": [
[
"has_feather",
"has_amethyst_shard",
"has_the_recipe"
]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_feather": {
"conditions": {
"items": [
{
"items": [
"minecraft:feather"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_iron_ingot": {
"conditions": {
"items": [
{
"items": [
"minecraft:iron_ingot"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tead:arrow_3"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_feather",
"has_iron_ingot",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"tead:arrow_3"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_feather": {
"conditions": {
"items": [
{
"items": [
"minecraft:feather"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_iron_ingot": {
"conditions": {
"items": [
{
"items": [
"minecraft:iron_ingot"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tead:arrow_4"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_feather",
"has_iron_ingot",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"tead:arrow_4"
]
},
"sends_telemetry_event": false
}
Original file line number Diff line number Diff line change
@@ -1,18 +1,6 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_feather": {
"conditions": {
"items": [
{
"items": [
"minecraft:feather"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_lightning_rod": {
"conditions": {
"items": [
Expand All @@ -34,7 +22,6 @@
},
"requirements": [
[
"has_feather",
"has_lightning_rod",
"has_the_recipe"
]
Expand Down
Loading

0 comments on commit 118f724

Please sign in to comment.