Skip to content

Commit

Permalink
More tags
Browse files Browse the repository at this point in the history
  • Loading branch information
@CamoMano
CamoMano committed Jul 10, 2024
1 parent fd28226 commit 6428450
Show file tree
Hide file tree
Showing 20 changed files with 80 additions and 85 deletions.
2 changes: 1 addition & 1 deletion src/main/generated/.cache/33f862717e26ec2d6360a91a8f02941f561a0223
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21 2024-07-09T21:34:10.6729467 Enriched/Tags for minecraft:block
// 1.21 2024-07-10T12:32:08.6051063 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
2 changes: 1 addition & 1 deletion src/main/generated/.cache/3e0c651762a148941639324ba0d096b89d34fdb1
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21 2024-07-09T21:34:10.67194 Enriched/Block Loot Tables
// 1.21 2024-07-10T12:32:08.6041032 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
30 changes: 16 additions & 14 deletions src/main/generated/.cache/437931636ae53790c576ca0719d52da14c131efd
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
// 1.21 2024-07-09T21:34:10.67194 Enriched/Tags for minecraft:item
7de72c45ab014b3a47886aa8c9c699f9f1f1635d data\c\tags\item\ores.json
eb373d02e484b65c3e3cb5422b23771fbca65004 data\minecraft\tags\item\foot_armor.json
// 1.21 2024-07-10T12:32:08.6051063 Enriched/Tags for minecraft:item
a94b97d224da0464fc2bd7209ff67b8238e3302d data\c\tags\item\tools\melee_weapon.json
0b2f1d30056526fbfe5629d2129f3ca7cdb48107 data\minecraft\tags\item\enchantable\chest_armor.json
5130353929cba072dacb3ab075642e95f0f7746f data\enriched\tags\item\redwood_logs.json
89c60d3304c60899777e0814e2f178bc98f1b380 data\c\tags\item\tools.json
b89af94e429e603debbebc6dcec828fc2d9ef067 data\minecraft\tags\item\swords.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
0350db8c456d88da25a062a44d3b8cd01acf4770 data\c\tags\item\foods.json
7de72c45ab014b3a47886aa8c9c699f9f1f1635d data\c\tags\item\ores.json
680bce04e1c5f6a0a57b2bdbdf484ec28eff5ca4 data\minecraft\tags\item\axes.json
1c18a5b8f73fd8d4df1792cfa57fbae974afa729 data\minecraft\tags\item\head_armor.json
4c64607a05aee15148f7083c3053d50d98aa1bd6 data\c\tags\item\gems\sapphire.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
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
38905499eb1a4ab8f18dcfee4abc53455ea0d261 data\minecraft\tags\item\leg_armor.json
889c361c029c8f8047f632df4b12fa545b8cafdc data\minecraft\tags\item\shovels.json
4d1a35e2634756e0e1191a849f4932e5ca07752d data\c\tags\item\tools\mining_tool.json
4d1a35e2634756e0e1191a849f4932e5ca07752d data\minecraft\tags\item\pickaxes.json
c37ab60b454a016b81870fc27d9faf275989096c data\c\tags\item\ingots\obsidian_alloy.json
319a81d192361fb43916d37d5ec64108ff99836d data\c\tags\item\ingots.json
863ffe88aba59791de3bc9fd39e1c36c3fdac1ef data\c\tags\item\dusts.json
4c64607a05aee15148f7083c3053d50d98aa1bd6 data\c\tags\item\gems\ruby.json
cef670a6b27fb5fd943fa55d23ea352f847db879 data\c\tags\item\armors.json
2 changes: 1 addition & 1 deletion src/main/generated/.cache/53358fbdef77ef1af7355d18669e01bbae7a80f8
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21 2024-07-09T21:34:10.663357 Enriched/Recipes
// 1.21 2024-07-10T12:32:08.5949879 Enriched/Recipes
bddaf0484c3f36e7a3db02a1538562976e33553a data\enriched\recipe\steel_blend.json
7a034820fe10d3bef7737462418cbb790e3c2bf5 data\enriched\advancement\recipes\tools\ruby_pickaxe.json
b86af3b61d52ef9464d07d781c16767cb10c75be data\enriched\advancement\recipes\tools\sapphire_pickaxe.json
Expand Down
4 changes: 2 additions & 2 deletions src/main/generated/.cache/59192d6ffc5bfc8e2b71cafcacd1447414fb8b0d
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21 2024-07-09T21:34:10.6714349 Enriched/Language (en_us)
14fbaa364d29a02102981d88beb99062d29d12fd assets\enriched\lang\en_us.json
// 1.21 2024-07-10T12:32:08.6041032 Enriched/Language (en_us)
79487a92233ca9f21befb04ba747522c65fb9b4f assets\enriched\lang\en_us.json
6 changes: 3 additions & 3 deletions src/main/generated/.cache/6ffc7c45f7d836da3acace2d82bb174d99aa9f31
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21 2024-07-09T21:34:10.6673571 Enriched/Model Definitions
// 1.21 2024-07-10T12:32:08.6000293 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
1f1f40fa0c633242516bfee33d08c4921ed2f9d4 assets\enriched\models\item\emerald_boots_lapis_trim.json
c1019f4cf13f71eecf37d82f1f1a91dc9c074bfb assets\enriched\models\item\deepslate_sapphire_ore.json
1f1f40fa0c633242516bfee33d08c4921ed2f9d4 assets\enriched\models\item\emerald_boots_lapis_trim.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
6 changes: 3 additions & 3 deletions src/main/generated/.cache/e40d229de16c75d411f3b1e8e1d42d6101b221ad
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// 1.21 2024-07-09T21:34:10.6704336 Enriched/World Gen
// 1.21 2024-07-10T12:32:08.6041032 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,8 +12,8 @@ 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
5ae3c672f50e49f6121c1ef849f60ffca065eb86 data\enriched\worldgen\placed_feature\dark_granite_upper_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
907434c3f07db69fe016bfe09d10772d5dea43e9 data\enriched\worldgen\configured_feature\marble.json
30dd6b9471bab1ed1a1a1698b8d1c2662050496c data\enriched\worldgen\placed_feature\ruby_ore_placed.json
Expand Down
5 changes: 5 additions & 0 deletions src/main/generated/assets/enriched/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,5 +152,10 @@
"item.enriched.tanzanite_shovel": "Tanzanite Shovel",
"item.enriched.tanzanite_sword": "Tanzanite Sword",
"tag.block.enriched.redwood_logs": "Redwood Logs",
"tag.item.c.gems.ruby": "Ruby",
"tag.item.c.gems.sapphire": "Sapphire",
"tag.item.c.gems.tanzanite": "Tanzanite",
"tag.item.c.ingots.obsidian_alloy": "Obsidian Alloy Ingot",
"tag.item.c.ingots.steel": "Steel Ingot",
"tag.item.enriched.redwood_logs": "Redwood Logs"
}
28 changes: 0 additions & 28 deletions src/main/generated/data/c/tags/item/armors.json
View file

This file was deleted.

6 changes: 6 additions & 0 deletions src/main/generated/data/c/tags/item/foods.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"values": [
"enriched:berry_juice",
"enriched:beef_stew"
]
}
2 changes: 1 addition & 1 deletion src/main/generated/data/c/tags/item/gems/sapphire.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"values": [
"enriched:ruby"
"enriched:sapphire"
]
}
5 changes: 5 additions & 0 deletions src/main/generated/data/c/tags/item/gems/tanzanite.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"enriched:tanzanite"
]
}
5 changes: 5 additions & 0 deletions src/main/generated/data/c/tags/item/ingots/obsidian_alloy.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"enriched:obsidian_alloy_ingot"
]
}
0 ...data/minecraft/tags/item/chest_armor.json → ...ft/tags/item/enchantable/chest_armor.json
View file
File renamed without changes.
0 .../data/minecraft/tags/item/foot_armor.json → ...aft/tags/item/enchantable/foot_armor.json
View file
File renamed without changes.
0 .../data/minecraft/tags/item/head_armor.json → ...aft/tags/item/enchantable/head_armor.json
View file
File renamed without changes.
0 ...d/data/minecraft/tags/item/leg_armor.json → ...raft/tags/item/enchantable/leg_armor.json
View file
File renamed without changes.
11 changes: 11 additions & 0 deletions src/main/java/com/enrichedmc/enriched/datagen/lang/EnrichedEnglishLanguageProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import net.minecraft.item.Item;
import net.minecraft.registry.RegistryWrapper;

import static com.enrichedmc.enriched.tag.EnrichedTags.ItemTags.*;

public class EnrichedEnglishLanguageProvider extends FabricLanguageProvider {
public EnrichedEnglishLanguageProvider(
FabricDataOutput dataOutput,
Expand Down Expand Up @@ -261,6 +263,15 @@ public void generateTranslations(
translationBuilder.add(EnrichedItems.BEEF_STEW, "Beef Stew");
translationBuilder.add(EnrichedItems.BERRY_JUICE, "Berry Juice");

/*----------------*/
/* -- Tags -- */
/*----------------*/
translationBuilder.add(SAPPHIRES, "Sapphire");
translationBuilder.add(RUBIES, "Ruby");
translationBuilder.add(TANZANITES, "Tanzanite");
translationBuilder.add(OBSIDIAN_INGOTS, "Obsidian Alloy Ingot");
translationBuilder.add(STEEL_INGOTS, "Steel Ingot");

/*----------------*/
/* -- Entities -- */
/*----------------*/
Expand Down
39 changes: 9 additions & 30 deletions src/main/java/com/enrichedmc/enriched/datagen/tag/EnrichedItemTagProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,57 +133,32 @@ protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) {
.add(EnrichedItems.TANZANITE_SWORD)
.add(EnrichedItems.EMERALD_SWORD);

this.getOrCreateTagBuilder(ConventionalItemTags.ARMORS)
.add(EnrichedItems.STEEL_HELMET)
.add(EnrichedItems.STEEL_CHESTPLATE)
.add(EnrichedItems.STEEL_LEGGINGS)
.add(EnrichedItems.STEEL_BOOTS)
.add(EnrichedItems.OBSIDIAN_HELMET)
.add(EnrichedItems.OBSIDIAN_CHESTPLATE)
.add(EnrichedItems.OBSIDIAN_LEGGINGS)
.add(EnrichedItems.OBSIDIAN_BOOTS)
.add(EnrichedItems.RUBY_HELMET)
.add(EnrichedItems.RUBY_CHESTPLATE)
.add(EnrichedItems.RUBY_LEGGINGS)
.add(EnrichedItems.RUBY_BOOTS)
.add(EnrichedItems.SAPPHIRE_HELMET)
.add(EnrichedItems.SAPPHIRE_CHESTPLATE)
.add(EnrichedItems.SAPPHIRE_LEGGINGS)
.add(EnrichedItems.SAPPHIRE_BOOTS)
.add(EnrichedItems.TANZANITE_HELMET)
.add(EnrichedItems.TANZANITE_CHESTPLATE)
.add(EnrichedItems.TANZANITE_LEGGINGS)
.add(EnrichedItems.TANZANITE_BOOTS)
.add(EnrichedItems.EMERALD_HELMET)
.add(EnrichedItems.EMERALD_CHESTPLATE)
.add(EnrichedItems.EMERALD_LEGGINGS)
.add(EnrichedItems.EMERALD_BOOTS);

this.getOrCreateTagBuilder(ItemTags.HEAD_ARMOR)
this.getOrCreateTagBuilder(ItemTags.HEAD_ARMOR_ENCHANTABLE)
.add(EnrichedItems.STEEL_HELMET)
.add(EnrichedItems.OBSIDIAN_HELMET)
.add(EnrichedItems.RUBY_HELMET)
.add(EnrichedItems.SAPPHIRE_HELMET)
.add(EnrichedItems.TANZANITE_HELMET)
.add(EnrichedItems.EMERALD_HELMET);

this.getOrCreateTagBuilder(ItemTags.CHEST_ARMOR)
this.getOrCreateTagBuilder(ItemTags.CHEST_ARMOR_ENCHANTABLE)
.add(EnrichedItems.STEEL_CHESTPLATE)
.add(EnrichedItems.OBSIDIAN_CHESTPLATE)
.add(EnrichedItems.RUBY_CHESTPLATE)
.add(EnrichedItems.SAPPHIRE_CHESTPLATE)
.add(EnrichedItems.TANZANITE_CHESTPLATE)
.add(EnrichedItems.EMERALD_CHESTPLATE);

this.getOrCreateTagBuilder(ItemTags.LEG_ARMOR)
this.getOrCreateTagBuilder(ItemTags.LEG_ARMOR_ENCHANTABLE)
.add(EnrichedItems.STEEL_LEGGINGS)
.add(EnrichedItems.OBSIDIAN_LEGGINGS)
.add(EnrichedItems.RUBY_LEGGINGS)
.add(EnrichedItems.SAPPHIRE_LEGGINGS)
.add(EnrichedItems.TANZANITE_LEGGINGS)
.add(EnrichedItems.EMERALD_LEGGINGS);

this.getOrCreateTagBuilder(ItemTags.FOOT_ARMOR)
this.getOrCreateTagBuilder(ItemTags.FOOT_ARMOR_ENCHANTABLE)
.add(EnrichedItems.STEEL_BOOTS)
.add(EnrichedItems.OBSIDIAN_BOOTS)
.add(EnrichedItems.RUBY_BOOTS)
Expand All @@ -200,9 +175,13 @@ protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) {
.add(EnrichedItems.EMERALD_SWORD)
.add(EnrichedItems.COPPER_SWORD);


// Conventional Tags
this.getOrCreateTagBuilder(STEEL_INGOTS).add(EnrichedItems.STEEL_INGOT);
this.getOrCreateTagBuilder(OBSIDIAN_INGOTS).add(EnrichedItems.OBSIDIAN_ALLOY_INGOT);
this.getOrCreateTagBuilder(RUBIES).add(EnrichedItems.RUBY);
this.getOrCreateTagBuilder(SAPPHIRES).add(EnrichedItems.RUBY);
this.getOrCreateTagBuilder(SAPPHIRES).add(EnrichedItems.SAPPHIRE);
this.getOrCreateTagBuilder(TANZANITES).add(EnrichedItems.TANZANITE);
this.getOrCreateTagBuilder(FOODS).add(EnrichedItems.BERRY_JUICE).add(EnrichedItems.BEEF_STEW);
}
}
12 changes: 11 additions & 1 deletion src/main/java/com/enrichedmc/enriched/tag/EnrichedTags.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,22 @@ public static class ItemTags {

public static final TagKey<Item> STEEL_INGOTS =
EnrichedRegisters.createCommonTagKey(RegistryKeys.ITEM, "ingots/steel");

public static final TagKey<Item> OBSIDIAN_INGOTS =
EnrichedRegisters.createCommonTagKey(RegistryKeys.ITEM, "ingots/obsidian_alloy");
public static final TagKey<Item> RUBIES =
EnrichedRegisters.createCommonTagKey(RegistryKeys.ITEM, "gems/ruby");

public static final TagKey<Item> SAPPHIRES =
EnrichedRegisters.createCommonTagKey(RegistryKeys.ITEM, "gems/sapphire");
}

public static final TagKey<Item> TANZANITES =
EnrichedRegisters.createCommonTagKey(RegistryKeys.ITEM, "gems/tanzanite");
public static final TagKey<Item> FOODS =
EnrichedRegisters.createCommonTagKey(RegistryKeys.ITEM, "foods");
}



public static class BlockTags {
public static final TagKey<Block> REDWOOD_LOGS =
Expand Down

0 comments on commit 6428450

Please sign in to comment.