From 2c8c022034ba9967affc7ecf02dc6583f4f3652a Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 3 Sep 2019 15:38:15 -0700 Subject: [PATCH] Add a bunch of tags from the omnibus. Fix test imports. And update patches for line numbers. --- .../net/minecraft/block/CropsBlock.java.patch | 6 +- .../minecraft/entity/LivingEntity.java.patch | 6 +- .../data/forge/tags/blocks/end_stones.json | 6 + .../data/forge/tags/blocks/glass.json | 7 + .../data/forge/tags/blocks/glass/black.json | 6 + .../data/forge/tags/blocks/glass/blue.json | 6 + .../data/forge/tags/blocks/glass/brown.json | 6 + .../forge/tags/blocks/glass/colorless.json | 6 + .../data/forge/tags/blocks/glass/cyan.json | 6 + .../data/forge/tags/blocks/glass/gray.json | 6 + .../data/forge/tags/blocks/glass/green.json | 6 + .../forge/tags/blocks/glass/light_blue.json | 6 + .../forge/tags/blocks/glass/light_gray.json | 6 + .../data/forge/tags/blocks/glass/lime.json | 6 + .../data/forge/tags/blocks/glass/magenta.json | 6 + .../data/forge/tags/blocks/glass/orange.json | 6 + .../data/forge/tags/blocks/glass/pink.json | 6 + .../data/forge/tags/blocks/glass/purple.json | 6 + .../data/forge/tags/blocks/glass/red.json | 6 + .../data/forge/tags/blocks/glass/white.json | 6 + .../data/forge/tags/blocks/glass/yellow.json | 6 + .../data/forge/tags/blocks/glass_panes.json | 7 + .../forge/tags/blocks/glass_panes/black.json | 6 + .../forge/tags/blocks/glass_panes/blue.json | 6 + .../forge/tags/blocks/glass_panes/brown.json | 6 + .../tags/blocks/glass_panes/colorless.json | 6 + .../forge/tags/blocks/glass_panes/cyan.json | 6 + .../forge/tags/blocks/glass_panes/gray.json | 6 + .../forge/tags/blocks/glass_panes/green.json | 6 + .../tags/blocks/glass_panes/light_blue.json | 6 + .../tags/blocks/glass_panes/light_gray.json | 6 + .../forge/tags/blocks/glass_panes/lime.json | 6 + .../tags/blocks/glass_panes/magenta.json | 6 + .../forge/tags/blocks/glass_panes/orange.json | 6 + .../forge/tags/blocks/glass_panes/pink.json | 6 + .../forge/tags/blocks/glass_panes/purple.json | 6 + .../forge/tags/blocks/glass_panes/red.json | 6 + .../forge/tags/blocks/glass_panes/white.json | 6 + .../forge/tags/blocks/glass_panes/yellow.json | 6 + .../data/forge/tags/blocks/gravel.json | 6 + .../data/forge/tags/blocks/netherrack.json | 6 + .../data/forge/tags/blocks/obsidian.json | 6 + .../data/forge/tags/blocks/sand.json | 7 + .../forge/tags/blocks/sand/colorless.json | 6 + .../data/forge/tags/blocks/sand/red.json | 6 + .../data/forge/tags/blocks/sandstone.json | 13 ++ .../data/forge/tags/blocks/stained_glass.json | 21 +++ .../tags/blocks/stained_glass_panes.json | 21 +++ .../data/forge/tags/items/arrows.json | 8 ++ .../data/forge/tags/items/bones.json | 6 + .../data/forge/tags/items/bookshelves.json | 6 + .../data/forge/tags/items/crops.json | 10 ++ .../data/forge/tags/items/crops/beetroot.json | 6 + .../data/forge/tags/items/crops/carrot.json | 6 + .../forge/tags/items/crops/nether_wart.json | 6 + .../data/forge/tags/items/crops/potatoe.json | 6 + .../data/forge/tags/items/crops/wheat.json | 6 + .../resources/data/forge/tags/items/eggs.json | 6 + .../data/forge/tags/items/end_stones.json | 6 + .../data/forge/tags/items/ender_pearls.json | 6 + .../data/forge/tags/items/feathers.json | 6 + .../data/forge/tags/items/glass.json | 7 + .../data/forge/tags/items/glass/black.json | 6 + .../data/forge/tags/items/glass/blue.json | 6 + .../data/forge/tags/items/glass/brown.json | 6 + .../forge/tags/items/glass/colorless.json | 6 + .../data/forge/tags/items/glass/cyan.json | 6 + .../data/forge/tags/items/glass/gray.json | 6 + .../data/forge/tags/items/glass/green.json | 6 + .../forge/tags/items/glass/light_blue.json | 6 + .../forge/tags/items/glass/light_gray.json | 6 + .../data/forge/tags/items/glass/lime.json | 6 + .../data/forge/tags/items/glass/magenta.json | 6 + .../data/forge/tags/items/glass/orange.json | 6 + .../data/forge/tags/items/glass/pink.json | 6 + .../data/forge/tags/items/glass/purple.json | 6 + .../data/forge/tags/items/glass/red.json | 6 + .../data/forge/tags/items/glass/white.json | 6 + .../data/forge/tags/items/glass/yellow.json | 6 + .../data/forge/tags/items/glass_panes.json | 7 + .../forge/tags/items/glass_panes/black.json | 6 + .../forge/tags/items/glass_panes/blue.json | 6 + .../forge/tags/items/glass_panes/brown.json | 6 + .../tags/items/glass_panes/colorless.json | 6 + .../forge/tags/items/glass_panes/cyan.json | 6 + .../forge/tags/items/glass_panes/gray.json | 6 + .../forge/tags/items/glass_panes/green.json | 6 + .../tags/items/glass_panes/light_blue.json | 6 + .../tags/items/glass_panes/light_gray.json | 6 + .../forge/tags/items/glass_panes/lime.json | 6 + .../forge/tags/items/glass_panes/magenta.json | 6 + .../forge/tags/items/glass_panes/orange.json | 6 + .../forge/tags/items/glass_panes/pink.json | 6 + .../forge/tags/items/glass_panes/purple.json | 6 + .../forge/tags/items/glass_panes/red.json | 6 + .../forge/tags/items/glass_panes/white.json | 6 + .../forge/tags/items/glass_panes/yellow.json | 6 + .../data/forge/tags/items/gravel.json | 6 + .../data/forge/tags/items/gunpowder.json | 6 + .../data/forge/tags/items/heads.json | 11 ++ .../data/forge/tags/items/leather.json | 6 + .../data/forge/tags/items/mushrooms.json | 7 + .../data/forge/tags/items/nether_stars.json | 6 + .../data/forge/tags/items/netherrack.json | 6 + .../data/forge/tags/items/obsidian.json | 6 + .../resources/data/forge/tags/items/sand.json | 7 + .../data/forge/tags/items/sand/colorless.json | 6 + .../data/forge/tags/items/sand/red.json | 6 + .../data/forge/tags/items/sandstone.json | 13 ++ .../data/forge/tags/items/seeds.json | 9 ++ .../data/forge/tags/items/seeds/beetroot.json | 6 + .../data/forge/tags/items/seeds/melon.json | 6 + .../data/forge/tags/items/seeds/pumpkin.json | 6 + .../data/forge/tags/items/seeds/wheat.json | 6 + .../data/forge/tags/items/slimeballs.json | 6 + .../data/forge/tags/items/stained_glass.json | 21 +++ .../forge/tags/items/stained_glass_panes.json | 21 +++ .../data/forge/tags/items/string.json | 6 + .../java/net/minecraftforge/common/Tags.java | 128 ++++++++++++++++++ .../common/data/ForgeBlockTagsProvider.java | 50 +++++++ .../common/data/ForgeItemTagsProvider.java | 119 +++++++++++++--- .../debug/entity/GravityAttributeTest.java | 83 ++++++------ 122 files changed, 1122 insertions(+), 61 deletions(-) create mode 100644 src/generated/resources/data/forge/tags/blocks/end_stones.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass/black.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass/blue.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass/brown.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass/colorless.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass/cyan.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass/gray.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass/green.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass/light_blue.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass/light_gray.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass/lime.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass/magenta.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass/orange.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass/pink.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass/purple.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass/red.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass/white.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass/yellow.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass_panes.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass_panes/black.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass_panes/blue.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass_panes/brown.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass_panes/colorless.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass_panes/cyan.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass_panes/gray.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass_panes/green.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass_panes/light_blue.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass_panes/light_gray.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass_panes/lime.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass_panes/magenta.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass_panes/orange.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass_panes/pink.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass_panes/purple.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass_panes/red.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass_panes/white.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass_panes/yellow.json create mode 100644 src/generated/resources/data/forge/tags/blocks/gravel.json create mode 100644 src/generated/resources/data/forge/tags/blocks/netherrack.json create mode 100644 src/generated/resources/data/forge/tags/blocks/obsidian.json create mode 100644 src/generated/resources/data/forge/tags/blocks/sand.json create mode 100644 src/generated/resources/data/forge/tags/blocks/sand/colorless.json create mode 100644 src/generated/resources/data/forge/tags/blocks/sand/red.json create mode 100644 src/generated/resources/data/forge/tags/blocks/sandstone.json create mode 100644 src/generated/resources/data/forge/tags/blocks/stained_glass.json create mode 100644 src/generated/resources/data/forge/tags/blocks/stained_glass_panes.json create mode 100644 src/generated/resources/data/forge/tags/items/arrows.json create mode 100644 src/generated/resources/data/forge/tags/items/bones.json create mode 100644 src/generated/resources/data/forge/tags/items/bookshelves.json create mode 100644 src/generated/resources/data/forge/tags/items/crops.json create mode 100644 src/generated/resources/data/forge/tags/items/crops/beetroot.json create mode 100644 src/generated/resources/data/forge/tags/items/crops/carrot.json create mode 100644 src/generated/resources/data/forge/tags/items/crops/nether_wart.json create mode 100644 src/generated/resources/data/forge/tags/items/crops/potatoe.json create mode 100644 src/generated/resources/data/forge/tags/items/crops/wheat.json create mode 100644 src/generated/resources/data/forge/tags/items/eggs.json create mode 100644 src/generated/resources/data/forge/tags/items/end_stones.json create mode 100644 src/generated/resources/data/forge/tags/items/ender_pearls.json create mode 100644 src/generated/resources/data/forge/tags/items/feathers.json create mode 100644 src/generated/resources/data/forge/tags/items/glass.json create mode 100644 src/generated/resources/data/forge/tags/items/glass/black.json create mode 100644 src/generated/resources/data/forge/tags/items/glass/blue.json create mode 100644 src/generated/resources/data/forge/tags/items/glass/brown.json create mode 100644 src/generated/resources/data/forge/tags/items/glass/colorless.json create mode 100644 src/generated/resources/data/forge/tags/items/glass/cyan.json create mode 100644 src/generated/resources/data/forge/tags/items/glass/gray.json create mode 100644 src/generated/resources/data/forge/tags/items/glass/green.json create mode 100644 src/generated/resources/data/forge/tags/items/glass/light_blue.json create mode 100644 src/generated/resources/data/forge/tags/items/glass/light_gray.json create mode 100644 src/generated/resources/data/forge/tags/items/glass/lime.json create mode 100644 src/generated/resources/data/forge/tags/items/glass/magenta.json create mode 100644 src/generated/resources/data/forge/tags/items/glass/orange.json create mode 100644 src/generated/resources/data/forge/tags/items/glass/pink.json create mode 100644 src/generated/resources/data/forge/tags/items/glass/purple.json create mode 100644 src/generated/resources/data/forge/tags/items/glass/red.json create mode 100644 src/generated/resources/data/forge/tags/items/glass/white.json create mode 100644 src/generated/resources/data/forge/tags/items/glass/yellow.json create mode 100644 src/generated/resources/data/forge/tags/items/glass_panes.json create mode 100644 src/generated/resources/data/forge/tags/items/glass_panes/black.json create mode 100644 src/generated/resources/data/forge/tags/items/glass_panes/blue.json create mode 100644 src/generated/resources/data/forge/tags/items/glass_panes/brown.json create mode 100644 src/generated/resources/data/forge/tags/items/glass_panes/colorless.json create mode 100644 src/generated/resources/data/forge/tags/items/glass_panes/cyan.json create mode 100644 src/generated/resources/data/forge/tags/items/glass_panes/gray.json create mode 100644 src/generated/resources/data/forge/tags/items/glass_panes/green.json create mode 100644 src/generated/resources/data/forge/tags/items/glass_panes/light_blue.json create mode 100644 src/generated/resources/data/forge/tags/items/glass_panes/light_gray.json create mode 100644 src/generated/resources/data/forge/tags/items/glass_panes/lime.json create mode 100644 src/generated/resources/data/forge/tags/items/glass_panes/magenta.json create mode 100644 src/generated/resources/data/forge/tags/items/glass_panes/orange.json create mode 100644 src/generated/resources/data/forge/tags/items/glass_panes/pink.json create mode 100644 src/generated/resources/data/forge/tags/items/glass_panes/purple.json create mode 100644 src/generated/resources/data/forge/tags/items/glass_panes/red.json create mode 100644 src/generated/resources/data/forge/tags/items/glass_panes/white.json create mode 100644 src/generated/resources/data/forge/tags/items/glass_panes/yellow.json create mode 100644 src/generated/resources/data/forge/tags/items/gravel.json create mode 100644 src/generated/resources/data/forge/tags/items/gunpowder.json create mode 100644 src/generated/resources/data/forge/tags/items/heads.json create mode 100644 src/generated/resources/data/forge/tags/items/leather.json create mode 100644 src/generated/resources/data/forge/tags/items/mushrooms.json create mode 100644 src/generated/resources/data/forge/tags/items/nether_stars.json create mode 100644 src/generated/resources/data/forge/tags/items/netherrack.json create mode 100644 src/generated/resources/data/forge/tags/items/obsidian.json create mode 100644 src/generated/resources/data/forge/tags/items/sand.json create mode 100644 src/generated/resources/data/forge/tags/items/sand/colorless.json create mode 100644 src/generated/resources/data/forge/tags/items/sand/red.json create mode 100644 src/generated/resources/data/forge/tags/items/sandstone.json create mode 100644 src/generated/resources/data/forge/tags/items/seeds.json create mode 100644 src/generated/resources/data/forge/tags/items/seeds/beetroot.json create mode 100644 src/generated/resources/data/forge/tags/items/seeds/melon.json create mode 100644 src/generated/resources/data/forge/tags/items/seeds/pumpkin.json create mode 100644 src/generated/resources/data/forge/tags/items/seeds/wheat.json create mode 100644 src/generated/resources/data/forge/tags/items/slimeballs.json create mode 100644 src/generated/resources/data/forge/tags/items/stained_glass.json create mode 100644 src/generated/resources/data/forge/tags/items/stained_glass_panes.json create mode 100644 src/generated/resources/data/forge/tags/items/string.json diff --git a/patches/minecraft/net/minecraft/block/CropsBlock.java.patch b/patches/minecraft/net/minecraft/block/CropsBlock.java.patch index de9c275163..ed34404f84 100644 --- a/patches/minecraft/net/minecraft/block/CropsBlock.java.patch +++ b/patches/minecraft/net/minecraft/block/CropsBlock.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/block/CropsBlock.java +++ b/net/minecraft/block/CropsBlock.java -@@ -59,12 +59,14 @@ +@@ -57,12 +57,14 @@ public void func_196267_b(BlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) { super.func_196267_b(p_196267_1_, p_196267_2_, p_196267_3_, p_196267_4_); @@ -16,7 +16,7 @@ } } } -@@ -93,9 +95,9 @@ +@@ -91,9 +93,9 @@ for(int j = -1; j <= 1; ++j) { float f1 = 0.0F; BlockState blockstate = p_180672_1_.func_180495_p(blockpos.func_177982_a(i, 0, j)); @@ -28,7 +28,7 @@ f1 = 3.0F; } } -@@ -131,7 +133,7 @@ +@@ -129,7 +131,7 @@ } public void func_196262_a(BlockState p_196262_1_, World p_196262_2_, BlockPos p_196262_3_, Entity p_196262_4_) { diff --git a/patches/minecraft/net/minecraft/entity/LivingEntity.java.patch b/patches/minecraft/net/minecraft/entity/LivingEntity.java.patch index 7e53985b6b..480a31de43 100644 --- a/patches/minecraft/net/minecraft/entity/LivingEntity.java.patch +++ b/patches/minecraft/net/minecraft/entity/LivingEntity.java.patch @@ -52,7 +52,7 @@ while(i > 0) { int j = ExperienceOrbEntity.func_70527_a(i); i -= j; -@@ -395,7 +401,7 @@ +@@ -395,7 +405,7 @@ } } @@ -61,7 +61,7 @@ for(int k = 0; k < 20; ++k) { double d2 = this.field_70146_Z.nextGaussian() * 0.02D; -@@ -590,7 +596,7 @@ +@@ -590,7 +600,7 @@ Effect effect = iterator.next(); EffectInstance effectinstance = this.field_70713_bf.get(effect); if (!effectinstance.func_76455_a(this)) { @@ -397,7 +397,7 @@ this.func_184602_cy(); } -@@ -2532,6 +2588,11 @@ +@@ -2532,7 +2588,11 @@ public void func_184597_cx() { if (!this.field_184627_bm.func_190926_b()) { diff --git a/src/generated/resources/data/forge/tags/blocks/end_stones.json b/src/generated/resources/data/forge/tags/blocks/end_stones.json new file mode 100644 index 0000000000..146dcd9a67 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/end_stones.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:end_stone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass.json b/src/generated/resources/data/forge/tags/blocks/glass.json new file mode 100644 index 0000000000..a7ee75a4f5 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#forge:glass/colorless", + "#forge:stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass/black.json b/src/generated/resources/data/forge/tags/blocks/glass/black.json new file mode 100644 index 0000000000..4f01d11d87 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass/black.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:black_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass/blue.json b/src/generated/resources/data/forge/tags/blocks/glass/blue.json new file mode 100644 index 0000000000..f00b8f0a6c --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass/blue.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:blue_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass/brown.json b/src/generated/resources/data/forge/tags/blocks/glass/brown.json new file mode 100644 index 0000000000..b201d9ca08 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass/brown.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:brown_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass/colorless.json b/src/generated/resources/data/forge/tags/blocks/glass/colorless.json new file mode 100644 index 0000000000..41c35c3229 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass/colorless.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass/cyan.json b/src/generated/resources/data/forge/tags/blocks/glass/cyan.json new file mode 100644 index 0000000000..5663dae008 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass/cyan.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:cyan_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass/gray.json b/src/generated/resources/data/forge/tags/blocks/glass/gray.json new file mode 100644 index 0000000000..17f2ac1427 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass/gray.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:gray_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass/green.json b/src/generated/resources/data/forge/tags/blocks/glass/green.json new file mode 100644 index 0000000000..1af1fa0a99 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass/green.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:green_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass/light_blue.json b/src/generated/resources/data/forge/tags/blocks/glass/light_blue.json new file mode 100644 index 0000000000..681d8f5e5f --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass/light_blue.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:light_blue_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass/light_gray.json b/src/generated/resources/data/forge/tags/blocks/glass/light_gray.json new file mode 100644 index 0000000000..bbb35c80d7 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass/light_gray.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:light_gray_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass/lime.json b/src/generated/resources/data/forge/tags/blocks/glass/lime.json new file mode 100644 index 0000000000..a9cf3d5947 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass/lime.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:lime_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass/magenta.json b/src/generated/resources/data/forge/tags/blocks/glass/magenta.json new file mode 100644 index 0000000000..c1d51e99b2 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass/magenta.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:magenta_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass/orange.json b/src/generated/resources/data/forge/tags/blocks/glass/orange.json new file mode 100644 index 0000000000..4f99b379ea --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass/orange.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:orange_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass/pink.json b/src/generated/resources/data/forge/tags/blocks/glass/pink.json new file mode 100644 index 0000000000..2cf7241412 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass/pink.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:pink_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass/purple.json b/src/generated/resources/data/forge/tags/blocks/glass/purple.json new file mode 100644 index 0000000000..25e9a26469 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass/purple.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:purple_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass/red.json b/src/generated/resources/data/forge/tags/blocks/glass/red.json new file mode 100644 index 0000000000..5b04856508 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass/red.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:red_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass/white.json b/src/generated/resources/data/forge/tags/blocks/glass/white.json new file mode 100644 index 0000000000..ce529c5f09 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass/white.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:white_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass/yellow.json b/src/generated/resources/data/forge/tags/blocks/glass/yellow.json new file mode 100644 index 0000000000..e8120972fa --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass/yellow.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:yellow_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes.json b/src/generated/resources/data/forge/tags/blocks/glass_panes.json new file mode 100644 index 0000000000..54d1bc517f --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass_panes.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#forge:glass_panes/colorless", + "#forge:stained_glass_panes" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/black.json b/src/generated/resources/data/forge/tags/blocks/glass_panes/black.json new file mode 100644 index 0000000000..ea0ccfb61a --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass_panes/black.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:black_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/blue.json b/src/generated/resources/data/forge/tags/blocks/glass_panes/blue.json new file mode 100644 index 0000000000..dd2834f520 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass_panes/blue.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:blue_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/brown.json b/src/generated/resources/data/forge/tags/blocks/glass_panes/brown.json new file mode 100644 index 0000000000..d428cc7cd9 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass_panes/brown.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:brown_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/colorless.json b/src/generated/resources/data/forge/tags/blocks/glass_panes/colorless.json new file mode 100644 index 0000000000..a0638aaced --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass_panes/colorless.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/cyan.json b/src/generated/resources/data/forge/tags/blocks/glass_panes/cyan.json new file mode 100644 index 0000000000..90bda4e2e0 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass_panes/cyan.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:cyan_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/gray.json b/src/generated/resources/data/forge/tags/blocks/glass_panes/gray.json new file mode 100644 index 0000000000..cf7cc64757 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass_panes/gray.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:gray_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/green.json b/src/generated/resources/data/forge/tags/blocks/glass_panes/green.json new file mode 100644 index 0000000000..80d123f3b5 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass_panes/green.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:green_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/light_blue.json b/src/generated/resources/data/forge/tags/blocks/glass_panes/light_blue.json new file mode 100644 index 0000000000..22c38c65e8 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass_panes/light_blue.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:light_blue_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/light_gray.json b/src/generated/resources/data/forge/tags/blocks/glass_panes/light_gray.json new file mode 100644 index 0000000000..08bf8e8462 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass_panes/light_gray.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:light_gray_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/lime.json b/src/generated/resources/data/forge/tags/blocks/glass_panes/lime.json new file mode 100644 index 0000000000..6319bf5e67 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass_panes/lime.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:lime_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/magenta.json b/src/generated/resources/data/forge/tags/blocks/glass_panes/magenta.json new file mode 100644 index 0000000000..e4efb3c414 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass_panes/magenta.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:magenta_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/orange.json b/src/generated/resources/data/forge/tags/blocks/glass_panes/orange.json new file mode 100644 index 0000000000..0764afe55c --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass_panes/orange.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:orange_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/pink.json b/src/generated/resources/data/forge/tags/blocks/glass_panes/pink.json new file mode 100644 index 0000000000..2e34eda30e --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass_panes/pink.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:pink_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/purple.json b/src/generated/resources/data/forge/tags/blocks/glass_panes/purple.json new file mode 100644 index 0000000000..a3d2c78235 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass_panes/purple.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:purple_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/red.json b/src/generated/resources/data/forge/tags/blocks/glass_panes/red.json new file mode 100644 index 0000000000..191a08d50a --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass_panes/red.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:red_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/white.json b/src/generated/resources/data/forge/tags/blocks/glass_panes/white.json new file mode 100644 index 0000000000..3f759cfc8f --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass_panes/white.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:white_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/yellow.json b/src/generated/resources/data/forge/tags/blocks/glass_panes/yellow.json new file mode 100644 index 0000000000..53793f5fb3 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass_panes/yellow.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:yellow_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/gravel.json b/src/generated/resources/data/forge/tags/blocks/gravel.json new file mode 100644 index 0000000000..087cf289d6 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/gravel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:gravel" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/netherrack.json b/src/generated/resources/data/forge/tags/blocks/netherrack.json new file mode 100644 index 0000000000..d54c65bbb4 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/netherrack.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:netherrack" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/obsidian.json b/src/generated/resources/data/forge/tags/blocks/obsidian.json new file mode 100644 index 0000000000..03a3719e30 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/obsidian.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:obsidian" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/sand.json b/src/generated/resources/data/forge/tags/blocks/sand.json new file mode 100644 index 0000000000..6207c43cc1 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/sand.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#forge:sand/colorless", + "#forge:sand/red" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/sand/colorless.json b/src/generated/resources/data/forge/tags/blocks/sand/colorless.json new file mode 100644 index 0000000000..8f570f7b95 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/sand/colorless.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:sand" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/sand/red.json b/src/generated/resources/data/forge/tags/blocks/sand/red.json new file mode 100644 index 0000000000..9c7731079d --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/sand/red.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:red_sand" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/sandstone.json b/src/generated/resources/data/forge/tags/blocks/sandstone.json new file mode 100644 index 0000000000..12b4f2170e --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/sandstone.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "minecraft:sandstone", + "minecraft:cut_sandstone", + "minecraft:chiseled_sandstone", + "minecraft:smooth_sandstone", + "minecraft:red_sandstone", + "minecraft:cut_red_sandstone", + "minecraft:chiseled_red_sandstone", + "minecraft:smooth_red_sandstone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/stained_glass.json b/src/generated/resources/data/forge/tags/blocks/stained_glass.json new file mode 100644 index 0000000000..85881bd249 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/stained_glass.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "minecraft:white_stained_glass", + "minecraft:orange_stained_glass", + "minecraft:magenta_stained_glass", + "minecraft:light_blue_stained_glass", + "minecraft:yellow_stained_glass", + "minecraft:lime_stained_glass", + "minecraft:pink_stained_glass", + "minecraft:gray_stained_glass", + "minecraft:light_gray_stained_glass", + "minecraft:cyan_stained_glass", + "minecraft:purple_stained_glass", + "minecraft:blue_stained_glass", + "minecraft:brown_stained_glass", + "minecraft:green_stained_glass", + "minecraft:red_stained_glass", + "minecraft:black_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/stained_glass_panes.json b/src/generated/resources/data/forge/tags/blocks/stained_glass_panes.json new file mode 100644 index 0000000000..7f913160d9 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/stained_glass_panes.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "minecraft:white_stained_glass_pane", + "minecraft:orange_stained_glass_pane", + "minecraft:magenta_stained_glass_pane", + "minecraft:light_blue_stained_glass_pane", + "minecraft:yellow_stained_glass_pane", + "minecraft:lime_stained_glass_pane", + "minecraft:pink_stained_glass_pane", + "minecraft:gray_stained_glass_pane", + "minecraft:light_gray_stained_glass_pane", + "minecraft:cyan_stained_glass_pane", + "minecraft:purple_stained_glass_pane", + "minecraft:blue_stained_glass_pane", + "minecraft:brown_stained_glass_pane", + "minecraft:green_stained_glass_pane", + "minecraft:red_stained_glass_pane", + "minecraft:black_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/arrows.json b/src/generated/resources/data/forge/tags/items/arrows.json new file mode 100644 index 0000000000..69ebb0d5e2 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/arrows.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "minecraft:arrow", + "minecraft:tipped_arrow", + "minecraft:spectral_arrow" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/bones.json b/src/generated/resources/data/forge/tags/items/bones.json new file mode 100644 index 0000000000..f6026e3e55 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/bones.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:bone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/bookshelves.json b/src/generated/resources/data/forge/tags/items/bookshelves.json new file mode 100644 index 0000000000..6cdb0ddace --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/bookshelves.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:bookshelf" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/crops.json b/src/generated/resources/data/forge/tags/items/crops.json new file mode 100644 index 0000000000..e389ebd456 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/crops.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "#forge:crops/beetroot", + "#forge:crops/carrot", + "#forge:crops/nether_wart", + "#forge:crops/potatoe", + "#forge:crops/wheat" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/crops/beetroot.json b/src/generated/resources/data/forge/tags/items/crops/beetroot.json new file mode 100644 index 0000000000..cfe05d1345 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/crops/beetroot.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:beetroot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/crops/carrot.json b/src/generated/resources/data/forge/tags/items/crops/carrot.json new file mode 100644 index 0000000000..d9898ab418 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/crops/carrot.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:carrot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/crops/nether_wart.json b/src/generated/resources/data/forge/tags/items/crops/nether_wart.json new file mode 100644 index 0000000000..727025b7cd --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/crops/nether_wart.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:nether_wart" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/crops/potatoe.json b/src/generated/resources/data/forge/tags/items/crops/potatoe.json new file mode 100644 index 0000000000..9e0e20bce6 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/crops/potatoe.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:potato" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/crops/wheat.json b/src/generated/resources/data/forge/tags/items/crops/wheat.json new file mode 100644 index 0000000000..0e0c3ea2bc --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/crops/wheat.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:wheat" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/eggs.json b/src/generated/resources/data/forge/tags/items/eggs.json new file mode 100644 index 0000000000..ae95fb6699 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/eggs.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:egg" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/end_stones.json b/src/generated/resources/data/forge/tags/items/end_stones.json new file mode 100644 index 0000000000..146dcd9a67 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/end_stones.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:end_stone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ender_pearls.json b/src/generated/resources/data/forge/tags/items/ender_pearls.json new file mode 100644 index 0000000000..0b410745d4 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ender_pearls.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:ender_pearl" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/feathers.json b/src/generated/resources/data/forge/tags/items/feathers.json new file mode 100644 index 0000000000..9540a42ac6 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/feathers.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:feather" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass.json b/src/generated/resources/data/forge/tags/items/glass.json new file mode 100644 index 0000000000..a7ee75a4f5 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#forge:glass/colorless", + "#forge:stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass/black.json b/src/generated/resources/data/forge/tags/items/glass/black.json new file mode 100644 index 0000000000..4f01d11d87 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass/black.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:black_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass/blue.json b/src/generated/resources/data/forge/tags/items/glass/blue.json new file mode 100644 index 0000000000..f00b8f0a6c --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass/blue.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:blue_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass/brown.json b/src/generated/resources/data/forge/tags/items/glass/brown.json new file mode 100644 index 0000000000..b201d9ca08 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass/brown.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:brown_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass/colorless.json b/src/generated/resources/data/forge/tags/items/glass/colorless.json new file mode 100644 index 0000000000..41c35c3229 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass/colorless.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass/cyan.json b/src/generated/resources/data/forge/tags/items/glass/cyan.json new file mode 100644 index 0000000000..5663dae008 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass/cyan.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:cyan_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass/gray.json b/src/generated/resources/data/forge/tags/items/glass/gray.json new file mode 100644 index 0000000000..17f2ac1427 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass/gray.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:gray_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass/green.json b/src/generated/resources/data/forge/tags/items/glass/green.json new file mode 100644 index 0000000000..1af1fa0a99 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass/green.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:green_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass/light_blue.json b/src/generated/resources/data/forge/tags/items/glass/light_blue.json new file mode 100644 index 0000000000..681d8f5e5f --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass/light_blue.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:light_blue_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass/light_gray.json b/src/generated/resources/data/forge/tags/items/glass/light_gray.json new file mode 100644 index 0000000000..bbb35c80d7 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass/light_gray.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:light_gray_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass/lime.json b/src/generated/resources/data/forge/tags/items/glass/lime.json new file mode 100644 index 0000000000..a9cf3d5947 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass/lime.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:lime_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass/magenta.json b/src/generated/resources/data/forge/tags/items/glass/magenta.json new file mode 100644 index 0000000000..c1d51e99b2 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass/magenta.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:magenta_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass/orange.json b/src/generated/resources/data/forge/tags/items/glass/orange.json new file mode 100644 index 0000000000..4f99b379ea --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass/orange.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:orange_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass/pink.json b/src/generated/resources/data/forge/tags/items/glass/pink.json new file mode 100644 index 0000000000..2cf7241412 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass/pink.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:pink_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass/purple.json b/src/generated/resources/data/forge/tags/items/glass/purple.json new file mode 100644 index 0000000000..25e9a26469 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass/purple.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:purple_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass/red.json b/src/generated/resources/data/forge/tags/items/glass/red.json new file mode 100644 index 0000000000..5b04856508 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass/red.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:red_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass/white.json b/src/generated/resources/data/forge/tags/items/glass/white.json new file mode 100644 index 0000000000..ce529c5f09 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass/white.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:white_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass/yellow.json b/src/generated/resources/data/forge/tags/items/glass/yellow.json new file mode 100644 index 0000000000..e8120972fa --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass/yellow.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:yellow_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass_panes.json b/src/generated/resources/data/forge/tags/items/glass_panes.json new file mode 100644 index 0000000000..54d1bc517f --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass_panes.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#forge:glass_panes/colorless", + "#forge:stained_glass_panes" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/black.json b/src/generated/resources/data/forge/tags/items/glass_panes/black.json new file mode 100644 index 0000000000..ea0ccfb61a --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass_panes/black.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:black_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/blue.json b/src/generated/resources/data/forge/tags/items/glass_panes/blue.json new file mode 100644 index 0000000000..dd2834f520 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass_panes/blue.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:blue_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/brown.json b/src/generated/resources/data/forge/tags/items/glass_panes/brown.json new file mode 100644 index 0000000000..d428cc7cd9 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass_panes/brown.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:brown_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/colorless.json b/src/generated/resources/data/forge/tags/items/glass_panes/colorless.json new file mode 100644 index 0000000000..a0638aaced --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass_panes/colorless.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/cyan.json b/src/generated/resources/data/forge/tags/items/glass_panes/cyan.json new file mode 100644 index 0000000000..90bda4e2e0 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass_panes/cyan.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:cyan_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/gray.json b/src/generated/resources/data/forge/tags/items/glass_panes/gray.json new file mode 100644 index 0000000000..cf7cc64757 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass_panes/gray.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:gray_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/green.json b/src/generated/resources/data/forge/tags/items/glass_panes/green.json new file mode 100644 index 0000000000..80d123f3b5 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass_panes/green.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:green_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/light_blue.json b/src/generated/resources/data/forge/tags/items/glass_panes/light_blue.json new file mode 100644 index 0000000000..22c38c65e8 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass_panes/light_blue.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:light_blue_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/light_gray.json b/src/generated/resources/data/forge/tags/items/glass_panes/light_gray.json new file mode 100644 index 0000000000..08bf8e8462 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass_panes/light_gray.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:light_gray_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/lime.json b/src/generated/resources/data/forge/tags/items/glass_panes/lime.json new file mode 100644 index 0000000000..6319bf5e67 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass_panes/lime.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:lime_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/magenta.json b/src/generated/resources/data/forge/tags/items/glass_panes/magenta.json new file mode 100644 index 0000000000..e4efb3c414 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass_panes/magenta.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:magenta_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/orange.json b/src/generated/resources/data/forge/tags/items/glass_panes/orange.json new file mode 100644 index 0000000000..0764afe55c --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass_panes/orange.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:orange_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/pink.json b/src/generated/resources/data/forge/tags/items/glass_panes/pink.json new file mode 100644 index 0000000000..2e34eda30e --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass_panes/pink.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:pink_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/purple.json b/src/generated/resources/data/forge/tags/items/glass_panes/purple.json new file mode 100644 index 0000000000..a3d2c78235 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass_panes/purple.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:purple_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/red.json b/src/generated/resources/data/forge/tags/items/glass_panes/red.json new file mode 100644 index 0000000000..191a08d50a --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass_panes/red.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:red_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/white.json b/src/generated/resources/data/forge/tags/items/glass_panes/white.json new file mode 100644 index 0000000000..3f759cfc8f --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass_panes/white.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:white_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/yellow.json b/src/generated/resources/data/forge/tags/items/glass_panes/yellow.json new file mode 100644 index 0000000000..53793f5fb3 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass_panes/yellow.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:yellow_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/gravel.json b/src/generated/resources/data/forge/tags/items/gravel.json new file mode 100644 index 0000000000..087cf289d6 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gravel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:gravel" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/gunpowder.json b/src/generated/resources/data/forge/tags/items/gunpowder.json new file mode 100644 index 0000000000..c517ea1756 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gunpowder.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:gunpowder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/heads.json b/src/generated/resources/data/forge/tags/items/heads.json new file mode 100644 index 0000000000..b5a3caaf24 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/heads.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:creeper_head", + "minecraft:dragon_head", + "minecraft:player_head", + "minecraft:skeleton_skull", + "minecraft:wither_skeleton_skull", + "minecraft:zombie_head" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/leather.json b/src/generated/resources/data/forge/tags/items/leather.json new file mode 100644 index 0000000000..8247c9a3a2 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/leather.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:leather" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/mushrooms.json b/src/generated/resources/data/forge/tags/items/mushrooms.json new file mode 100644 index 0000000000..0b6b09481a --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/mushrooms.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:brown_mushroom", + "minecraft:red_mushroom" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/nether_stars.json b/src/generated/resources/data/forge/tags/items/nether_stars.json new file mode 100644 index 0000000000..9c3c474d79 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nether_stars.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:nether_star" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/netherrack.json b/src/generated/resources/data/forge/tags/items/netherrack.json new file mode 100644 index 0000000000..d54c65bbb4 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/netherrack.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:netherrack" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/obsidian.json b/src/generated/resources/data/forge/tags/items/obsidian.json new file mode 100644 index 0000000000..03a3719e30 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/obsidian.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:obsidian" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/sand.json b/src/generated/resources/data/forge/tags/items/sand.json new file mode 100644 index 0000000000..6207c43cc1 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/sand.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#forge:sand/colorless", + "#forge:sand/red" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/sand/colorless.json b/src/generated/resources/data/forge/tags/items/sand/colorless.json new file mode 100644 index 0000000000..8f570f7b95 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/sand/colorless.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:sand" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/sand/red.json b/src/generated/resources/data/forge/tags/items/sand/red.json new file mode 100644 index 0000000000..9c7731079d --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/sand/red.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:red_sand" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/sandstone.json b/src/generated/resources/data/forge/tags/items/sandstone.json new file mode 100644 index 0000000000..12b4f2170e --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/sandstone.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "minecraft:sandstone", + "minecraft:cut_sandstone", + "minecraft:chiseled_sandstone", + "minecraft:smooth_sandstone", + "minecraft:red_sandstone", + "minecraft:cut_red_sandstone", + "minecraft:chiseled_red_sandstone", + "minecraft:smooth_red_sandstone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/seeds.json b/src/generated/resources/data/forge/tags/items/seeds.json new file mode 100644 index 0000000000..6a1aab958d --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/seeds.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "#forge:seeds/beetroot", + "#forge:seeds/melon", + "#forge:seeds/pumpkin", + "#forge:seeds/wheat" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/seeds/beetroot.json b/src/generated/resources/data/forge/tags/items/seeds/beetroot.json new file mode 100644 index 0000000000..7a28601e78 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/seeds/beetroot.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:beetroot_seeds" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/seeds/melon.json b/src/generated/resources/data/forge/tags/items/seeds/melon.json new file mode 100644 index 0000000000..3617bfab06 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/seeds/melon.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:melon_seeds" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/seeds/pumpkin.json b/src/generated/resources/data/forge/tags/items/seeds/pumpkin.json new file mode 100644 index 0000000000..0c9c342234 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/seeds/pumpkin.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:pumpkin_seeds" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/seeds/wheat.json b/src/generated/resources/data/forge/tags/items/seeds/wheat.json new file mode 100644 index 0000000000..d7322a7714 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/seeds/wheat.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:wheat_seeds" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/slimeballs.json b/src/generated/resources/data/forge/tags/items/slimeballs.json new file mode 100644 index 0000000000..2440109f53 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/slimeballs.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:slime_ball" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/stained_glass.json b/src/generated/resources/data/forge/tags/items/stained_glass.json new file mode 100644 index 0000000000..85881bd249 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/stained_glass.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "minecraft:white_stained_glass", + "minecraft:orange_stained_glass", + "minecraft:magenta_stained_glass", + "minecraft:light_blue_stained_glass", + "minecraft:yellow_stained_glass", + "minecraft:lime_stained_glass", + "minecraft:pink_stained_glass", + "minecraft:gray_stained_glass", + "minecraft:light_gray_stained_glass", + "minecraft:cyan_stained_glass", + "minecraft:purple_stained_glass", + "minecraft:blue_stained_glass", + "minecraft:brown_stained_glass", + "minecraft:green_stained_glass", + "minecraft:red_stained_glass", + "minecraft:black_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/stained_glass_panes.json b/src/generated/resources/data/forge/tags/items/stained_glass_panes.json new file mode 100644 index 0000000000..7f913160d9 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/stained_glass_panes.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "minecraft:white_stained_glass_pane", + "minecraft:orange_stained_glass_pane", + "minecraft:magenta_stained_glass_pane", + "minecraft:light_blue_stained_glass_pane", + "minecraft:yellow_stained_glass_pane", + "minecraft:lime_stained_glass_pane", + "minecraft:pink_stained_glass_pane", + "minecraft:gray_stained_glass_pane", + "minecraft:light_gray_stained_glass_pane", + "minecraft:cyan_stained_glass_pane", + "minecraft:purple_stained_glass_pane", + "minecraft:blue_stained_glass_pane", + "minecraft:brown_stained_glass_pane", + "minecraft:green_stained_glass_pane", + "minecraft:red_stained_glass_pane", + "minecraft:black_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/string.json b/src/generated/resources/data/forge/tags/items/string.json new file mode 100644 index 0000000000..90efbd8594 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/string.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:string" + ] +} \ No newline at end of file diff --git a/src/main/java/net/minecraftforge/common/Tags.java b/src/main/java/net/minecraftforge/common/Tags.java index 5d2f24c1a2..c8fdf1cb0b 100644 --- a/src/main/java/net/minecraftforge/common/Tags.java +++ b/src/main/java/net/minecraftforge/common/Tags.java @@ -36,11 +36,54 @@ public class Tags public static final Tag CHESTS_WOODEN = tag("chests/wooden"); public static final Tag COBBLESTONE = tag("cobblestone"); public static final Tag DIRT = tag("dirt"); + public static final Tag END_STONES = tag("end_stones"); public static final Tag FENCE_GATES = tag("fence_gates"); public static final Tag FENCE_GATES_WOODEN = tag("fence_gates/wooden"); public static final Tag FENCES = tag("fences"); public static final Tag FENCES_NETHER_BRICK = tag("fences/nether_brick"); public static final Tag FENCES_WOODEN = tag("fences/wooden"); + + public static final Tag GLASS = tag("glass"); + public static final Tag GLASS_BLACK = tag("glass/black"); + public static final Tag GLASS_BLUE = tag("glass/blue"); + public static final Tag GLASS_BROWN = tag("glass/brown"); + public static final Tag GLASS_COLORLESS = tag("glass/colorless"); + public static final Tag GLASS_CYAN = tag("glass/cyan"); + public static final Tag GLASS_GRAY = tag("glass/gray"); + public static final Tag GLASS_GREEN = tag("glass/green"); + public static final Tag GLASS_LIGHT_BLUE = tag("glass/light_blue"); + public static final Tag GLASS_LIGHT_GRAY = tag("glass/light_gray"); + public static final Tag GLASS_LIME = tag("glass/lime"); + public static final Tag GLASS_MAGENTA = tag("glass/magenta"); + public static final Tag GLASS_ORANGE = tag("glass/orange"); + public static final Tag GLASS_PINK = tag("glass/pink"); + public static final Tag GLASS_PURPLE = tag("glass/purple"); + public static final Tag GLASS_RED = tag("glass/red"); + public static final Tag GLASS_WHITE = tag("glass/white"); + public static final Tag GLASS_YELLOW = tag("glass/yellow"); + + public static final Tag GLASS_PANES = tag("glass_panes"); + public static final Tag GLASS_PANES_BLACK = tag("glass_panes/black"); + public static final Tag GLASS_PANES_BLUE = tag("glass_panes/blue"); + public static final Tag GLASS_PANES_BROWN = tag("glass_panes/brown"); + public static final Tag GLASS_PANES_COLORLESS = tag("glass_panes/colorless"); + public static final Tag GLASS_PANES_CYAN = tag("glass_panes/cyan"); + public static final Tag GLASS_PANES_GRAY = tag("glass_panes/gray"); + public static final Tag GLASS_PANES_GREEN = tag("glass_panes/green"); + public static final Tag GLASS_PANES_LIGHT_BLUE = tag("glass_panes/light_blue"); + public static final Tag GLASS_PANES_LIGHT_GRAY = tag("glass_panes/light_gray"); + public static final Tag GLASS_PANES_LIME = tag("glass_panes/lime"); + public static final Tag GLASS_PANES_MAGENTA = tag("glass_panes/magenta"); + public static final Tag GLASS_PANES_ORANGE = tag("glass_panes/orange"); + public static final Tag GLASS_PANES_PINK = tag("glass_panes/pink"); + public static final Tag GLASS_PANES_PURPLE = tag("glass_panes/purple"); + public static final Tag GLASS_PANES_RED = tag("glass_panes/red"); + public static final Tag GLASS_PANES_WHITE = tag("glass_panes/white"); + public static final Tag GLASS_PANES_YELLOW = tag("glass_panes/yellow"); + + public static final Tag GRAVEL = tag("gravel"); + public static final Tag NETHERRACK = tag("netherrack"); + public static final Tag OBSIDIAN = tag("obsidian"); public static final Tag ORES = tag("ores"); public static final Tag ORES_COAL = tag("ores/coal"); public static final Tag ORES_DIAMOND = tag("ores/diamond"); @@ -50,6 +93,14 @@ public class Tags public static final Tag ORES_LAPIS = tag("ores/lapis"); public static final Tag ORES_QUARTZ = tag("ores/quartz"); public static final Tag ORES_REDSTONE = tag("ores/redstone"); + + public static final Tag SAND = tag("sand"); + public static final Tag SAND_COLORLESS = tag("sand/colorless"); + public static final Tag SAND_RED = tag("sand/red"); + + public static final Tag SANDSTONE = tag("sandstone"); + public static final Tag STAINED_GLASS = tag("stained_glass"); + public static final Tag STAINED_GLASS_PANES = tag("stained_glass_panes"); public static final Tag STONE = tag("stone"); public static final Tag STORAGE_BLOCKS = tag("storage_blocks"); public static final Tag STORAGE_BLOCKS_COAL = tag("storage_blocks/coal"); @@ -69,15 +120,25 @@ public class Tags public static class Items { + public static final Tag ARROWS = tag("arrows"); + public static final Tag BONES = tag("bones"); + public static final Tag BOOKSHELVES = tag("bookshelves"); public static final Tag CHESTS = tag("chests"); public static final Tag CHESTS_ENDER = tag("chests/ender"); public static final Tag CHESTS_TRAPPED = tag("chests/trapped"); public static final Tag CHESTS_WOODEN = tag("chests/wooden"); public static final Tag COBBLESTONE = tag("cobblestone"); + public static final Tag CROPS = tag("crops"); + public static final Tag CROPS_BEETROOT = tag("crops/beetroot"); + public static final Tag CROPS_CARROT = tag("crops/carrot"); + public static final Tag CROPS_NETHER_WART = tag("crops/nether_wart"); + public static final Tag CROPS_POTATOE = tag("crops/potatoe"); + public static final Tag CROPS_WHEAT = tag("crops/wheat"); public static final Tag DUSTS = tag("dusts"); public static final Tag DUSTS_PRISMARINE = tag("dusts/prismarine"); public static final Tag DUSTS_REDSTONE = tag("dusts/redstone"); public static final Tag DUSTS_GLOWSTONE = tag("dusts/glowstone"); + public static final Tag DYES = tag("dyes"); public static final Tag DYES_BLACK = tag("dyes/black"); public static final Tag DYES_RED = tag("dyes/red"); @@ -95,6 +156,11 @@ public class Tags public static final Tag DYES_MAGENTA = tag("dyes/magenta"); public static final Tag DYES_ORANGE = tag("dyes/orange"); public static final Tag DYES_WHITE = tag("dyes/white"); + + public static final Tag EGGS = tag("eggs"); + public static final Tag END_STONES = tag("end_stones"); + public static final Tag ENDER_PEARLS = tag("ender_pearls"); + public static final Tag FEATHERS = tag("feathers"); public static final Tag FENCE_GATES = tag("fence_gates"); public static final Tag FENCE_GATES_WOODEN = tag("fence_gates/wooden"); public static final Tag FENCES = tag("fences"); @@ -106,15 +172,62 @@ public class Tags public static final Tag GEMS_LAPIS = tag("gems/lapis"); public static final Tag GEMS_PRISMARINE = tag("gems/prismarine"); public static final Tag GEMS_QUARTZ = tag("gems/quartz"); + + public static final Tag GLASS = tag("glass"); + public static final Tag GLASS_BLACK = tag("glass/black"); + public static final Tag GLASS_BLUE = tag("glass/blue"); + public static final Tag GLASS_BROWN = tag("glass/brown"); + public static final Tag GLASS_COLORLESS = tag("glass/colorless"); + public static final Tag GLASS_CYAN = tag("glass/cyan"); + public static final Tag GLASS_GRAY = tag("glass/gray"); + public static final Tag GLASS_GREEN = tag("glass/green"); + public static final Tag GLASS_LIGHT_BLUE = tag("glass/light_blue"); + public static final Tag GLASS_LIGHT_GRAY = tag("glass/light_gray"); + public static final Tag GLASS_LIME = tag("glass/lime"); + public static final Tag GLASS_MAGENTA = tag("glass/magenta"); + public static final Tag GLASS_ORANGE = tag("glass/orange"); + public static final Tag GLASS_PINK = tag("glass/pink"); + public static final Tag GLASS_PURPLE = tag("glass/purple"); + public static final Tag GLASS_RED = tag("glass/red"); + public static final Tag GLASS_WHITE = tag("glass/white"); + public static final Tag GLASS_YELLOW = tag("glass/yellow"); + + public static final Tag GLASS_PANES = tag("glass_panes"); + public static final Tag GLASS_PANES_BLACK = tag("glass_panes/black"); + public static final Tag GLASS_PANES_BLUE = tag("glass_panes/blue"); + public static final Tag GLASS_PANES_BROWN = tag("glass_panes/brown"); + public static final Tag GLASS_PANES_COLORLESS = tag("glass_panes/colorless"); + public static final Tag GLASS_PANES_CYAN = tag("glass_panes/cyan"); + public static final Tag GLASS_PANES_GRAY = tag("glass_panes/gray"); + public static final Tag GLASS_PANES_GREEN = tag("glass_panes/green"); + public static final Tag GLASS_PANES_LIGHT_BLUE = tag("glass_panes/light_blue"); + public static final Tag GLASS_PANES_LIGHT_GRAY = tag("glass_panes/light_gray"); + public static final Tag GLASS_PANES_LIME = tag("glass_panes/lime"); + public static final Tag GLASS_PANES_MAGENTA = tag("glass_panes/magenta"); + public static final Tag GLASS_PANES_ORANGE = tag("glass_panes/orange"); + public static final Tag GLASS_PANES_PINK = tag("glass_panes/pink"); + public static final Tag GLASS_PANES_PURPLE = tag("glass_panes/purple"); + public static final Tag GLASS_PANES_RED = tag("glass_panes/red"); + public static final Tag GLASS_PANES_WHITE = tag("glass_panes/white"); + public static final Tag GLASS_PANES_YELLOW = tag("glass_panes/yellow"); + + public static final Tag GRAVEL = tag("gravel"); + public static final Tag GUNPOWDER = tag("gunpowder"); + public static final Tag HEADS = tag("heads"); public static final Tag INGOTS = tag("ingots"); public static final Tag INGOTS_BRICK = tag("ingots/brick"); public static final Tag INGOTS_GOLD = tag("ingots/gold"); public static final Tag INGOTS_IRON = tag("ingots/iron"); public static final Tag INGOTS_NETHER_BRICK = tag("ingots/nether_brick"); + public static final Tag LEATHER = tag("leather"); + public static final Tag MUSHROOMS = tag("mushrooms"); public static final Tag MUSIC_DISCS = tag("music_discs"); + public static final Tag NETHER_STARS = tag("nether_stars"); + public static final Tag NETHERRACK = tag("netherrack"); public static final Tag NUGGETS = tag("nuggets"); public static final Tag NUGGETS_GOLD = tag("nuggets/gold"); public static final Tag NUGGETS_IRON = tag("nuggets/iron"); + public static final Tag OBSIDIAN = tag("obsidian"); public static final Tag ORES = tag("ores"); public static final Tag ORES_COAL = tag("ores/coal"); public static final Tag ORES_DIAMOND = tag("ores/diamond"); @@ -127,6 +240,20 @@ public class Tags public static final Tag RODS = tag("rods"); public static final Tag RODS_BLAZE = tag("rods/blaze"); public static final Tag RODS_WOODEN = tag("rods/wooden"); + + public static final Tag SAND = tag("sand"); + public static final Tag SAND_COLORLESS = tag("sand/colorless"); + public static final Tag SAND_RED = tag("sand/red"); + + public static final Tag SANDSTONE = tag("sandstone"); + public static final Tag SEEDS = tag("seeds"); + public static final Tag SEEDS_BEETROOT = tag("seeds/beetroot"); + public static final Tag SEEDS_MELON = tag("seeds/melon"); + public static final Tag SEEDS_PUMPKIN = tag("seeds/pumpkin"); + public static final Tag SEEDS_WHEAT = tag("seeds/wheat"); + public static final Tag SLIMEBALLS = tag("slimeballs"); + public static final Tag STAINED_GLASS = tag("stained_glass"); + public static final Tag STAINED_GLASS_PANES = tag("stained_glass_panes"); public static final Tag STONE = tag("stone"); public static final Tag STORAGE_BLOCKS = tag("storage_blocks"); public static final Tag STORAGE_BLOCKS_COAL = tag("storage_blocks/coal"); @@ -137,6 +264,7 @@ public class Tags public static final Tag STORAGE_BLOCKS_LAPIS = tag("storage_blocks/lapis"); public static final Tag STORAGE_BLOCKS_QUARTZ = tag("storage_blocks/quartz"); public static final Tag STORAGE_BLOCKS_REDSTONE = tag("storage_blocks/redstone"); + public static final Tag STRING = tag("string"); private static Tag tag(String name) { diff --git a/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java index c193f2821a..254289f18b 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java @@ -20,14 +20,21 @@ package net.minecraftforge.common.data; import net.minecraft.data.DataGenerator; +import net.minecraft.item.DyeColor; +import net.minecraft.tags.Tag; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.Tags; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.data.BlockTagsProvider; import static net.minecraftforge.common.Tags.Blocks.*; import java.nio.file.Path; +import java.util.Locale; import java.util.Set; +import java.util.function.Consumer; import java.util.stream.Collectors; public class ForgeBlockTagsProvider extends BlockTagsProvider @@ -51,11 +58,21 @@ public class ForgeBlockTagsProvider extends BlockTagsProvider getBuilder(CHESTS_WOODEN).add(Blocks.CHEST, Blocks.TRAPPED_CHEST); getBuilder(COBBLESTONE).add(Blocks.COBBLESTONE, Blocks.INFESTED_COBBLESTONE, Blocks.MOSSY_COBBLESTONE); getBuilder(DIRT).add(Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.PODZOL); + getBuilder(END_STONES).add(Blocks.END_STONE); getBuilder(FENCE_GATES).add(FENCE_GATES_WOODEN); getBuilder(FENCE_GATES_WOODEN).add(Blocks.OAK_FENCE_GATE, Blocks.SPRUCE_FENCE_GATE, Blocks.BIRCH_FENCE_GATE, Blocks.JUNGLE_FENCE_GATE, Blocks.ACACIA_FENCE_GATE, Blocks.DARK_OAK_FENCE_GATE); getBuilder(FENCES).add(FENCES_NETHER_BRICK, FENCES_WOODEN); getBuilder(FENCES_NETHER_BRICK).add(Blocks.NETHER_BRICK_FENCE); getBuilder(FENCES_WOODEN).add(Blocks.OAK_FENCE, Blocks.SPRUCE_FENCE, Blocks.BIRCH_FENCE, Blocks.JUNGLE_FENCE, Blocks.ACACIA_FENCE, Blocks.DARK_OAK_FENCE); + getBuilder(GLASS).add(GLASS_COLORLESS, STAINED_GLASS); + getBuilder(GLASS_COLORLESS).add(Blocks.GLASS); + addColored(getBuilder(STAINED_GLASS)::add, GLASS, "{color}_stained_glass"); + getBuilder(GLASS_PANES).add(GLASS_PANES_COLORLESS, STAINED_GLASS_PANES); + getBuilder(GLASS_PANES_COLORLESS).add(Blocks.GLASS_PANE); + addColored(getBuilder(STAINED_GLASS_PANES)::add, GLASS_PANES, "{color}_stained_glass_pane"); + getBuilder(GRAVEL).add(Blocks.GRAVEL); + getBuilder(NETHERRACK).add(Blocks.NETHERRACK); + getBuilder(OBSIDIAN).add(Blocks.OBSIDIAN); getBuilder(ORES).add(ORES_COAL, ORES_DIAMOND, ORES_EMERALD, ORES_GOLD, ORES_IRON, ORES_LAPIS, ORES_REDSTONE, ORES_QUARTZ); getBuilder(ORES_COAL).add(Blocks.COAL_ORE); getBuilder(ORES_DIAMOND).add(Blocks.DIAMOND_ORE); @@ -65,6 +82,10 @@ public class ForgeBlockTagsProvider extends BlockTagsProvider getBuilder(ORES_LAPIS).add(Blocks.LAPIS_ORE); getBuilder(ORES_QUARTZ).add(Blocks.NETHER_QUARTZ_ORE); getBuilder(ORES_REDSTONE).add(Blocks.REDSTONE_ORE); + getBuilder(SAND).add(SAND_COLORLESS, SAND_RED); + getBuilder(SAND_COLORLESS).add(Blocks.SAND); + getBuilder(SAND_RED).add(Blocks.RED_SAND); + getBuilder(SANDSTONE).add(Blocks.SANDSTONE, Blocks.CUT_SANDSTONE, Blocks.CHISELED_SANDSTONE, Blocks.SMOOTH_SANDSTONE, Blocks.RED_SANDSTONE, Blocks.CUT_RED_SANDSTONE, Blocks.CHISELED_RED_SANDSTONE, Blocks.SMOOTH_RED_SANDSTONE); getBuilder(STONE).add(Blocks.ANDESITE, Blocks.DIORITE, Blocks.GRANITE, Blocks.INFESTED_STONE, Blocks.STONE, Blocks.POLISHED_ANDESITE, Blocks.POLISHED_DIORITE, Blocks.POLISHED_GRANITE); getBuilder(STORAGE_BLOCKS).add(STORAGE_BLOCKS_COAL, STORAGE_BLOCKS_DIAMOND, STORAGE_BLOCKS_EMERALD, STORAGE_BLOCKS_GOLD, STORAGE_BLOCKS_IRON, STORAGE_BLOCKS_LAPIS, STORAGE_BLOCKS_QUARTZ, STORAGE_BLOCKS_REDSTONE); getBuilder(STORAGE_BLOCKS_COAL).add(Blocks.COAL_BLOCK); @@ -77,6 +98,35 @@ public class ForgeBlockTagsProvider extends BlockTagsProvider getBuilder(STORAGE_BLOCKS_REDSTONE).add(Blocks.REDSTONE_BLOCK); } + private void addColored(Consumer consumer, Tag group, String pattern) + { + String prefix = group.getId().getPath().toUpperCase(Locale.ENGLISH) + '_'; + for (DyeColor color : DyeColor.values()) + { + ResourceLocation key = new ResourceLocation("minecraft", pattern.replace("{color}", color.getTranslationKey())); + Tag tag = getForgeTag(prefix + color.getTranslationKey()); + Block block = ForgeRegistries.BLOCKS.getValue(key); + if (block == null || block == Blocks.AIR) + throw new IllegalStateException("Unknown vanilla block: " + key.toString()); + getBuilder(tag).add(block); + consumer.accept(block); + } + } + + @SuppressWarnings("unchecked") + private Tag getForgeTag(String name) + { + try + { + name = name.toUpperCase(Locale.ENGLISH); + return (Tag)Tags.Blocks.class.getDeclaredField(name).get(null); + } + catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) + { + throw new IllegalStateException(Tags.Blocks.class.getName() + " is missing tag name: " + name); + } + } + @Override protected Path makePath(ResourceLocation id) { diff --git a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java index 7d9435b256..067e694875 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java @@ -20,14 +20,21 @@ package net.minecraftforge.common.data; import java.nio.file.Path; +import java.util.Locale; import java.util.Set; +import java.util.function.Consumer; import java.util.stream.Collectors; +import net.minecraft.block.Block; import net.minecraft.data.DataGenerator; import net.minecraft.data.ItemTagsProvider; +import net.minecraft.item.DyeColor; +import net.minecraft.item.Item; import net.minecraft.item.Items; +import net.minecraft.tags.Tag; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.Tags; +import net.minecraftforge.registries.ForgeRegistries; public class ForgeItemTagsProvider extends ItemTagsProvider { @@ -44,32 +51,29 @@ public class ForgeItemTagsProvider extends ItemTagsProvider super.registerTags(); filter = this.tagToBuilder.entrySet().stream().map(e -> e.getKey().getId()).collect(Collectors.toSet()); + getBuilder(Tags.Items.ARROWS).add(Items.ARROW, Items.TIPPED_ARROW, Items.SPECTRAL_ARROW); + getBuilder(Tags.Items.BONES).add(Items.BONE); + getBuilder(Tags.Items.BOOKSHELVES).add(Items.BOOKSHELF); copy(Tags.Blocks.CHESTS, Tags.Items.CHESTS); copy(Tags.Blocks.CHESTS_ENDER, Tags.Items.CHESTS_ENDER); copy(Tags.Blocks.CHESTS_TRAPPED, Tags.Items.CHESTS_TRAPPED); copy(Tags.Blocks.CHESTS_WOODEN, Tags.Items.CHESTS_WOODEN); copy(Tags.Blocks.COBBLESTONE, Tags.Items.COBBLESTONE); + getBuilder(Tags.Items.CROPS).add(Tags.Items.CROPS_BEETROOT, Tags.Items.CROPS_CARROT, Tags.Items.CROPS_NETHER_WART, Tags.Items.CROPS_POTATOE, Tags.Items.CROPS_WHEAT); + getBuilder(Tags.Items.CROPS_BEETROOT).add(Items.BEETROOT); + getBuilder(Tags.Items.CROPS_CARROT).add(Items.CARROT); + getBuilder(Tags.Items.CROPS_NETHER_WART).add(Items.NETHER_WART); + getBuilder(Tags.Items.CROPS_POTATOE).add(Items.POTATO); + getBuilder(Tags.Items.CROPS_WHEAT).add(Items.WHEAT); getBuilder(Tags.Items.DUSTS).add(Tags.Items.DUSTS_GLOWSTONE, Tags.Items.DUSTS_PRISMARINE, Tags.Items.DUSTS_REDSTONE); getBuilder(Tags.Items.DUSTS_GLOWSTONE).add(Items.GLOWSTONE_DUST); getBuilder(Tags.Items.DUSTS_PRISMARINE).add(Items.PRISMARINE_SHARD); getBuilder(Tags.Items.DUSTS_REDSTONE).add(Items.REDSTONE); - getBuilder(Tags.Items.DYES).add(Tags.Items.DYES_BLACK, Tags.Items.DYES_RED, Tags.Items.DYES_GREEN, Tags.Items.DYES_BROWN, Tags.Items.DYES_BLUE, Tags.Items.DYES_PURPLE, Tags.Items.DYES_CYAN, Tags.Items.DYES_LIGHT_GRAY, Tags.Items.DYES_GRAY, Tags.Items.DYES_PINK, Tags.Items.DYES_LIME, Tags.Items.DYES_YELLOW, Tags.Items.DYES_LIGHT_BLUE, Tags.Items.DYES_MAGENTA, Tags.Items.DYES_ORANGE, Tags.Items.DYES_WHITE); - getBuilder(Tags.Items.DYES_BLACK).add(Items.BLACK_DYE); - getBuilder(Tags.Items.DYES_BLUE).add(Items.BLUE_DYE); - getBuilder(Tags.Items.DYES_BROWN).add(Items.BROWN_DYE); - getBuilder(Tags.Items.DYES_CYAN).add(Items.CYAN_DYE); - getBuilder(Tags.Items.DYES_GRAY).add(Items.GRAY_DYE); - getBuilder(Tags.Items.DYES_GREEN).add(Items.GREEN_DYE); - getBuilder(Tags.Items.DYES_LIGHT_BLUE).add(Items.LIGHT_BLUE_DYE); - getBuilder(Tags.Items.DYES_LIGHT_GRAY).add(Items.LIGHT_GRAY_DYE); - getBuilder(Tags.Items.DYES_LIME).add(Items.LIME_DYE); - getBuilder(Tags.Items.DYES_MAGENTA).add(Items.MAGENTA_DYE); - getBuilder(Tags.Items.DYES_ORANGE).add(Items.ORANGE_DYE); - getBuilder(Tags.Items.DYES_PINK).add(Items.PINK_DYE); - getBuilder(Tags.Items.DYES_PURPLE).add(Items.PURPLE_DYE); - getBuilder(Tags.Items.DYES_RED).add(Items.RED_DYE); - getBuilder(Tags.Items.DYES_WHITE).add(Items.WHITE_DYE); - getBuilder(Tags.Items.DYES_YELLOW).add(Items.YELLOW_DYE); + addColored(getBuilder(Tags.Items.DYES)::add, Tags.Items.DYES, "{color}_dye"); + getBuilder(Tags.Items.EGGS).add(Items.EGG); + copy(Tags.Blocks.END_STONES, Tags.Items.END_STONES); + getBuilder(Tags.Items.ENDER_PEARLS).add(Items.ENDER_PEARL); + getBuilder(Tags.Items.FEATHERS).add(Items.FEATHER); copy(Tags.Blocks.FENCE_GATES, Tags.Items.FENCE_GATES); copy(Tags.Blocks.FENCE_GATES_WOODEN, Tags.Items.FENCE_GATES_WOODEN); copy(Tags.Blocks.FENCES, Tags.Items.FENCES); @@ -81,15 +85,27 @@ public class ForgeItemTagsProvider extends ItemTagsProvider getBuilder(Tags.Items.GEMS_LAPIS).add(Items.LAPIS_LAZULI); getBuilder(Tags.Items.GEMS_PRISMARINE).add(Items.PRISMARINE_CRYSTALS); getBuilder(Tags.Items.GEMS_QUARTZ).add(Items.QUARTZ); + copy(Tags.Blocks.GLASS, Tags.Items.GLASS); + copyColored(Tags.Blocks.GLASS, Tags.Items.GLASS); + copy(Tags.Blocks.GLASS_PANES, Tags.Items.GLASS_PANES); + copyColored(Tags.Blocks.GLASS_PANES, Tags.Items.GLASS_PANES); + copy(Tags.Blocks.GRAVEL, Tags.Items.GRAVEL); + getBuilder(Tags.Items.GUNPOWDER).add(Items.GUNPOWDER); + getBuilder(Tags.Items.HEADS).add(Items.CREEPER_HEAD, Items.DRAGON_HEAD, Items.PLAYER_HEAD, Items.SKELETON_SKULL, Items.WITHER_SKELETON_SKULL, Items.ZOMBIE_HEAD); getBuilder(Tags.Items.INGOTS).add(Tags.Items.INGOTS_IRON, Tags.Items.INGOTS_GOLD, Tags.Items.INGOTS_BRICK, Tags.Items.INGOTS_NETHER_BRICK); getBuilder(Tags.Items.INGOTS_BRICK).add(Items.BRICK); getBuilder(Tags.Items.INGOTS_GOLD).add(Items.GOLD_INGOT); getBuilder(Tags.Items.INGOTS_IRON).add(Items.IRON_INGOT); getBuilder(Tags.Items.INGOTS_NETHER_BRICK).add(Items.NETHER_BRICK); + getBuilder(Tags.Items.LEATHER).add(Items.LEATHER); + getBuilder(Tags.Items.MUSHROOMS).add(Items.BROWN_MUSHROOM, Items.RED_MUSHROOM); getBuilder(Tags.Items.MUSIC_DISCS).add(Items.MUSIC_DISC_13, Items.MUSIC_DISC_CAT, Items.MUSIC_DISC_BLOCKS, Items.MUSIC_DISC_CHIRP, Items.MUSIC_DISC_FAR, Items.MUSIC_DISC_MALL, Items.MUSIC_DISC_MELLOHI, Items.MUSIC_DISC_STAL, Items.MUSIC_DISC_STRAD, Items.MUSIC_DISC_WARD, Items.MUSIC_DISC_11, Items.MUSIC_DISC_WAIT); + getBuilder(Tags.Items.NETHER_STARS).add(Items.NETHER_STAR); + copy(Tags.Blocks.NETHERRACK, Tags.Items.NETHERRACK); getBuilder(Tags.Items.NUGGETS).add(Tags.Items.NUGGETS_IRON, Tags.Items.NUGGETS_GOLD); getBuilder(Tags.Items.NUGGETS_IRON).add(Items.IRON_NUGGET); getBuilder(Tags.Items.NUGGETS_GOLD).add(Items.GOLD_NUGGET); + copy(Tags.Blocks.OBSIDIAN, Tags.Items.OBSIDIAN); copy(Tags.Blocks.ORES, Tags.Items.ORES); copy(Tags.Blocks.ORES_COAL, Tags.Items.ORES_COAL); copy(Tags.Blocks.ORES_DIAMOND, Tags.Items.ORES_DIAMOND); @@ -102,6 +118,18 @@ public class ForgeItemTagsProvider extends ItemTagsProvider getBuilder(Tags.Items.RODS).add(Tags.Items.RODS_BLAZE, Tags.Items.RODS_WOODEN); getBuilder(Tags.Items.RODS_BLAZE).add(Items.BLAZE_ROD); getBuilder(Tags.Items.RODS_WOODEN).add(Items.STICK); + copy(Tags.Blocks.SAND, Tags.Items.SAND); + copy(Tags.Blocks.SAND_COLORLESS, Tags.Items.SAND_COLORLESS); + copy(Tags.Blocks.SAND_RED, Tags.Items.SAND_RED); + copy(Tags.Blocks.SANDSTONE, Tags.Items.SANDSTONE); + getBuilder(Tags.Items.SEEDS).add(Tags.Items.SEEDS_BEETROOT, Tags.Items.SEEDS_MELON, Tags.Items.SEEDS_PUMPKIN, Tags.Items.SEEDS_WHEAT); + getBuilder(Tags.Items.SEEDS_BEETROOT).add(Items.BEETROOT_SEEDS); + getBuilder(Tags.Items.SEEDS_MELON).add(Items.MELON_SEEDS); + getBuilder(Tags.Items.SEEDS_PUMPKIN).add(Items.PUMPKIN_SEEDS); + getBuilder(Tags.Items.SEEDS_WHEAT).add(Items.WHEAT_SEEDS); + getBuilder(Tags.Items.SLIMEBALLS).add(Items.SLIME_BALL); + copy(Tags.Blocks.STAINED_GLASS, Tags.Items.STAINED_GLASS); + copy(Tags.Blocks.STAINED_GLASS_PANES, Tags.Items.STAINED_GLASS_PANES); copy(Tags.Blocks.STONE, Tags.Items.STONE); copy(Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS); copy(Tags.Blocks.STORAGE_BLOCKS_COAL, Tags.Items.STORAGE_BLOCKS_COAL); @@ -112,6 +140,63 @@ public class ForgeItemTagsProvider extends ItemTagsProvider copy(Tags.Blocks.STORAGE_BLOCKS_LAPIS, Tags.Items.STORAGE_BLOCKS_LAPIS); copy(Tags.Blocks.STORAGE_BLOCKS_QUARTZ, Tags.Items.STORAGE_BLOCKS_QUARTZ); copy(Tags.Blocks.STORAGE_BLOCKS_REDSTONE, Tags.Items.STORAGE_BLOCKS_REDSTONE); + getBuilder(Tags.Items.STRING).add(Items.STRING); + } + + private void addColored(Consumer consumer, Tag group, String pattern) + { + String prefix = group.getId().getPath().toUpperCase(Locale.ENGLISH) + '_'; + for (DyeColor color : DyeColor.values()) + { + ResourceLocation key = new ResourceLocation("minecraft", pattern.replace("{color}", color.getTranslationKey())); + Tag tag = getForgeItemTag(prefix + color.getTranslationKey()); + Item item = ForgeRegistries.ITEMS.getValue(key); + if (item == null || item == Items.AIR) + throw new IllegalStateException("Unknown vanilla item: " + key.toString()); + getBuilder(tag).add(item); + consumer.accept(item); + } + } + + private void copyColored(Tag blockGroup, Tag itemGroup) + { + String blockPre = blockGroup.getId().getPath().toUpperCase(Locale.ENGLISH) + '_'; + String itemPre = itemGroup.getId().getPath().toUpperCase(Locale.ENGLISH) + '_'; + for (DyeColor color : DyeColor.values()) + { + Tag from = getForgeBlockTag(blockPre + color.getTranslationKey()); + Tag to = getForgeItemTag(itemPre + color.getTranslationKey()); + copy(from, to); + } + copy(getForgeBlockTag(blockPre + "colorless"), getForgeItemTag(itemPre + "colorless")); + } + + @SuppressWarnings("unchecked") + private Tag getForgeBlockTag(String name) + { + try + { + name = name.toUpperCase(Locale.ENGLISH); + return (Tag)Tags.Blocks.class.getDeclaredField(name).get(null); + } + catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) + { + throw new IllegalStateException(Tags.Blocks.class.getName() + " is missing tag name: " + name); + } + } + + @SuppressWarnings("unchecked") + private Tag getForgeItemTag(String name) + { + try + { + name = name.toUpperCase(Locale.ENGLISH); + return (Tag)Tags.Items.class.getDeclaredField(name).get(null); + } + catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) + { + throw new IllegalStateException(Tags.Items.class.getName() + " is missing tag name: " + name); + } } @Override diff --git a/src/test/java/net/minecraftforge/debug/entity/GravityAttributeTest.java b/src/test/java/net/minecraftforge/debug/entity/GravityAttributeTest.java index 2779558715..a1d9431706 100644 --- a/src/test/java/net/minecraftforge/debug/entity/GravityAttributeTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/GravityAttributeTest.java @@ -22,7 +22,6 @@ package net.minecraftforge.debug.entity; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -41,96 +40,104 @@ import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.Rarity; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.world.ServerWorld; import net.minecraft.world.World; import net.minecraft.world.biome.Biome.Category; -import net.minecraft.world.chunk.ServerChunkProvider; +import net.minecraft.world.server.ServerWorld; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; @Mod("gravity_attribute_test") public class GravityAttributeTest { public static final boolean ENABLE = true; - private static Logger logger; + private static Logger logger = LogManager.getLogger(); private int ticks; private static final UUID REDUCED_GRAVITY_ID = UUID.fromString("DEB06000-7979-4242-8888-00000DEB0600"); private static final AttributeModifier REDUCED_GRAVITY = (new AttributeModifier(REDUCED_GRAVITY_ID, "Reduced gravity", (double)-0.80, Operation.MULTIPLY_TOTAL)).setSaved(false); - + public GravityAttributeTest() { - if (ENABLE) { - logger = LogManager.getLogger(); + if (ENABLE) + { MinecraftForge.EVENT_BUS.register(this); FMLJavaModLoadingContext.get().getModEventBus().register(this); } } @SubscribeEvent - public void worldTick(TickEvent.WorldTickEvent event) { - if (ENABLE && !event.world.isRemote) { - if (ticks++ > 60) { + public void worldTick(TickEvent.WorldTickEvent event) + { + if (ENABLE && !event.world.isRemote) + { + if (ticks++ > 60) + { ticks = 0; World w = event.world; List list; - if(w.isRemote) { - ClientWorld cw = (ClientWorld) w; + if(w.isRemote) + { + ClientWorld cw = (ClientWorld)w; list = new ArrayList<>(100); - for(Entity e : cw.func_217416_b()) { - if(e.isAlive()) - { - if(e instanceof LivingEntity) { - list.add((LivingEntity) e); - } - } + for(Entity e : cw.getAllEntities()) + { + if(e.isAlive() && e instanceof LivingEntity) + list.add((LivingEntity)e); } - } else { - ServerWorld sw = (ServerWorld) w; + } + else + { + ServerWorld sw = (ServerWorld)w; Stream s = sw.getEntities().filter(Entity::isAlive).filter(e -> e instanceof LivingEntity).map(e -> (LivingEntity)e); list = s.collect(Collectors.toList()); } - for(LivingEntity liv : list) { + + for(LivingEntity liv : list) + { IAttributeInstance grav = liv.getAttribute(LivingEntity.ENTITY_GRAVITY); boolean inPlains = liv.world.getBiome(liv.getPosition()).getCategory() == Category.PLAINS; - if (inPlains && !grav.hasModifier(REDUCED_GRAVITY)) { + if (inPlains && !grav.hasModifier(REDUCED_GRAVITY)) + { logger.info("Granted low gravity to Entity: {}", liv); grav.applyModifier(REDUCED_GRAVITY); - } else if (!inPlains && grav.hasModifier(REDUCED_GRAVITY)) { + } + else if (!inPlains && grav.hasModifier(REDUCED_GRAVITY)) + { logger.info("Removed low gravity from Entity: {}", liv); grav.removeModifier(REDUCED_GRAVITY); } } } - + } } - + @SubscribeEvent - public void registerItems(RegistryEvent.Register event) { + public void registerItems(RegistryEvent.Register event) + { event.getRegistry().register(new ItemGravityStick(new Item.Properties().group(ItemGroup.TOOLS).rarity(Rarity.RARE)).setRegistryName("gravity_attribute_test:gravity_stick")); } - - public static class ItemGravityStick extends Item + + public static class ItemGravityStick extends Item { private static final UUID GRAVITY_MODIFIER = UUID.fromString("DEB06001-7979-4242-8888-10000DEB0601"); - - public ItemGravityStick(Properties properties) { + + public ItemGravityStick(Properties properties) + { super(properties); } - + @Override - public Multimap getAttributeModifiers(EquipmentSlotType slot) { + public Multimap getAttributeModifiers(EquipmentSlotType slot) + { @SuppressWarnings("deprecation") Multimap multimap = super.getAttributeModifiers(slot); - if (slot == EquipmentSlotType.MAINHAND) { + if (slot == EquipmentSlotType.MAINHAND) multimap.put(LivingEntity.ENTITY_GRAVITY.getName(), new AttributeModifier(GRAVITY_MODIFIER, "More Gravity", 1.0D, Operation.ADDITION)); - } - + return multimap; } }