diff --git a/src/main/java/com/jenny/compressedtnt/datagen/ModBlockStateProvider.java b/src/main/java/com/jenny/compressedtnt/datagen/ModBlockStateProvider.java index 08476ac..c6337aa 100644 --- a/src/main/java/com/jenny/compressedtnt/datagen/ModBlockStateProvider.java +++ b/src/main/java/com/jenny/compressedtnt/datagen/ModBlockStateProvider.java @@ -7,6 +7,7 @@ import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.*; import net.minecraftforge.client.model.generators.BlockStateProvider; +import net.minecraftforge.client.model.generators.ConfiguredModel; import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; @@ -26,9 +27,6 @@ public class ModBlockStateProvider extends BlockStateProvider { sideTopBottom(blocks.TNT_32.get()); sideTopBottom(blocks.TNT_64.get()); sideTopBottom(blocks.TNT_128.get()); - sideTopBottom(blocks.TNT_CLUSTER_2.get()); - sideTopBottom(blocks.TNT_CLUSTER_4.get()); - sideTopBottom(blocks.TNT_CLUSTER_8.get()); } private void blockWithItem(RegistryObject blockRegistryObject) { @@ -62,6 +60,7 @@ public class ModBlockStateProvider extends BlockStateProvider { public void sideTopBottom(Block block) { ModelFile model = models().cubeBottomTop(name(block), extend(blockTexture(block), "_side"), extend(blockTexture(block), "_bottom"), extend(blockTexture(block), "_top")); + this.getVariantBuilder(block).forAllStates(blockState -> ConfiguredModel.builder().modelFile(model).build()); simpleBlockItem(block, model); } diff --git a/src/main/resources/assets/compressedtnt/blockstates/tnt_128.json b/src/main/resources/assets/compressedtnt/blockstates/tnt_128.json deleted file mode 100644 index 012b0de..0000000 --- a/src/main/resources/assets/compressedtnt/blockstates/tnt_128.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "compressedtnt:block/tnt_128" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/compressedtnt/blockstates/tnt_16.json b/src/main/resources/assets/compressedtnt/blockstates/tnt_16.json deleted file mode 100644 index a15fd88..0000000 --- a/src/main/resources/assets/compressedtnt/blockstates/tnt_16.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "compressedtnt:block/tnt_16" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/compressedtnt/blockstates/tnt_32.json b/src/main/resources/assets/compressedtnt/blockstates/tnt_32.json deleted file mode 100644 index 411ea60..0000000 --- a/src/main/resources/assets/compressedtnt/blockstates/tnt_32.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "compressedtnt:block/tnt_32" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/compressedtnt/blockstates/tnt_64.json b/src/main/resources/assets/compressedtnt/blockstates/tnt_64.json deleted file mode 100644 index ec9299f..0000000 --- a/src/main/resources/assets/compressedtnt/blockstates/tnt_64.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "compressedtnt:block/tnt_64" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/compressedtnt/blockstates/tnt_8.json b/src/main/resources/assets/compressedtnt/blockstates/tnt_8.json deleted file mode 100644 index 2654481..0000000 --- a/src/main/resources/assets/compressedtnt/blockstates/tnt_8.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "compressedtnt:block/tnt_8" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/compressedtnt/blockstates/tnt_black_hole.json b/src/main/resources/assets/compressedtnt/blockstates/tnt_black_hole.json deleted file mode 100644 index c06ad6f..0000000 --- a/src/main/resources/assets/compressedtnt/blockstates/tnt_black_hole.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "compressedtnt:block/ttn_black_hole" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/compressedtnt/blockstates/tnt_cluster_2.json b/src/main/resources/assets/compressedtnt/blockstates/tnt_cluster_2.json deleted file mode 100644 index a953723..0000000 --- a/src/main/resources/assets/compressedtnt/blockstates/tnt_cluster_2.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "compressedtnt:block/tnt_cluster_2" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/compressedtnt/blockstates/tnt_cluster_4.json b/src/main/resources/assets/compressedtnt/blockstates/tnt_cluster_4.json deleted file mode 100644 index f56c1fd..0000000 --- a/src/main/resources/assets/compressedtnt/blockstates/tnt_cluster_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "compressedtnt:block/tnt_cluster_4" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/compressedtnt/blockstates/tnt_cluster_8.json b/src/main/resources/assets/compressedtnt/blockstates/tnt_cluster_8.json deleted file mode 100644 index e6d169c..0000000 --- a/src/main/resources/assets/compressedtnt/blockstates/tnt_cluster_8.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "compressedtnt:block/tnt_cluster_8" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/compressedtnt/blockstates/tnt_homing.json b/src/main/resources/assets/compressedtnt/blockstates/tnt_homing.json deleted file mode 100644 index cb874f1..0000000 --- a/src/main/resources/assets/compressedtnt/blockstates/tnt_homing.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "compressedtnt:block/tnt_homing" - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_128.json b/src/main/resources/data/compressedtnt/loot_tables/tnt_128.json new file mode 100644 index 0000000..9a43c0b --- /dev/null +++ b/src/main/resources/data/compressedtnt/loot_tables/tnt_128.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "compressedtnt:tnt_128" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_16.json b/src/main/resources/data/compressedtnt/loot_tables/tnt_16.json new file mode 100644 index 0000000..e154dbb --- /dev/null +++ b/src/main/resources/data/compressedtnt/loot_tables/tnt_16.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "compressedtnt:tnt_16" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_32.json b/src/main/resources/data/compressedtnt/loot_tables/tnt_32.json new file mode 100644 index 0000000..f9e55f8 --- /dev/null +++ b/src/main/resources/data/compressedtnt/loot_tables/tnt_32.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "compressedtnt:tnt_32" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_64.json b/src/main/resources/data/compressedtnt/loot_tables/tnt_64.json new file mode 100644 index 0000000..ec60da5 --- /dev/null +++ b/src/main/resources/data/compressedtnt/loot_tables/tnt_64.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "compressedtnt:tnt_64" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_8.json b/src/main/resources/data/compressedtnt/loot_tables/tnt_8.json new file mode 100644 index 0000000..a285316 --- /dev/null +++ b/src/main/resources/data/compressedtnt/loot_tables/tnt_8.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "compressedtnt:tnt_8" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_black_hole.json b/src/main/resources/data/compressedtnt/loot_tables/tnt_black_hole.json new file mode 100644 index 0000000..4106567 --- /dev/null +++ b/src/main/resources/data/compressedtnt/loot_tables/tnt_black_hole.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "compressedtnt:tnt_black_hole" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_cluster_2.json b/src/main/resources/data/compressedtnt/loot_tables/tnt_cluster_2.json new file mode 100644 index 0000000..d403915 --- /dev/null +++ b/src/main/resources/data/compressedtnt/loot_tables/tnt_cluster_2.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "compressedtnt:tnt_cluster_2" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_cluster_4.json b/src/main/resources/data/compressedtnt/loot_tables/tnt_cluster_4.json new file mode 100644 index 0000000..4c37d9d --- /dev/null +++ b/src/main/resources/data/compressedtnt/loot_tables/tnt_cluster_4.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "compressedtnt:tnt_cluster_4" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_cluster_8.json b/src/main/resources/data/compressedtnt/loot_tables/tnt_cluster_8.json new file mode 100644 index 0000000..f4ce1c4 --- /dev/null +++ b/src/main/resources/data/compressedtnt/loot_tables/tnt_cluster_8.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "compressedtnt:tnt_cluster_8" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/compressedtnt/loot_tables/tnt_homing.json b/src/main/resources/data/compressedtnt/loot_tables/tnt_homing.json new file mode 100644 index 0000000..4031710 --- /dev/null +++ b/src/main/resources/data/compressedtnt/loot_tables/tnt_homing.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "compressedtnt:tnt_homing" + } + ] + } + ] +} \ No newline at end of file