From c28cbffb7452280467cf661dedbb615f530e6915 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sun, 11 Oct 2020 14:55:49 +0300 Subject: [PATCH 1/3] Stone Material --- .../blocks/basis/BlockStoneButton.java | 22 +++++ .../blocks/basis/BlockStonePressurePlate.java | 22 +++++ .../ru/betterend/blocks/basis/BlockWall.java | 22 +++++ .../blocks/complex/StoneMaterial.java | 83 +++++++++++++++++++ 4 files changed, 149 insertions(+) create mode 100644 src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java create mode 100644 src/main/java/ru/betterend/blocks/basis/BlockStonePressurePlate.java create mode 100644 src/main/java/ru/betterend/blocks/basis/BlockWall.java create mode 100644 src/main/java/ru/betterend/blocks/complex/StoneMaterial.java diff --git a/src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java b/src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java new file mode 100644 index 00000000..d01f2007 --- /dev/null +++ b/src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java @@ -0,0 +1,22 @@ +package ru.betterend.blocks.basis; + +import java.util.Collections; +import java.util.List; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.StoneButtonBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext; + +public class BlockStoneButton extends StoneButtonBlock { + public BlockStoneButton(Block source) { + super(FabricBlockSettings.copyOf(source).nonOpaque()); + } + + @Override + public List getDroppedStacks(BlockState state, LootContext.Builder builder) { + return Collections.singletonList(new ItemStack(this)); + } +} diff --git a/src/main/java/ru/betterend/blocks/basis/BlockStonePressurePlate.java b/src/main/java/ru/betterend/blocks/basis/BlockStonePressurePlate.java new file mode 100644 index 00000000..f7afd29a --- /dev/null +++ b/src/main/java/ru/betterend/blocks/basis/BlockStonePressurePlate.java @@ -0,0 +1,22 @@ +package ru.betterend.blocks.basis; + +import java.util.Collections; +import java.util.List; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.PressurePlateBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext; + +public class BlockStonePressurePlate extends PressurePlateBlock { + public BlockStonePressurePlate(Block source) { + super(ActivationRule.MOBS, FabricBlockSettings.copyOf(source).nonOpaque()); + } + + @Override + public List getDroppedStacks(BlockState state, LootContext.Builder builder) { + return Collections.singletonList(new ItemStack(this)); + } +} diff --git a/src/main/java/ru/betterend/blocks/basis/BlockWall.java b/src/main/java/ru/betterend/blocks/basis/BlockWall.java new file mode 100644 index 00000000..5758cc5d --- /dev/null +++ b/src/main/java/ru/betterend/blocks/basis/BlockWall.java @@ -0,0 +1,22 @@ +package ru.betterend.blocks.basis; + +import java.util.Collections; +import java.util.List; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.WallBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext; + +public class BlockWall extends WallBlock { + public BlockWall(Block source) { + super(FabricBlockSettings.copyOf(source).nonOpaque()); + } + + @Override + public List getDroppedStacks(BlockState state, LootContext.Builder builder) { + return Collections.singletonList(new ItemStack(this)); + } +} diff --git a/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java b/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java new file mode 100644 index 00000000..7bf62dd5 --- /dev/null +++ b/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java @@ -0,0 +1,83 @@ +package ru.betterend.blocks.complex; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.block.MaterialColor; +import net.minecraft.tag.BlockTags; +import net.minecraft.tag.ItemTags; +import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BlockPillar; +import ru.betterend.blocks.basis.BlockSlab; +import ru.betterend.blocks.basis.BlockStairs; +import ru.betterend.blocks.basis.BlockStoneButton; +import ru.betterend.blocks.basis.BlockStonePressurePlate; +import ru.betterend.blocks.basis.BlockWall; +import ru.betterend.recipe.builders.RecipeBuilder; +import ru.betterend.registry.BlockRegistry; +import ru.betterend.util.TagHelper; + +public class StoneMaterial { + public final Block stone; + + public final Block tile; + public final Block small_tiles; + public final Block pillar; + public final Block stairs; + public final Block slab; + public final Block wall; + public final Block button; + public final Block pressure_plate; + + public final Block bricks; + public final Block brick_stairs; + public final Block brick_slab; + public final Block brick_wall; + + public StoneMaterial(String name, MaterialColor color) { + FabricBlockSettings material = FabricBlockSettings.copyOf(Blocks.END_STONE).materialColor(color); + + stone = BlockRegistry.registerBlock(name, new BlockBase(material)); + tile = BlockRegistry.registerBlock(name + "_tile", new BlockBase(material)); + small_tiles = BlockRegistry.registerBlock(name + "_small_tiles", new BlockBase(material)); + pillar = BlockRegistry.registerBlock(name + "_pillar", new BlockPillar(material)); + stairs = BlockRegistry.registerBlock(name + "_stairs", new BlockStairs(stone)); + slab = BlockRegistry.registerBlock(name + "_slab", new BlockSlab(stone)); + wall = BlockRegistry.registerBlock(name + "_wall", new BlockWall(stone)); + button = BlockRegistry.registerBlock(name + "_button", new BlockStoneButton(stone)); + pressure_plate = BlockRegistry.registerBlock(name + "_pressure_plate", new BlockStonePressurePlate(stone)); + + bricks = BlockRegistry.registerBlock(name + "_bricks", new BlockBase(material)); + brick_stairs = BlockRegistry.registerBlock(name + "_brick_stairs", new BlockStairs(bricks)); + brick_slab = BlockRegistry.registerBlock(name + "_brick_stairs", new BlockSlab(bricks)); + brick_wall = BlockRegistry.registerBlock(name + "_wall", new BlockWall(bricks)); + + // Recipes // + RecipeBuilder.make(name + "_bricks", bricks).setOutputCount(4).setShape("##", "##").addMaterial('#', stone).setGroup("end_bricks").build(); + RecipeBuilder.make(name + "_tile", tile).setOutputCount(4).setShape("##", "##").addMaterial('#', bricks).setGroup("end_tile").build(); + RecipeBuilder.make(name + "_small_tiles", small_tiles).setOutputCount(4).setShape("##", "##").addMaterial('#', tile).setGroup("end_small_tile").build(); + RecipeBuilder.make(name + "_pillar", pillar).setShape("#", "#").addMaterial('#', slab).setGroup("end_pillar").build(); + + RecipeBuilder.make(name + "_stairs", stairs).setOutputCount(4).setShape("# ", "## ", "###").addMaterial('#', stone).setGroup("end_stone_stairs").build(); + RecipeBuilder.make(name + "_slab", slab).setOutputCount(6).setShape("###").addMaterial('#', stone).setGroup("end_stone_slabs").build(); + RecipeBuilder.make(name + "_brick_stairs", brick_stairs).setOutputCount(4).setShape("# ", "## ", "###").addMaterial('#', bricks).setGroup("end_stone_stairs").build(); + RecipeBuilder.make(name + "_brick_slab", brick_slab).setOutputCount(6).setShape("###").addMaterial('#', bricks).setGroup("end_stone_slabs").build(); + + RecipeBuilder.make(name + "_wall", wall).setOutputCount(6).setShape("###", "###").addMaterial('#', stone).setGroup("end_wall").build(); + RecipeBuilder.make(name + "_brick_wall", brick_wall).setOutputCount(6).setShape("###", "###").addMaterial('#', bricks).setGroup("end_wall").build(); + + RecipeBuilder.make(name + "_button", button).setList("#").addMaterial('#', stone).setGroup("end_stone_buttons").build(); + RecipeBuilder.make(name + "_pressure_plate", pressure_plate).setShape("##").addMaterial('#', stone).setGroup("end_stone_plates").build(); + + // Item Tags // + TagHelper.addTag(ItemTags.SLABS, slab, brick_slab); + TagHelper.addTag(ItemTags.STONE_BRICKS, bricks); + TagHelper.addTag(ItemTags.STONE_CRAFTING_MATERIALS, stone); + + // Block Tags // + TagHelper.addTag(BlockTags.STONE_BRICKS, bricks); + TagHelper.addTag(BlockTags.WALLS, wall, brick_wall); + TagHelper.addTag(BlockTags.SLABS, slab, brick_slab); + TagHelper.addTags(pressure_plate, BlockTags.PRESSURE_PLATES, BlockTags.STONE_PRESSURE_PLATES); + } +} \ No newline at end of file From 4a5ce4a8947c33c0a8dfecf19b80fe8688d529a7 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sun, 11 Oct 2020 15:21:06 +0300 Subject: [PATCH 2/3] Fixes, violecite --- src/main/java/ru/betterend/blocks/complex/StoneMaterial.java | 4 ++-- src/main/java/ru/betterend/registry/BlockRegistry.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java b/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java index 7bf62dd5..a7bd09fd 100644 --- a/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java +++ b/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java @@ -49,8 +49,8 @@ public class StoneMaterial { bricks = BlockRegistry.registerBlock(name + "_bricks", new BlockBase(material)); brick_stairs = BlockRegistry.registerBlock(name + "_brick_stairs", new BlockStairs(bricks)); - brick_slab = BlockRegistry.registerBlock(name + "_brick_stairs", new BlockSlab(bricks)); - brick_wall = BlockRegistry.registerBlock(name + "_wall", new BlockWall(bricks)); + brick_slab = BlockRegistry.registerBlock(name + "_brick_slab", new BlockSlab(bricks)); + brick_wall = BlockRegistry.registerBlock(name + "_brick_wall", new BlockWall(bricks)); // Recipes // RecipeBuilder.make(name + "_bricks", bricks).setOutputCount(4).setShape("##", "##").addMaterial('#', stone).setGroup("end_bricks").build(); diff --git a/src/main/java/ru/betterend/registry/BlockRegistry.java b/src/main/java/ru/betterend/registry/BlockRegistry.java index 847bc5a5..3810eca0 100644 --- a/src/main/java/ru/betterend/registry/BlockRegistry.java +++ b/src/main/java/ru/betterend/registry/BlockRegistry.java @@ -31,6 +31,7 @@ import ru.betterend.blocks.EnderBlock; import ru.betterend.blocks.TerminiteBlock; import ru.betterend.blocks.basis.BlockGlowingFur; import ru.betterend.blocks.basis.BlockVine; +import ru.betterend.blocks.complex.StoneMaterial; import ru.betterend.blocks.complex.WoodenMaterial; import ru.betterend.tab.CreativeTab; @@ -48,6 +49,7 @@ public class BlockRegistry { // Rocks // public static final Block FLAVOLITE = registerBlock("flavolite", new BlockStone(MaterialColor.SAND)); + public static final StoneMaterial VIOLECITE = new StoneMaterial("violecite", MaterialColor.PURPLE); // Wooden Materials // public static final Block MOSSY_GLOWSHROOM_SAPLING = registerBlock("mossy_glowshroom_sapling", new BlockMossyGlowshroomSapling()); From bfa32d5088d83ef08484cf1f9bf33a082cdc2c77 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sun, 11 Oct 2020 16:12:05 +0300 Subject: [PATCH 3/3] Unfinished blockstates --- .../blocks/complex/StoneMaterial.java | 2 +- .../betterend/blockstates/violecite.json | 7 + .../blockstates/violecite_brick_slab.json | 15 ++ .../blockstates/violecite_brick_stairs.json | 209 ++++++++++++++++++ .../blockstates/violecite_brick_wall.json | 90 ++++++++ .../blockstates/violecite_bricks.json | 7 + .../blockstates/violecite_button.json | 118 ++++++++++ .../blockstates/violecite_pillar.json | 7 + .../blockstates/violecite_plate.json | 10 + .../betterend/blockstates/violecite_slab.json | 15 ++ .../blockstates/violecite_small_tiles.json | 7 + .../blockstates/violecite_stairs.json | 209 ++++++++++++++++++ .../betterend/blockstates/violecite_tile.json | 7 + .../betterend/blockstates/violecite_wall.json | 90 ++++++++ .../betterend/models/block/violecite.json | 6 + .../block/violecite_brick_inner_stairs.json | 8 + .../block/violecite_brick_outer_stairs.json | 8 + .../models/block/violecite_brick_stairs.json | 8 + .../block/violecite_brick_wall_inventory.json | 6 + .../block/violecite_brick_wall_post.json | 6 + .../block/violecite_brick_wall_side.json | 6 + .../block/violecite_brick_wall_side_tall.json | 6 + .../models/block/violecite_bricks.json | 6 + .../models/block/violecite_button.json | 6 + .../block/violecite_button_inventory.json | 6 + .../block/violecite_button_pressed.json | 6 + .../models/block/violecite_inner_stairs.json | 8 + .../models/block/violecite_outer_stairs.json | 8 + .../models/block/violecite_pillar.json | 7 + .../block/violecite_pressure_plate_down.json | 6 + .../block/violecite_pressure_plate_up.json | 6 + .../models/block/violecite_small_tiles.json | 6 + .../models/block/violecite_stairs.json | 8 + .../models/block/violecite_tile.json | 6 + .../block/violecite_wall_inventory.json | 6 + .../models/block/violecite_wall_post.json | 6 + .../models/block/violecite_wall_side.json | 6 + .../block/violecite_wall_side_tall.json | 6 + .../betterend/models/item/violecite.json | 3 + .../models/item/violecite_brick_slab.json | 3 + .../models/item/violecite_brick_stairs.json | 3 + .../models/item/violecite_brick_wall.json | 3 + .../models/item/violecite_bricks.json | 3 + .../models/item/violecite_button.json | 3 + .../models/item/violecite_pillar.json | 3 + .../models/item/violecite_plate.json | 3 + .../betterend/models/item/violecite_slab.json | 3 + .../models/item/violecite_small_tiles.json | 3 + .../models/item/violecite_stairs.json | 3 + .../betterend/models/item/violecite_tile.json | 3 + .../betterend/models/item/violecite_wall.json | 3 + .../betterend/textures/block/purpur_block.png | Bin 179 -> 0 bytes .../assets/betterend/textures/block/violecite | Bin 0 -> 274 bytes .../betterend/textures/block/violecite.png | Bin 0 -> 274 bytes .../textures/block/violecite_pilar_side.png | Bin 0 -> 407 bytes .../textures/block/violecite_pillar_top.png | Bin 0 -> 268 bytes .../textures/block/violecite_small_tiles.png | Bin 0 -> 230 bytes 57 files changed, 988 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/betterend/blockstates/violecite.json create mode 100644 src/main/resources/assets/betterend/blockstates/violecite_brick_slab.json create mode 100644 src/main/resources/assets/betterend/blockstates/violecite_brick_stairs.json create mode 100644 src/main/resources/assets/betterend/blockstates/violecite_brick_wall.json create mode 100644 src/main/resources/assets/betterend/blockstates/violecite_bricks.json create mode 100644 src/main/resources/assets/betterend/blockstates/violecite_button.json create mode 100644 src/main/resources/assets/betterend/blockstates/violecite_pillar.json create mode 100644 src/main/resources/assets/betterend/blockstates/violecite_plate.json create mode 100644 src/main/resources/assets/betterend/blockstates/violecite_slab.json create mode 100644 src/main/resources/assets/betterend/blockstates/violecite_small_tiles.json create mode 100644 src/main/resources/assets/betterend/blockstates/violecite_stairs.json create mode 100644 src/main/resources/assets/betterend/blockstates/violecite_tile.json create mode 100644 src/main/resources/assets/betterend/blockstates/violecite_wall.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_brick_inner_stairs.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_brick_outer_stairs.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_brick_stairs.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_brick_wall_inventory.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_brick_wall_post.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_brick_wall_side.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_brick_wall_side_tall.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_bricks.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_button.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_button_inventory.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_button_pressed.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_inner_stairs.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_outer_stairs.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_pillar.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_pressure_plate_down.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_pressure_plate_up.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_small_tiles.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_stairs.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_tile.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_wall_inventory.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_wall_post.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_wall_side.json create mode 100644 src/main/resources/assets/betterend/models/block/violecite_wall_side_tall.json create mode 100644 src/main/resources/assets/betterend/models/item/violecite.json create mode 100644 src/main/resources/assets/betterend/models/item/violecite_brick_slab.json create mode 100644 src/main/resources/assets/betterend/models/item/violecite_brick_stairs.json create mode 100644 src/main/resources/assets/betterend/models/item/violecite_brick_wall.json create mode 100644 src/main/resources/assets/betterend/models/item/violecite_bricks.json create mode 100644 src/main/resources/assets/betterend/models/item/violecite_button.json create mode 100644 src/main/resources/assets/betterend/models/item/violecite_pillar.json create mode 100644 src/main/resources/assets/betterend/models/item/violecite_plate.json create mode 100644 src/main/resources/assets/betterend/models/item/violecite_slab.json create mode 100644 src/main/resources/assets/betterend/models/item/violecite_small_tiles.json create mode 100644 src/main/resources/assets/betterend/models/item/violecite_stairs.json create mode 100644 src/main/resources/assets/betterend/models/item/violecite_tile.json create mode 100644 src/main/resources/assets/betterend/models/item/violecite_wall.json delete mode 100644 src/main/resources/assets/betterend/textures/block/purpur_block.png create mode 100644 src/main/resources/assets/betterend/textures/block/violecite create mode 100644 src/main/resources/assets/betterend/textures/block/violecite.png create mode 100644 src/main/resources/assets/betterend/textures/block/violecite_pilar_side.png create mode 100644 src/main/resources/assets/betterend/textures/block/violecite_pillar_top.png create mode 100644 src/main/resources/assets/betterend/textures/block/violecite_small_tiles.png diff --git a/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java b/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java index a7bd09fd..cc037c95 100644 --- a/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java +++ b/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java @@ -45,7 +45,7 @@ public class StoneMaterial { slab = BlockRegistry.registerBlock(name + "_slab", new BlockSlab(stone)); wall = BlockRegistry.registerBlock(name + "_wall", new BlockWall(stone)); button = BlockRegistry.registerBlock(name + "_button", new BlockStoneButton(stone)); - pressure_plate = BlockRegistry.registerBlock(name + "_pressure_plate", new BlockStonePressurePlate(stone)); + pressure_plate = BlockRegistry.registerBlock(name + "_plate", new BlockStonePressurePlate(stone)); bricks = BlockRegistry.registerBlock(name + "_bricks", new BlockBase(material)); brick_stairs = BlockRegistry.registerBlock(name + "_brick_stairs", new BlockStairs(bricks)); diff --git a/src/main/resources/assets/betterend/blockstates/violecite.json b/src/main/resources/assets/betterend/blockstates/violecite.json new file mode 100644 index 00000000..e751d3fd --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/violecite.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "betterend:block/violecite" + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_brick_slab.json b/src/main/resources/assets/betterend/blockstates/violecite_brick_slab.json new file mode 100644 index 00000000..cb44f1b7 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/violecite_brick_slab.json @@ -0,0 +1,15 @@ +{ + "variants": { + "type=bottom": { + "model": "betterend:block/violecite_brick_half_slab" + }, + "type=double": { + "model": "betterend:block/violecite_brick_planks" + }, + "type=top": { + "model": "betterend:block/violecite_brick_half_slab", + "uvlock": true, + "x": 180 + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_brick_stairs.json b/src/main/resources/assets/betterend/blockstates/violecite_brick_stairs.json new file mode 100644 index 00000000..9d0c276a --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/violecite_brick_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "betterend:block/violecite_brick_inner_stairs", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "betterend:block/violecite_brick_inner_stairs" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "betterend:block/violecite_brick_outer_stairs", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "betterend:block/violecite_brick_outer_stairs" + }, + "facing=east,half=bottom,shape=straight": { + "model": "betterend:block/violecite_brick_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "betterend:block/violecite_brick_inner_stairs", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "betterend:block/violecite_brick_inner_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "betterend:block/violecite_brick_outer_stairs", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "betterend:block/violecite_brick_outer_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "betterend:block/violecite_brick_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "betterend:block/violecite_brick_inner_stairs", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "betterend:block/violecite_brick_inner_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "betterend:block/violecite_brick_outer_stairs", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "betterend:block/violecite_brick_outer_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "betterend:block/violecite_brick_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "betterend:block/violecite_brick_inner_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "betterend:block/violecite_brick_inner_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "betterend:block/violecite_brick_outer_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "betterend:block/violecite_brick_outer_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "betterend:block/violecite_brick_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "betterend:block/violecite_brick_inner_stairs" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "betterend:block/violecite_brick_inner_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "betterend:block/violecite_brick_outer_stairs" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "betterend:block/violecite_brick_outer_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "betterend:block/violecite_brick_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "betterend:block/violecite_brick_inner_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "betterend:block/violecite_brick_inner_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "betterend:block/violecite_brick_outer_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "betterend:block/violecite_brick_outer_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "betterend:block/violecite_brick_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "betterend:block/violecite_brick_inner_stairs", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "betterend:block/violecite_brick_inner_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "betterend:block/violecite_brick_outer_stairs", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "betterend:block/violecite_brick_outer_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "betterend:block/violecite_brick_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "betterend:block/violecite_brick_inner_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "betterend:block/violecite_brick_inner_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "betterend:block/violecite_brick_outer_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "betterend:block/violecite_brick_outer_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "betterend:block/violecite_brick_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_brick_wall.json b/src/main/resources/assets/betterend/blockstates/violecite_brick_wall.json new file mode 100644 index 00000000..c41190bc --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/violecite_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "minecraft:block/violecite_brick_wall_post" + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "minecraft:block/violecite_brick_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "minecraft:block/violecite_brick_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "minecraft:block/violecite_brick_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "minecraft:block/violecite_brick_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "minecraft:block/violecite_brick_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "minecraft:block/violecite_brick_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "minecraft:block/violecite_brick_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "minecraft:block/violecite_brick_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_bricks.json b/src/main/resources/assets/betterend/blockstates/violecite_bricks.json new file mode 100644 index 00000000..0d87306b --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/violecite_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "betterend:block/violecite_bricks" + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_button.json b/src/main/resources/assets/betterend/blockstates/violecite_button.json new file mode 100644 index 00000000..4671d482 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/violecite_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=ceiling,facing=east,powered=false": { + "model": "betterend:block/violecite_button", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=north,powered=false": { + "model": "betterend:block/violecite_button", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=north,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=south,powered=false": { + "model": "betterend:block/violecite_button", + "x": 180 + }, + "face=ceiling,facing=south,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "x": 180 + }, + "face=ceiling,facing=west,powered=false": { + "model": "betterend:block/violecite_button", + "x": 180, + "y": 90 + }, + "face=ceiling,facing=west,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "betterend:block/violecite_button", + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "y": 90 + }, + "face=floor,facing=north,powered=false": { + "model": "betterend:block/violecite_button" + }, + "face=floor,facing=north,powered=true": { + "model": "betterend:block/violecite_button_pressed" + }, + "face=floor,facing=south,powered=false": { + "model": "betterend:block/violecite_button", + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "y": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "betterend:block/violecite_button", + "y": 270 + }, + "face=floor,facing=west,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "y": 270 + }, + "face=wall,facing=east,powered=false": { + "model": "betterend:block/violecite_button", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=north,powered=false": { + "model": "betterend:block/violecite_button", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=south,powered=false": { + "model": "betterend:block/violecite_button", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=west,powered=false": { + "model": "betterend:block/violecite_button", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "uvlock": true, + "x": 90, + "y": 270 + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_pillar.json b/src/main/resources/assets/betterend/blockstates/violecite_pillar.json new file mode 100644 index 00000000..3eb5a9cf --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/violecite_pillar.json @@ -0,0 +1,7 @@ +{ + "variants": { + "axis=x": { "model": "betterend:block/violecite_pillar", "x": 90, "y": 90 }, + "axis=y": { "model": "betterend:block/violecite_pillar" }, + "axis=z": { "model": "betterend:block/violecite_pillar", "x": 90 } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_plate.json b/src/main/resources/assets/betterend/blockstates/violecite_plate.json new file mode 100644 index 00000000..7adc867f --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/violecite_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "betterend:block/violecite_pressure_plate_up" + }, + "powered=true": { + "model": "betterend:block/violecite_pressure_plate_down" + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_slab.json b/src/main/resources/assets/betterend/blockstates/violecite_slab.json new file mode 100644 index 00000000..a231e15f --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/violecite_slab.json @@ -0,0 +1,15 @@ +{ + "variants": { + "type=bottom": { + "model": "betterend:block/violecite_half_slab" + }, + "type=double": { + "model": "betterend:block/violecite_planks" + }, + "type=top": { + "model": "betterend:block/violecite_half_slab", + "uvlock": true, + "x": 180 + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_small_tiles.json b/src/main/resources/assets/betterend/blockstates/violecite_small_tiles.json new file mode 100644 index 00000000..711b5b92 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/violecite_small_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "betterend:block/violecite_small_tiles" + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_stairs.json b/src/main/resources/assets/betterend/blockstates/violecite_stairs.json new file mode 100644 index 00000000..3231569f --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/violecite_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "betterend:block/violecite_inner_stairs" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "betterend:block/violecite_outer_stairs" + }, + "facing=east,half=bottom,shape=straight": { + "model": "betterend:block/violecite_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "betterend:block/violecite_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "betterend:block/violecite_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "betterend:block/violecite_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "betterend:block/violecite_inner_stairs" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "betterend:block/violecite_outer_stairs" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "betterend:block/violecite_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "betterend:block/violecite_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "betterend:block/violecite_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "betterend:block/violecite_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_tile.json b/src/main/resources/assets/betterend/blockstates/violecite_tile.json new file mode 100644 index 00000000..43157f62 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/violecite_tile.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "betterend:block/violecite_tile" + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_wall.json b/src/main/resources/assets/betterend/blockstates/violecite_wall.json new file mode 100644 index 00000000..15c6f3e5 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/violecite_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "minecraft:block/violecite_wall_post" + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "minecraft:block/violecite_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "minecraft:block/violecite_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "minecraft:block/violecite_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "minecraft:block/violecite_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "minecraft:block/violecite_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "minecraft:block/violecite_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "minecraft:block/violecite_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "minecraft:block/violecite_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} diff --git a/src/main/resources/assets/betterend/models/block/violecite.json b/src/main/resources/assets/betterend/models/block/violecite.json new file mode 100644 index 00000000..12104029 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_inner_stairs.json b/src/main/resources/assets/betterend/models/block/violecite_brick_inner_stairs.json new file mode 100644 index 00000000..312f60e7 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_brick_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "betterend:block/violecite_bricks", + "side": "betterend:block/violecite_bricks", + "top": "betterend:block/violecite_bricks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_outer_stairs.json b/src/main/resources/assets/betterend/models/block/violecite_brick_outer_stairs.json new file mode 100644 index 00000000..d9f36449 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_brick_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "betterend:block/violecite_bricks", + "side": "betterend:block/violecite_bricks", + "top": "betterend:block/violecite_bricks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_stairs.json b/src/main/resources/assets/betterend/models/block/violecite_brick_stairs.json new file mode 100644 index 00000000..60bf8b2a --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "betterend:block/violecite_bricks", + "side": "betterend:block/violecite_bricks", + "top": "betterend:block/violecite_bricks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_wall_inventory.json b/src/main/resources/assets/betterend/models/block/violecite_brick_wall_inventory.json new file mode 100644 index 00000000..1e9673e3 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "minecraft:block/violecite_bricks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_wall_post.json b/src/main/resources/assets/betterend/models/block/violecite_brick_wall_post.json new file mode 100644 index 00000000..5304434e --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "minecraft:block/violecite_bricks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_wall_side.json b/src/main/resources/assets/betterend/models/block/violecite_brick_wall_side.json new file mode 100644 index 00000000..819543a2 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "minecraft:block/violecite_bricks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_wall_side_tall.json b/src/main/resources/assets/betterend/models/block/violecite_brick_wall_side_tall.json new file mode 100644 index 00000000..2966dff0 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "minecraft:block/violecite_bricks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_bricks.json b/src/main/resources/assets/betterend/models/block/violecite_bricks.json new file mode 100644 index 00000000..46b36cbc --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/violecite_bricks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_button.json b/src/main/resources/assets/betterend/models/block/violecite_button.json new file mode 100644 index 00000000..9b23ba46 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_button.json @@ -0,0 +1,6 @@ +{ + "parent": "block/button", + "textures": { + "texture": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_button_inventory.json b/src/main/resources/assets/betterend/models/block/violecite_button_inventory.json new file mode 100644 index 00000000..2e15a716 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/button_inventory", + "textures": { + "texture": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_button_pressed.json b/src/main/resources/assets/betterend/models/block/violecite_button_pressed.json new file mode 100644 index 00000000..cec115fc --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "block/button_pressed", + "textures": { + "texture": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_inner_stairs.json b/src/main/resources/assets/betterend/models/block/violecite_inner_stairs.json new file mode 100644 index 00000000..745d44b9 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "betterend:block/violecite", + "side": "betterend:block/violecite", + "top": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_outer_stairs.json b/src/main/resources/assets/betterend/models/block/violecite_outer_stairs.json new file mode 100644 index 00000000..67d0261c --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "betterend:block/violecite", + "side": "betterend:block/violecite", + "top": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_pillar.json b/src/main/resources/assets/betterend/models/block/violecite_pillar.json new file mode 100644 index 00000000..3b14644a --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "betterend:block/violecite_pillar_top", + "side": "betterend:block/violecite_pillar_side" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_pressure_plate_down.json b/src/main/resources/assets/betterend/models/block/violecite_pressure_plate_down.json new file mode 100644 index 00000000..e08999fd --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "block/pressure_plate_down", + "textures": { + "texture": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_pressure_plate_up.json b/src/main/resources/assets/betterend/models/block/violecite_pressure_plate_up.json new file mode 100644 index 00000000..54f744d6 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_pressure_plate_up.json @@ -0,0 +1,6 @@ +{ + "parent": "block/pressure_plate_up", + "textures": { + "texture": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_small_tiles.json b/src/main/resources/assets/betterend/models/block/violecite_small_tiles.json new file mode 100644 index 00000000..023bd3e8 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_small_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/violecite_small_tiles" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_stairs.json b/src/main/resources/assets/betterend/models/block/violecite_stairs.json new file mode 100644 index 00000000..b48445aa --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "betterend:block/violecite", + "side": "betterend:block/violecite", + "top": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_tile.json b/src/main/resources/assets/betterend/models/block/violecite_tile.json new file mode 100644 index 00000000..5b235309 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_tile.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/violecite_tile" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_wall_inventory.json b/src/main/resources/assets/betterend/models/block/violecite_wall_inventory.json new file mode 100644 index 00000000..799d84b0 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "minecraft:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_wall_post.json b/src/main/resources/assets/betterend/models/block/violecite_wall_post.json new file mode 100644 index 00000000..80d13460 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "minecraft:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_wall_side.json b/src/main/resources/assets/betterend/models/block/violecite_wall_side.json new file mode 100644 index 00000000..75fcfcf4 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "minecraft:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_wall_side_tall.json b/src/main/resources/assets/betterend/models/block/violecite_wall_side_tall.json new file mode 100644 index 00000000..847be061 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "minecraft:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/item/violecite.json b/src/main/resources/assets/betterend/models/item/violecite.json new file mode 100644 index 00000000..556e1602 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/violecite.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/violecite" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_brick_slab.json b/src/main/resources/assets/betterend/models/item/violecite_brick_slab.json new file mode 100644 index 00000000..80081c59 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/violecite_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/violecite_brick_slab" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_brick_stairs.json b/src/main/resources/assets/betterend/models/item/violecite_brick_stairs.json new file mode 100644 index 00000000..10918c92 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/violecite_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/violecite_brick_stairs" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_brick_wall.json b/src/main/resources/assets/betterend/models/item/violecite_brick_wall.json new file mode 100644 index 00000000..84a70ea6 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/violecite_brick_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/violecite_brick_wall_inventory" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_bricks.json b/src/main/resources/assets/betterend/models/item/violecite_bricks.json new file mode 100644 index 00000000..8675cdf4 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/violecite_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/violecite_bricks" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_button.json b/src/main/resources/assets/betterend/models/item/violecite_button.json new file mode 100644 index 00000000..9db14a55 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/violecite_button.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/violecite_button_inventory" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_pillar.json b/src/main/resources/assets/betterend/models/item/violecite_pillar.json new file mode 100644 index 00000000..8ad651ee --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/violecite_pillar.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/violecite_pillar" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_plate.json b/src/main/resources/assets/betterend/models/item/violecite_plate.json new file mode 100644 index 00000000..c419e6b7 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/violecite_plate.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/violecite_pressure_plate_up" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_slab.json b/src/main/resources/assets/betterend/models/item/violecite_slab.json new file mode 100644 index 00000000..db568062 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/violecite_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/violecite_slab" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_small_tiles.json b/src/main/resources/assets/betterend/models/item/violecite_small_tiles.json new file mode 100644 index 00000000..248f878a --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/violecite_small_tiles.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/violecite_small_tiles" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_stairs.json b/src/main/resources/assets/betterend/models/item/violecite_stairs.json new file mode 100644 index 00000000..ecebc12f --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/violecite_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/violecite_stairs" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_tile.json b/src/main/resources/assets/betterend/models/item/violecite_tile.json new file mode 100644 index 00000000..0a4f4c8b --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/violecite_tile.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/violecite_tile" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_wall.json b/src/main/resources/assets/betterend/models/item/violecite_wall.json new file mode 100644 index 00000000..aa6ed8b1 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/violecite_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/violecite_wall_inventory" +} diff --git a/src/main/resources/assets/betterend/textures/block/purpur_block.png b/src/main/resources/assets/betterend/textures/block/purpur_block.png deleted file mode 100644 index 717d26c8bf75846149ecf8c5fbf7eecd04a046d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Rh}-6Ar-fhPZW6k=07}f*}(*v zCGWYHO?+B#(ztUZC)nI!5MXcHyVd4^#7%~nPa13rv-ygYb}`;~BAHO< z6vkjAtFlgi;a8wS=1mGcY>5-jDzLUZk=)Q~<->E6b;px~i48Ii3XUm09`h1SWP6q| bE3h$4y?KmduSyIz&=m}xu6{1-oD!M<(WX9g diff --git a/src/main/resources/assets/betterend/textures/block/violecite b/src/main/resources/assets/betterend/textures/block/violecite new file mode 100644 index 0000000000000000000000000000000000000000..88788b5ac5946904e769563c22859e56ccc08cb0 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFo=M_36YrG2VSWj0!mvv4FO#mI;P@Vt) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/violecite.png b/src/main/resources/assets/betterend/textures/block/violecite.png new file mode 100644 index 0000000000000000000000000000000000000000..88788b5ac5946904e769563c22859e56ccc08cb0 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFo=M_36YrG2VSWj0!mvv4FO#mI;P@Vt) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/violecite_pilar_side.png b/src/main/resources/assets/betterend/textures/block/violecite_pilar_side.png new file mode 100644 index 0000000000000000000000000000000000000000..961964b41be01a1a856d4fc841ebb343a1cd3d09 GIT binary patch literal 407 zcmV;I0cie-P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T-O`rdb!F0inxfB1>NsBP`|HQe_1*Vw zy(zzLukO_!AD;8P5Px}kGsbMo&3gAq=fw(vP-JJ5&1ss0$S@2fCJ@a+r8@kISZjHQ zCIITXX#szbrkMmF_O@+AQqPlhQ)47#iYtjd%W@I#JWlTW4$jLVgmK;^Ng@Kej+eoy zJ7L6J;&7F5iJKq-E>@SvV+-+#_ddlh9}lD~%{B2)wHFceKJm$@`M+qOl?b8Z zYU4@LdIYV?Ij$H5V=VXEagL!yO6Pb-EDIJy#H|p}IuWwVLKgTI;%+45#-~Rni7L^}4ByF@K>tgn4!PtTg}t002ovPDHLkV1g^h Bu5thX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/violecite_pillar_top.png b/src/main/resources/assets/betterend/textures/block/violecite_pillar_top.png new file mode 100644 index 0000000000000000000000000000000000000000..1f7c62e68faa99bdb5690c81db8399ca46e152e8 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF6weX4GKIg7sS+7=qc=I2w+>Vkk6s%_xdEos+Y%4FSXQI^;w7` zvcUX6kMV;we~uW>iYQK8t}7u__H08P&nAUAN96+yi{GriSgoS|zpv(Wn~ZV?)rWhY9VmYlkj0mv!i lHDpL^b8uucSk`CB!^5!AR!TFr+3z{XdQVqBmvv4FO#sF}FmeC@ literal 0 HcmV?d00001