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 0000000..4a2e748 Binary files /dev/null and b/src/main/resources/assets/terraoriginum/textures/block/crucifix.png differ 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 0000000..91dc57d Binary files /dev/null and b/src/main/resources/assets/terraoriginum/textures/block/crucifix2.png differ diff --git a/src/main/resources/data/terraoriginum/origins/demon.json b/src/main/resources/data/terraoriginum/origins/demon.json index bf10ae9..d4657df 100644 --- a/src/main/resources/data/terraoriginum/origins/demon.json +++ b/src/main/resources/data/terraoriginum/origins/demon.json @@ -12,6 +12,7 @@ "terraoriginum:spirit-powers/ectodiff", "terraoriginum:spirit-powers/lackofectodmg", "terraoriginum:spirit-powers/undead", + "terraoriginum:spirit-powers/nightvis", "terraoriginum:ectotest" ], "icon": "minecraft:bone",