PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-23 21:38:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move remaining block tags to datagen

Browse source
This commit is contained in:
Sollace 2024-03-19 13:57:56 +00:00
parent 731de7572f
commit 7bad93044d
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
10 changed files with 41 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockTagProvider.java
View file

@ -9,11 +9,15 @@ import com.minelittlepony.unicopia.server.world.Tree;
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.registry.RegistryWrapper;
import net.minecraft.registry.RegistryWrapper.WrapperLookup;
import net.minecraft.registry.tag.BlockTags;
import net.minecraft.registry.tag.TagKey;
import net.minecraft.util.Identifier;
public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider {
public UBlockTagProvider(FabricDataOutput output, CompletableFuture<RegistryWrapper.WrapperLookup> registriesFuture) {
@ -45,6 +49,31 @@ public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider {
addChitinBlocksets();
addHayBlocks();
addFruitTrees();
getOrCreateTagBuilder(UTags.CRYSTAL_HEART_BASE).add(
Blocks.DIAMOND_BLOCK,
Blocks.QUARTZ_BLOCK, Blocks.QUARTZ_BRICKS, Blocks.QUARTZ_SLAB, Blocks.QUARTZ_STAIRS, Blocks.QUARTZ_PILLAR,
Blocks.SMOOTH_QUARTZ, Blocks.SMOOTH_QUARTZ_SLAB, Blocks.SMOOTH_QUARTZ_STAIRS, Blocks.CHISELED_QUARTZ_BLOCK,
Blocks.AMETHYST_BLOCK, Blocks.NETHERITE_BLOCK, Blocks.EMERALD_BLOCK
);
getOrCreateTagBuilder(UTags.CRYSTAL_HEART_ORNAMENT).add(Blocks.END_ROD);
getOrCreateTagBuilder(UTags.FRAGILE)
.forceAddTag(ConventionalBlockTags.GLASS_BLOCKS)
.forceAddTag(ConventionalBlockTags.GLASS_PANES)
.add(Blocks.VINE, Blocks.LILY_PAD);
getOrCreateTagBuilder(UTags.INTERESTING).add(
Blocks.SEA_LANTERN, Blocks.ENDER_CHEST, Blocks.END_PORTAL_FRAME,
Blocks.JUKEBOX, Blocks.SPAWNER
).forceAddTag(ConventionalBlockTags.ORES);
getOrCreateTagBuilder(UTags.KICKS_UP_DUST).forceAddTag(BlockTags.SAND).add(
Blocks.SUSPICIOUS_SAND,
Blocks.GRAVEL, Blocks.SUSPICIOUS_GRAVEL
).forceAddTag(TagKey.of(RegistryKeys.BLOCK, new Identifier("c", "concrete_powders")));
getOrCreateTagBuilder(UTags.UNAFFECTED_BY_GROW_ABILITY).add(Blocks.GRASS_BLOCK);
}
private void addFruitTrees() {
@ -78,9 +107,13 @@ public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider {
UBlocks.ZAP_STAIRS
);
Block[] burnableLogs = { UBlocks.WAXED_ZAP_LOG, UBlocks.WAXED_ZAP_WOOD, UBlocks.WAXED_STRIPPED_ZAP_LOG, UBlocks.WAXED_STRIPPED_ZAP_WOOD };
getOrCreateTagBuilder(BlockTags.LOGS).add(burnableLogs).add(UBlocks.ZAP_LOG, UBlocks.ZAP_WOOD, UBlocks.STRIPPED_ZAP_LOG, UBlocks.STRIPPED_ZAP_WOOD);
getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).add(burnableLogs);
TagKey<Block> logsTag = UTags.block("zap_logs");
TagKey<Block> waxedLogsTag = UTags.block("waxed_zap_logs");
getOrCreateTagBuilder(logsTag).add(UBlocks.ZAP_LOG, UBlocks.ZAP_WOOD, UBlocks.STRIPPED_ZAP_LOG, UBlocks.STRIPPED_ZAP_WOOD);
getOrCreateTagBuilder(waxedLogsTag).add(UBlocks.WAXED_ZAP_LOG, UBlocks.WAXED_ZAP_WOOD, UBlocks.WAXED_STRIPPED_ZAP_LOG, UBlocks.WAXED_STRIPPED_ZAP_WOOD);
getOrCreateTagBuilder(BlockTags.LOGS).forceAddTag(logsTag).forceAddTag(waxedLogsTag);
getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).forceAddTag(logsTag);
getOrCreateTagBuilder(BlockTags.PLANKS).add(UBlocks.ZAP_PLANKS, UBlocks.WAXED_ZAP_PLANKS);
//getOrCreateTagBuilder(BlockTags.WOODEN_BUTTONS).add(UBlocks.ZAP_BUTTON);
@ -101,9 +134,11 @@ public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider {
getOrCreateTagBuilder(BlockTags.LEAVES).add(UBlocks.PALM_LEAVES);
getOrCreateTagBuilder(BlockTags.HOE_MINEABLE).add(UBlocks.PALM_LEAVES);
Block[] logs = { UBlocks.PALM_LOG, UBlocks.PALM_WOOD, UBlocks.STRIPPED_PALM_LOG, UBlocks.STRIPPED_PALM_WOOD };
getOrCreateTagBuilder(BlockTags.LOGS).add(logs);
getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).add(logs);
TagKey<Block> logsTag = UTags.block("palm_logs");
getOrCreateTagBuilder(logsTag).add(UBlocks.PALM_LOG, UBlocks.PALM_WOOD, UBlocks.STRIPPED_PALM_LOG, UBlocks.STRIPPED_PALM_WOOD);
getOrCreateTagBuilder(BlockTags.LOGS).forceAddTag(logsTag);
getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).forceAddTag(logsTag);
getOrCreateTagBuilder(BlockTags.PLANKS).add(UBlocks.PALM_PLANKS);
addSign(UBlocks.PALM_SIGN, UBlocks.PALM_WALL_SIGN, UBlocks.PALM_HANGING_SIGN, UBlocks.PALM_WALL_HANGING_SIGN);
getOrCreateTagBuilder(BlockTags.WOODEN_BUTTONS).add(UBlocks.PALM_BUTTON);

18
src/main/resources/data/unicopia/tags/blocks/crystal_heart_base.json
View file

@ -1,18 +0,0 @@
{
"replace": false,
"values": [
"minecraft:diamond_block",
"minecraft:quartz_block",
"minecraft:quartz_bricks",
"minecraft:quartz_slab",
"minecraft:quartz_stairs",
"minecraft:quartz_pillar",
"minecraft:smooth_quartz",
"minecraft:smooth_quartz_slab",
"minecraft:smooth_quartz_stairs",
"minecraft:chiseled_quartz_block",
"minecraft:amethyst_block",
"minecraft:netherite_block",
"minecraft:emerald_block"
]
}

6
src/main/resources/data/unicopia/tags/blocks/crystal_heart_ornament.json
View file

@ -1,6 +0,0 @@
{
"replace": false,
"values": [
"minecraft:end_rod"
]
}

9
src/main/resources/data/unicopia/tags/blocks/fragile.json
View file

@ -1,9 +0,0 @@
{
"replace": false,
"values": [
"#unicopia:glass_blocks",
"#unicopia:glass_panes",
"minecraft:vine",
"minecraft:lily_pad"
]
}

6
src/main/resources/data/unicopia/tags/blocks/glass_blocks.json
View file

@ -1,6 +0,0 @@
{
"replace": false,
"values": [
"#c:glass_blocks"
]
}

6
src/main/resources/data/unicopia/tags/blocks/glass_panes.json
View file

@ -1,6 +0,0 @@
{
"replace": false,
"values": [
"#c:glass_panes"
]
}

11
src/main/resources/data/unicopia/tags/blocks/interesting.json
View file

@ -1,11 +0,0 @@
{
"replace": false,
"values": [
"minecraft:sea_lantern",
"minecraft:ender_chest",
"minecraft:end_portal_frame",
"minecraft:jukebox",
"minecraft:spawner",
"#c:ores"
]
}

9
src/main/resources/data/unicopia/tags/blocks/kicks_up_dust.json
View file

@ -1,9 +0,0 @@
{
"replace": false,
"values": [
"#minecraft:sand",
"minecraft:gravel",
"minecraft:suspicious_gravel",
"#c:concrete_powders"
]
}

9
src/main/resources/data/unicopia/tags/blocks/palm_logs.json
View file

@ -1,9 +0,0 @@
{
"replace": false,
"values": [
"unicopia:palm_log",
"unicopia:palm_wood",
"unicopia:stripped_palm_log",
"unicopia:stripped_palm_wood"
]
}

6
src/main/resources/data/unicopia/tags/blocks/unaffected_by_grow_ability.json
View file

@ -1,6 +0,0 @@
{
"replace": false,
"values": [
"minecraft:grass_block"
]
}