Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Meteoric Iron Bell (again) #307

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Add Meteoric Iron Bell (again) #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c04917
Add Meteoric Iron Bell
EmpressAutumn Feb 15, 2024
3761960
Merge branch 'main' of https://github.com/EmpressAutumn/Galacticontri…
EmpressAutumn Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/dev/galacticraft/mod/Constant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
8 changes: 3 additions & 5 deletions src/main/java/dev/galacticraft/mod/content/GCBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand All @@ -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;

/**
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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);
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/dev/galacticraft/mod/content/block/decoration/MeteoricIronBellBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
}
1 change: 1 addition & 0 deletions src/main/java/dev/galacticraft/mod/content/item/GCCreativeModeTabs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/dev/galacticraft/mod/content/item/GCItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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);
Expand Down
64 changes: 64 additions & 0 deletions src/main/resources/assets/galacticraft/blockstates/meteoric_iron_bell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
}
}
1 change: 1 addition & 0 deletions src/main/resources/assets/galacticraft/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
20 changes: 20 additions & 0 deletions src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_between_walls.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" }
}
}
]
}
19 changes: 19 additions & 0 deletions src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_ceiling.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" }
}
}
]
}
43 changes: 43 additions & 0 deletions src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_floor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" }
}
}
]
}
20 changes: 20 additions & 0 deletions src/main/resources/assets/galacticraft/models/block/meteoric_iron_bell_wall.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" }
}
}
]
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/galacticraft/models/item/meteoric_iron_bell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "galacticraft:item/meteoric_iron_bell"
}
}
Binary file added src/main/resources/assets/galacticraft/textures/item/meteoric_iron_bell.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.