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

Adopted new BCLib API

Browse source
This commit is contained in:
Frank 2022-06-21 19:25:57 +02:00
parent 0f5d4e73fa
commit 6770bbbbea
84 changed files with 164 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/org/betterx/betterend/complexmaterials/CrystalSubblocksMaterial.java
View file

@ -1,8 +1,5 @@
package org.betterx.betterend.complexmaterials;
import org.betterx.bclib.api.v2.tag.NamedBlockTags;
import org.betterx.bclib.api.v2.tag.NamedItemTags;
import org.betterx.bclib.api.v2.tag.TagAPI;
import org.betterx.bclib.blocks.BaseSlabBlock;
import org.betterx.bclib.blocks.BaseStairsBlock;
import org.betterx.bclib.blocks.BaseWallBlock;
@ -14,7 +11,10 @@ import org.betterx.betterend.blocks.basis.LitPillarBlock;
import org.betterx.betterend.config.Configs;
import org.betterx.betterend.recipe.CraftingRecipes;
import org.betterx.betterend.registry.EndBlocks;
import org.betterx.worlds.together.tag.v3.TagManager;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ItemTags;
import net.minecraft.world.level.block.Block;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@ -122,14 +122,14 @@ public class CrystalSubblocksMaterial {
CraftingRecipes.registerPedestal(name + "_pedestal", pedestal, slab, pillar);
// Item Tags //
TagAPI.addItemTag(NamedItemTags.SLABS, slab, brick_slab);
TagAPI.addItemTag(NamedItemTags.STONE_BRICKS, bricks);
TagAPI.addItemTag(NamedItemTags.STONE_CRAFTING_MATERIALS, source);
TagAPI.addItemTag(NamedItemTags.STONE_TOOL_MATERIALS, source);
TagManager.ITEMS.add(ItemTags.SLABS, slab.asItem(), brick_slab.asItem());
TagManager.ITEMS.add(ItemTags.STONE_BRICKS, bricks.asItem());
TagManager.ITEMS.add(ItemTags.STONE_CRAFTING_MATERIALS, source.asItem());
TagManager.ITEMS.add(ItemTags.STONE_TOOL_MATERIALS, source.asItem());
// Block Tags //
TagAPI.addBlockTag(NamedBlockTags.STONE_BRICKS, bricks);
TagAPI.addBlockTag(NamedBlockTags.WALLS, wall, brick_wall);
TagAPI.addBlockTag(NamedBlockTags.SLABS, slab, brick_slab);
TagManager.BLOCKS.add(BlockTags.STONE_BRICKS, bricks);
TagManager.BLOCKS.add(BlockTags.WALLS, wall, brick_wall);
TagManager.BLOCKS.add(BlockTags.SLABS, slab, brick_slab);
}
}

17
src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java
View file

@ -1,8 +1,5 @@
package org.betterx.betterend.complexmaterials;
import org.betterx.bclib.api.v2.tag.NamedBlockTags;
import org.betterx.bclib.api.v2.tag.NamedItemTags;
import org.betterx.bclib.api.v2.tag.TagAPI;
import org.betterx.bclib.blocks.*;
import org.betterx.bclib.items.ModelProviderItem;
import org.betterx.bclib.items.tool.BaseAxeItem;
@ -25,8 +22,10 @@ import org.betterx.betterend.item.tool.EndPickaxe;
import org.betterx.betterend.recipe.builders.AlloyingRecipe;
import org.betterx.betterend.registry.EndBlocks;
import org.betterx.betterend.registry.EndItems;
import org.betterx.worlds.together.tag.v3.TagManager;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ItemTags;
import net.minecraft.tags.TagKey;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.item.ArmorMaterial;
@ -167,9 +166,9 @@ public class MetalMaterial {
rawOre = hasOre ? EndItems.registerEndItem(name + "_raw", new ModelProviderItem(itemSettings)) : null;
ore = hasOre ? EndBlocks.registerBlock(name + "_ore", new BaseOreBlock(() -> rawOre, 1, 3, 1)) : null;
alloyingOre = hasOre ? TagAPI.makeItemTag(BetterEnd.MOD_ID, name + "_alloying") : null;
alloyingOre = hasOre ? TagManager.ITEMS.makeTag(BetterEnd.MOD_ID, name + "_alloying") : null;
if (hasOre) {
TagAPI.addItemTag(alloyingOre, ore, rawOre);
TagManager.ITEMS.add(alloyingOre, ore.asItem(), rawOre);
}
block = EndBlocks.registerBlock(name + "_block", new BaseBlock(settings));
@ -506,9 +505,9 @@ public class MetalMaterial {
.setGroup("end_metal_boots")
.build();
TagAPI.addBlockTag(NamedBlockTags.ANVIL, anvilBlock);
TagAPI.addBlockTag(NamedBlockTags.BEACON_BASE_BLOCKS, block);
TagAPI.addItemTag(NamedItemTags.BEACON_PAYMENT_ITEMS, ingot);
TagAPI.addBlockTag(BlockTags.DRAGON_IMMUNE, ore, bars);
TagManager.BLOCKS.add(BlockTags.ANVIL, anvilBlock);
TagManager.BLOCKS.add(BlockTags.BEACON_BASE_BLOCKS, block);
TagManager.ITEMS.add(ItemTags.BEACON_PAYMENT_ITEMS, ingot);
TagManager.BLOCKS.add(BlockTags.DRAGON_IMMUNE, ore, bars);
}
}

31
src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java
View file

@ -1,6 +1,5 @@
package org.betterx.betterend.complexmaterials;
import org.betterx.bclib.api.v2.tag.*;
import org.betterx.bclib.blocks.*;
import org.betterx.bclib.recipes.GridRecipe;
import org.betterx.betterend.BetterEnd;
@ -11,8 +10,12 @@ import org.betterx.betterend.config.Configs;
import org.betterx.betterend.recipe.CraftingRecipes;
import org.betterx.betterend.registry.EndBlocks;
import org.betterx.betterend.registry.EndItems;
import org.betterx.worlds.together.tag.v3.CommonBlockTags;
import org.betterx.worlds.together.tag.v3.CommonItemTags;
import org.betterx.worlds.together.tag.v3.TagManager;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ItemTags;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.material.MaterialColor;
@ -175,22 +178,22 @@ public class StoneMaterial {
CraftingRecipes.registerPedestal(name + "_pedestal", pedestal, slab, pillar);
// Item Tags //
TagAPI.addItemTag(NamedItemTags.SLABS, slab, brickSlab);
TagAPI.addItemTag(NamedItemTags.STONE_BRICKS, bricks);
TagAPI.addItemTag(NamedItemTags.STONE_CRAFTING_MATERIALS, stone);
TagAPI.addItemTag(NamedItemTags.STONE_TOOL_MATERIALS, stone);
TagAPI.addItemTag(CommonItemTags.FURNACES, furnace);
TagManager.ITEMS.add(ItemTags.SLABS, slab.asItem(), brickSlab.asItem());
TagManager.ITEMS.add(ItemTags.STONE_BRICKS, bricks.asItem());
TagManager.ITEMS.add(ItemTags.STONE_CRAFTING_MATERIALS, stone.asItem());
TagManager.ITEMS.add(ItemTags.STONE_TOOL_MATERIALS, stone.asItem());
TagManager.ITEMS.add(CommonItemTags.FURNACES, furnace.asItem());
// Block Tags //
TagAPI.addBlockTag(NamedBlockTags.STONE_BRICKS, bricks);
TagAPI.addBlockTag(NamedBlockTags.WALLS, wall, brickWall);
TagAPI.addBlockTag(NamedBlockTags.SLABS, slab, brickSlab);
TagAPI.addBlockTags(pressurePlate, NamedBlockTags.PRESSURE_PLATES, NamedBlockTags.STONE_PRESSURE_PLATES);
TagAPI.addBlockTag(CommonBlockTags.END_STONES, stone);
TagManager.BLOCKS.add(BlockTags.STONE_BRICKS, bricks);
TagManager.BLOCKS.add(BlockTags.WALLS, wall, brickWall);
TagManager.BLOCKS.add(BlockTags.SLABS, slab, brickSlab);
TagManager.BLOCKS.add(pressurePlate, BlockTags.PRESSURE_PLATES, BlockTags.STONE_PRESSURE_PLATES);
TagManager.BLOCKS.add(CommonBlockTags.END_STONES, stone);
TagAPI.addBlockTag(BlockTags.DRAGON_IMMUNE, stone, stairs, slab, wall);
TagManager.BLOCKS.add(BlockTags.DRAGON_IMMUNE, stone, stairs, slab, wall);
TagAPI.addBlockTag(CommonBlockTags.END_STONES, stone);
TagAPI.addBlockTag(CommonBlockTags.END_STONES, stone);
TagManager.BLOCKS.add(CommonBlockTags.END_STONES, stone);
TagManager.BLOCKS.add(CommonBlockTags.END_STONES, stone);
}
}