diff --git a/src/main/java/com/smithy/scorched_earth/ScorchedEarth.java b/src/main/java/com/smithy/scorched_earth/ScorchedEarth.java index 830901b..63091ec 100644 --- a/src/main/java/com/smithy/scorched_earth/ScorchedEarth.java +++ b/src/main/java/com/smithy/scorched_earth/ScorchedEarth.java @@ -1,10 +1,14 @@ package com.smithy.scorched_earth; import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; +import net.minecraft.item.ItemGroups; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.smithy.scorched_earth.registry.BlockRegistries; + public class ScorchedEarth implements ModInitializer { public static final String MOD_ID = "scorched_earth"; @@ -18,6 +22,17 @@ public class ScorchedEarth implements ModInitializer { // This code runs as soon as Minecraft is in a mod-load-ready state. // However, some things (like resources) may still be uninitialized. // Proceed with mild caution. + BlockRegistries.register(); + + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL) + .register((content) -> { + content.add(BlockRegistries.ASH); + content.add(BlockRegistries.SALT); + content.add(BlockRegistries.ASH_BLOCK); + content.add(BlockRegistries.SALT_BLOCK); + content.add(BlockRegistries.ASH_DIRT); + content.add(BlockRegistries.ASH_GRASS); + }); LOGGER.info("man this Earth is " + MOD_ID); } diff --git a/src/main/java/com/smithy/scorched_earth/blocks/Ash.java b/src/main/java/com/smithy/scorched_earth/blocks/Ash.java new file mode 100644 index 0000000..3caf102 --- /dev/null +++ b/src/main/java/com/smithy/scorched_earth/blocks/Ash.java @@ -0,0 +1,17 @@ +package com.smithy.scorched_earth.blocks; + +import net.minecraft.block.BlockState; +import net.minecraft.block.SnowBlock; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.random.Random; + +public class Ash extends SnowBlock { + public Ash(Settings settings) { + super(settings); + } + + @Override + public void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random random) { + } +} diff --git a/src/main/java/com/smithy/scorched_earth/blocks/Salt.java b/src/main/java/com/smithy/scorched_earth/blocks/Salt.java new file mode 100644 index 0000000..f32a7a0 --- /dev/null +++ b/src/main/java/com/smithy/scorched_earth/blocks/Salt.java @@ -0,0 +1,18 @@ +package com.smithy.scorched_earth.blocks; + +import net.minecraft.block.BlockState; +import net.minecraft.block.SnowBlock; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.random.Random; + +public class Salt extends SnowBlock { + + public Salt(Settings settings) { + super(settings); + } + + @Override + public void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random random) { + } +} diff --git a/src/main/java/com/smithy/scorched_earth/mixin/ExampleMixin.java b/src/main/java/com/smithy/scorched_earth/mixin/ExampleMixin.java index edef971..0ddc8db 100644 --- a/src/main/java/com/smithy/scorched_earth/mixin/ExampleMixin.java +++ b/src/main/java/com/smithy/scorched_earth/mixin/ExampleMixin.java @@ -6,10 +6,13 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import com.smithy.scorched_earth.ScorchedEarth; + @Mixin(MinecraftServer.class) public class ExampleMixin { @Inject(at = @At("HEAD"), method = "loadWorld") private void init(CallbackInfo info) { + ScorchedEarth.LOGGER.info("time to scorch this earth."); // This code is injected into the start of MinecraftServer.loadWorld()V } } \ No newline at end of file diff --git a/src/main/java/com/smithy/scorched_earth/registry/BlockRegistries.java b/src/main/java/com/smithy/scorched_earth/registry/BlockRegistries.java new file mode 100644 index 0000000..ae79ecf --- /dev/null +++ b/src/main/java/com/smithy/scorched_earth/registry/BlockRegistries.java @@ -0,0 +1,102 @@ +package com.smithy.scorched_earth.registry; + +import com.smithy.scorched_earth.ScorchedEarth; +import com.smithy.scorched_earth.blocks.Ash; +import com.smithy.scorched_earth.blocks.Salt; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.block.MapColor; +import net.minecraft.block.piston.PistonBehavior; +import net.minecraft.item.BlockItem; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.util.Identifier; + +public class BlockRegistries { + + public static final Block SALT = new Salt( + FabricBlockSettings + .create() + .mapColor(MapColor.OFF_WHITE) + .replaceable() + .notSolid() + .ticksRandomly() + .strength(0.1f) + .requiresTool() + .sounds(BlockSoundGroup.SAND) + .blockVision((state, world, pos) -> { + return (Integer) state.get(Salt.LAYERS) >= 8; + }).pistonBehavior(PistonBehavior.DESTROY)); + + public static final Block SALT_BLOCK = new Block( + FabricBlockSettings + .create() + .mapColor(MapColor.OFF_WHITE) + .requiresTool() + .strength(0.2f) + .sounds(BlockSoundGroup.SAND)); + + public static final Block ASH = new Ash( + FabricBlockSettings + .create() + .mapColor(MapColor.BLACK) + .replaceable() + .notSolid() + .ticksRandomly() + .strength(0.1f) + .sounds(BlockSoundGroup.SAND) + .blockVision((state, world, pos) -> { + return (Integer) state.get(Salt.LAYERS) >= 8; + }).pistonBehavior(PistonBehavior.DESTROY)); + + public static final Block ASH_BLOCK = new Block( + FabricBlockSettings + .create() + .mapColor(MapColor.OFF_WHITE) + .requiresTool() + .strength(0.2f) + .sounds(BlockSoundGroup.SAND)); + + public static final Block ASH_DIRT = new Block( + FabricBlockSettings + .create() + .mapColor(MapColor.GRAY) + .strength(0.5F) + .sounds(BlockSoundGroup.GRAVEL)); + + public static final Block ASH_GRASS = new Block( + FabricBlockSettings + .create() + .mapColor(MapColor.GRAY) + .strength(0.6F) + .sounds(BlockSoundGroup.GRASS)); + + public static void register() { + // BLOCKS ONLY + Registry.register(Registries.BLOCK, new Identifier(ScorchedEarth.MOD_ID, "salt"), SALT); + Registry.register(Registries.BLOCK, new Identifier(ScorchedEarth.MOD_ID, "salt_block"), SALT_BLOCK); + Registry.register(Registries.BLOCK, new Identifier(ScorchedEarth.MOD_ID, "ash"), ASH); + Registry.register(Registries.BLOCK, new Identifier(ScorchedEarth.MOD_ID, "ash_block"), ASH_BLOCK); + Registry.register(Registries.BLOCK, new Identifier(ScorchedEarth.MOD_ID, "ashy_dirt"), ASH_DIRT); + Registry.register(Registries.BLOCK, new Identifier(ScorchedEarth.MOD_ID, "ashy_grass"), ASH_GRASS); + + // ITEMS ONLY + Registry.register(Registries.ITEM, new Identifier(ScorchedEarth.MOD_ID, "salt"), + new BlockItem(SALT, new FabricItemSettings())); + Registry.register(Registries.ITEM, new Identifier(ScorchedEarth.MOD_ID, "salt_block"), + new BlockItem(SALT_BLOCK, new FabricItemSettings())); + Registry.register(Registries.ITEM, new Identifier(ScorchedEarth.MOD_ID, "ash"), + new BlockItem(ASH, new FabricItemSettings())); + Registry.register(Registries.ITEM, new Identifier(ScorchedEarth.MOD_ID, "ash_block"), + new BlockItem(ASH_BLOCK, new FabricItemSettings())); + Registry.register(Registries.ITEM, new Identifier(ScorchedEarth.MOD_ID, "ashy_dirt"), + new BlockItem(ASH_DIRT, new FabricItemSettings())); + Registry.register(Registries.ITEM, new Identifier(ScorchedEarth.MOD_ID, "ashy_grass"), + new BlockItem(ASH_GRASS, new FabricItemSettings())); + + } +} diff --git a/src/main/resources/assets/scorched_earth/blockstates/ash.json b/src/main/resources/assets/scorched_earth/blockstates/ash.json new file mode 100644 index 0000000..4fcef30 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/blockstates/ash.json @@ -0,0 +1,12 @@ +{ + "variants": { + "layers=1": { "model": "scorched_earth:block/ash_layer_1" }, + "layers=2": { "model": "scorched_earth:block/ash_layer_2" }, + "layers=3": { "model": "scorched_earth:block/ash_layer_3" }, + "layers=4": { "model": "scorched_earth:block/ash_layer_4" }, + "layers=5": { "model": "scorched_earth:block/ash_layer_5" }, + "layers=6": { "model": "scorched_earth:block/ash_layer_6" }, + "layers=7": { "model": "scorched_earth:block/ash_layer_7" }, + "layers=8": { "model": "scorched_earth:block/ash_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/scorched_earth/blockstates/ash_block.json b/src/main/resources/assets/scorched_earth/blockstates/ash_block.json new file mode 100644 index 0000000..1b7ef3e --- /dev/null +++ b/src/main/resources/assets/scorched_earth/blockstates/ash_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "scorched_earth:block/ash_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/scorched_earth/blockstates/ashy_dirt.json b/src/main/resources/assets/scorched_earth/blockstates/ashy_dirt.json new file mode 100644 index 0000000..600d50a --- /dev/null +++ b/src/main/resources/assets/scorched_earth/blockstates/ashy_dirt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "scorched_earth:block/ashy_dirt" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/scorched_earth/blockstates/ashy_grass.json b/src/main/resources/assets/scorched_earth/blockstates/ashy_grass.json new file mode 100644 index 0000000..435f16a --- /dev/null +++ b/src/main/resources/assets/scorched_earth/blockstates/ashy_grass.json @@ -0,0 +1,21 @@ +{ + "variants": { + "": [ + { + "model": "scorched_earth:block/ashy_grass" + }, + { + "model": "scorched_earth:block/ashy_grass", + "y": 90 + }, + { + "model": "scorched_earth:block/ashy_grass", + "y": 180 + }, + { + "model": "scorched_earth:block/ashy_grass", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/scorched_earth/blockstates/salt.json b/src/main/resources/assets/scorched_earth/blockstates/salt.json new file mode 100644 index 0000000..da7c798 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/blockstates/salt.json @@ -0,0 +1,12 @@ +{ + "variants": { + "layers=1": { "model": "scorched_earth:block/salt_layer_1" }, + "layers=2": { "model": "scorched_earth:block/salt_layer_2" }, + "layers=3": { "model": "scorched_earth:block/salt_layer_3" }, + "layers=4": { "model": "scorched_earth:block/salt_layer_4" }, + "layers=5": { "model": "scorched_earth:block/salt_layer_5" }, + "layers=6": { "model": "scorched_earth:block/salt_layer_6" }, + "layers=7": { "model": "scorched_earth:block/salt_layer_7" }, + "layers=8": { "model": "scorched_earth:block/salt_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/scorched_earth/blockstates/salt_block.json b/src/main/resources/assets/scorched_earth/blockstates/salt_block.json new file mode 100644 index 0000000..264c9f4 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/blockstates/salt_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "scorched_earth:block/salt_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/scorched_earth/lang/en_us.json b/src/main/resources/assets/scorched_earth/lang/en_us.json index eaaf304..8c98ff5 100644 --- a/src/main/resources/assets/scorched_earth/lang/en_us.json +++ b/src/main/resources/assets/scorched_earth/lang/en_us.json @@ -1,5 +1,11 @@ { + // other shit + "generator.scorched_earth.scorched_earth_preset": "Scorched Earth", -"generator.scorched_earth.scorched_earth_preset": "Scorched Earth" - + // items + "block.scorched_earth.salt": "Salt", + "block.scorched_earth.salt_block": "Salt Block", + "block.scorched_earth.ash": "Ash", + "block.scorched_earth.ash_block": "Ash Block", + "block.scorched_earth.ashy_dirt": "Ashy Dirt" } \ No newline at end of file diff --git a/src/main/resources/assets/scorched_earth/models/block/ash_block.json b/src/main/resources/assets/scorched_earth/models/block/ash_block.json new file mode 100644 index 0000000..8fad84b --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/block/ash_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "scorched_earth:block/ash" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/scorched_earth/models/block/ash_layer_1.json b/src/main/resources/assets/scorched_earth/models/block/ash_layer_1.json new file mode 100644 index 0000000..8e9ee26 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/block/ash_layer_1.json @@ -0,0 +1,19 @@ +{ "parent": "block/thin_block", + "textures": { + "particle": "scorched_earth:block/ash", + "texture": "scorched_earth:block/ash" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture", "cullface": "east" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/scorched_earth/models/block/ash_layer_2.json b/src/main/resources/assets/scorched_earth/models/block/ash_layer_2.json new file mode 100644 index 0000000..b416ff6 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/block/ash_layer_2.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "scorched_earth:block/ash", + "texture": "scorched_earth:block/ash" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 4, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 16, 16 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 0, 12, 16, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 12, 16, 16 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 12, 16, 16 ], "texture": "#texture", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/scorched_earth/models/block/ash_layer_3.json b/src/main/resources/assets/scorched_earth/models/block/ash_layer_3.json new file mode 100644 index 0000000..4599610 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/block/ash_layer_3.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "scorched_earth:block/ash", + "texture": "scorched_earth:block/ash" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 6, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/scorched_earth/models/block/ash_layer_4.json b/src/main/resources/assets/scorched_earth/models/block/ash_layer_4.json new file mode 100644 index 0000000..e5d3ff4 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/block/ash_layer_4.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "scorched_earth:block/ash", + "texture": "scorched_earth:block/ash" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 8, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/scorched_earth/models/block/ash_layer_5.json b/src/main/resources/assets/scorched_earth/models/block/ash_layer_5.json new file mode 100644 index 0000000..1a7cd02 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/block/ash_layer_5.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "scorched_earth:block/ash", + "texture": "scorched_earth:block/ash" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 10, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 6, 16, 16 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 0, 6, 16, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 6, 16, 16 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 6, 16, 16 ], "texture": "#texture", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/scorched_earth/models/block/ash_layer_6.json b/src/main/resources/assets/scorched_earth/models/block/ash_layer_6.json new file mode 100644 index 0000000..8e8b238 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/block/ash_layer_6.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "scorched_earth:block/ash", + "texture": "scorched_earth:block/ash" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 12, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/scorched_earth/models/block/ash_layer_7.json b/src/main/resources/assets/scorched_earth/models/block/ash_layer_7.json new file mode 100644 index 0000000..13a73bf --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/block/ash_layer_7.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "scorched_earth:block/ash", + "texture": "scorched_earth:block/ash" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 14, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/scorched_earth/models/block/ashy_dirt.json b/src/main/resources/assets/scorched_earth/models/block/ashy_dirt.json new file mode 100644 index 0000000..396b68b --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/block/ashy_dirt.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "scorched_earth:block/ashy_dirt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/scorched_earth/models/block/ashy_grass.json b/src/main/resources/assets/scorched_earth/models/block/ashy_grass.json new file mode 100644 index 0000000..7fb1037 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/block/ashy_grass.json @@ -0,0 +1,21 @@ +{ "parent": "block/block", + "textures": { + "particle": "scorched_earth:block/ashy_dirt", + "bottom": "scorched_earth:block/ashy_dirt", + "top": "scorched_earth:block/ash", + "side": "scorched_earth:block/ash_grass_side" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "up", "tintindex": 0 }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/scorched_earth/models/block/salt_block.json b/src/main/resources/assets/scorched_earth/models/block/salt_block.json new file mode 100644 index 0000000..d3d9ee4 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/block/salt_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "scorched_earth:block/salt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/scorched_earth/models/block/salt_layer_1.json b/src/main/resources/assets/scorched_earth/models/block/salt_layer_1.json new file mode 100644 index 0000000..933fe95 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/block/salt_layer_1.json @@ -0,0 +1,19 @@ +{ "parent": "block/thin_block", + "textures": { + "particle": "scorched_earth:block/salt", + "texture": "scorched_earth:block/salt" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture", "cullface": "east" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/scorched_earth/models/block/salt_layer_2.json b/src/main/resources/assets/scorched_earth/models/block/salt_layer_2.json new file mode 100644 index 0000000..918933e --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/block/salt_layer_2.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "scorched_earth:block/salt", + "texture": "scorched_earth:block/salt" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 4, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 16, 16 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 0, 12, 16, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 12, 16, 16 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 12, 16, 16 ], "texture": "#texture", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/scorched_earth/models/block/salt_layer_3.json b/src/main/resources/assets/scorched_earth/models/block/salt_layer_3.json new file mode 100644 index 0000000..e02c640 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/block/salt_layer_3.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "scorched_earth:block/salt", + "texture": "scorched_earth:block/salt" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 6, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/scorched_earth/models/block/salt_layer_4.json b/src/main/resources/assets/scorched_earth/models/block/salt_layer_4.json new file mode 100644 index 0000000..4669da3 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/block/salt_layer_4.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "scorched_earth:block/salt", + "texture": "scorched_earth:block/salt" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 8, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/scorched_earth/models/block/salt_layer_5.json b/src/main/resources/assets/scorched_earth/models/block/salt_layer_5.json new file mode 100644 index 0000000..9b7471c --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/block/salt_layer_5.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "scorched_earth:block/salt", + "texture": "scorched_earth:block/salt" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 10, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 6, 16, 16 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 0, 6, 16, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 6, 16, 16 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 6, 16, 16 ], "texture": "#texture", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/scorched_earth/models/block/salt_layer_6.json b/src/main/resources/assets/scorched_earth/models/block/salt_layer_6.json new file mode 100644 index 0000000..721bb72 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/block/salt_layer_6.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "scorched_earth:block/salt", + "texture": "scorched_earth:block/salt" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 12, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/scorched_earth/models/block/salt_layer_7.json b/src/main/resources/assets/scorched_earth/models/block/salt_layer_7.json new file mode 100644 index 0000000..323b8c4 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/block/salt_layer_7.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "scorched_earth:block/salt", + "texture": "scorched_earth:block/salt" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 14, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/scorched_earth/models/item/ash.json b/src/main/resources/assets/scorched_earth/models/item/ash.json new file mode 100644 index 0000000..20093c2 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/item/ash.json @@ -0,0 +1,3 @@ +{ + "parent": "scorched_earth:block/ash_layer_1" +} \ No newline at end of file diff --git a/src/main/resources/assets/scorched_earth/models/item/ash_block.json b/src/main/resources/assets/scorched_earth/models/item/ash_block.json new file mode 100644 index 0000000..8213c5c --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/item/ash_block.json @@ -0,0 +1,3 @@ +{ + "parent": "scorched_earth:block/ash_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/scorched_earth/models/item/ashy_dirt.json b/src/main/resources/assets/scorched_earth/models/item/ashy_dirt.json new file mode 100644 index 0000000..39c24e5 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/item/ashy_dirt.json @@ -0,0 +1,3 @@ +{ + "parent": "scorched_earth:block/ashy_dirt" +} \ No newline at end of file diff --git a/src/main/resources/assets/scorched_earth/models/item/ashy_grass.json b/src/main/resources/assets/scorched_earth/models/item/ashy_grass.json new file mode 100644 index 0000000..39c24e5 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/item/ashy_grass.json @@ -0,0 +1,3 @@ +{ + "parent": "scorched_earth:block/ashy_dirt" +} \ No newline at end of file diff --git a/src/main/resources/assets/scorched_earth/models/item/salt.json b/src/main/resources/assets/scorched_earth/models/item/salt.json new file mode 100644 index 0000000..4cf1722 --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/item/salt.json @@ -0,0 +1,3 @@ +{ + "parent": "scorched_earth:block/salt_layer_1" +} \ No newline at end of file diff --git a/src/main/resources/assets/scorched_earth/models/item/salt_block.json b/src/main/resources/assets/scorched_earth/models/item/salt_block.json new file mode 100644 index 0000000..217657a --- /dev/null +++ b/src/main/resources/assets/scorched_earth/models/item/salt_block.json @@ -0,0 +1,3 @@ +{ + "parent": "scorched_earth:block/salt_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/scorched_earth/textures/block/ash.png b/src/main/resources/assets/scorched_earth/textures/block/ash.png new file mode 100644 index 0000000..264424a Binary files /dev/null and b/src/main/resources/assets/scorched_earth/textures/block/ash.png differ diff --git a/src/main/resources/assets/scorched_earth/textures/block/ash_grass_side.png b/src/main/resources/assets/scorched_earth/textures/block/ash_grass_side.png new file mode 100644 index 0000000..6408638 Binary files /dev/null and b/src/main/resources/assets/scorched_earth/textures/block/ash_grass_side.png differ diff --git a/src/main/resources/assets/scorched_earth/textures/block/ash_grass_side.png~ b/src/main/resources/assets/scorched_earth/textures/block/ash_grass_side.png~ new file mode 100644 index 0000000..685d4c6 Binary files /dev/null and b/src/main/resources/assets/scorched_earth/textures/block/ash_grass_side.png~ differ diff --git a/src/main/resources/assets/scorched_earth/textures/block/ashy_dirt.png b/src/main/resources/assets/scorched_earth/textures/block/ashy_dirt.png new file mode 100644 index 0000000..a924895 Binary files /dev/null and b/src/main/resources/assets/scorched_earth/textures/block/ashy_dirt.png differ diff --git a/src/main/resources/assets/scorched_earth/textures/block/salt.png b/src/main/resources/assets/scorched_earth/textures/block/salt.png new file mode 100644 index 0000000..d367a26 Binary files /dev/null and b/src/main/resources/assets/scorched_earth/textures/block/salt.png differ