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

Wooden material tags

Browse source
This commit is contained in:
paulevsGitch 2021-07-23 14:13:36 +03:00
parent edf9e1d004
commit ddbdc0207d
3 changed files with 55 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/ru/bclib/complexmaterials/ComplexMaterial.java
View file

@ -52,22 +52,25 @@ public abstract class ComplexMaterial {
getBlockEntries().forEach(entry -> {
Block block = entry.init(this, blockSettings, blocksRegistry);
blocks.put(entry.getName(baseName), block);
blocks.put(entry.getSuffix(), block);
});
getItemEntries().forEach(entry -> {
Item item = entry.init(this, itemSettings, itemsRegistry);
items.put(entry.getName(baseName), item);
items.put(entry.getSuffix(), item);
});
initRecipes();
initFlammable();
}
public abstract void initDefault(FabricBlockSettings blockSettings, FabricItemSettings itemSettings);
protected abstract void initDefault(FabricBlockSettings blockSettings, FabricItemSettings itemSettings);
public void initTags() {}
protected void initTags() {}
public void initRecipes() {}
protected void initRecipes() {}
protected void initFlammable() {}
protected void addBlockTag(Tag.Named<Block> tag) {
blockTags.put(tag.getName().getPath(), tag);

58
src/main/java/ru/bclib/complexmaterials/WoodenMaterial.java
View file

@ -2,6 +2,7 @@ package ru.bclib.complexmaterials;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ItemTags;
import net.minecraft.tags.Tag;
@ -49,13 +50,13 @@ public class WoodenMaterial extends ComplexMaterial {
}
@Override
public void initTags() {
protected void initTags() {
addBlockTag(TagAPI.makeBlockTag(getModID(), getBaseName() + "_logs"));
addItemTag(TagAPI.makeItemTag(getModID(), getBaseName() + "_logs"));
}
@Override
public void initDefault(FabricBlockSettings blockSettings, FabricItemSettings itemSettings) {
protected void initDefault(FabricBlockSettings blockSettings, FabricItemSettings itemSettings) {
Tag.Named<Block> tagBlockLog = getBlockTag(getBaseName() + "_logs");
Tag.Named<Item> tagItemLog = getItemTag(getBaseName() + "_logs");
@ -90,58 +91,85 @@ public class WoodenMaterial extends ComplexMaterial {
);
addBlockEntry(new BlockEntry("planks", (complexMaterial, settings) -> {
return new BaseBlock(settings);
}).setBlockTags(BlockTags.PLANKS));
}).setBlockTags(BlockTags.PLANKS).setItemTags(ItemTags.PLANKS));
final Block planks = getBlock("planks");
addBlockEntry(new BlockEntry("stairs", (complexMaterial, settings) -> {
return new BaseStairsBlock(planks);
}));
}).setBlockTags(BlockTags.WOODEN_STAIRS, BlockTags.STAIRS).setItemTags(ItemTags.WOODEN_STAIRS, ItemTags.STAIRS));
addBlockEntry(new BlockEntry("slab", (complexMaterial, settings) -> {
return new BaseSlabBlock(planks);
}));
}).setBlockTags(BlockTags.WOODEN_SLABS, BlockTags.SLABS).setItemTags(ItemTags.WOODEN_SLABS, ItemTags.SLABS));
addBlockEntry(new BlockEntry("fence", (complexMaterial, settings) -> {
return new BaseFenceBlock(planks);
}));
}).setBlockTags(BlockTags.FENCES, BlockTags.WOODEN_FENCES).setItemTags(ItemTags.FENCES, ItemTags.WOODEN_FENCES));
addBlockEntry(new BlockEntry("gate", (complexMaterial, settings) -> {
return new BaseGateBlock(planks);
}));
}).setBlockTags(BlockTags.FENCE_GATES));
addBlockEntry(new BlockEntry("button", (complexMaterial, settings) -> {
return new BaseWoodenButtonBlock(planks);
}));
}).setBlockTags(BlockTags.BUTTONS, BlockTags.WOODEN_BUTTONS).setItemTags(ItemTags.BUTTONS, ItemTags.WOODEN_BUTTONS));
addBlockEntry(new BlockEntry("plate", (complexMaterial, settings) -> {
return new WoodenPressurePlateBlock(planks);
}));
}).setBlockTags(BlockTags.PRESSURE_PLATES, BlockTags.WOODEN_PRESSURE_PLATES).setItemTags(ItemTags.WOODEN_PRESSURE_PLATES));
addBlockEntry(new BlockEntry("trapdoor", (complexMaterial, settings) -> {
return new BaseTrapdoorBlock(planks);
}));
}).setBlockTags(BlockTags.TRAPDOORS, BlockTags.WOODEN_TRAPDOORS).setItemTags(ItemTags.TRAPDOORS, ItemTags.WOODEN_TRAPDOORS));
addBlockEntry(new BlockEntry("door", (complexMaterial, settings) -> {
return new BaseDoorBlock(planks);
}));
}).setBlockTags(BlockTags.DOORS, BlockTags.WOODEN_DOORS).setItemTags(ItemTags.DOORS, ItemTags.WOODEN_DOORS));
addBlockEntry(new BlockEntry("crafting_table", (complexMaterial, settings) -> {
return new BaseCraftingTableBlock(planks);
}));
}).setBlockTags(TagAPI.BLOCK_WORKBENCHES).setItemTags(TagAPI.ITEM_WORKBENCHES));
addBlockEntry(new BlockEntry("ladder", (complexMaterial, settings) -> {
return new BaseLadderBlock(planks);
}).setBlockTags(BlockTags.CLIMBABLE));
addBlockEntry(new BlockEntry("sign", (complexMaterial, settings) -> {
return new BaseSignBlock(planks);
}));
}).setBlockTags(BlockTags.SIGNS).setItemTags(ItemTags.SIGNS));
addBlockEntry(new BlockEntry("chest", (complexMaterial, settings) -> {
return new BaseChestBlock(planks);
}));
}).setBlockTags(TagAPI.BLOCK_CHEST).setItemTags(TagAPI.ITEM_CHEST));
addBlockEntry(new BlockEntry("barrel", (complexMaterial, settings) -> {
return new BaseBarrelBlock(planks);
}));
addBlockEntry(new BlockEntry("bookshelf", (complexMaterial, settings) -> {
return new BaseBookshelfBlock(planks);
}));
}).setBlockTags(TagAPI.BLOCK_BOOKSHELVES));
addBlockEntry(new BlockEntry("composter", (complexMaterial, settings) -> {
return new BaseComposterBlock(planks);
}));
}
protected void initFlammable() {
FlammableBlockRegistry.getDefaultInstance().add(getBlock("log"), 5, 5);
FlammableBlockRegistry.getDefaultInstance().add(getBlock("bark"), 5, 5);
FlammableBlockRegistry.getDefaultInstance().add(getBlock("log_stripped"), 5, 5);
FlammableBlockRegistry.getDefaultInstance().add(getBlock("bark_stripped"), 5, 5);
FlammableBlockRegistry.getDefaultInstance().add(getBlock("planks"), 5, 20);
FlammableBlockRegistry.getDefaultInstance().add(getBlock("stairs"), 5, 20);
FlammableBlockRegistry.getDefaultInstance().add(getBlock("slab"), 5, 20);
FlammableBlockRegistry.getDefaultInstance().add(getBlock("fence"), 5, 20);
FlammableBlockRegistry.getDefaultInstance().add(getBlock("gate"), 5, 20);
FlammableBlockRegistry.getDefaultInstance().add(getBlock("button"), 5, 20);
FlammableBlockRegistry.getDefaultInstance().add(getBlock("pressurePlate"), 5, 20);
FlammableBlockRegistry.getDefaultInstance().add(getBlock("trapdoor"), 5, 20);
FlammableBlockRegistry.getDefaultInstance().add(getBlock("door"), 5, 20);
FlammableBlockRegistry.getDefaultInstance().add(getBlock("craftingTable"), 5, 20);
FlammableBlockRegistry.getDefaultInstance().add(getBlock("ladder"), 5, 20);
FlammableBlockRegistry.getDefaultInstance().add(getBlock("sign"), 5, 20);
FlammableBlockRegistry.getDefaultInstance().add(getBlock("chest"), 5, 20);
FlammableBlockRegistry.getDefaultInstance().add(getBlock("barrel"), 5, 20);
FlammableBlockRegistry.getDefaultInstance().add(getBlock("shelf"), 5, 20);
FlammableBlockRegistry.getDefaultInstance().add(getBlock("composter"), 5, 20);
}
@Override
public void initRecipes() {

4
src/main/java/ru/bclib/complexmaterials/entry/ComplexMaterialEntry.java
View file

@ -16,4 +16,8 @@ public abstract class ComplexMaterialEntry {
public ResourceLocation getLocation(String modID, String baseName) {
return new ResourceLocation(modID, getName(baseName));
}
public String getSuffix() {
return suffix;
}
}