No longer move obsidian by contraption (Stoopid datagen), this time for real

This commit is contained in:
grimmauld 2021-06-17 21:55:13 +02:00
parent b76f2dffb5
commit a6f0816611
3 changed files with 11 additions and 7 deletions

View File

@ -3672,7 +3672,6 @@ d3fdb8ece6cb072a93ddb64a0baad5ac952117a4 data/create/recipes/weathered_limestone
20c20a12b0baff2ba493b1405db7d2d8a15b81af data/create/tags/blocks/brittle.json 20c20a12b0baff2ba493b1405db7d2d8a15b81af data/create/tags/blocks/brittle.json
330bfb3850ba3964b10b1bccbc3cbb9b012cae54 data/create/tags/blocks/fan_heaters.json 330bfb3850ba3964b10b1bccbc3cbb9b012cae54 data/create/tags/blocks/fan_heaters.json
3bc64e3a1e7980237435b1770a9ba2102d57fcd4 data/create/tags/blocks/fan_transparent.json 3bc64e3a1e7980237435b1770a9ba2102d57fcd4 data/create/tags/blocks/fan_transparent.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/create/tags/blocks/non_movable.json
c81ea194e808985847159b201140d4aa4cbcca65 data/create/tags/blocks/safe_nbt.json c81ea194e808985847159b201140d4aa4cbcca65 data/create/tags/blocks/safe_nbt.json
c9ac7e3e5ec18554e7184168d65e9b8e44ef5610 data/create/tags/blocks/sails.json c9ac7e3e5ec18554e7184168d65e9b8e44ef5610 data/create/tags/blocks/sails.json
6cdeeac1689f7b5bfd9bc40b462143d8eaf3ad0b data/create/tags/blocks/seats.json 6cdeeac1689f7b5bfd9bc40b462143d8eaf3ad0b data/create/tags/blocks/seats.json

View File

@ -1,4 +0,0 @@
{
"replace": false,
"values": []
}

View File

@ -146,7 +146,7 @@ public class AllTags {
WINDMILL_SAILS, WINDMILL_SAILS,
FAN_HEATERS, FAN_HEATERS,
WINDOWABLE, WINDOWABLE,
NON_MOVABLE, NON_MOVABLE(false),
BRITTLE, BRITTLE,
SEATS, SEATS,
SAILS, SAILS,
@ -168,17 +168,26 @@ public class AllTags {
} }
private AllBlockTags(NameSpace namespace, String path) { private AllBlockTags(NameSpace namespace, String path) {
this(namespace, path, true);
}
private AllBlockTags(NameSpace namespace, String path, boolean generateData) {
ResourceLocation id = ResourceLocation id =
new ResourceLocation(namespace.id, (path.isEmpty() ? "" : path + "/") + Lang.asId(name())); new ResourceLocation(namespace.id, (path.isEmpty() ? "" : path + "/") + Lang.asId(name()));
if (ModList.get() if (ModList.get()
.isLoaded(namespace.id)) { .isLoaded(namespace.id)) {
tag = BlockTags.makeWrapperTag(id.toString()); tag = BlockTags.makeWrapperTag(id.toString());
if (generateData)
REGISTRATE.addDataGenerator(ProviderType.BLOCK_TAGS, prov -> prov.getOrCreateTagBuilder(tag)); REGISTRATE.addDataGenerator(ProviderType.BLOCK_TAGS, prov -> prov.getOrCreateTagBuilder(tag));
} else { } else {
tag = new EmptyNamedTag<>(id); tag = new EmptyNamedTag<>(id);
} }
} }
AllBlockTags(boolean generateData) {
this(MOD, "", generateData);
}
public boolean matches(BlockState block) { public boolean matches(BlockState block) {
return tag.contains(block.getBlock()); return tag.contains(block.getBlock());
} }