From 7755b0049b76a5a78e2f4f765b0472673c708eec Mon Sep 17 00:00:00 2001 From: Ryan <78032176+BigGaemer@users.noreply.github.com> Date: Mon, 22 Jan 2024 13:23:22 +0200 Subject: [PATCH] added crucifix --- .../arcteam/terraoriginum/TerraOriginum.java | 3 + .../terraoriginum/blocks/crucifix.java | 22 ++++++++ .../terraoriginum/blocks/crucifixClass.java | 28 +++++++++ .../terraoriginum/blockstates/crucifix.json | 5 ++ .../terraoriginum/models/block/crucifix.json | 53 ++++++++++++++++++ .../terraoriginum/models/item/crucifix.json | 3 + .../terraoriginum/textures/block/crucifix.png | Bin 0 -> 486 bytes .../textures/block/crucifix2.png | Bin 0 -> 246 bytes .../data/terraoriginum/origins/demon.json | 1 + 9 files changed, 115 insertions(+) create mode 100644 src/main/java/net/arcmods/arcteam/terraoriginum/blocks/crucifix.java create mode 100644 src/main/java/net/arcmods/arcteam/terraoriginum/blocks/crucifixClass.java create mode 100644 src/main/resources/assets/terraoriginum/blockstates/crucifix.json create mode 100644 src/main/resources/assets/terraoriginum/models/block/crucifix.json create mode 100644 src/main/resources/assets/terraoriginum/models/item/crucifix.json create mode 100644 src/main/resources/assets/terraoriginum/textures/block/crucifix.png create mode 100644 src/main/resources/assets/terraoriginum/textures/block/crucifix2.png diff --git a/src/main/java/net/arcmods/arcteam/terraoriginum/TerraOriginum.java b/src/main/java/net/arcmods/arcteam/terraoriginum/TerraOriginum.java index b1d3ab8..5184bd1 100644 --- a/src/main/java/net/arcmods/arcteam/terraoriginum/TerraOriginum.java +++ b/src/main/java/net/arcmods/arcteam/terraoriginum/TerraOriginum.java @@ -1,5 +1,6 @@ package net.arcmods.arcteam.terraoriginum; +import net.arcmods.arcteam.terraoriginum.blocks.crucifix; import net.arcmods.arcteam.terraoriginum.items.mync_eye; import net.arcmods.arcteam.terraoriginum.items.umbrella; import net.arcmods.arcteam.terraoriginum.registry.modEnchantments; @@ -20,8 +21,10 @@ public class TerraOriginum implements ModInitializer { umbrella.registerItems(); mync_eye.register(); modEnchantments.register(); + crucifix.register(); ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((content) -> content.add(umbrella.UMBRELLA)); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.FUNCTIONAL).register((content) -> content.add(crucifix.CRUCIFIX)); LOGGER.info("man this Origins is " + MOD_ID); } } diff --git a/src/main/java/net/arcmods/arcteam/terraoriginum/blocks/crucifix.java b/src/main/java/net/arcmods/arcteam/terraoriginum/blocks/crucifix.java new file mode 100644 index 0000000..a0d2367 --- /dev/null +++ b/src/main/java/net/arcmods/arcteam/terraoriginum/blocks/crucifix.java @@ -0,0 +1,22 @@ +package net.arcmods.arcteam.terraoriginum.blocks; + +import net.arcmods.arcteam.terraoriginum.TerraOriginum; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; + +public class crucifix { + + public static final Block CRUCIFIX = new crucifixClass(FabricBlockSettings.create().strength(5.5f, 4.8f).requiresTool()); + + public static void register() { + // Registry.register(Registries.BLOCK, new Identifier(TerraOriginum.MOD_ID, "crucifix"), new BlockItem(CRUCIFIX, new FabricItemSettings())); + // Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "crucifix"), CRUCIFIX); + Registry.register(Registries.BLOCK, new Identifier(TerraOriginum.MOD_ID, "crucifix"), CRUCIFIX); + Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "crucifix"), new BlockItem(CRUCIFIX, new Item.Settings())); + } +} diff --git a/src/main/java/net/arcmods/arcteam/terraoriginum/blocks/crucifixClass.java b/src/main/java/net/arcmods/arcteam/terraoriginum/blocks/crucifixClass.java new file mode 100644 index 0000000..b356a30 --- /dev/null +++ b/src/main/java/net/arcmods/arcteam/terraoriginum/blocks/crucifixClass.java @@ -0,0 +1,28 @@ +package net.arcmods.arcteam.terraoriginum.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; + +public class crucifixClass extends Block { + + public crucifixClass(Settings properties) { + super(properties); + } + + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { + VoxelShape shape = VoxelShapes.empty(); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.375, 0, 0.375, 0.5625, 0.75, 0.5625)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.5625, 0.375, 0.375, 0.75, 0.5625, 0.5625)); + shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.1875, 0.375, 0.375, 0.375, 0.5625, 0.5625)); + + return shape; + } + + +} diff --git a/src/main/resources/assets/terraoriginum/blockstates/crucifix.json b/src/main/resources/assets/terraoriginum/blockstates/crucifix.json new file mode 100644 index 0000000..5cfb790 --- /dev/null +++ b/src/main/resources/assets/terraoriginum/blockstates/crucifix.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "terraoriginum:block/crucifix" } + } + } \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/block/crucifix.json b/src/main/resources/assets/terraoriginum/models/block/crucifix.json new file mode 100644 index 0000000..e46610a --- /dev/null +++ b/src/main/resources/assets/terraoriginum/models/block/crucifix.json @@ -0,0 +1,53 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/cube_all", + "textures": { + "0": "terraoriginum:block/crucifix", + "1": "terraoriginum:block/crucifix2", + "particle": "terraoriginum:block/crucifix" + }, + "elements": [ + { + "from": [6, 0, 6], + "to": [9, 12, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [6.7, 0, 7]}, + "faces": { + "north": {"uv": [2, 2, 5, 14], "texture": "#0"}, + "east": {"uv": [-1, 2, 2, 14], "texture": "#0"}, + "south": {"uv": [8, 2, 11, 14], "texture": "#0"}, + "west": {"uv": [5, 2, 8, 14], "texture": "#0"}, + "up": {"uv": [5, 2, 2, -1], "texture": "#0"}, + "down": {"uv": [8, -1, 5, 2], "texture": "#0"} + } + }, + { + "from": [9, 6, 6], + "to": [12, 9, 9], + "faces": { + "north": {"uv": [2, 2, 5, 5], "texture": "#1"}, + "east": {"uv": [-1, 2, 2, 5], "texture": "#1"}, + "south": {"uv": [8, 2, 11, 5], "texture": "#1"}, + "west": {"uv": [5, 2, 8, 5], "texture": "#1"}, + "up": {"uv": [5, 2, 2, -1], "texture": "#1"}, + "down": {"uv": [8, -1, 5, 2], "texture": "#1"} + } + }, + { + "from": [3, 6, 6], + "to": [6, 9, 9], + "faces": { + "north": {"uv": [2, 2, 5, 5], "texture": "#1"}, + "east": {"uv": [-1, 2, 2, 5], "texture": "#1"}, + "south": {"uv": [8, 2, 11, 5], "texture": "#1"}, + "west": {"uv": [5, 2, 8, 5], "texture": "#1"}, + "up": {"uv": [5, 2, 2, -1], "texture": "#1"}, + "down": {"uv": [8, -1, 5, 2], "texture": "#1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 6, 1] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/crucifix.json b/src/main/resources/assets/terraoriginum/models/item/crucifix.json new file mode 100644 index 0000000..8ab7d78 --- /dev/null +++ b/src/main/resources/assets/terraoriginum/models/item/crucifix.json @@ -0,0 +1,3 @@ +{ + "parent": "terraoriginum:block/crucifix" + } \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/textures/block/crucifix.png b/src/main/resources/assets/terraoriginum/textures/block/crucifix.png new file mode 100644 index 0000000000000000000000000000000000000000..4a2e748094e2cf595019981107ea5603c4573f1a GIT binary patch literal 486 zcmV@P)woO3wm==+}Kaw+^G^Id#?esVk>2_bMkp9vvw zI-P!-1wh{3-t_hL6@U-|>-CzpZCNZ9hzQ&5HaxU1}P=Fu45PmLkBQLx|d z>HD7R^-2f#Zb2jI~J)>=Xcs46*UQc9$hP*wWAf4qede*VHR45XC!u5-?a2q`5lmkT2DBS@pF zTrL;A-EQ3PcYwz>=iKA0tEw7ju-R-l91i51nayU*=W{+jKB()OrfJyic3PIDJUu;) c8vK8K0m#bJ1E~v&nE(I)07*qoM6N<$g6R&}qW}N^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terraoriginum/textures/block/crucifix2.png b/src/main/resources/assets/terraoriginum/textures/block/crucifix2.png new file mode 100644 index 0000000000000000000000000000000000000000..91dc57daafb4c2da8a46efc24a2c54f9e1e39d9b GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf%;%YI$A6&e%tujZQShtSV_p0Q>|+EmgvmqPWxZ#u%8p0w`*PSa~Vz5 zHCsD46j_cHir8&fzd?uF(Cu68af#-w(*zDJ*JHT!eXrc{gQc-oO3zl#J0kJ%p0Tg+ zDzDqyIy(3cC*0F3I5)A_&Ba5r@V>c{(`6G8*T(O1p|#aV*S+rQFgS0V8o4QVc35bs s^>eP|o@G;1p8K5p`FigD{qo-!{uTO`3#?oF4(M