From 4c04917cac06f8aba77405c4eb86cbc7458cbb60 Mon Sep 17 00:00:00 2001 From: EmpressAutumn Date: Thu, 15 Feb 2024 15:33:42 -0500 Subject: [PATCH] Add Meteoric Iron Bell - Created a (bad) item texture - Currently no block textures - Added models without datagen (for now) --- .../java/dev/galacticraft/mod/Constant.java | 1 + .../galacticraft/mod/content/GCBlocks.java | 8 +-- .../decoration/MeteoricIronBellBlock.java | 9 +++ .../mod/content/item/GCCreativeModeTabs.java | 1 + .../mod/content/item/GCItems.java | 2 + .../blockstates/meteoric_iron_bell.json | 64 ++++++++++++++++++ .../assets/galacticraft/lang/en_us.json | 1 + .../meteoric_iron_bell_between_walls.json | 20 ++++++ .../block/meteoric_iron_bell_ceiling.json | 19 ++++++ .../block/meteoric_iron_bell_floor.json | 43 ++++++++++++ .../models/block/meteoric_iron_bell_wall.json | 20 ++++++ .../models/item/meteoric_iron_bell.json | 6 ++ .../textures/item/meteoric_iron_bell.png | Bin 0 -> 275 bytes 13 files changed, 189 insertions(+), 5 deletions(-) create mode 100644 src/main/java/dev/galacticraft/mod/content/block/decoration/MeteoricIronBellBlock.java create mode 100644 src/main/resources/assets/galacticraft/blockstates/meteoric_iron_bell.json create mode 100644 src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_between_walls.json create mode 100644 src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_ceiling.json create mode 100644 src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_floor.json create mode 100644 src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_wall.json create mode 100644 src/main/resources/assets/galacticraft/models/item/meteoric_iron_bell.json create mode 100644 src/main/resources/assets/galacticraft/textures/item/meteoric_iron_bell.png diff --git a/src/main/java/dev/galacticraft/mod/Constant.java b/src/main/java/dev/galacticraft/mod/Constant.java index 874995911..728186374 100644 --- a/src/main/java/dev/galacticraft/mod/Constant.java +++ b/src/main/java/dev/galacticraft/mod/Constant.java @@ -185,6 +185,7 @@ interface Block { String DETAILED_METEORIC_IRON_DECORATION_SLAB = "detailed_meteoric_iron_decoration_slab"; String DETAILED_METEORIC_IRON_DECORATION_STAIRS = "detailed_meteoric_iron_decoration_stairs"; String DETAILED_METEORIC_IRON_DECORATION_WALL = "detailed_meteoric_iron_decoration_wall"; + String METEORIC_IRON_BELL = "meteoric_iron_bell"; String STEEL_DECORATION = "steel_decoration"; String STEEL_DECORATION_SLAB = "steel_decoration_slab"; diff --git a/src/main/java/dev/galacticraft/mod/content/GCBlocks.java b/src/main/java/dev/galacticraft/mod/content/GCBlocks.java index 7e59a668c..2bab3dfa4 100644 --- a/src/main/java/dev/galacticraft/mod/content/GCBlocks.java +++ b/src/main/java/dev/galacticraft/mod/content/GCBlocks.java @@ -24,10 +24,7 @@ import dev.galacticraft.machinelib.api.block.MachineBlock; import dev.galacticraft.mod.Constant; -import dev.galacticraft.mod.content.block.decoration.GratingBlock; -import dev.galacticraft.mod.content.block.decoration.LightPanelBlock; -import dev.galacticraft.mod.content.block.decoration.LunarCartographyTableBlock; -import dev.galacticraft.mod.content.block.decoration.VacuumGlassBlock; +import dev.galacticraft.mod.content.block.decoration.*; import dev.galacticraft.mod.content.block.entity.machine.*; import dev.galacticraft.mod.content.block.environment.*; import dev.galacticraft.mod.content.block.machine.*; @@ -54,7 +51,6 @@ import net.minecraft.world.level.block.state.properties.NoteBlockInstrument; import net.minecraft.world.level.material.MapColor; import net.minecraft.world.level.material.PushReaction; - import java.util.function.ToIntFunction; /** @@ -129,6 +125,7 @@ public class GCBlocks { public static final Block DETAILED_METEORIC_IRON_DECORATION_SLAB = new SlabBlock(BlockBehaviour.Properties.copy(DETAILED_METEORIC_IRON_DECORATION).strength(2.5F, 3.0F)); public static final Block DETAILED_METEORIC_IRON_DECORATION_STAIRS = new StairBlock(DETAILED_METEORIC_IRON_DECORATION.defaultBlockState(), BlockBehaviour.Properties.copy(DETAILED_METEORIC_IRON_DECORATION)); public static final Block DETAILED_METEORIC_IRON_DECORATION_WALL = new WallBlock(BlockBehaviour.Properties.copy(DETAILED_METEORIC_IRON_DECORATION)); + public static final Block METEORIC_IRON_BELL = new MeteoricIronBellBlock(BlockBehaviour.Properties.copy(Blocks.BELL)); // Copy from minecraft:bell public static final Block STEEL_DECORATION = new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 3.0F)); public static final Block STEEL_DECORATION_SLAB = new SlabBlock(BlockBehaviour.Properties.copy(STEEL_DECORATION).strength(2.5F, 3.0F)); @@ -412,6 +409,7 @@ public static void register() { Registry.register(BuiltInRegistries.BLOCK, Constant.id(Constant.Block.DETAILED_METEORIC_IRON_DECORATION_SLAB), DETAILED_METEORIC_IRON_DECORATION_SLAB); Registry.register(BuiltInRegistries.BLOCK, Constant.id(Constant.Block.DETAILED_METEORIC_IRON_DECORATION_STAIRS), DETAILED_METEORIC_IRON_DECORATION_STAIRS); Registry.register(BuiltInRegistries.BLOCK, Constant.id(Constant.Block.DETAILED_METEORIC_IRON_DECORATION_WALL), DETAILED_METEORIC_IRON_DECORATION_WALL); + Registry.register(BuiltInRegistries.BLOCK, Constant.id(Constant.Block.METEORIC_IRON_BELL), METEORIC_IRON_BELL); Registry.register(BuiltInRegistries.BLOCK, Constant.id(Constant.Block.STEEL_DECORATION), STEEL_DECORATION); Registry.register(BuiltInRegistries.BLOCK, Constant.id(Constant.Block.STEEL_DECORATION_SLAB), STEEL_DECORATION_SLAB); diff --git a/src/main/java/dev/galacticraft/mod/content/block/decoration/MeteoricIronBellBlock.java b/src/main/java/dev/galacticraft/mod/content/block/decoration/MeteoricIronBellBlock.java new file mode 100644 index 000000000..69f1091f4 --- /dev/null +++ b/src/main/java/dev/galacticraft/mod/content/block/decoration/MeteoricIronBellBlock.java @@ -0,0 +1,9 @@ +package dev.galacticraft.mod.content.block.decoration; + +import net.minecraft.world.level.block.BellBlock; + +public class MeteoricIronBellBlock extends BellBlock { + public MeteoricIronBellBlock(Properties properties) { + super(properties); + } +} diff --git a/src/main/java/dev/galacticraft/mod/content/item/GCCreativeModeTabs.java b/src/main/java/dev/galacticraft/mod/content/item/GCCreativeModeTabs.java index e2a24d84c..0f3deb553 100644 --- a/src/main/java/dev/galacticraft/mod/content/item/GCCreativeModeTabs.java +++ b/src/main/java/dev/galacticraft/mod/content/item/GCCreativeModeTabs.java @@ -305,6 +305,7 @@ public class GCCreativeModeTabs { output.accept(DETAILED_METEORIC_IRON_DECORATION_SLAB); output.accept(DETAILED_METEORIC_IRON_DECORATION_STAIRS); output.accept(DETAILED_METEORIC_IRON_DECORATION_WALL); + output.accept(METEORIC_IRON_BELL); output.accept(STEEL_DECORATION); output.accept(STEEL_DECORATION_SLAB); diff --git a/src/main/java/dev/galacticraft/mod/content/item/GCItems.java b/src/main/java/dev/galacticraft/mod/content/item/GCItems.java index 96f62bc87..0e3f96544 100644 --- a/src/main/java/dev/galacticraft/mod/content/item/GCItems.java +++ b/src/main/java/dev/galacticraft/mod/content/item/GCItems.java @@ -99,6 +99,7 @@ public class GCItems { public static final Item DETAILED_METEORIC_IRON_DECORATION_SLAB = new BlockItem(GCBlocks.DETAILED_METEORIC_IRON_DECORATION_SLAB, new Item.Properties()); public static final Item DETAILED_METEORIC_IRON_DECORATION_STAIRS = new BlockItem(GCBlocks.DETAILED_METEORIC_IRON_DECORATION_STAIRS, new Item.Properties()); public static final Item DETAILED_METEORIC_IRON_DECORATION_WALL = new BlockItem(GCBlocks.DETAILED_METEORIC_IRON_DECORATION_WALL, new Item.Properties()); + public static final Item METEORIC_IRON_BELL = new BlockItem(GCBlocks.METEORIC_IRON_BELL, new Item.Properties()); public static final Item STEEL_DECORATION = new BlockItem(GCBlocks.STEEL_DECORATION, new Item.Properties()); public static final Item STEEL_DECORATION_SLAB = new BlockItem(GCBlocks.STEEL_DECORATION_SLAB, new Item.Properties()); @@ -526,6 +527,7 @@ public static void register() { Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.DETAILED_METEORIC_IRON_DECORATION_SLAB), DETAILED_METEORIC_IRON_DECORATION_SLAB); Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.DETAILED_METEORIC_IRON_DECORATION_STAIRS), DETAILED_METEORIC_IRON_DECORATION_STAIRS); Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.DETAILED_METEORIC_IRON_DECORATION_WALL), DETAILED_METEORIC_IRON_DECORATION_WALL); + Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.METEORIC_IRON_BELL), METEORIC_IRON_BELL); Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.STEEL_DECORATION), STEEL_DECORATION); Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.STEEL_DECORATION_SLAB), STEEL_DECORATION_SLAB); diff --git a/src/main/resources/assets/galacticraft/blockstates/meteoric_iron_bell.json b/src/main/resources/assets/galacticraft/blockstates/meteoric_iron_bell.json new file mode 100644 index 000000000..3500a321d --- /dev/null +++ b/src/main/resources/assets/galacticraft/blockstates/meteoric_iron_bell.json @@ -0,0 +1,64 @@ +{ + "variants": { + "attachment=ceiling,facing=east": { + "model": "galacticraft:block/meteoric_iron_bell_ceiling", + "y": 90 + }, + "attachment=ceiling,facing=north": { + "model": "galacticraft:block/meteoric_iron_bell_ceiling" + }, + "attachment=ceiling,facing=south": { + "model": "galacticraft:block/meteoric_iron_bell_ceiling", + "y": 180 + }, + "attachment=ceiling,facing=west": { + "model": "galacticraft:block/meteoric_iron_bell_ceiling", + "y": 270 + }, + "attachment=double_wall,facing=east": { + "model": "galacticraft:block/meteoric_iron_bell_between_walls" + }, + "attachment=double_wall,facing=north": { + "model": "galacticraft:block/meteoric_iron_bell_between_walls", + "y": 270 + }, + "attachment=double_wall,facing=south": { + "model": "galacticraft:block/meteoric_iron_bell_between_walls", + "y": 90 + }, + "attachment=double_wall,facing=west": { + "model": "galacticraft:block/meteoric_iron_bell_between_walls", + "y": 180 + }, + "attachment=floor,facing=east": { + "model": "galacticraft:block/meteoric_iron_bell_floor", + "y": 90 + }, + "attachment=floor,facing=north": { + "model": "galacticraft:block/meteoric_iron_bell_floor" + }, + "attachment=floor,facing=south": { + "model": "galacticraft:block/meteoric_iron_bell_floor", + "y": 180 + }, + "attachment=floor,facing=west": { + "model": "galacticraft:block/meteoric_iron_bell_floor", + "y": 270 + }, + "attachment=single_wall,facing=east": { + "model": "galacticraft:block/meteoric_iron_bell_wall" + }, + "attachment=single_wall,facing=north": { + "model": "galacticraft:block/meteoric_iron_bell_wall", + "y": 270 + }, + "attachment=single_wall,facing=south": { + "model": "galacticraft:block/meteoric_iron_bell_wall", + "y": 90 + }, + "attachment=single_wall,facing=west": { + "model": "galacticraft:block/meteoric_iron_bell_wall", + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/galacticraft/lang/en_us.json b/src/main/resources/assets/galacticraft/lang/en_us.json index 587e2205a..69e73c876 100644 --- a/src/main/resources/assets/galacticraft/lang/en_us.json +++ b/src/main/resources/assets/galacticraft/lang/en_us.json @@ -210,6 +210,7 @@ "block.galacticraft.oxygen": "Oxygen", "block.galacticraft.fallen_meteor": "Fallen Meteor", "block.galacticraft.rocket_launch_pad": "Rocket Launch Pad", + "block.galacticraft.meteoric_iron_bell": "Meteoric Iron Bell", "item.galacticraft.heavy_duty_helmet": "Heavy Duty Helmet", "item.galacticraft.heavy_duty_chestplate": "Heavy Duty Chestplate", "item.galacticraft.heavy_duty_leggings": "Heavy Duty Leggings", diff --git a/src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_between_walls.json b/src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_between_walls.json new file mode 100644 index 000000000..8e7903f36 --- /dev/null +++ b/src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_between_walls.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "block/bell_bottom", + "bar": "block/dark_oak_planks" + }, + "elements": [ + { + "from": [ 0, 13, 7 ], + "to": [ 16, 15, 9 ], + "faces": { + "north": { "uv": [ 2, 2, 14, 4 ], "texture": "#bar" }, + "east": { "uv": [ 5, 4, 7, 6 ], "texture": "#bar", "cullface": "east" }, + "south": { "uv": [ 2, 3, 14, 5 ], "texture": "#bar" }, + "west": { "uv": [ 5, 4, 7, 6 ], "texture": "#bar", "cullface": "west" }, + "up": { "uv": [ 2, 3, 14, 5 ], "texture": "#bar" }, + "down": { "uv": [ 2, 3, 14, 5 ], "texture": "#bar" } + } + } + ] +} diff --git a/src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_ceiling.json b/src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_ceiling.json new file mode 100644 index 000000000..a105fb98a --- /dev/null +++ b/src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_ceiling.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "block/bell_bottom", + "bar": "block/dark_oak_planks" + }, + "elements": [ + { + "from": [ 7, 13, 7 ], + "to": [ 9, 16, 9 ], + "faces": { + "north": {"uv": [ 7, 2, 9, 5 ], "texture": "#bar" }, + "east": {"uv": [ 1, 2, 3, 5 ], "texture": "#bar" }, + "south": {"uv": [ 6, 2, 8, 5 ], "texture": "#bar" }, + "west": {"uv": [ 4, 2, 6, 5 ], "texture": "#bar" }, + "up": {"uv": [ 1, 3, 3, 5 ], "texture": "#bar", "cullface": "up" } + } + } + ] +} diff --git a/src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_floor.json b/src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_floor.json new file mode 100644 index 000000000..c2abfcbd5 --- /dev/null +++ b/src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_floor.json @@ -0,0 +1,43 @@ +{ + "textures": { + "particle": "block/bell_bottom", + "bar": "block/dark_oak_planks", + "post": "block/stone" + }, + "elements": [ + { + "from": [ 2, 13, 7 ], + "to": [ 14, 15, 9 ], + "faces": { + "north": { "uv": [ 2, 2, 14, 4 ], "texture": "#bar" }, + "south": { "uv": [ 2, 3, 14, 5 ], "texture": "#bar" }, + "up": { "uv": [ 2, 3, 14, 5 ], "texture": "#bar" }, + "down": { "uv": [ 2, 3, 14, 5 ], "texture": "#bar" } + } + }, + { + "from": [ 14, 0, 6 ], + "to": [ 16, 16, 10 ], + "faces": { + "north": { "uv": [ 0, 1, 2, 16 ], "texture": "#post" }, + "east": { "uv": [ 0, 1, 4, 16 ], "texture": "#post" }, + "south": { "uv": [ 0, 1, 2, 16 ], "texture": "#post" }, + "west": { "uv": [ 0, 1, 4, 16 ], "texture": "#post" }, + "up": { "uv": [ 0, 0, 2, 4 ], "texture": "#post", "cullface": "up" }, + "down": { "uv": [ 0, 0, 2, 4 ], "texture": "#post", "cullface": "down" } + } + }, + { + "from": [ 0, 0, 6 ], + "to": [ 2, 16, 10 ], + "faces": { + "north": { "uv": [ 0, 1, 2, 16 ], "texture": "#post" }, + "east": { "uv": [ 0, 1, 4, 16 ], "texture": "#post" }, + "south": { "uv": [ 0, 1, 2, 16 ], "texture": "#post" }, + "west": { "uv": [ 0, 1, 4, 16 ], "texture": "#post" }, + "up": { "uv": [ 0, 0, 2, 4 ], "texture": "#post","cullface": "up" }, + "down": { "uv": [ 0, 0, 2, 4 ], "texture": "#post", "cullface": "down" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_wall.json b/src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_wall.json new file mode 100644 index 000000000..92927bd25 --- /dev/null +++ b/src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_wall.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "block/bell_bottom", + "bar": "block/dark_oak_planks" + }, + "elements": [ + { + "from": [ 3, 13, 7 ], + "to": [ 16, 15, 9 ], + "faces": { + "north": { "uv": [ 2, 2, 14, 4 ], "texture": "#bar" }, + "east": { "uv": [ 5, 4, 7, 6 ], "texture": "#bar", "cullface": "east" }, + "south": { "uv": [ 2, 3, 14, 5 ], "texture": "#bar" }, + "west": { "uv": [ 5, 4, 7, 6 ], "texture": "#bar" }, + "up": { "uv": [ 2, 3, 14, 5 ], "texture": "#bar" }, + "down": { "uv": [ 2, 3, 14, 5 ], "texture": "#bar" } + } + } + ] +} diff --git a/src/main/resources/assets/galacticraft/models/item/meteoric_iron_bell.json b/src/main/resources/assets/galacticraft/models/item/meteoric_iron_bell.json new file mode 100644 index 000000000..1524f9aa5 --- /dev/null +++ b/src/main/resources/assets/galacticraft/models/item/meteoric_iron_bell.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "galacticraft:item/meteoric_iron_bell" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/galacticraft/textures/item/meteoric_iron_bell.png b/src/main/resources/assets/galacticraft/textures/item/meteoric_iron_bell.png new file mode 100644 index 0000000000000000000000000000000000000000..c4409dc8fa28accca63aba5c0e2d92eb64a02f18 GIT binary patch literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|&0G|-ocvI!(XfFpv5o1X{OA|d$XY1VLh}yzbV?E9Gs@xUxCIc1LvA=l) zqanMpkRWhi(`mJaBH78UxNYze{o!YT-=h0JY&-O6*NOElIw^}9zw2Q&h)z4*}Q$iB} Dw{l;n literal 0 HcmV?d00001