Skip to content

Commit

Permalink
Fixed loot tables, recipes & pickaxe harvest levels, models & blockst…
Browse files Browse the repository at this point in the history
…ates
  • Loading branch information
Leronus committed Aug 11, 2024
1 parent 9ec1e67 commit e9368d6
Show file tree
Hide file tree
Showing 2,444 changed files with 26,652 additions and 1,205 deletions.
4 changes: 3 additions & 1 deletion MORES-CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
v2.0.0
Updated to Minecraft 1.21
Updated to Minecraft 1.21
- Fixed items not craftable in mOres alpha 2.0.0
- Fixed ore blocks dropping themselves in mOres alpha 2.0.0
1,179 changes: 0 additions & 1,179 deletions src/main/generated/.cache/2c213646d49e9ecdb2ab778829ad26b18324abe1

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
// 1.21 2024-08-10T11:27:18.208201 mOres/World Gen
// 1.21 2024-08-11T08:18:24.6892253 mOres/World Gen
e7d115fdae40224319a08a829e1d775cba361848 data\mores\worldgen\placed_feature\silver_upper_placed.json
c18a52c91db4ee51e2ee0a2eadc723b126a05950 data\mores\worldgen\configured_feature\tourmaline_buried_ore.json
7b5d73656beff031ef3a23e4c4986b18deddc2ed data\mores\worldgen\configured_feature\nether_tanzanite_ore.json
7fd632e248d961ad028ba0b1be6facf9d4fe4723 data\mores\worldgen\placed_feature\nether_sapphire_placed.json
d99ab97a888d13136260bd2581eac3dd09e522a3 data\mores\worldgen\placed_feature\end_onyx_placed.json
7fd632e248d961ad028ba0b1be6facf9d4fe4723 data\mores\worldgen\placed_feature\nether_sapphire_placed.json
e330a26fcf9e86444b8a6520620744e19aecb715 data\mores\worldgen\placed_feature\tin_upper_placed.json
17ec872cd9ed2cd2e3a7a3353fe49433c108de8c data\mores\worldgen\placed_feature\tourmaline_large_placed.json
ff00ffbf0734d3c3aeba811b57f9d99c9f2fcf22 data\mores\worldgen\placed_feature\moissanite_buried_placed.json
6892d468342ff79aac351f1e66ec3d1e78d9ba83 data\mores\worldgen\configured_feature\sapphire_large_ore.json
f69a0a16f28568e5a420d8caf1f913edb9e7cddb data\mores\worldgen\configured_feature\moissanite_large_ore.json
242c19d64bc2fda04a153a5aac52bd3609728eff data\mores\worldgen\configured_feature\nether_moissanite_ore.json
6892d468342ff79aac351f1e66ec3d1e78d9ba83 data\mores\worldgen\configured_feature\sapphire_large_ore.json
dae3adb4910e19d3a49db653a296a8b4612bf01b data\mores\worldgen\configured_feature\tourmaline_small_ore.json
1df92b128ece0920fa33071d924fe4e1a30609b5 data\mores\worldgen\configured_feature\sapphire_buried_ore.json
cdde7bfaf5ef92d58500c044f8e89b0b57afb504 data\mores\worldgen\configured_feature\nether_anthracite_ore.json
1df92b128ece0920fa33071d924fe4e1a30609b5 data\mores\worldgen\configured_feature\sapphire_buried_ore.json
88469efac3ed693f5158f4e6fd1ec98ea5e0bab9 data\mores\worldgen\placed_feature\moissanite_large_placed.json
ddcc77a9ebb78c971e824042c86bf263c9ac2f9e data\mores\worldgen\configured_feature\ruby_buried_ore.json
0411da2ee84e578979bda3b4e39d81e15ff88c4f data\mores\worldgen\configured_feature\tin_upper_ore.json
45d4dbe9366b77189f196451fb0d9fadbda1cf02 data\mores\worldgen\configured_feature\turquoise_small_ore.json
8fc0f1aa465740a5e7c05528b1bf1693ccc64506 data\mores\worldgen\configured_feature\moissanite_buried_ore.json
c3718dc77d968155c9dc63cbcd631a1401caef7e data\mores\worldgen\configured_feature\cobalt_upper_ore.json
8fc0f1aa465740a5e7c05528b1bf1693ccc64506 data\mores\worldgen\configured_feature\moissanite_buried_ore.json
f58d4086dff0feb130fd3d6ac3a96633ecf6e122 data\mores\worldgen\placed_feature\ruby_large_placed.json
711fc4bdb5fb6973a9aa88f488ae0afdea8f9847 data\mores\worldgen\placed_feature\cobalt_upper_placed.json
deb0e1e733b879cb641b8e48ea13907373567992 data\mores\worldgen\placed_feature\cobalt_small_placed.json
Expand All @@ -37,21 +37,21 @@ f281b81077f64baa42ee142d23a5fd4e53c1a386 data\mores\worldgen\placed_feature\sapp
2d058392b74e8fc5adb8af251b68d900ea09b96f data\mores\worldgen\configured_feature\overworld_anthracite_ore.json
100c6708bdc59f94e175c460f1de31c8c7d47fa3 data\mores\worldgen\placed_feature\tin_small_placed.json
ca5be574fb29c66694085c807d984baa54e2d9a3 data\mores\worldgen\configured_feature\nether_ruby_ore.json
de3845c5c81018db4fdd601d98d3ff955b84bd43 data\mores\worldgen\configured_feature\silver_middle_ore.json
30b24e30ae7048dececda578d57b0b35af43dfa8 data\mores\worldgen\configured_feature\turquoise_large_ore.json
de3845c5c81018db4fdd601d98d3ff955b84bd43 data\mores\worldgen\configured_feature\silver_middle_ore.json
f01e5af6652bb12efe4cc5ee05b306d2ddee1881 data\mores\worldgen\placed_feature\turquoise_small_placed.json
bdd0c2cc2909f73eba53209ceb9064ab138394e4 data\mores\worldgen\placed_feature\overworld_anthracite_placed.json
88f701ce7e7801720a18859be78fb3a5d50c1154 data\mores\worldgen\configured_feature\tin_middle_ore.json
ef997dec7841569fc7f781ecb501d30064d21052 data\mores\worldgen\placed_feature\sapphire_buried_placed.json
f4fc9a2304a047c17cd42df0846348184d3d050d data\mores\worldgen\configured_feature\ruby_small_ore.json
cbf7096450a0b25284d2f8f966ff7460d89c7638 data\mores\worldgen\placed_feature\sapphire_small_placed.json
ef997dec7841569fc7f781ecb501d30064d21052 data\mores\worldgen\placed_feature\sapphire_buried_placed.json
86065106f33b5eb753b936b47026cd1a1229ec43 data\mores\worldgen\placed_feature\silver_small_placed.json
a4fc0e8c4b764f3cc9e817388ed9772466e1e2b7 data\mores\worldgen\placed_feature\silver_middle_placed.json
42d6029ba358d40492dfe0c2c7d264b0eaf0c90d data\mores\worldgen\configured_feature\silver_small_ore.json
8610adcff33f5dd23874b3713d04e76ece259796 data\mores\worldgen\placed_feature\turquoise_buried_placed.json
0fb04bda60258cb186dc92a29c0641272777af5f data\mores\worldgen\configured_feature\topaz_small_ore.json
1d48148e678767b8b23a2045e877a630eceb1e7c data\mores\worldgen\configured_feature\nether_silver_ore.json
814053ef8f2951e0b02e8d3806ea49579665cd68 data\mores\worldgen\configured_feature\cobalt_small_ore.json
1d48148e678767b8b23a2045e877a630eceb1e7c data\mores\worldgen\configured_feature\nether_silver_ore.json
434098b435b8367c9bddf855be4d2edd54a322db data\mores\worldgen\placed_feature\nether_silver_placed.json
e81336d07e5ed25002370de774406a813c496ee6 data\mores\worldgen\placed_feature\topaz_large_placed.json
e3e8de1a062fcdc897121c235008625847c403d5 data\mores\worldgen\configured_feature\turquoise_buried_ore.json
Expand All @@ -60,8 +60,8 @@ c4dc25c7ef8ceaaa70677ca4cdbee5584ea1da96 data\mores\worldgen\placed_feature\neth
b42d78be3b5e8b2d4aa26bc7c195bbefeef05cd0 data\mores\worldgen\configured_feature\topaz_large_ore.json
6fa9b33c7b371757d15fdf6b878485e00273c558 data\mores\worldgen\placed_feature\tourmaline_small_placed.json
de3845c5c81018db4fdd601d98d3ff955b84bd43 data\mores\worldgen\configured_feature\silver_upper_ore.json
d05306e936e0b54fb908ff3880ad8f338a238f19 data\mores\worldgen\placed_feature\nether_anthracite_placed.json
e6677c1c42eec51690dbe892aad08802091cb98a data\mores\worldgen\placed_feature\ruby_small_placed.json
d05306e936e0b54fb908ff3880ad8f338a238f19 data\mores\worldgen\placed_feature\nether_anthracite_placed.json
141c663116141eda23acd633424d23ca978492d1 data\mores\worldgen\placed_feature\tourmaline_buried_placed.json
a53ed0fa9d059eb02672159517e2a446b731730a data\mores\worldgen\configured_feature\tourmaline_large_ore.json
c3718dc77d968155c9dc63cbcd631a1401caef7e data\mores\worldgen\configured_feature\cobalt_middle_ore.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
// 1.21 2024-08-10T11:27:18.1997374 mOres/Tags for minecraft:item
// 1.21 2024-08-11T08:18:24.6887237 mOres/Tags for minecraft:item
ae4a3668a772771ca6c965f69b5f5bed18de030d data\mores\tags\item\gem\tanzanite.json
4c34e8219f3e2170a1990a840a7117fdb3abbcd8 data\mores\tags\item\ingot\obsidian.json
d04b1b66fa03ef3e9f2ace80be81491c8bac4a11 data\mores\tags\item\gem\turquoise.json
38d4d2c247f7096d9c7901c2782d804e99d891cb data\minecraft\tags\item\diamond_ores.json
f5e1fe67b2d51770071784fad8397530debe35f7 data\minecraft\tags\item\trimmable_armor.json
33db88e9cdfa2a07fad99136c608e6fb7f035326 data\mores\tags\item\ingot\cobalt.json
a53be1137d0a011903fe3bbd027eb184fd533525 data\mores\tags\item\ingot\steel.json
16ec202a5b626b538cbe2691cc7f4b4a3dfbfa0e data\mores\tags\item\gem\tourmaline.json
33db88e9cdfa2a07fad99136c608e6fb7f035326 data\mores\tags\item\ingot\cobalt.json
bb22b2f566360ba138b6f73e4992a52575c1318e data\mores\tags\item\gem\sapphire.json
97a93a5d81c8bc030425eccf7ee25e749a480b92 data\mores\tags\item\gem\topaz.json
bb22b2f566360ba138b6f73e4992a52575c1318e data\mores\tags\item\gem\sapphire.json
41868eab6d7d70a8d9fdb1fadd2874ba471221f1 data\mores\tags\item\ingot\silver.json
70786b5bc271625b44fc429e19f42953c435c592 data\mores\tags\item\ingot\tin.json
c790279fd36ba74aadc3410aa141ab62cd23f373 data\mores\tags\item\gem\ruby.json
Expand All @@ -17,4 +16,3 @@ b0d485c06fbb49eff2c1d4c2bee2fa85e0df115c data\mores\tags\item\gem\onyx.json
0e8693bf73f004de7722ed0c4797ab8cba29ee28 data\mores\tags\item\ingot\sterling_silver.json
ad0a1e9afcacf1d0e0eb4ecfcf9926254af8423b data\mores\tags\item\ingot\bronze.json
dc2f94bc4311ebc23cb6391771eca90d2f0aac4b data\mores\tags\item\gem\moissanite.json
dbaf5a34e61c237064e5180b3dec7a44939f53ae data\minecraft\tags\item\iron_ores.json
80 changes: 80 additions & 0 deletions src/main/generated/data/minecraft/tags/item/trimmable_armor.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
{
"values": [
"mores:silver_helmet",
"mores:silver_chestplate",
"mores:silver_leggings",
"mores:silver_boots",
"mores:copper_helmet",
"mores:copper_chestplate",
"mores:copper_leggings",
"mores:copper_boots",
"mores:cobalt_helmet",
"mores:cobalt_chestplate",
"mores:cobalt_leggings",
"mores:cobalt_boots",
"mores:bronze_helmet",
"mores:bronze_chestplate",
"mores:bronze_leggings",
"mores:bronze_boots",
"mores:tin_helmet",
"mores:tin_chestplate",
"mores:tin_leggings",
"mores:tin_boots",
"mores:sterling_helmet",
"mores:sterling_chestplate",
"mores:sterling_leggings",
"mores:sterling_boots",
"mores:steel_helmet",
"mores:steel_chestplate",
"mores:steel_leggings",
"mores:steel_boots",
"mores:amethyst_helmet",
"mores:amethyst_chestplate",
"mores:amethyst_leggings",
"mores:amethyst_boots",
"mores:emerald_helmet",
"mores:emerald_chestplate",
"mores:emerald_leggings",
"mores:emerald_boots",
"mores:tourmaline_helmet",
"mores:tourmaline_chestplate",
"mores:tourmaline_leggings",
"mores:tourmaline_boots",
"mores:topaz_helmet",
"mores:topaz_chestplate",
"mores:topaz_leggings",
"mores:topaz_boots",
"mores:ruby_helmet",
"mores:ruby_chestplate",
"mores:ruby_leggings",
"mores:ruby_boots",
"mores:sapphire_helmet",
"mores:sapphire_chestplate",
"mores:sapphire_leggings",
"mores:sapphire_boots",
"mores:tanzanite_helmet",
"mores:tanzanite_chestplate",
"mores:tanzanite_leggings",
"mores:tanzanite_boots",
"mores:turquoise_helmet",
"mores:turquoise_chestplate",
"mores:turquoise_leggings",
"mores:turquoise_boots",
"mores:moissanite_helmet",
"mores:moissanite_chestplate",
"mores:moissanite_leggings",
"mores:moissanite_boots",
"mores:onyx_helmet",
"mores:onyx_chestplate",
"mores:onyx_leggings",
"mores:onyx_boots",
"mores:obsidian_helmet",
"mores:obsidian_chestplate",
"mores:obsidian_leggings",
"mores:obsidian_boots",
"mores:graphene_helmet",
"mores:graphene_chestplate",
"mores:graphene_leggings",
"mores:graphene_boots"
]
}
5 changes: 5 additions & 0 deletions src/main/generated/data/mores/tags/item/gem/graphene.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"mores:graphene_gem"
]
}
5 changes: 5 additions & 0 deletions src/main/generated/data/mores/tags/item/gem/moissanite.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"mores:moissanite_gem"
]
}
5 changes: 5 additions & 0 deletions src/main/generated/data/mores/tags/item/gem/onyx.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"mores:onyx_gem"
]
}
5 changes: 5 additions & 0 deletions src/main/generated/data/mores/tags/item/gem/ruby.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"mores:ruby_gem"
]
}
5 changes: 5 additions & 0 deletions src/main/generated/data/mores/tags/item/gem/sapphire.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"mores:sapphire_gem"
]
}
5 changes: 5 additions & 0 deletions src/main/generated/data/mores/tags/item/gem/tanzanite.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"mores:tanzanite_gem"
]
}
5 changes: 5 additions & 0 deletions src/main/generated/data/mores/tags/item/gem/topaz.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"mores:topaz_gem"
]
}
5 changes: 5 additions & 0 deletions src/main/generated/data/mores/tags/item/gem/tourmaline.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"mores:tourmaline_gem"
]
}
5 changes: 5 additions & 0 deletions src/main/generated/data/mores/tags/item/gem/turquoise.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"mores:turquoise_gem"
]
}
5 changes: 5 additions & 0 deletions src/main/generated/data/mores/tags/item/ingot/bronze.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"mores:bronze_ingot"
]
}
5 changes: 5 additions & 0 deletions src/main/generated/data/mores/tags/item/ingot/cobalt.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"mores:cobalt_ingot"
]
}
5 changes: 5 additions & 0 deletions src/main/generated/data/mores/tags/item/ingot/obsidian.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"mores:obsidian_ingot"
]
}
5 changes: 5 additions & 0 deletions src/main/generated/data/mores/tags/item/ingot/silver.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"mores:silver_ingot"
]
}
5 changes: 5 additions & 0 deletions src/main/generated/data/mores/tags/item/ingot/steel.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"mores:steel_ingot"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"mores:sterling_ingot"
]
}
5 changes: 5 additions & 0 deletions src/main/generated/data/mores/tags/item/ingot/tin.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"mores:tin_ingot"
]
}
2 changes: 1 addition & 1 deletion src/main/java/mod/leronus/mores/MoresDataGenerator.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {
// pack.addProvider(ModBlockTagProvider::new);
pack.addProvider(ModItemTagProvider::new);
// pack.addProvider(ModBlockLootTableGenerator::new);
pack.addProvider(ModModelProvider::new);
// pack.addProvider(ModModelProvider::new);
// pack.addProvider(ModRecipeGenerator::new);
// pack.addProvider(ModPaintingVariantTagProvider::new);
// pack.addProvider(ModAdvancementProvider::new);
Expand Down
21 changes: 11 additions & 10 deletions src/main/java/mod/leronus/mores/datagen/ModModelProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,17 @@ public void generateItemModels(ItemModelGenerator itemModelGenerator) {
itemModelGenerator.registerArmor(((ArmorItem) ModItems.GRAPHENE_LEGGINGS));
itemModelGenerator.registerArmor(((ArmorItem) ModItems.GRAPHENE_BOOTS));

itemModelGenerator.register(ModItems.ANTHRACITE, Models.GENERATED);

itemModelGenerator.register(ModItems.BRONZE_APPLE, Models.GENERATED);
itemModelGenerator.register(ModItems.SILVER_APPLE, Models.GENERATED);
itemModelGenerator.register(ModItems.COBALT_APPLE, Models.GENERATED);

itemModelGenerator.register(ModItems.VELVET, Models.GENERATED);
itemModelGenerator.register(ModItems.CHOCOLATE, Models.GENERATED);
itemModelGenerator.register(ModItems.CARROT_PIE, Models.GENERATED);
itemModelGenerator.register(ModItems.CHAIN, Models.GENERATED);

// itemModelGenerator.register(ModItems.TIN_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.COPPER_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.BRONZE_HORSE_ARMOR, Models.GENERATED);
Expand All @@ -433,16 +444,6 @@ public void generateItemModels(ItemModelGenerator itemModelGenerator) {
// itemModelGenerator.register(ModItems.GRAPHENE_HORSE_ARMOR, Models.GENERATED);
// itemModelGenerator.register(ModItems.NETHERITE_HORSE_ARMOR, Models.GENERATED);

itemModelGenerator.register(ModItems.ANTHRACITE, Models.GENERATED);

itemModelGenerator.register(ModItems.BRONZE_APPLE, Models.GENERATED);
itemModelGenerator.register(ModItems.SILVER_APPLE, Models.GENERATED);
itemModelGenerator.register(ModItems.COBALT_APPLE, Models.GENERATED);

itemModelGenerator.register(ModItems.VELVET, Models.GENERATED);
itemModelGenerator.register(ModItems.CHOCOLATE, Models.GENERATED);
itemModelGenerator.register(ModItems.CARROT_PIE, Models.GENERATED);
itemModelGenerator.register(ModItems.CHAIN, Models.GENERATED);
// itemModelGenerator.register(ModItems.DUCK, Models.GENERATED);
// itemModelGenerator.register(ModItems.COOKED_DUCK, Models.GENERATED);
// itemModelGenerator.register(ModItems.DUCK_EGG, Models.GENERATED);
Expand Down
Loading

0 comments on commit e9368d6

Please sign in to comment.