diff --git a/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java b/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java index 45f58d7b..13731a82 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java +++ b/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java @@ -23,6 +23,7 @@ import net.minecraft.block.FallingBlock; import net.minecraft.block.Material; import net.minecraft.block.MaterialColor; import net.minecraft.block.SaplingBlock; +import net.minecraft.block.SlabBlock; import net.minecraft.item.ItemStack; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.Identifier; @@ -136,6 +137,19 @@ public interface UBlocks { .nonOpaque() .build())); + Block SMOOTH_MARBLE_BLOCK = register("smooth_marble_block", new Block(FabricBlockSettings.of(Material.STONE) + .strength(0.7F, 10) + .breakByTool(FabricToolTags.PICKAXES) + .build())); + Block CHISELED_MARBLE_BLOCK = register("chiseled_marble_block", new Block(FabricBlockSettings.of(Material.STONE) + .strength(0.8F, 10) + .breakByTool(FabricToolTags.PICKAXES) + .build())); + Block SMOOTH_MARBLE_SLAB = register("smooth_marble_slab", new SlabBlock(FabricBlockSettings.of(Material.STONE) + .strength(0.7F, 10) + .breakByTool(FabricToolTags.PICKAXES) + .build())); + Block SUGAR_BLOCK = register("sugar_block", new FallingBlock(FabricBlockSettings.of(Material.SAND) .strength(10, 10) .hardness(0.7F) diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItems.java b/src/main/java/com/minelittlepony/unicopia/item/UItems.java index 8ed613e9..f20a1fb2 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/UItems.java +++ b/src/main/java/com/minelittlepony/unicopia/item/UItems.java @@ -77,6 +77,10 @@ public interface UItems { Item SUGAR_BLOCK = register("sugar_block", new BlockItem(UBlocks.SUGAR_BLOCK, new Settings().group(ItemGroup.BUILDING_BLOCKS))); + Item SMOOTH_MARBLE_BLOCK = register("smooth_marble_block", new BlockItem(UBlocks.SMOOTH_MARBLE_BLOCK, new Settings().group(ItemGroup.BUILDING_BLOCKS))); + Item CHISELED_MARBLE_BLOCK = register("chiseled_marble_block", new BlockItem(UBlocks.CHISELED_MARBLE_BLOCK, new Settings().group(ItemGroup.BUILDING_BLOCKS))); + Item SMOOTH_MARBLE_SLAB = register("smooth_marble_slab", new BlockItem(UBlocks.SMOOTH_MARBLE_SLAB, new Settings().group(ItemGroup.BUILDING_BLOCKS))); + Item CLOUD_SLAB = register("cloud_slab", new PredicatedBlockItem(UBlocks.CLOUD_SLAB, new Settings().group(ItemGroup.BUILDING_BLOCKS), PLAYER_PEGASUS)); Item ENCHANTED_CLOUD_SLAB = register("enchanted_cloud_slab", new PredicatedBlockItem(UBlocks.ENCHANTED_CLOUD_SLAB, new Settings().group(ItemGroup.BUILDING_BLOCKS), PLAYER_PEGASUS)); Item DENSE_CLOUD_SLAB = register("dense_cloud_slab", new PredicatedBlockItem(UBlocks.DENSE_CLOUD_SLAB, new Settings().group(ItemGroup.BUILDING_BLOCKS), PLAYER_PEGASUS)); diff --git a/src/main/resources/assets/unicopia/blockstates/chiseled_marble_block.json b/src/main/resources/assets/unicopia/blockstates/chiseled_marble_block.json new file mode 100644 index 00000000..55f4e052 --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/chiseled_marble_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "unicopia:block/chiseled_marble_block" } + } +} diff --git a/src/main/resources/assets/unicopia/blockstates/smooth_marble_block.json b/src/main/resources/assets/unicopia/blockstates/smooth_marble_block.json new file mode 100644 index 00000000..f948d99b --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/smooth_marble_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "unicopia:block/smooth_marble_block" } + } +} diff --git a/src/main/resources/assets/unicopia/blockstates/smooth_marble_slab.json b/src/main/resources/assets/unicopia/blockstates/smooth_marble_slab.json new file mode 100644 index 00000000..b7c9e048 --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/smooth_marble_slab.json @@ -0,0 +1,7 @@ +{ + "variants": { + "type=bottom": { "model": "unicopia:block/smooth_marble_slab" }, + "type=top": { "model": "unicopia:block/smooth_marble_slab_top" }, + "type=double": { "model": "unicopia:block/smooth_marble_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index 8f11e974..29830c89 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -24,6 +24,10 @@ "block.unicopia.slime_drop": "Slime Droplet", "block.unicopia.slime_layer": "Slime", + "block.unicopia.chiseled_marble_block": "Chiseled Marble Block", + "block.unicopia.smooth_marble_block": "Smooth Marble Block", + "block.unicopia.smooth_marble_slab": "Smooth Marble Slab", + "block.unicopia.apple_leaves": "Apple Leaves", "block.unicopia.apple_sapling": "Apple Seeds", diff --git a/src/main/resources/assets/unicopia/models/block/chiseled_marble_block.json b/src/main/resources/assets/unicopia/models/block/chiseled_marble_block.json new file mode 100644 index 00000000..155c6ad4 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/chiseled_marble_block.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "unicopia:blocks/smooth_marble_block", + "side": "unicopia:blocks/chiseled_marble_block_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/smooth_marble_block.json b/src/main/resources/assets/unicopia/models/block/smooth_marble_block.json new file mode 100644 index 00000000..ff4864c2 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/smooth_marble_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "unicopia:blocks/smooth_marble_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/smooth_marble_slab.json b/src/main/resources/assets/unicopia/models/block/smooth_marble_slab.json new file mode 100644 index 00000000..b36d5b16 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/smooth_marble_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "unicopia:blocks/smooth_marble_block", + "top": "unicopia:blocks/smooth_marble_block", + "side": "unicopia:blocks/smooth_marble_block" + } +} diff --git a/src/main/resources/assets/unicopia/models/block/smooth_marble_slab_top.json b/src/main/resources/assets/unicopia/models/block/smooth_marble_slab_top.json new file mode 100644 index 00000000..30c6419e --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/smooth_marble_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "unicopia:blocks/smooth_marble_block", + "top": "unicopia:blocks/smooth_marble_block", + "side": "unicopia:blocks/smooth_marble_block" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/chiseled_marble_block.json b/src/main/resources/assets/unicopia/models/item/chiseled_marble_block.json new file mode 100644 index 00000000..093b18b0 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/chiseled_marble_block.json @@ -0,0 +1,10 @@ +{ + "parent": "unicopia:block/chiseled_marble_block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/unicopia/models/item/smooth_marble_block.json b/src/main/resources/assets/unicopia/models/item/smooth_marble_block.json new file mode 100644 index 00000000..544dca6a --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/smooth_marble_block.json @@ -0,0 +1,10 @@ +{ + "parent": "unicopia:block/smooth_marble_block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/unicopia/models/item/smooth_marble_slab.json b/src/main/resources/assets/unicopia/models/item/smooth_marble_slab.json new file mode 100644 index 00000000..bc670293 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/smooth_marble_slab.json @@ -0,0 +1,10 @@ +{ + "parent": "unicopia:block/smooth_marble_slab", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/unicopia/textures/blocks/chiseled_marble_block_side.png b/src/main/resources/assets/unicopia/textures/blocks/chiseled_marble_block_side.png new file mode 100644 index 00000000..81a10ff4 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/blocks/chiseled_marble_block_side.png differ diff --git a/src/main/resources/assets/unicopia/textures/blocks/smooth_marble_block.png b/src/main/resources/assets/unicopia/textures/blocks/smooth_marble_block.png new file mode 100644 index 00000000..fd1035ca Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/blocks/smooth_marble_block.png differ diff --git a/src/main/resources/data/minecraft/tags/blocks/slabs.json b/src/main/resources/data/minecraft/tags/blocks/slabs.json index 8d5b81d5..bed20181 100644 --- a/src/main/resources/data/minecraft/tags/blocks/slabs.json +++ b/src/main/resources/data/minecraft/tags/blocks/slabs.json @@ -3,6 +3,7 @@ "values": [ "unicopia:cloud_slab", "unicopia:enchanted_cloud_slab", - "unicopia:dense_cloud_slab" + "unicopia:dense_cloud_slab", + "unicopia:smooth_marble_slab" ] } \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/chiseled_marble_block.json b/src/main/resources/data/unicopia/loot_tables/blocks/chiseled_marble_block.json new file mode 100644 index 00000000..19a2a319 --- /dev/null +++ b/src/main/resources/data/unicopia/loot_tables/blocks/chiseled_marble_block.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "unicopia:smooth_marble_block", + "functions": [ + { + "function": "minecraft:set_count", + "count": 6 + }, + { + "function": "minecraft:explosion_decay" + } + ] + } + ] + } + ] +} diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/smooth_marble_block.json b/src/main/resources/data/unicopia/loot_tables/blocks/smooth_marble_block.json new file mode 100644 index 00000000..b2fcc859 --- /dev/null +++ b/src/main/resources/data/unicopia/loot_tables/blocks/smooth_marble_block.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "unicopia:gem", + "functions": [ + { + "function": "minecraft:set_count", + "count": 9 + }, + { + "function": "minecraft:explosion_decay" + } + ] + } + ] + } + ] +} diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/smooth_marble_slab.json b/src/main/resources/data/unicopia/loot_tables/blocks/smooth_marble_slab.json new file mode 100644 index 00000000..5aab06f0 --- /dev/null +++ b/src/main/resources/data/unicopia/loot_tables/blocks/smooth_marble_slab.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "unicopia:gem", + "functions": [ + { + "function": "minecraft:set_count", + "count": 3 + }, + { + "function": "minecraft:explosion_decay" + } + ] + } + ] + } + ] +} diff --git a/src/main/resources/data/unicopia/recipes/chiseled_marble_block.json b/src/main/resources/data/unicopia/recipes/chiseled_marble_block.json new file mode 100644 index 00000000..241824a0 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/chiseled_marble_block.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": [ + { "item": "unicopia:smooth_marble_block" } + ] + }, + "result": { "item": "unicopia:chiseled_marble_block" } +} diff --git a/src/main/resources/data/unicopia/recipes/smooth_marble_block.json b/src/main/resources/data/unicopia/recipes/smooth_marble_block.json new file mode 100644 index 00000000..1ce9de81 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/smooth_marble_block.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": [ + { "item": "unicopia:gem" } + ] + }, + "result": { "item": "unicopia:smooth_marble_block" } +} diff --git a/src/main/resources/data/unicopia/recipes/smooth_marble_slab.json b/src/main/resources/data/unicopia/recipes/smooth_marble_slab.json new file mode 100644 index 00000000..0a31a65d --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/smooth_marble_slab.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": [ + { "item": "unicopia:gem" } + ] + }, + "result": { "item": "unicopia:smooth_marble_slab", "count": 2 } +}