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

Refactored Tag Constants (Pt II)

Browse source
This commit is contained in:
Frank 2022-01-23 21:35:48 +01:00
parent fffbc6acc2
commit 14fcb93e3b
28 changed files with 151 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/ru/bclib/registry/BlockRegistry.java
View file

@ -8,7 +8,12 @@ import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.block.Block;
import ru.bclib.api.TagAPI;
import ru.bclib.api.tag.NamedBlockTags;
import ru.bclib.api.tag.NamedCommonBlockTags;
import ru.bclib.api.tag.NamedCommonItemTags;
import ru.bclib.api.tag.NamedItemTags;
import ru.bclib.api.tag.NamedMineableTags;
import ru.bclib.api.tag.TagAPI;
import ru.bclib.blocks.BaseLeavesBlock;
import ru.bclib.blocks.BaseOreBlock;
import ru.bclib.blocks.FeatureSaplingBlock;
@ -44,20 +49,20 @@ public class BlockRegistry extends BaseRegistry<Block> {
if (block instanceof BaseLeavesBlock){
TagAPI.addBlockTags(
block,
TagAPI.NAMED_BLOCK_LEAVES,
TagAPI.NAMED_COMMON_BLOCK_LEAVES,
TagAPI.NAMED_MINEABLE_HOE,
TagAPI.NAMED_MINEABLE_SHEARS
NamedBlockTags.LEAVES,
NamedCommonBlockTags.LEAVES,
NamedMineableTags.HOE,
NamedMineableTags.SHEARS
);
if (item != null){
TagAPI.addItemTags(item, TagAPI.NAMED_COMMON_ITEM_LEAVES, TagAPI.NAMED_ITEM_LEAVES);
TagAPI.addItemTags(item, NamedCommonItemTags.LEAVES, NamedItemTags.LEAVES);
}
} else if (block instanceof BaseOreBlock){
TagAPI.addBlockTags(block, TagAPI.NAMED_MINEABLE_PICKAXE);
TagAPI.addBlockTags(block, NamedMineableTags.PICKAXE);
} else if (block instanceof FeatureSaplingBlock){
TagAPI.addBlockTags(block, TagAPI.NAMED_COMMON_BLOCK_SAPLINGS, TagAPI.NAMED_BLOCK_SAPLINGS);
TagAPI.addBlockTags(block, NamedCommonBlockTags.SAPLINGS, NamedBlockTags.SAPLINGS);
if (item != null){
TagAPI.addItemTags(item, TagAPI.NAMED_COMMON_ITEM_SAPLINGS, TagAPI.NAMED_ITEM_SAPLINGS);
TagAPI.addItemTags(item, NamedCommonItemTags.SAPLINGS, NamedItemTags.SAPLINGS);
}
}

16
src/main/java/ru/bclib/registry/ItemRegistry.java
View file

@ -20,7 +20,9 @@ import net.minecraft.world.item.ShovelItem;
import net.minecraft.world.item.SpawnEggItem;
import net.minecraft.world.item.SwordItem;
import net.minecraft.world.level.block.DispenserBlock;
import ru.bclib.api.TagAPI;
import ru.bclib.api.tag.NamedCommonItemTags;
import ru.bclib.api.tag.NamedToolTags;
import ru.bclib.api.tag.TagAPI;
import ru.bclib.config.PathConfig;
import ru.bclib.items.BaseDiscItem;
import ru.bclib.items.BaseDrinkItem;
@ -69,22 +71,22 @@ public class ItemRegistry extends BaseRegistry<Item> {
registerItem(itemId, item);
if (item instanceof ShovelItem) {
TagAPI.addItemTag(TagAPI.NAMED_FABRIC_SHOVELS, item);
TagAPI.addItemTag(NamedToolTags.FABRIC_SHOVELS, item);
}
else if (item instanceof SwordItem) {
TagAPI.addItemTag(TagAPI.NAMED_FABRIC_SWORDS, item);
TagAPI.addItemTag(NamedToolTags.FABRIC_SWORDS, item);
}
else if (item instanceof BasePickaxeItem) {
TagAPI.addItemTag(TagAPI.NAMED_FABRIC_PICKAXES, item);
TagAPI.addItemTag(NamedToolTags.FABRIC_PICKAXES, item);
}
else if (item instanceof BaseAxeItem) {
TagAPI.addItemTag(TagAPI.NAMED_FABRIC_AXES, item);
TagAPI.addItemTag(NamedToolTags.FABRIC_AXES, item);
}
else if (item instanceof BaseHoeItem) {
TagAPI.addItemTag(TagAPI.NAMED_FABRIC_HOES, item);
TagAPI.addItemTag(NamedToolTags.FABRIC_HOES, item);
}
else if (item instanceof BaseShearsItem) {
TagAPI.addItemTags(item, TagAPI.NAMED_FABRIC_SHEARS, TagAPI.NAMED_COMMON_ITEM_SHEARS);
TagAPI.addItemTags(item, NamedToolTags.FABRIC_SHEARS, NamedCommonItemTags.SHEARS);
DispenserBlock.registerBehavior(item.asItem(), new ShearsDispenseItemBehavior());
}