Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tags 1.21 #10545

Merged
merged 3 commits into from
Dec 22, 2024
Merged

Fix tags 1.21 #10545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dde70cd
Tidy up crafting tags for 1.21
uecasm Dec 22, 2024
3709dab
Fix missed port for #10473
uecasm Dec 22, 2024
16aee71
Port #10529
uecasm Dec 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...t_table/loot_tables/miner/lucky_ore1.json → ...colonies/loot_table/miner/lucky_ore1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
"rolls": 1.0
}
],
"random_sequence": "minecolonies:loot_tables/miner/lucky_ore1"
"random_sequence": "minecolonies:miner/lucky_ore1"
}
2 changes: 1 addition & 1 deletion ...t_table/loot_tables/miner/lucky_ore2.json → ...colonies/loot_table/miner/lucky_ore2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
"rolls": 1.0
}
],
"random_sequence": "minecolonies:loot_tables/miner/lucky_ore2"
"random_sequence": "minecolonies:miner/lucky_ore2"
}
2 changes: 1 addition & 1 deletion ...t_table/loot_tables/miner/lucky_ore3.json → ...colonies/loot_table/miner/lucky_ore3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@
"rolls": 1.0
}
],
"random_sequence": "minecolonies:loot_tables/miner/lucky_ore3"
"random_sequence": "minecolonies:miner/lucky_ore3"
}
2 changes: 1 addition & 1 deletion ...t_table/loot_tables/miner/lucky_ore4.json → ...colonies/loot_table/miner/lucky_ore4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@
"rolls": 1.0
}
],
"random_sequence": "minecolonies:loot_tables/miner/lucky_ore4"
"random_sequence": "minecolonies:miner/lucky_ore4"
}
2 changes: 1 addition & 1 deletion ...t_table/loot_tables/miner/lucky_ore5.json → ...colonies/loot_table/miner/lucky_ore5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@
"rolls": 1.0
}
],
"random_sequence": "minecolonies:loot_tables/miner/lucky_ore5"
"random_sequence": "minecolonies:miner/lucky_ore5"
}
1 change: 1 addition & 0 deletions src/datagen/generated/minecolonies/data/minecolonies/tags/item/blacksmith_product.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"values": [
"minecraft:shears",
"minecraft:lightning_rod",
"minecraft:mace",
"#c:nuggets",
"#c:ingots"
]
Expand Down
22 changes: 22 additions & 0 deletions src/datagen/generated/minecolonies/data/minecolonies/tags/item/fletcher_do_ingredient.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"values": [
"minecraft:azalea_leaves",
"minecraft:flowering_azalea_leaves",
"minecraft:coarse_dirt",
"minecraft:rooted_dirt",
"minecraft:grass_block",
"minecraft:hay_block",
"minecraft:moss_block",
"minecraft:dried_kelp_block",
"minecraft:mud",
"minecraft:packed_mud",
"minecraft:mud_bricks",
"minecraft:muddy_mangrove_roots",
"minecraft:podzol",
"minecraft:mycelium",
"minecraft:brown_mushroom_block",
"minecraft:red_mushroom_block",
"minecraft:nether_wart_block",
"minecraft:warped_wart_block"
]
}
11 changes: 10 additions & 1 deletion src/datagen/generated/minecolonies/data/minecolonies/tags/item/mechanic_product.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,18 @@
"minecraft:fire_charge",
"minecraft:conduit",
"minecraft:respawn_anchor",
"minecraft:recovery_compass",
"minecraft:shulker_box",
"minecraft:slime_ball",
"minecraft:glow_item_frame",
"minecraft:spyglass"
"minecraft:spyglass",
"minecraft:waxed_copper_door",
"minecraft:waxed_copper_trapdoor",
"minecraft:waxed_exposed_copper_door",
"minecraft:waxed_exposed_copper_trapdoor",
"minecraft:waxed_oxidized_copper_door",
"minecraft:waxed_oxidized_copper_trapdoor",
"minecraft:waxed_weathered_copper_door",
"minecraft:waxed_weathered_copper_trapdoor"
]
}
1 change: 1 addition & 0 deletions ...datagen/generated/minecolonies/data/minecolonies/tags/item/mechanic_product_excluded.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"values": [
"minecraft:spectral_arrow",
"minecraft:hay_block",
"minecraft:wheat",
"minecraft:lead"
]
}
4 changes: 3 additions & 1 deletion src/datagen/generated/minecolonies/data/minecolonies/tags/item/stonemason_do_ingredient.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
"values": [
"minecraft:stone",
"minecraft:calcite",
"minecraft:mud_bricks",
"minecraft:polished_andesite",
"minecraft:polished_diorite",
"minecraft:polished_granite",
"minecraft:quartz_block",
"minecraft:smooth_quartz",
"minecraft:quartz_bricks",
Expand Down
2 changes: 2 additions & 0 deletions src/datagen/generated/minecolonies/data/minecolonies/tags/item/stonemason_product.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
"minecraft:cracked_deepslate_tiles",
"minecraft:bricks",
"minecraft:polished_blackstone_bricks",
"minecraft:tuff_bricks",
"minecraft:nether_bricks",
"minecraft:chiseled_nether_bricks",
"minecraft:dripstone_block",
"minecraft:quartz_block",
"minecraft:chiseled_quartz_block",
"minecraft:quartz_pillar",
"minecraft:quartz_bricks",
Expand Down
9 changes: 3 additions & 6 deletions src/main/java/com/minecolonies/core/entity/ai/workers/production/EntityAIStructureMiner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceKey;
Expand All @@ -36,14 +35,12 @@
import net.minecraft.world.item.Items;
import net.minecraft.world.level.block.*;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.FluidState;
import net.minecraft.world.level.material.Fluids;
import net.minecraft.world.level.storage.loot.LootTable;
import net.neoforged.neoforge.common.ItemAbilities;
import net.minecraft.world.level.storage.loot.LootParams;
import net.minecraft.world.level.storage.loot.LootParams.Builder;
import net.minecraft.world.level.storage.loot.LootTable;
import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet;
import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
import net.neoforged.neoforge.common.ItemAbilities;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

Expand Down Expand Up @@ -78,7 +75,7 @@ public class EntityAIStructureMiner extends AbstractEntityAIStructureWithWorkOrd
/**
* Lucky ore loot table
*/
public static final ResourceLocation LUCKY_ORE_LOOT_TABLE = new ResourceLocation(Constants.MOD_ID, "loot_tables/miner/lucky_ore");
public static final ResourceLocation LUCKY_ORE_LOOT_TABLE = new ResourceLocation(Constants.MOD_ID, "miner/lucky_ore");

/**
* Lead the miner to the other side of the shaft.
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/minecolonies/core/generation/defaults/DefaultBlockTagsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,10 @@ protected void addTags(final HolderLookup.Provider holder)
.addTag(BlockTags.LOGS)
.addTag(ModTags.mangroveTree)
.add(Blocks.MUSHROOM_STEM)
.addOptionalTag(new ResourceLocation("productivebees", "nests/wood_nests"));
.addOptionalTag(ResourceLocation.fromNamespaceAndPath("productivebees", "nests/wood_nests"));

tag(ModTags.colonyProtectionException)
.addOptional(ResourceLocation.parse("waystones:waystone"))
.addOptional(ResourceLocation.parse("waystones:sandy_waystone"))
.addOptional(ResourceLocation.parse("waystones:mossy_waystone"));
.addOptionalTag(ResourceLocation.fromNamespaceAndPath("waystones", "waystones"));

tag(ModTags.indestructible).add(Blocks.BEDROCK);
tag(ModTags.oreChanceBlocks)
Expand Down
23 changes: 16 additions & 7 deletions src/main/java/com/minecolonies/core/generation/defaults/DefaultItemTagsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ protected void addTags(final @NotNull HolderLookup.Provider provider)
.addTag(ModTags.crafterIngredient.get(TagConstants.CRAFTING_MECHANIC))
.add(Items.BRICK, Items.NETHER_BRICK);
tag(ModTags.crafterProduct.get(TagConstants.CRAFTING_BLACKSMITH))
.add(Items.SHEARS, Items.LIGHTNING_ROD)
.add(Items.SHEARS, Items.LIGHTNING_ROD, Items.MACE)
.addTags(Tags.Items.NUGGETS, Tags.Items.INGOTS);
tag(ModTags.crafterProductExclusions.get(TagConstants.CRAFTING_BLACKSMITH))
.addTag(ModTags.crafterProduct.get(TagConstants.CRAFTING_DYER))
Expand Down Expand Up @@ -325,6 +325,11 @@ protected void addTags(final @NotNull HolderLookup.Provider provider)
tag(ModTags.crafterProductExclusions.get(TagConstants.CRAFTING_FLETCHER))
.add(Items.BOOK)
.add(Items.ITEM_FRAME);
tag(ModTags.crafterDoIngredient.get(TagConstants.CRAFTING_FLETCHER))
.add(Items.AZALEA_LEAVES, Items.FLOWERING_AZALEA_LEAVES)
.add(Items.COARSE_DIRT, Items.ROOTED_DIRT, Items.GRASS_BLOCK, Items.HAY_BLOCK, Items.MOSS_BLOCK, Items.DRIED_KELP_BLOCK)
.add(Items.MUD, Items.PACKED_MUD, Items.MUD_BRICKS, Items.MUDDY_MANGROVE_ROOTS, Items.PODZOL, Items.MYCELIUM)
.add(Items.BROWN_MUSHROOM_BLOCK, Items.RED_MUSHROOM_BLOCK, Items.NETHER_WART_BLOCK, Items.WARPED_WART_BLOCK);

tag(ModTags.crafterIngredient.get(TagConstants.CRAFTING_GLASSBLOWER))
.addTag(Tags.Items.GLASS_BLOCKS)
Expand Down Expand Up @@ -382,13 +387,18 @@ protected void addTags(final @NotNull HolderLookup.Provider provider)
.add(Items.FIRE_CHARGE)
.add(Items.CONDUIT)
.add(Items.RESPAWN_ANCHOR)
.add(Items.RECOVERY_COMPASS)
.add(Items.SHULKER_BOX)
.add(Items.SLIME_BALL)
.add(Items.GLOW_ITEM_FRAME)
.add(Items.SPYGLASS);
.add(Items.SPYGLASS)
.add(Items.WAXED_COPPER_DOOR, Items.WAXED_COPPER_TRAPDOOR)
.add(Items.WAXED_EXPOSED_COPPER_DOOR, Items.WAXED_EXPOSED_COPPER_TRAPDOOR)
.add(Items.WAXED_OXIDIZED_COPPER_DOOR, Items.WAXED_OXIDIZED_COPPER_TRAPDOOR)
.add(Items.WAXED_WEATHERED_COPPER_DOOR, Items.WAXED_WEATHERED_COPPER_TRAPDOOR);
tag(ModTags.crafterProductExclusions.get(TagConstants.CRAFTING_MECHANIC))
.add(Items.SPECTRAL_ARROW)
.add(Items.HAY_BLOCK)
.add(Items.HAY_BLOCK, Items.WHEAT)
.add(Items.LEAD);

tag(ModTags.crafterIngredient.get(TagConstants.CRAFTING_PLANTATION))
Expand Down Expand Up @@ -456,10 +466,10 @@ protected void addTags(final @NotNull HolderLookup.Provider provider)
tag(ModTags.crafterProduct.get(TagConstants.CRAFTING_STONEMASON))
.add(Items.POLISHED_DEEPSLATE, Items.DEEPSLATE_BRICKS, Items.DEEPSLATE_TILES)
.add(Items.CRACKED_DEEPSLATE_BRICKS, Items.CRACKED_DEEPSLATE_TILES)
.add(Items.BRICKS, Items.POLISHED_BLACKSTONE_BRICKS)
.add(Items.BRICKS, Items.POLISHED_BLACKSTONE_BRICKS, Items.TUFF_BRICKS)
.add(Items.NETHER_BRICKS, Items.CHISELED_NETHER_BRICKS)
.add(Items.DRIPSTONE_BLOCK)
.add(Items.CHISELED_QUARTZ_BLOCK)
.add(Items.QUARTZ_BLOCK, Items.CHISELED_QUARTZ_BLOCK)
.add(Items.QUARTZ_PILLAR)
.add(Items.QUARTZ_BRICKS)
.add(Items.CUT_COPPER, Items.EXPOSED_CUT_COPPER, Items.OXIDIZED_CUT_COPPER, Items.WEATHERED_CUT_COPPER)
Expand All @@ -482,8 +492,7 @@ protected void addTags(final @NotNull HolderLookup.Provider provider)
.add(paperExtras);

tag(ModTags.crafterDoIngredient.get(TagConstants.CRAFTING_STONEMASON))
.add(Items.STONE, Items.CALCITE)
.add(Items.MUD_BRICKS)
.add(Items.STONE, Items.CALCITE, Items.POLISHED_ANDESITE, Items.POLISHED_DIORITE, Items.POLISHED_GRANITE)
.add(Items.QUARTZ_BLOCK, Items.SMOOTH_QUARTZ, Items.QUARTZ_BRICKS, Items.QUARTZ_PILLAR, Items.CHISELED_QUARTZ_BLOCK)
.add(Items.NETHERRACK)
.add(Items.BLACKSTONE, Items.CHISELED_POLISHED_BLACKSTONE, Items.CRACKED_POLISHED_BLACKSTONE_BRICKS)
Expand Down
Loading