diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d new file mode 100644 index 000000000..fc48a76ee --- /dev/null +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -0,0 +1,10 @@ +// 1.20.1 2024-09-09T21:45:30.1964838 Loot Tables +98386b2e65b2afb7cf5b0cabf6a7b0f062c1e640 data/superbwarfare/loot_tables/blocks/barbed_wire.json +dabbe17417c944567dc6dfcdcba32b8377c24f69 data/superbwarfare/loot_tables/blocks/deepslate_galena_ore.json +a7c1af3e194d35a64544902468bd964f45f2f9ef data/superbwarfare/loot_tables/blocks/deepslate_scheelite_ore.json +e80a153391c34dbca9130a140e6401242e3add4c data/superbwarfare/loot_tables/blocks/dragon_teeth.json +cdd4acb439988069ca04920cb3905f01b7257362 data/superbwarfare/loot_tables/blocks/galena_ore.json +188ee13e38134e87d07ded14b35c60b488db9ef8 data/superbwarfare/loot_tables/blocks/jump_pad.json +8216c47bb150112820b066eb1edbec51c7e61251 data/superbwarfare/loot_tables/blocks/reforging_table.json +8ae2495a0843798bc13e0d3ca4c010f88a44c7a6 data/superbwarfare/loot_tables/blocks/sandbag.json +bce3fc7a50ba51c24ad3a37d2534a7db9cf0db73 data/superbwarfare/loot_tables/blocks/scheelite_ore.json diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index c232494f3..ecb964ddc 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,8 +1,9 @@ -// 1.20.1 2024-09-09T20:45:09.8782505 Item Models: superbwarfare +// 1.20.1 2024-09-09T22:03:46.3738464 Item Models: superbwarfare 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_47_blueprint.json c993bddc0db9453ffbefa59f9ac9a74dba909038 assets/superbwarfare/models/item/ancient_cpu.json 4b8fe8fbe5e64c3449ad539317254e4ed7188411 assets/superbwarfare/models/item/ap_head.json +984c08ca6f6893a15721a85e30118f9e32c65c7f assets/superbwarfare/models/item/barbed_wire.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/bocek_blueprint.json 1e5b4637c3787516305dd3d1598f401a5e78a954 assets/superbwarfare/models/item/cemented_carbide_action.json b793716e367623d60461fc760de4f012c28fdc53 assets/superbwarfare/models/item/cemented_carbide_barrel.json @@ -33,6 +34,7 @@ e04bbd61e716fc5d53c9425aba508fc3287bfd57 assets/superbwarfare/models/item/iron_p 00e7fd942d22c0fbf1f5b70cd5f4d86cc6f5be1d assets/superbwarfare/models/item/iron_spring.json 590c0efcf223fdc2e98660ff3b293a68f87ac02e assets/superbwarfare/models/item/iron_trigger.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/javelin_blueprint.json +195c1b7cbcce9b0ac42ecbfc21a8cafff8c78372 assets/superbwarfare/models/item/jump_pad.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/k_98_blueprint.json ce9e4fd8ea92cfdbdda158776c1b6e1b482a3f2a assets/superbwarfare/models/item/lead_ingot.json f66c351b4843ad4d4e086ccfb7d4d0221227d196 assets/superbwarfare/models/item/legendary_material_pack.json @@ -63,6 +65,7 @@ f5b4fc1445373e6acfaa077e109de693c624eb1e assets/superbwarfare/models/item/nether 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/qbz_95_blueprint.json e821640d80c55763e7e7b62f7b80c60ff56dcc4f assets/superbwarfare/models/item/rare_material_pack.json ce0f0949b0545d8ef08aeaa52dd423dbe592f704 assets/superbwarfare/models/item/raw_cemented_carbide_powder.json +5b8f7d5922e49e06bcd4d4d2a2a3dc934548570b assets/superbwarfare/models/item/reforging_table.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/rpg_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/rpk_blueprint.json ce2232fbc6a9186371c6ae6745ec3be2a0a33546 assets/superbwarfare/models/item/scheelite.json diff --git a/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f b/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f new file mode 100644 index 000000000..9828fa4d9 --- /dev/null +++ b/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f @@ -0,0 +1,16 @@ +// 1.20.1 2024-09-09T22:01:45.0001015 Block States: superbwarfare +f3b778ca36ca78c3d80f1b778078897f59bdb0c5 assets/superbwarfare/blockstates/barbed_wire.json +62fb0464ca59ac21693639c406e08730427d87b3 assets/superbwarfare/blockstates/deepslate_galena_ore.json +b8b7cdea6c8626c74d652d0b300b3afe19c60674 assets/superbwarfare/blockstates/deepslate_scheelite_ore.json +d8a6ec32752f10b1f363f6c78ed2da6dc895d545 assets/superbwarfare/blockstates/galena_ore.json +37d592516f2b685940e46f7d5c524407a200eeac assets/superbwarfare/blockstates/jump_pad.json +d765539a643378e4f8ce56dc42bcff579d666e8a assets/superbwarfare/blockstates/reforging_table.json +123574c25d10de6d915514af34f0a878c93a07ea assets/superbwarfare/blockstates/scheelite_ore.json +0fe4613a4446ac485eee58bed6d0d8f5b38f6253 assets/superbwarfare/models/block/deepslate_galena_ore.json +84f584f684519f686e976b994f0a2639a98a7851 assets/superbwarfare/models/block/deepslate_scheelite_ore.json +e9bea7028029623e5dc9d8b0eead6add93c36931 assets/superbwarfare/models/block/galena_ore.json +15dcf7724846b0e19f826f6d7e9241ac81ef5969 assets/superbwarfare/models/block/scheelite_ore.json +321d7f61b596ac9a8b3633f8d1bc3351b7b12c5a assets/superbwarfare/models/item/deepslate_galena_ore.json +c83798987b4d4eeadd96357cd12fdfd5d44b2952 assets/superbwarfare/models/item/deepslate_scheelite_ore.json +dab3d5800ad52100d0af25033d0aed1b5214db46 assets/superbwarfare/models/item/galena_ore.json +fe6f5b256dc4f8a16fbc5b42028a5d73300c3cd5 assets/superbwarfare/models/item/scheelite_ore.json diff --git a/src/generated/resources/assets/superbwarfare/blockstates/barbed_wire.json b/src/generated/resources/assets/superbwarfare/blockstates/barbed_wire.json new file mode 100644 index 000000000..67654d964 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/blockstates/barbed_wire.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=east,waterlogged=false": { + "model": "superbwarfare:block/barbed_wire", + "y": 90 + }, + "facing=east,waterlogged=true": { + "model": "superbwarfare:block/barbed_wire", + "y": 90 + }, + "facing=north,waterlogged=false": { + "model": "superbwarfare:block/barbed_wire" + }, + "facing=north,waterlogged=true": { + "model": "superbwarfare:block/barbed_wire" + }, + "facing=south,waterlogged=false": { + "model": "superbwarfare:block/barbed_wire", + "y": 180 + }, + "facing=south,waterlogged=true": { + "model": "superbwarfare:block/barbed_wire", + "y": 180 + }, + "facing=west,waterlogged=false": { + "model": "superbwarfare:block/barbed_wire", + "y": 270 + }, + "facing=west,waterlogged=true": { + "model": "superbwarfare:block/barbed_wire", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/blockstates/deepslate_galena_ore.json b/src/generated/resources/assets/superbwarfare/blockstates/deepslate_galena_ore.json similarity index 100% rename from src/main/resources/assets/superbwarfare/blockstates/deepslate_galena_ore.json rename to src/generated/resources/assets/superbwarfare/blockstates/deepslate_galena_ore.json diff --git a/src/main/resources/assets/superbwarfare/blockstates/deepslate_scheelite_ore.json b/src/generated/resources/assets/superbwarfare/blockstates/deepslate_scheelite_ore.json similarity index 100% rename from src/main/resources/assets/superbwarfare/blockstates/deepslate_scheelite_ore.json rename to src/generated/resources/assets/superbwarfare/blockstates/deepslate_scheelite_ore.json diff --git a/src/main/resources/assets/superbwarfare/blockstates/galena_ore.json b/src/generated/resources/assets/superbwarfare/blockstates/galena_ore.json similarity index 100% rename from src/main/resources/assets/superbwarfare/blockstates/galena_ore.json rename to src/generated/resources/assets/superbwarfare/blockstates/galena_ore.json diff --git a/src/generated/resources/assets/superbwarfare/blockstates/jump_pad.json b/src/generated/resources/assets/superbwarfare/blockstates/jump_pad.json new file mode 100644 index 000000000..58d23acfa --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/blockstates/jump_pad.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=east,waterlogged=false": { + "model": "superbwarfare:block/jump_pad", + "y": 90 + }, + "facing=east,waterlogged=true": { + "model": "superbwarfare:block/jump_pad", + "y": 90 + }, + "facing=north,waterlogged=false": { + "model": "superbwarfare:block/jump_pad" + }, + "facing=north,waterlogged=true": { + "model": "superbwarfare:block/jump_pad" + }, + "facing=south,waterlogged=false": { + "model": "superbwarfare:block/jump_pad", + "y": 180 + }, + "facing=south,waterlogged=true": { + "model": "superbwarfare:block/jump_pad", + "y": 180 + }, + "facing=west,waterlogged=false": { + "model": "superbwarfare:block/jump_pad", + "y": 270 + }, + "facing=west,waterlogged=true": { + "model": "superbwarfare:block/jump_pad", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/blockstates/reforging_table.json b/src/generated/resources/assets/superbwarfare/blockstates/reforging_table.json new file mode 100644 index 000000000..d19188c29 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/blockstates/reforging_table.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=east,waterlogged=false": { + "model": "superbwarfare:block/reforging_table", + "y": 90 + }, + "facing=east,waterlogged=true": { + "model": "superbwarfare:block/reforging_table", + "y": 90 + }, + "facing=north,waterlogged=false": { + "model": "superbwarfare:block/reforging_table" + }, + "facing=north,waterlogged=true": { + "model": "superbwarfare:block/reforging_table" + }, + "facing=south,waterlogged=false": { + "model": "superbwarfare:block/reforging_table", + "y": 180 + }, + "facing=south,waterlogged=true": { + "model": "superbwarfare:block/reforging_table", + "y": 180 + }, + "facing=west,waterlogged=false": { + "model": "superbwarfare:block/reforging_table", + "y": 270 + }, + "facing=west,waterlogged=true": { + "model": "superbwarfare:block/reforging_table", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/blockstates/scheelite_ore.json b/src/generated/resources/assets/superbwarfare/blockstates/scheelite_ore.json similarity index 100% rename from src/main/resources/assets/superbwarfare/blockstates/scheelite_ore.json rename to src/generated/resources/assets/superbwarfare/blockstates/scheelite_ore.json diff --git a/src/generated/resources/assets/superbwarfare/models/block/deepslate_galena_ore.json b/src/generated/resources/assets/superbwarfare/models/block/deepslate_galena_ore.json new file mode 100644 index 000000000..f7cb9c133 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/block/deepslate_galena_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "superbwarfare:block/deepslate_galena_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/block/deepslate_scheelite_ore.json b/src/generated/resources/assets/superbwarfare/models/block/deepslate_scheelite_ore.json new file mode 100644 index 000000000..2bedc0720 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/block/deepslate_scheelite_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "superbwarfare:block/deepslate_scheelite_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/block/galena_ore.json b/src/generated/resources/assets/superbwarfare/models/block/galena_ore.json new file mode 100644 index 000000000..825288d45 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/block/galena_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "superbwarfare:block/galena_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/block/scheelite_ore.json b/src/generated/resources/assets/superbwarfare/models/block/scheelite_ore.json new file mode 100644 index 000000000..ac6d51d9b --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/block/scheelite_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "superbwarfare:block/scheelite_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/barbed_wire.json b/src/generated/resources/assets/superbwarfare/models/item/barbed_wire.json new file mode 100644 index 000000000..b8ea05220 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/barbed_wire.json @@ -0,0 +1,3 @@ +{ + "parent": "superbwarfare:block/barbed_wire" +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/deepslate_galena_ore.json b/src/generated/resources/assets/superbwarfare/models/item/deepslate_galena_ore.json new file mode 100644 index 000000000..f929517b6 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/deepslate_galena_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "superbwarfare:block/deepslate_galena_ore" +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/deepslate_scheelite_ore.json b/src/generated/resources/assets/superbwarfare/models/item/deepslate_scheelite_ore.json new file mode 100644 index 000000000..f665b4c8c --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/deepslate_scheelite_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "superbwarfare:block/deepslate_scheelite_ore" +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/galena_ore.json b/src/generated/resources/assets/superbwarfare/models/item/galena_ore.json new file mode 100644 index 000000000..2acadadab --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/galena_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "superbwarfare:block/galena_ore" +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/jump_pad.json b/src/generated/resources/assets/superbwarfare/models/item/jump_pad.json new file mode 100644 index 000000000..44236c198 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/jump_pad.json @@ -0,0 +1,3 @@ +{ + "parent": "superbwarfare:block/jump_pad" +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/reforging_table.json b/src/generated/resources/assets/superbwarfare/models/item/reforging_table.json similarity index 100% rename from src/main/resources/assets/superbwarfare/models/item/reforging_table.json rename to src/generated/resources/assets/superbwarfare/models/item/reforging_table.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/scheelite_ore.json b/src/generated/resources/assets/superbwarfare/models/item/scheelite_ore.json new file mode 100644 index 000000000..f4f931b4d --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/scheelite_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "superbwarfare:block/scheelite_ore" +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_tables/blocks/barbed_wire.json b/src/generated/resources/data/superbwarfare/loot_tables/blocks/barbed_wire.json similarity index 100% rename from src/main/resources/data/superbwarfare/loot_tables/blocks/barbed_wire.json rename to src/generated/resources/data/superbwarfare/loot_tables/blocks/barbed_wire.json diff --git a/src/main/resources/data/superbwarfare/loot_tables/blocks/deepslate_galena_ore.json b/src/generated/resources/data/superbwarfare/loot_tables/blocks/deepslate_galena_ore.json similarity index 100% rename from src/main/resources/data/superbwarfare/loot_tables/blocks/deepslate_galena_ore.json rename to src/generated/resources/data/superbwarfare/loot_tables/blocks/deepslate_galena_ore.json diff --git a/src/main/resources/data/superbwarfare/loot_tables/blocks/deepslate_scheelite_ore.json b/src/generated/resources/data/superbwarfare/loot_tables/blocks/deepslate_scheelite_ore.json similarity index 100% rename from src/main/resources/data/superbwarfare/loot_tables/blocks/deepslate_scheelite_ore.json rename to src/generated/resources/data/superbwarfare/loot_tables/blocks/deepslate_scheelite_ore.json diff --git a/src/main/resources/data/superbwarfare/loot_tables/blocks/dragon_teeth.json b/src/generated/resources/data/superbwarfare/loot_tables/blocks/dragon_teeth.json similarity index 100% rename from src/main/resources/data/superbwarfare/loot_tables/blocks/dragon_teeth.json rename to src/generated/resources/data/superbwarfare/loot_tables/blocks/dragon_teeth.json diff --git a/src/main/resources/data/superbwarfare/loot_tables/blocks/galena_ore.json b/src/generated/resources/data/superbwarfare/loot_tables/blocks/galena_ore.json similarity index 100% rename from src/main/resources/data/superbwarfare/loot_tables/blocks/galena_ore.json rename to src/generated/resources/data/superbwarfare/loot_tables/blocks/galena_ore.json diff --git a/src/main/resources/data/superbwarfare/loot_tables/blocks/jump_pad.json b/src/generated/resources/data/superbwarfare/loot_tables/blocks/jump_pad.json similarity index 100% rename from src/main/resources/data/superbwarfare/loot_tables/blocks/jump_pad.json rename to src/generated/resources/data/superbwarfare/loot_tables/blocks/jump_pad.json diff --git a/src/main/resources/data/superbwarfare/loot_tables/blocks/reforging_table.json b/src/generated/resources/data/superbwarfare/loot_tables/blocks/reforging_table.json similarity index 100% rename from src/main/resources/data/superbwarfare/loot_tables/blocks/reforging_table.json rename to src/generated/resources/data/superbwarfare/loot_tables/blocks/reforging_table.json diff --git a/src/main/resources/data/superbwarfare/loot_tables/blocks/sandbag.json b/src/generated/resources/data/superbwarfare/loot_tables/blocks/sandbag.json similarity index 100% rename from src/main/resources/data/superbwarfare/loot_tables/blocks/sandbag.json rename to src/generated/resources/data/superbwarfare/loot_tables/blocks/sandbag.json diff --git a/src/main/resources/data/superbwarfare/loot_tables/blocks/scheelite_ore.json b/src/generated/resources/data/superbwarfare/loot_tables/blocks/scheelite_ore.json similarity index 100% rename from src/main/resources/data/superbwarfare/loot_tables/blocks/scheelite_ore.json rename to src/generated/resources/data/superbwarfare/loot_tables/blocks/scheelite_ore.json diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/DataGenerators.java b/src/main/java/net/mcreator/superbwarfare/datagen/DataGenerators.java index 8ae461a6e..0d7986dee 100644 --- a/src/main/java/net/mcreator/superbwarfare/datagen/DataGenerators.java +++ b/src/main/java/net/mcreator/superbwarfare/datagen/DataGenerators.java @@ -21,9 +21,9 @@ public class DataGenerators { CompletableFuture lookupProvider = event.getLookupProvider(); ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); -// generator.addProvider(event.includeServer(), ModLootTableProvider.create(packOutput)); + generator.addProvider(event.includeServer(), ModLootTableProvider.create(packOutput)); // generator.addProvider(event.includeServer(), new ModWorldGenProvider(packOutput, lookupProvider)); -// generator.addProvider(event.includeServer(), new ModBlockStateProvider(packOutput, existingFileHelper)); + generator.addProvider(event.includeServer(), new ModBlockStateProvider(packOutput, existingFileHelper)); generator.addProvider(event.includeServer(), new ModItemModelProvider(packOutput, existingFileHelper)); ModBlockTagProvider tagProvider = generator.addProvider(event.includeServer(), new ModBlockTagProvider(packOutput, lookupProvider, existingFileHelper)); generator.addProvider(event.includeServer(), new ModItemTagProvider(packOutput, lookupProvider, tagProvider.contentsGetter(), existingFileHelper)); diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockLootProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockLootProvider.java new file mode 100644 index 000000000..07ed440cf --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockLootProvider.java @@ -0,0 +1,35 @@ +package net.mcreator.superbwarfare.datagen; + +import net.mcreator.superbwarfare.init.ModBlocks; +import net.mcreator.superbwarfare.init.ModItems; +import net.minecraft.data.loot.BlockLootSubProvider; +import net.minecraft.world.flag.FeatureFlags; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.registries.RegistryObject; + +import java.util.Set; + +public class ModBlockLootProvider extends BlockLootSubProvider { + public ModBlockLootProvider() { + super(Set.of(), FeatureFlags.REGISTRY.allFlags()); + } + + @Override + protected void generate() { + this.dropSelf(ModBlocks.SANDBAG.get()); + this.dropSelf(ModBlocks.BARBED_WIRE.get()); + this.dropSelf(ModBlocks.JUMP_PAD.get()); + this.dropSelf(ModBlocks.DRAGON_TEETH.get()); + this.dropSelf(ModBlocks.REFORGING_TABLE.get()); + + this.add(ModBlocks.GALENA_ORE.get(), this.createOreDrop(ModBlocks.GALENA_ORE.get(), ModItems.GALENA.get())); + this.add(ModBlocks.SCHEELITE_ORE.get(), this.createOreDrop(ModBlocks.SCHEELITE_ORE.get(), ModItems.SCHEELITE.get())); + this.add(ModBlocks.DEEPSLATE_GALENA_ORE.get(), this.createOreDrop(ModBlocks.DEEPSLATE_GALENA_ORE.get(), ModItems.GALENA.get())); + this.add(ModBlocks.DEEPSLATE_SCHEELITE_ORE.get(), this.createOreDrop(ModBlocks.DEEPSLATE_SCHEELITE_ORE.get(), ModItems.SCHEELITE.get())); + } + + @Override + protected Iterable getKnownBlocks() { + return ModBlocks.REGISTRY.getEntries().stream().map(RegistryObject::get)::iterator; + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockStateProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockStateProvider.java new file mode 100644 index 000000000..a4963c996 --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockStateProvider.java @@ -0,0 +1,49 @@ +package net.mcreator.superbwarfare.datagen; + +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModBlocks; +import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; + +import net.minecraftforge.client.model.generators.BlockStateProvider; +import net.minecraftforge.client.model.generators.ModelFile; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +@SuppressWarnings({"ConstantConditions", "SameParameterValue"}) +public class ModBlockStateProvider extends BlockStateProvider { + public ModBlockStateProvider(PackOutput output, ExistingFileHelper exFileHelper) { + super(output, ModUtils.MODID, exFileHelper); + } + + @Override + protected void registerStatesAndModels() { + horizontalBlock(ModBlocks.BARBED_WIRE.get(), new ModelFile.UncheckedModelFile(modLoc("block/barbed_wire"))); + horizontalBlock(ModBlocks.JUMP_PAD.get(), new ModelFile.UncheckedModelFile(modLoc("block/jump_pad"))); + horizontalBlock(ModBlocks.REFORGING_TABLE.get(), new ModelFile.UncheckedModelFile(modLoc("block/reforging_table"))); + + blockWithItem(ModBlocks.GALENA_ORE); + blockWithItem(ModBlocks.DEEPSLATE_GALENA_ORE); + blockWithItem(ModBlocks.SCHEELITE_ORE); + blockWithItem(ModBlocks.DEEPSLATE_SCHEELITE_ORE); + } + + private String name(Block block) { + return key(block).getPath(); + } + + private ResourceLocation key(Block block) { + return ForgeRegistries.BLOCKS.getKey(block); + } + + private void blockItem(RegistryObject blockRegistryObject) { + simpleBlockItem(blockRegistryObject.get(), new ModelFile.UncheckedModelFile(ModUtils.MODID + + ":block/" + ForgeRegistries.BLOCKS.getKey(blockRegistryObject.get()).getPath())); + } + + private void blockWithItem(RegistryObject blockRegistryObject) { + simpleBlockWithItem(blockRegistryObject.get(), cubeAll(blockRegistryObject.get())); + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java index f24fa1d59..af4193c4e 100644 --- a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.datagen; import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModBlocks; import net.mcreator.superbwarfare.init.ModItems; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; @@ -112,6 +113,11 @@ public class ModItemModelProvider extends ItemModelProvider { blueprintItem(ModItems.K_98_BLUEPRINT); blueprintItem(ModItems.MOSIN_NAGANT_BLUEPRINT); blueprintItem(ModItems.JAVELIN_BLUEPRINT); + + // blocks + evenSimplerBlockItem(ModBlocks.BARBED_WIRE); + evenSimplerBlockItem(ModBlocks.JUMP_PAD); + evenSimplerBlockItem(ModBlocks.REFORGING_TABLE); } private ItemModelBuilder simpleItem(RegistryObject item) { diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModLootTableProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModLootTableProvider.java new file mode 100644 index 000000000..ae444af6b --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModLootTableProvider.java @@ -0,0 +1,16 @@ +package net.mcreator.superbwarfare.datagen; + +import net.minecraft.data.PackOutput; +import net.minecraft.data.loot.LootTableProvider; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; + +import java.util.List; +import java.util.Set; + +public class ModLootTableProvider { + public static LootTableProvider create(PackOutput output) { + return new LootTableProvider(output, Set.of(), List.of( + new LootTableProvider.SubProviderEntry(ModBlockLootProvider::new, LootContextParamSets.BLOCK) + )); + } +} diff --git a/src/main/resources/assets/superbwarfare/blockstates/barbed_wire.json b/src/main/resources/assets/superbwarfare/blockstates/barbed_wire.json deleted file mode 100644 index 611e89651..000000000 --- a/src/main/resources/assets/superbwarfare/blockstates/barbed_wire.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "variants": { - "facing=north": { - "model": "superbwarfare:block/barbed_wire" - }, - "facing=east": { - "model": "superbwarfare:block/barbed_wire", - "y": 90 - }, - "facing=south": { - "model": "superbwarfare:block/barbed_wire", - "y": 180 - }, - "facing=west": { - "model": "superbwarfare:block/barbed_wire", - "y": 270 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/blockstates/gun_recycle.json b/src/main/resources/assets/superbwarfare/blockstates/gun_recycle.json deleted file mode 100644 index 73a56d4ee..000000000 --- a/src/main/resources/assets/superbwarfare/blockstates/gun_recycle.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "superbwarfare:block/gun_recycle" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/blockstates/jump_pad.json b/src/main/resources/assets/superbwarfare/blockstates/jump_pad.json deleted file mode 100644 index 939b95c3a..000000000 --- a/src/main/resources/assets/superbwarfare/blockstates/jump_pad.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "variants": { - "facing=north": { - "model": "superbwarfare:block/jump_pad" - }, - "facing=east": { - "model": "superbwarfare:block/jump_pad", - "y": 90 - }, - "facing=south": { - "model": "superbwarfare:block/jump_pad", - "y": 180 - }, - "facing=west": { - "model": "superbwarfare:block/jump_pad", - "y": 270 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/blockstates/reforging_table.json b/src/main/resources/assets/superbwarfare/blockstates/reforging_table.json deleted file mode 100644 index 3693e99a6..000000000 --- a/src/main/resources/assets/superbwarfare/blockstates/reforging_table.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "variants": { - "facing=north": { - "model": "superbwarfare:block/reforging_table" - }, - "facing=east": { - "model": "superbwarfare:block/reforging_table", - "y": 90 - }, - "facing=south": { - "model": "superbwarfare:block/reforging_table", - "y": 180 - }, - "facing=west": { - "model": "superbwarfare:block/reforging_table", - "y": 270 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/block/barbed_wire.json b/src/main/resources/assets/superbwarfare/models/block/barbed_wire.json index 9b9537f42..921b45e77 100644 --- a/src/main/resources/assets/superbwarfare/models/block/barbed_wire.json +++ b/src/main/resources/assets/superbwarfare/models/block/barbed_wire.json @@ -1,9 +1,258 @@ { - "parent": "superbwarfare:custom/tiesiwang", + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "elements": [ + { + "from": [1.35391, -2.94254, 6.75], + "to": [2.35391, 20.05746, 8.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [5, 2, 5.25, 7.75], "texture": "#1"}, + "east": {"uv": [0.5, 0, 1, 5.75], "texture": "#1"}, + "south": {"uv": [5.25, 2, 5.5, 7.75], "texture": "#1"}, + "west": {"uv": [0, 0, 0.5, 5.75], "texture": "#1"}, + "up": {"uv": [1, 6, 0.5, 5.75], "rotation": 270, "texture": "#1"}, + "down": {"uv": [1.5, 5.75, 1, 6], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [0.35391, -2.44203, 7.7505], + "to": [1.35391, 19.55797, 9.7505], + "rotation": {"angle": -45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [2.25, 5.5, 2.5, 11], "texture": "#1"}, + "east": {"uv": [2.5, 0, 3, 5.5], "texture": "#1"}, + "south": {"uv": [2.5, 5.5, 2.75, 11], "texture": "#1"}, + "west": {"uv": [2, 0, 2.5, 5.5], "texture": "#1"}, + "up": {"uv": [2, 6, 1.5, 5.75], "rotation": 270, "texture": "#1"}, + "down": {"uv": [6.25, 2, 5.75, 2.25], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [0.25391, 8.05797, 8.2505], + "to": [0.35391, 9.05797, 9.2505], + "rotation": {"angle": -45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [5.75, 3.25, 6, 3.5], "texture": "#1"}, + "east": {"uv": [5.75, 3.5, 6, 3.75], "texture": "#1"}, + "south": {"uv": [3.75, 5.75, 4, 6], "texture": "#1"}, + "west": {"uv": [3.75, 5.5, 4, 5.75], "texture": "#1"}, + "up": {"uv": [6, 4, 5.75, 3.75], "rotation": 270, "texture": "#1"}, + "down": {"uv": [6, 4, 5.75, 4.25], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [16.35391, 8.05797, 8.2505], + "to": [16.45391, 9.05797, 9.2505], + "rotation": {"angle": -45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [5.75, 4.5, 6, 4.75], "texture": "#1"}, + "east": {"uv": [5.75, 4.75, 6, 5], "texture": "#1"}, + "south": {"uv": [5.75, 5, 6, 5.25], "texture": "#1"}, + "west": {"uv": [5.75, 4.25, 6, 4.5], "texture": "#1"}, + "up": {"uv": [6, 5.5, 5.75, 5.25], "rotation": 270, "texture": "#1"}, + "down": {"uv": [6, 5.5, 5.75, 5.75], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [14.35391, -2.94254, 6.75], + "to": [15.35391, 20.05746, 8.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [2, 5.5, 2.25, 11.25], "texture": "#1"}, + "east": {"uv": [1.5, 0, 2, 5.75], "texture": "#1"}, + "south": {"uv": [5.5, 2, 5.75, 7.75], "texture": "#1"}, + "west": {"uv": [1, 0, 1.5, 5.75], "texture": "#1"}, + "up": {"uv": [6.25, 2.5, 5.75, 2.25], "rotation": 270, "texture": "#1"}, + "down": {"uv": [6.25, 2.5, 5.75, 2.75], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [0.85391, 8.95746, 8.75], + "to": [15.85391, 10.95746, 10.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [4, 0, 7.75, 0.5], "texture": "#1"}, + "east": {"uv": [0, 5.75, 0.5, 6.25], "texture": "#1"}, + "south": {"uv": [4, 0.5, 7.75, 1], "texture": "#1"}, + "west": {"uv": [3.25, 5.5, 3.75, 6], "texture": "#1"}, + "up": {"uv": [4.5, 4.75, 4, 1], "rotation": 270, "texture": "#1"}, + "down": {"uv": [5, 1, 4.5, 4.75], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [15.35391, -2.44203, 7.7505], + "to": [16.35391, 19.55797, 9.7505], + "rotation": {"angle": -45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [2.75, 5.5, 3, 11], "texture": "#1"}, + "east": {"uv": [3.5, 0, 4, 5.5], "texture": "#1"}, + "south": {"uv": [3, 5.5, 3.25, 11], "texture": "#1"}, + "west": {"uv": [3, 0, 3.5, 5.5], "texture": "#1"}, + "up": {"uv": [6.25, 3, 5.75, 2.75], "rotation": 270, "texture": "#1"}, + "down": {"uv": [6.25, 3, 5.75, 3.25], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [1.35391, 6.95746, 17.75], + "to": [15.35391, 8.95746, 17.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [5, 1, 8.5, 1.5], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "south": {"uv": [5, 1.5, 8.5, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "up": {"uv": [0, 3.5, 0, 0], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 3.5], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [1.35391, 7.95746, 16.75], + "to": [15.35391, 7.95746, 18.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, + "east": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "south": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, + "west": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "up": {"uv": [4.5, 8.25, 4, 4.75], "rotation": 270, "texture": "#1"}, + "down": {"uv": [5, 4.75, 4.5, 8.25], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [1.35391, 17.95746, 7.75], + "to": [15.35391, 19.95746, 7.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [5, 1, 8.5, 1.5], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "south": {"uv": [5, 1.5, 8.5, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "up": {"uv": [0, 3.5, 0, 0], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 3.5], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [1.35391, 18.95746, 6.75], + "to": [15.35391, 18.95746, 8.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, + "east": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "south": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, + "west": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "up": {"uv": [4.5, 8.25, 4, 4.75], "rotation": 270, "texture": "#1"}, + "down": {"uv": [5, 4.75, 4.5, 8.25], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [1.35391, -2.04254, 7.75], + "to": [15.35391, -0.04254, 7.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [5, 1, 8.5, 1.5], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "south": {"uv": [5, 1.5, 8.5, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "up": {"uv": [0, 3.5, 0, 0], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 3.5], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [1.35391, -1.04254, 6.75], + "to": [15.35391, -1.04254, 8.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, + "east": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "south": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, + "west": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "up": {"uv": [4.5, 8.25, 4, 4.75], "rotation": 270, "texture": "#1"}, + "down": {"uv": [5, 4.75, 4.5, 8.25], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [1.35391, 7.95746, -2.25], + "to": [15.35391, 7.95746, -0.25], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, + "east": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "south": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, + "west": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, + "up": {"uv": [4.5, 8.25, 4, 4.75], "rotation": 270, "texture": "#1"}, + "down": {"uv": [5, 4.75, 4.5, 8.25], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [1.35391, 6.95746, -1.25], + "to": [15.35391, 8.95746, -1.25], + "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, + "faces": { + "north": {"uv": [5, 1, 8.5, 1.5], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "south": {"uv": [5, 1.5, 8.5, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, + "up": {"uv": [0, 3.5, 0, 0], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 3.5], "rotation": 90, "texture": "#1"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "translation": [0, 1, -3.5], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "translation": [0, 1, -3.5], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "rotation": [21.15, 23.99, -8.94], + "translation": [0, 3.5, -0.5], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [21.15, 23.99, -8.94], + "translation": [0, 3.5, -0.5], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "translation": [0, 3.25, 0], + "scale": [0.4, 0.4, 0.4] + }, + "gui": { + "rotation": [19.29, 47.82, -2.83], + "translation": [0, 0, -6.25], + "scale": [0.6, 0.6, 0.6] + }, + "head": { + "translation": [0, 14.25, 0] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, 0, -6.25] + } + }, + "groups": [ + { + "name": "group", + "origin": [15, 1, 15], + "color": 0, + "children": [ + { + "name": "group", + "origin": [8.35391, 8.70746, 8], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14] + } + ] + } + ], "textures": { - "all": "superbwarfare:block/sandbag", "particle": "superbwarfare:block/sandbag", - "1": "superbwarfare:block/tiesiwang" + "1": "superbwarfare:block/barbed_wire" }, "render_type": "cutout" } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/block/deepslate_galena_ore.json b/src/main/resources/assets/superbwarfare/models/block/deepslate_galena_ore.json deleted file mode 100644 index dc0b9270d..000000000 --- a/src/main/resources/assets/superbwarfare/models/block/deepslate_galena_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "superbwarfare:block/deepslate_galena_ore", - "particle": "superbwarfare:block/deepslate_galena_ore" - }, - "render_type": "solid" -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/block/deepslate_scheelite_ore.json b/src/main/resources/assets/superbwarfare/models/block/deepslate_scheelite_ore.json deleted file mode 100644 index d51a52473..000000000 --- a/src/main/resources/assets/superbwarfare/models/block/deepslate_scheelite_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "superbwarfare:block/deepslate_scheelite_ore", - "particle": "superbwarfare:block/deepslate_scheelite_ore" - }, - "render_type": "solid" -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/block/galena_ore.json b/src/main/resources/assets/superbwarfare/models/block/galena_ore.json deleted file mode 100644 index 7f6f440b6..000000000 --- a/src/main/resources/assets/superbwarfare/models/block/galena_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "superbwarfare:block/galena_ore", - "particle": "superbwarfare:block/galena_ore" - }, - "render_type": "solid" -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/block/gun_recycle.json b/src/main/resources/assets/superbwarfare/models/block/gun_recycle.json deleted file mode 100644 index 05aae500d..000000000 --- a/src/main/resources/assets/superbwarfare/models/block/gun_recycle.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "superbwarfare:block/no_tex", - "up": "superbwarfare:block/no_tex", - "north": "superbwarfare:block/no_tex", - "east": "superbwarfare:block/no_tex", - "south": "superbwarfare:block/no_tex", - "west": "superbwarfare:block/no_tex", - "particle": "superbwarfare:block/no_tex" - }, - "render_type": "solid" -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/block/jump_pad.json b/src/main/resources/assets/superbwarfare/models/block/jump_pad.json index ebbeeb1de..aaa7af113 100644 --- a/src/main/resources/assets/superbwarfare/models/block/jump_pad.json +++ b/src/main/resources/assets/superbwarfare/models/block/jump_pad.json @@ -1,7 +1,507 @@ { - "parent": "superbwarfare:custom/jump_pad", + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 3, + 16 + ], + "faces": { + "north": { + "uv": [ + 4, + 7, + 8, + 7.75 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 7.5, + 0, + 11.5, + 0.75 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 7.5, + 0.75, + 11.5, + 1.5 + ], + "texture": "#0" + }, + "west": { + "uv": [7.5, 1.5, 11.5, 2.25], + "texture": "#0" + }, + "up": { + "uv": [4, 4, 0, 0], + "texture": "#0" + }, + "down": { + "uv": [4, 4, 0, 8], + "texture": "#0" + } + } + }, + { + "from": [14, -0.1, 14], + "to": [16.25, 3.25, 16.25], + "faces": { + "north": { + "uv": [7.5, 3.25, 8.0625, 4.0625], + "texture": "#0" + }, + "east": { + "uv": [ + 7.5, + 4.25, + 8.0625, + 5.0625 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 7.5, + 5.25, + 8.0625, + 6.0625 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 4, + 7.75, + 4.5625, + 8.5625 + ], + "texture": "#0" + }, + "up": { + "uv": [ + 8.8125, + 4.8125, + 8.25, + 4.25 + ], + "texture": "#0" + }, + "down": { + "uv": [ + 8.8125, + 5, + 8.25, + 5.5625 + ], + "texture": "#0" + } + } + }, + { + "from": [ + -0.25, + -0.1, + 14 + ], + "to": [ + 2, + 3.25, + 16.25 + ], + "faces": { + "north": { + "uv": [ + 4.75, + 7.75, + 5.3125, + 8.5625 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 5.5, + 7.75, + 6.0625, + 8.5625 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 6.25, + 7.75, + 6.8125, + 8.5625 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 7, + 7.75, + 7.5625, + 8.5625 + ], + "texture": "#0" + }, + "up": { + "uv": [ + 9.0625, + 7.8125, + 8.5, + 7.25 + ], + "texture": "#0" + }, + "down": { + "uv": [ + 9.0625, + 8, + 8.5, + 8.5625 + ], + "texture": "#0" + } + } + }, + { + "from": [ + -0.25, + -0.1, + -0.25 + ], + "to": [ + 2, + 3.25, + 2 + ], + "faces": { + "north": { + "uv": [ + 7.75, + 7.75, + 8.3125, + 8.5625 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 0, + 8, + 0.5625, + 8.8125 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 0.75, + 8, + 1.3125, + 8.8125 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 1.5, + 8, + 2.0625, + 8.8125 + ], + "texture": "#0" + }, + "up": { + "uv": [ + 4.3125, + 9.3125, + 3.75, + 8.75 + ], + "texture": "#0" + }, + "down": { + "uv": [ + 5.0625, + 8.75, + 4.5, + 9.3125 + ], + "texture": "#0" + } + } + }, + { + "from": [ + 14, + -0.1, + -0.25 + ], + "to": [ + 16.25, + 3.25, + 2 + ], + "faces": { + "north": { + "uv": [ + 2.25, + 8, + 2.8125, + 8.8125 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 3, + 8, + 3.5625, + 8.8125 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 8, + 6.25, + 8.5625, + 7.0625 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 8.25, + 3.25, + 8.8125, + 4.0625 + ], + "texture": "#0" + }, + "up": { + "uv": [ + 5.8125, + 9.3125, + 5.25, + 8.75 + ], + "texture": "#0" + }, + "down": { + "uv": [ + 9.3125, + 5.75, + 8.75, + 6.3125 + ], + "texture": "#0" + } + } + }, + { + "from": [ + 1, + 3, + 1 + ], + "to": [ + 15, + 4, + 15 + ], + "faces": { + "north": { + "uv": [ + 7.5, + 2.25, + 11, + 2.5 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 7.5, + 2.5, + 11, + 2.75 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 7.5, + 2.75, + 11, + 3 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 7.5, + 3, + 11, + 3.25 + ], + "texture": "#0" + }, + "up": { + "uv": [ + 7.5, + 3.5, + 4, + 0 + ], + "texture": "#0" + }, + "down": { + "uv": [ + 7.5, + 3.5, + 4, + 7 + ], + "texture": "#0" + } + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [ + 90, + 0, + 0 + ], + "translation": [ + 0.25, + 2.75, + 3 + ], + "scale": [ + 0.4, + 0.4, + 0.4 + ] + }, + "thirdperson_lefthand": { + "rotation": [ + 90, + 0, + 0 + ], + "translation": [ + 0.25, + 2.75, + 3 + ], + "scale": [ + 0.4, + 0.4, + 0.4 + ] + }, + "firstperson_righthand": { + "rotation": [ + 71.5, + -21, + 0 + ], + "translation": [ + -1, + 1.5, + 3.75 + ], + "scale": [ + 0.7, + 0.7, + 0.7 + ] + }, + "firstperson_lefthand": { + "rotation": [ + 71.5, + -21, + 0 + ], + "translation": [ + -1, + 1.5, + 3.75 + ], + "scale": [ + 0.7, + 0.7, + 0.7 + ] + }, + "ground": { + "translation": [ + 0, + 0.5, + 0 + ], + "scale": [ + 0.5, + 0.5, + 0.5 + ] + }, + "gui": { + "rotation": [ + 45, + -45, + 0 + ], + "translation": [ + 0, + 2.5, + 0 + ], + "scale": [ + 0.68, + 0.68, + 0.68 + ] + }, + "head": { + "rotation": [ + 0, + 180, + 0 + ], + "translation": [ + 0, + 11, + 0 + ] + }, + "fixed": { + "rotation": [ + -90, + 90, + 0 + ], + "translation": [ + 0, + 0, + -5 + ] + } + }, "textures": { - "all": "superbwarfare:block/jump_pad", "particle": "superbwarfare:block/jump_pad", "0": "superbwarfare:block/jump_pad" }, diff --git a/src/main/resources/assets/superbwarfare/models/block/scheelite_ore.json b/src/main/resources/assets/superbwarfare/models/block/scheelite_ore.json deleted file mode 100644 index 4be0d8bc4..000000000 --- a/src/main/resources/assets/superbwarfare/models/block/scheelite_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "superbwarfare:block/scheelite_ore", - "particle": "superbwarfare:block/scheelite_ore" - }, - "render_type": "solid" -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/custom/jump_pad.json b/src/main/resources/assets/superbwarfare/models/custom/jump_pad.json deleted file mode 100644 index 79b017e09..000000000 --- a/src/main/resources/assets/superbwarfare/models/custom/jump_pad.json +++ /dev/null @@ -1,541 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 64, - 64 - ], - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 3, - 16 - ], - "faces": { - "north": { - "uv": [ - 4, - 7, - 8, - 7.75 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 7.5, - 0, - 11.5, - 0.75 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 7.5, - 0.75, - 11.5, - 1.5 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 7.5, - 1.5, - 11.5, - 2.25 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 4, - 4, - 0, - 0 - ], - "texture": "#0" - }, - "down": { - "uv": [ - 4, - 4, - 0, - 8 - ], - "texture": "#0" - } - } - }, - { - "from": [ - 14, - -0.1, - 14 - ], - "to": [ - 16.25, - 3.25, - 16.25 - ], - "faces": { - "north": { - "uv": [ - 7.5, - 3.25, - 8.0625, - 4.0625 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 7.5, - 4.25, - 8.0625, - 5.0625 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 7.5, - 5.25, - 8.0625, - 6.0625 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 4, - 7.75, - 4.5625, - 8.5625 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 8.8125, - 4.8125, - 8.25, - 4.25 - ], - "texture": "#0" - }, - "down": { - "uv": [ - 8.8125, - 5, - 8.25, - 5.5625 - ], - "texture": "#0" - } - } - }, - { - "from": [ - -0.25, - -0.1, - 14 - ], - "to": [ - 2, - 3.25, - 16.25 - ], - "faces": { - "north": { - "uv": [ - 4.75, - 7.75, - 5.3125, - 8.5625 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 5.5, - 7.75, - 6.0625, - 8.5625 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 6.25, - 7.75, - 6.8125, - 8.5625 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 7, - 7.75, - 7.5625, - 8.5625 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 9.0625, - 7.8125, - 8.5, - 7.25 - ], - "texture": "#0" - }, - "down": { - "uv": [ - 9.0625, - 8, - 8.5, - 8.5625 - ], - "texture": "#0" - } - } - }, - { - "from": [ - -0.25, - -0.1, - -0.25 - ], - "to": [ - 2, - 3.25, - 2 - ], - "faces": { - "north": { - "uv": [ - 7.75, - 7.75, - 8.3125, - 8.5625 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 0, - 8, - 0.5625, - 8.8125 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 0.75, - 8, - 1.3125, - 8.8125 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 1.5, - 8, - 2.0625, - 8.8125 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 4.3125, - 9.3125, - 3.75, - 8.75 - ], - "texture": "#0" - }, - "down": { - "uv": [ - 5.0625, - 8.75, - 4.5, - 9.3125 - ], - "texture": "#0" - } - } - }, - { - "from": [ - 14, - -0.1, - -0.25 - ], - "to": [ - 16.25, - 3.25, - 2 - ], - "faces": { - "north": { - "uv": [ - 2.25, - 8, - 2.8125, - 8.8125 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 3, - 8, - 3.5625, - 8.8125 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 8, - 6.25, - 8.5625, - 7.0625 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 8.25, - 3.25, - 8.8125, - 4.0625 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 5.8125, - 9.3125, - 5.25, - 8.75 - ], - "texture": "#0" - }, - "down": { - "uv": [ - 9.3125, - 5.75, - 8.75, - 6.3125 - ], - "texture": "#0" - } - } - }, - { - "from": [ - 1, - 3, - 1 - ], - "to": [ - 15, - 4, - 15 - ], - "faces": { - "north": { - "uv": [ - 7.5, - 2.25, - 11, - 2.5 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 7.5, - 2.5, - 11, - 2.75 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 7.5, - 2.75, - 11, - 3 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 7.5, - 3, - 11, - 3.25 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 7.5, - 3.5, - 4, - 0 - ], - "texture": "#0" - }, - "down": { - "uv": [ - 7.5, - 3.5, - 4, - 7 - ], - "texture": "#0" - } - } - } - ], - "gui_light": "front", - "display": { - "thirdperson_righthand": { - "rotation": [ - 90, - 0, - 0 - ], - "translation": [ - 0.25, - 2.75, - 3 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 90, - 0, - 0 - ], - "translation": [ - 0.25, - 2.75, - 3 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_righthand": { - "rotation": [ - 71.5, - -21, - 0 - ], - "translation": [ - -1, - 1.5, - 3.75 - ], - "scale": [ - 0.7, - 0.7, - 0.7 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 71.5, - -21, - 0 - ], - "translation": [ - -1, - 1.5, - 3.75 - ], - "scale": [ - 0.7, - 0.7, - 0.7 - ] - }, - "ground": { - "translation": [ - 0, - 0.5, - 0 - ], - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "gui": { - "rotation": [ - 45, - -45, - 0 - ], - "translation": [ - 0, - 2.5, - 0 - ], - "scale": [ - 0.68, - 0.68, - 0.68 - ] - }, - "head": { - "rotation": [ - 0, - 180, - 0 - ], - "translation": [ - 0, - 11, - 0 - ] - }, - "fixed": { - "rotation": [ - -90, - 90, - 0 - ], - "translation": [ - 0, - 0, - -5 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/custom/tiesiwang.json b/src/main/resources/assets/superbwarfare/models/custom/tiesiwang.json deleted file mode 100644 index ae41975a7..000000000 --- a/src/main/resources/assets/superbwarfare/models/custom/tiesiwang.json +++ /dev/null @@ -1,253 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [64, 64], - "elements": [ - { - "from": [1.35391, -2.94254, 6.75], - "to": [2.35391, 20.05746, 8.75], - "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, - "faces": { - "north": {"uv": [5, 2, 5.25, 7.75], "texture": "#1"}, - "east": {"uv": [0.5, 0, 1, 5.75], "texture": "#1"}, - "south": {"uv": [5.25, 2, 5.5, 7.75], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 5.75], "texture": "#1"}, - "up": {"uv": [1, 6, 0.5, 5.75], "rotation": 270, "texture": "#1"}, - "down": {"uv": [1.5, 5.75, 1, 6], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [0.35391, -2.44203, 7.7505], - "to": [1.35391, 19.55797, 9.7505], - "rotation": {"angle": -45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, - "faces": { - "north": {"uv": [2.25, 5.5, 2.5, 11], "texture": "#1"}, - "east": {"uv": [2.5, 0, 3, 5.5], "texture": "#1"}, - "south": {"uv": [2.5, 5.5, 2.75, 11], "texture": "#1"}, - "west": {"uv": [2, 0, 2.5, 5.5], "texture": "#1"}, - "up": {"uv": [2, 6, 1.5, 5.75], "rotation": 270, "texture": "#1"}, - "down": {"uv": [6.25, 2, 5.75, 2.25], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [0.25391, 8.05797, 8.2505], - "to": [0.35391, 9.05797, 9.2505], - "rotation": {"angle": -45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, - "faces": { - "north": {"uv": [5.75, 3.25, 6, 3.5], "texture": "#1"}, - "east": {"uv": [5.75, 3.5, 6, 3.75], "texture": "#1"}, - "south": {"uv": [3.75, 5.75, 4, 6], "texture": "#1"}, - "west": {"uv": [3.75, 5.5, 4, 5.75], "texture": "#1"}, - "up": {"uv": [6, 4, 5.75, 3.75], "rotation": 270, "texture": "#1"}, - "down": {"uv": [6, 4, 5.75, 4.25], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [16.35391, 8.05797, 8.2505], - "to": [16.45391, 9.05797, 9.2505], - "rotation": {"angle": -45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, - "faces": { - "north": {"uv": [5.75, 4.5, 6, 4.75], "texture": "#1"}, - "east": {"uv": [5.75, 4.75, 6, 5], "texture": "#1"}, - "south": {"uv": [5.75, 5, 6, 5.25], "texture": "#1"}, - "west": {"uv": [5.75, 4.25, 6, 4.5], "texture": "#1"}, - "up": {"uv": [6, 5.5, 5.75, 5.25], "rotation": 270, "texture": "#1"}, - "down": {"uv": [6, 5.5, 5.75, 5.75], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [14.35391, -2.94254, 6.75], - "to": [15.35391, 20.05746, 8.75], - "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, - "faces": { - "north": {"uv": [2, 5.5, 2.25, 11.25], "texture": "#1"}, - "east": {"uv": [1.5, 0, 2, 5.75], "texture": "#1"}, - "south": {"uv": [5.5, 2, 5.75, 7.75], "texture": "#1"}, - "west": {"uv": [1, 0, 1.5, 5.75], "texture": "#1"}, - "up": {"uv": [6.25, 2.5, 5.75, 2.25], "rotation": 270, "texture": "#1"}, - "down": {"uv": [6.25, 2.5, 5.75, 2.75], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [0.85391, 8.95746, 8.75], - "to": [15.85391, 10.95746, 10.75], - "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, - "faces": { - "north": {"uv": [4, 0, 7.75, 0.5], "texture": "#1"}, - "east": {"uv": [0, 5.75, 0.5, 6.25], "texture": "#1"}, - "south": {"uv": [4, 0.5, 7.75, 1], "texture": "#1"}, - "west": {"uv": [3.25, 5.5, 3.75, 6], "texture": "#1"}, - "up": {"uv": [4.5, 4.75, 4, 1], "rotation": 270, "texture": "#1"}, - "down": {"uv": [5, 1, 4.5, 4.75], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [15.35391, -2.44203, 7.7505], - "to": [16.35391, 19.55797, 9.7505], - "rotation": {"angle": -45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, - "faces": { - "north": {"uv": [2.75, 5.5, 3, 11], "texture": "#1"}, - "east": {"uv": [3.5, 0, 4, 5.5], "texture": "#1"}, - "south": {"uv": [3, 5.5, 3.25, 11], "texture": "#1"}, - "west": {"uv": [3, 0, 3.5, 5.5], "texture": "#1"}, - "up": {"uv": [6.25, 3, 5.75, 2.75], "rotation": 270, "texture": "#1"}, - "down": {"uv": [6.25, 3, 5.75, 3.25], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [1.35391, 6.95746, 17.75], - "to": [15.35391, 8.95746, 17.75], - "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, - "faces": { - "north": {"uv": [5, 1, 8.5, 1.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, - "south": {"uv": [5, 1.5, 8.5, 2], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, - "up": {"uv": [0, 3.5, 0, 0], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0, 3.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [1.35391, 7.95746, 16.75], - "to": [15.35391, 7.95746, 18.75], - "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, - "faces": { - "north": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, - "south": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, - "up": {"uv": [4.5, 8.25, 4, 4.75], "rotation": 270, "texture": "#1"}, - "down": {"uv": [5, 4.75, 4.5, 8.25], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [1.35391, 17.95746, 7.75], - "to": [15.35391, 19.95746, 7.75], - "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, - "faces": { - "north": {"uv": [5, 1, 8.5, 1.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, - "south": {"uv": [5, 1.5, 8.5, 2], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, - "up": {"uv": [0, 3.5, 0, 0], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0, 3.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [1.35391, 18.95746, 6.75], - "to": [15.35391, 18.95746, 8.75], - "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, - "faces": { - "north": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, - "south": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, - "up": {"uv": [4.5, 8.25, 4, 4.75], "rotation": 270, "texture": "#1"}, - "down": {"uv": [5, 4.75, 4.5, 8.25], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [1.35391, -2.04254, 7.75], - "to": [15.35391, -0.04254, 7.75], - "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, - "faces": { - "north": {"uv": [5, 1, 8.5, 1.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, - "south": {"uv": [5, 1.5, 8.5, 2], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, - "up": {"uv": [0, 3.5, 0, 0], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0, 3.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [1.35391, -1.04254, 6.75], - "to": [15.35391, -1.04254, 8.75], - "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, - "faces": { - "north": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, - "south": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, - "up": {"uv": [4.5, 8.25, 4, 4.75], "rotation": 270, "texture": "#1"}, - "down": {"uv": [5, 4.75, 4.5, 8.25], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [1.35391, 7.95746, -2.25], - "to": [15.35391, 7.95746, -0.25], - "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, - "faces": { - "north": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, - "south": {"uv": [0, 0, 3.5, 0], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0], "texture": "#1"}, - "up": {"uv": [4.5, 8.25, 4, 4.75], "rotation": 270, "texture": "#1"}, - "down": {"uv": [5, 4.75, 4.5, 8.25], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [1.35391, 6.95746, -1.25], - "to": [15.35391, 8.95746, -1.25], - "rotation": {"angle": 45, "axis": "x", "origin": [8.35391, 8.70746, 8]}, - "faces": { - "north": {"uv": [5, 1, 8.5, 1.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, - "south": {"uv": [5, 1.5, 8.5, 2], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 0.5], "texture": "#1"}, - "up": {"uv": [0, 3.5, 0, 0], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0, 3.5], "rotation": 90, "texture": "#1"} - } - } - ], - "gui_light": "front", - "display": { - "thirdperson_righthand": { - "translation": [0, 1, -3.5], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 1, -3.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [21.15, 23.99, -8.94], - "translation": [0, 3.5, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "rotation": [21.15, 23.99, -8.94], - "translation": [0, 3.5, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "translation": [0, 3.25, 0], - "scale": [0.4, 0.4, 0.4] - }, - "gui": { - "rotation": [19.29, 47.82, -2.83], - "translation": [0, 0, -6.25], - "scale": [0.6, 0.6, 0.6] - }, - "head": { - "translation": [0, 14.25, 0] - }, - "fixed": { - "rotation": [0, 90, 0], - "translation": [0, 0, -6.25] - } - }, - "groups": [ - { - "name": "group", - "origin": [15, 1, 15], - "color": 0, - "children": [ - { - "name": "group", - "origin": [8.35391, 8.70746, 8], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/barbed_wire.json b/src/main/resources/assets/superbwarfare/models/item/barbed_wire.json deleted file mode 100644 index 4ce0c7018..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/barbed_wire.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "superbwarfare:block/barbed_wire", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/deepslate_galena_ore.json b/src/main/resources/assets/superbwarfare/models/item/deepslate_galena_ore.json deleted file mode 100644 index c13730362..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/deepslate_galena_ore.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "superbwarfare:block/deepslate_galena_ore", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/deepslate_scheelite_ore.json b/src/main/resources/assets/superbwarfare/models/item/deepslate_scheelite_ore.json deleted file mode 100644 index 17544c3de..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/deepslate_scheelite_ore.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "superbwarfare:block/deepslate_scheelite_ore", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/galena_ore.json b/src/main/resources/assets/superbwarfare/models/item/galena_ore.json deleted file mode 100644 index c8dd9f602..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/galena_ore.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "superbwarfare:block/galena_ore", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/gun_recycle.json b/src/main/resources/assets/superbwarfare/models/item/gun_recycle.json deleted file mode 100644 index dfd3c3b36..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/gun_recycle.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "superbwarfare:block/gun_recycle", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/jump_pad.json b/src/main/resources/assets/superbwarfare/models/item/jump_pad.json deleted file mode 100644 index 354aa1ae7..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/jump_pad.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "superbwarfare:block/jump_pad", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/scheelite_ore.json b/src/main/resources/assets/superbwarfare/models/item/scheelite_ore.json deleted file mode 100644 index ece518adc..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/scheelite_ore.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "superbwarfare:block/scheelite_ore", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/textures/block/tiesiwang.png b/src/main/resources/assets/superbwarfare/textures/block/barbed_wire.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/block/tiesiwang.png rename to src/main/resources/assets/superbwarfare/textures/block/barbed_wire.png