MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Change] Moved and refactored Tag-API

Browse source
This commit is contained in:
Frank 2022-06-21 18:19:10 +02:00
parent 25fa53541f
commit 184f3a6448
56 changed files with 1220 additions and 358 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/org/betterx/bclib/registry/BlockRegistry.java
View file

@ -1,14 +1,19 @@
package org.betterx.bclib.registry;
import org.betterx.bclib.api.v2.tag.*;
import org.betterx.bclib.blocks.BaseLeavesBlock;
import org.betterx.bclib.blocks.BaseOreBlock;
import org.betterx.bclib.blocks.FeatureSaplingBlock;
import org.betterx.bclib.config.PathConfig;
import org.betterx.bclib.interfaces.CustomItemProvider;
import org.betterx.worlds.together.tag.CommonBlockTags;
import org.betterx.worlds.together.tag.CommonItemTags;
import org.betterx.worlds.together.tag.MineableTags;
import org.betterx.worlds.together.tag.TagManager;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ItemTags;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
@ -45,22 +50,22 @@ public class BlockRegistry extends BaseRegistry<Block> {
getModBlocks(id.getNamespace()).add(block);
if (block instanceof BaseLeavesBlock) {
TagAPI.addBlockTags(
TagManager.BLOCKS.add(
block,
NamedBlockTags.LEAVES,
BlockTags.LEAVES,
CommonBlockTags.LEAVES,
NamedMineableTags.HOE,
NamedMineableTags.SHEARS
MineableTags.HOE,
MineableTags.SHEARS
);
if (item != null) {
TagAPI.addItemTags(item, CommonItemTags.LEAVES, NamedItemTags.LEAVES);
TagManager.ITEMS.add(item, CommonItemTags.LEAVES, ItemTags.LEAVES);
}
} else if (block instanceof BaseOreBlock) {
TagAPI.addBlockTags(block, NamedMineableTags.PICKAXE);
TagManager.BLOCKS.add(block, MineableTags.PICKAXE);
} else if (block instanceof FeatureSaplingBlock) {
TagAPI.addBlockTags(block, CommonBlockTags.SAPLINGS, NamedBlockTags.SAPLINGS);
TagManager.BLOCKS.add(block, CommonBlockTags.SAPLINGS, BlockTags.SAPLINGS);
if (item != null) {
TagAPI.addItemTags(item, CommonItemTags.SAPLINGS, NamedItemTags.SAPLINGS);
TagManager.ITEMS.add(item, CommonItemTags.SAPLINGS, ItemTags.SAPLINGS);
}
}

18
src/main/java/org/betterx/bclib/registry/ItemRegistry.java
View file

@ -1,8 +1,5 @@
package org.betterx.bclib.registry;
import org.betterx.bclib.api.v2.tag.CommonItemTags;
import org.betterx.bclib.api.v2.tag.NamedToolTags;
import org.betterx.bclib.api.v2.tag.TagAPI;
import org.betterx.bclib.config.PathConfig;
import org.betterx.bclib.items.BaseDiscItem;
import org.betterx.bclib.items.BaseDrinkItem;
@ -12,6 +9,9 @@ import org.betterx.bclib.items.tool.BaseAxeItem;
import org.betterx.bclib.items.tool.BaseHoeItem;
import org.betterx.bclib.items.tool.BasePickaxeItem;
import org.betterx.bclib.items.tool.BaseShearsItem;
import org.betterx.worlds.together.tag.CommonItemTags;
import org.betterx.worlds.together.tag.TagManager;
import org.betterx.worlds.together.tag.ToolTags;
import net.minecraft.core.BlockSource;
import net.minecraft.core.Direction;
@ -66,17 +66,17 @@ public class ItemRegistry extends BaseRegistry<Item> {
registerItem(itemId, item);
if (item instanceof ShovelItem) {
TagAPI.addItemTag(NamedToolTags.FABRIC_SHOVELS, item);
TagManager.ITEMS.add(ToolTags.FABRIC_SHOVELS, item);
} else if (item instanceof SwordItem) {
TagAPI.addItemTag(NamedToolTags.FABRIC_SWORDS, item);
TagManager.ITEMS.add(ToolTags.FABRIC_SWORDS, item);
} else if (item instanceof BasePickaxeItem) {
TagAPI.addItemTag(NamedToolTags.FABRIC_PICKAXES, item);
TagManager.ITEMS.add(ToolTags.FABRIC_PICKAXES, item);
} else if (item instanceof BaseAxeItem) {
TagAPI.addItemTag(NamedToolTags.FABRIC_AXES, item);
TagManager.ITEMS.add(ToolTags.FABRIC_AXES, item);
} else if (item instanceof BaseHoeItem) {
TagAPI.addItemTag(NamedToolTags.FABRIC_HOES, item);
TagManager.ITEMS.add(ToolTags.FABRIC_HOES, item);
} else if (item instanceof BaseShearsItem) {
TagAPI.addItemTags(item, NamedToolTags.FABRIC_SHEARS, CommonItemTags.SHEARS);
TagManager.ITEMS.add(item, ToolTags.FABRIC_SHEARS, CommonItemTags.SHEARS);
DispenserBlock.registerBehavior(item.asItem(), new ShearsDispenseItemBehavior());
}