Skip to content

Commit

Permalink
Add white metal plating
Browse files Browse the repository at this point in the history
  • Loading branch information
@Griefed
Griefed committed Nov 11, 2023
1 parent 855fd64 commit 0ab7f7e
Show file tree
Hide file tree
Showing 18 changed files with 314 additions and 3 deletions.
6 changes: 3 additions & 3 deletions common/src/main/java/de/griefed/addemall/CommonClass.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ public static void init() {
}

/*###GENERATED CODE - DO NOT EDIT - MANUALLY EDITED CODE WILL BE LOST###*/
GeneratedModBlocks.loadClass();
GeneratedModItems.loadClass();
/*###GENERATED CODE - DO NOT EDIT - MANUALLY EDITED CODE WILL BE LOST###*/
GeneratedModBlocks.loadClass();
GeneratedModItems.loadClass();
/*###GENERATED CODE - DO NOT EDIT - MANUALLY EDITED CODE WILL BE LOST###*/
}

public static void onItemTooltip(ItemStack stack, TooltipFlag context, List<Component> tooltip) {
Expand Down
6 changes: 6 additions & 0 deletions common/src/main/java/de/griefed/addemall/block/GeneratedModBlocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ public class GeneratedModBlocks {
public static final RegistryObject<Item> METAL_PLATING_4_SLAB_ITEM = ITEMS.register("generated/metal/metal_plating_4_slab", () -> new BlockItem(METAL_PLATING_4_SLAB.get(), itemBuilder()));
public static final RegistryObject<Block> METAL_PLATING_4_STAIRS = BLOCKS.register("generated/metal/metal_plating_4_stairs", () -> new ModStairs(METAL_PLATING_4.get().defaultBlockState(), BlockBehaviour.Properties.copy(METAL_PLATING_4.get())));
public static final RegistryObject<Item> METAL_PLATING_4_STAIRS_ITEM = ITEMS.register("generated/metal/metal_plating_4_stairs", () -> new BlockItem(METAL_PLATING_4_STAIRS.get(), itemBuilder()));
public static final RegistryObject<Block> METAL_PLATING_5 = BLOCKS.register("generated/metal/metal_plating_5_block", () -> new Block(BlockBehaviour.Properties.of(Material.METAL).sound(SoundType.METAL).strength(12f, 12f).lightLevel(state -> 0).explosionResistance(12f).requiresCorrectToolForDrops()));
public static final RegistryObject<Item> METAL_PLATING_5_ITEM = ITEMS.register("generated/metal/metal_plating_5", () -> new BlockItem(METAL_PLATING_5.get(), itemBuilder()));
public static final RegistryObject<Block> METAL_PLATING_5_SLAB = BLOCKS.register("generated/metal/metal_plating_5_slab", () -> new SlabBlock(BlockBehaviour.Properties.copy(METAL_PLATING_5.get())));
public static final RegistryObject<Item> METAL_PLATING_5_SLAB_ITEM = ITEMS.register("generated/metal/metal_plating_5_slab", () -> new BlockItem(METAL_PLATING_5_SLAB.get(), itemBuilder()));
public static final RegistryObject<Block> METAL_PLATING_5_STAIRS = BLOCKS.register("generated/metal/metal_plating_5_stairs", () -> new ModStairs(METAL_PLATING_5.get().defaultBlockState(), BlockBehaviour.Properties.copy(METAL_PLATING_5.get())));
public static final RegistryObject<Item> METAL_PLATING_5_STAIRS_ITEM = ITEMS.register("generated/metal/metal_plating_5_stairs", () -> new BlockItem(METAL_PLATING_5_STAIRS.get(), itemBuilder()));
public static final RegistryObject<Block> METAL_ROOF_1 = BLOCKS.register("generated/metal/metal_roof_1_block", () -> new Block(BlockBehaviour.Properties.of(Material.METAL).sound(SoundType.METAL).strength(12f, 12f).lightLevel(state -> 0).explosionResistance(12f).requiresCorrectToolForDrops()));
public static final RegistryObject<Item> METAL_ROOF_1_ITEM = ITEMS.register("generated/metal/metal_roof_1", () -> new BlockItem(METAL_ROOF_1.get(), itemBuilder()));
public static final RegistryObject<Block> METAL_ROOF_1_SLAB = BLOCKS.register("generated/metal/metal_roof_1_slab", () -> new SlabBlock(BlockBehaviour.Properties.copy(METAL_ROOF_1.get())));
Expand Down
5 changes: 5 additions & 0 deletions ...src/main/resources/assets/addemall/blockstates/generated/metal/metal_plating_5_block.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "addemall:block/generated/metal/metal_plating_5_block" }
}
}
13 changes: 13 additions & 0 deletions .../src/main/resources/assets/addemall/blockstates/generated/metal/metal_plating_5_slab.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"variants": {
"type=bottom": {
"model": "addemall:block/generated/metal/metal_plating_5_slab"
},
"type=double": {
"model": "addemall:block/generated/metal/metal_plating_5_block"
},
"type=top": {
"model": "addemall:block/generated/metal/metal_plating_5_slab_top"
}
}
}
209 changes: 209 additions & 0 deletions ...rc/main/resources/assets/addemall/blockstates/generated/metal/metal_plating_5_stairs.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
{
"variants": {
"facing=east,half=bottom,shape=inner_left": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_inner",
"y": 270,
"uvlock": true
},
"facing=east,half=bottom,shape=inner_right": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_inner"
},
"facing=east,half=bottom,shape=outer_left": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_outer",
"y": 270,
"uvlock": true
},
"facing=east,half=bottom,shape=outer_right": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_outer"
},
"facing=east,half=bottom,shape=straight": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs"
},
"facing=east,half=top,shape=inner_left": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_inner",
"x": 180,
"uvlock": true
},
"facing=east,half=top,shape=inner_right": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_inner",
"x": 180,
"y": 90,
"uvlock": true
},
"facing=east,half=top,shape=outer_left": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_outer",
"x": 180,
"uvlock": true
},
"facing=east,half=top,shape=outer_right": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_outer",
"x": 180,
"y": 90,
"uvlock": true
},
"facing=east,half=top,shape=straight": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs",
"x": 180,
"uvlock": true
},
"facing=north,half=bottom,shape=inner_left": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_inner",
"y": 180,
"uvlock": true
},
"facing=north,half=bottom,shape=inner_right": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_inner",
"y": 270,
"uvlock": true
},
"facing=north,half=bottom,shape=outer_left": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_outer",
"y": 180,
"uvlock": true
},
"facing=north,half=bottom,shape=outer_right": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_outer",
"y": 270,
"uvlock": true
},
"facing=north,half=bottom,shape=straight": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs",
"y": 270,
"uvlock": true
},
"facing=north,half=top,shape=inner_left": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_inner",
"x": 180,
"y": 270,
"uvlock": true
},
"facing=north,half=top,shape=inner_right": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_inner",
"x": 180,
"uvlock": true
},
"facing=north,half=top,shape=outer_left": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_outer",
"x": 180,
"y": 270,
"uvlock": true
},
"facing=north,half=top,shape=outer_right": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_outer",
"x": 180,
"uvlock": true
},
"facing=north,half=top,shape=straight": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs",
"x": 180,
"y": 270,
"uvlock": true
},
"facing=south,half=bottom,shape=inner_left": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_inner"
},
"facing=south,half=bottom,shape=inner_right": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_inner",
"y": 90,
"uvlock": true
},
"facing=south,half=bottom,shape=outer_left": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_outer"
},
"facing=south,half=bottom,shape=outer_right": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_outer",
"y": 90,
"uvlock": true
},
"facing=south,half=bottom,shape=straight": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs",
"y": 90,
"uvlock": true
},
"facing=south,half=top,shape=inner_left": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_inner",
"x": 180,
"y": 90,
"uvlock": true
},
"facing=south,half=top,shape=inner_right": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_inner",
"x": 180,
"y": 180,
"uvlock": true
},
"facing=south,half=top,shape=outer_left": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_outer",
"x": 180,
"y": 90,
"uvlock": true
},
"facing=south,half=top,shape=outer_right": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_outer",
"x": 180,
"y": 180,
"uvlock": true
},
"facing=south,half=top,shape=straight": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs",
"x": 180,
"y": 90,
"uvlock": true
},
"facing=west,half=bottom,shape=inner_left": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_inner",
"y": 90,
"uvlock": true
},
"facing=west,half=bottom,shape=inner_right": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_inner",
"y": 180,
"uvlock": true
},
"facing=west,half=bottom,shape=outer_left": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_outer",
"y": 90,
"uvlock": true
},
"facing=west,half=bottom,shape=outer_right": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_outer",
"y": 180,
"uvlock": true
},
"facing=west,half=bottom,shape=straight": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs",
"y": 180,
"uvlock": true
},
"facing=west,half=top,shape=inner_left": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_inner",
"x": 180,
"y": 180,
"uvlock": true
},
"facing=west,half=top,shape=inner_right": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_inner",
"x": 180,
"y": 270,
"uvlock": true
},
"facing=west,half=top,shape=outer_left": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_outer",
"x": 180,
"y": 180,
"uvlock": true
},
"facing=west,half=top,shape=outer_right": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs_outer",
"x": 180,
"y": 270,
"uvlock": true
},
"facing=west,half=top,shape=straight": {
"model": "addemall:block/generated/metal/metal_plating_5_stairs",
"x": 180,
"y": 180,
"uvlock": true
}
}
}
9 changes: 9 additions & 0 deletions common/src/main/resources/assets/addemall/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,15 @@
"item.addemall.generated.metal.metal_plating_4_stairs": "Metal Plating 4 Stairs",
"block.addemall.generated.metal.metal_plating_4_stairs": "Metal Plating 4 Stairs",

"item.addemall.generated.metal.metal_plating_5_block": "Metal Plating 5",
"block.addemall.generated.metal.metal_plating_5_block": "Metal Plating 5",

"item.addemall.generated.metal.metal_plating_5_slab": "Metal Plating 5 Slab",
"block.addemall.generated.metal.metal_plating_5_slab": "Metal Plating 5 Slab",

"item.addemall.generated.metal.metal_plating_5_stairs": "Metal Plating 5 Stairs",
"block.addemall.generated.metal.metal_plating_5_stairs": "Metal Plating 5 Stairs",

"item.addemall.generated.metal.metal_roof_1_block": "Metal Roof 1",
"block.addemall.generated.metal.metal_roof_1_block": "Metal Roof 1",

Expand Down
6 changes: 6 additions & 0 deletions ...rc/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_block.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "addemall:block/generated/metal/metal_plating_5_block"
}
}
8 changes: 8 additions & 0 deletions ...src/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_slab.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/slab",
"textures": {
"bottom": "addemall:block/generated/metal/metal_plating_5_block",
"top": "addemall:block/generated/metal/metal_plating_5_block",
"side": "addemall:block/generated/metal/metal_plating_5_block"
}
}
8 changes: 8 additions & 0 deletions ...main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_slab_top.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/slab_top",
"textures": {
"bottom": "addemall:block/generated/metal/metal_plating_5_block",
"top": "addemall:block/generated/metal/metal_plating_5_block",
"side": "addemall:block/generated/metal/metal_plating_5_block"
}
}
8 changes: 8 additions & 0 deletions ...c/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_stairs.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/stairs",
"textures": {
"bottom": "addemall:block/generated/metal/metal_plating_5_block",
"top": "addemall:block/generated/metal/metal_plating_5_block",
"side": "addemall:block/generated/metal/metal_plating_5_block"
}
}
8 changes: 8 additions & 0 deletions .../resources/assets/addemall/models/block/generated/metal/metal_plating_5_stairs_inner.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/inner_stairs",
"textures": {
"bottom": "addemall:block/generated/metal/metal_plating_5_block",
"top": "addemall:block/generated/metal/metal_plating_5_block",
"side": "addemall:block/generated/metal/metal_plating_5_block"
}
}
8 changes: 8 additions & 0 deletions .../resources/assets/addemall/models/block/generated/metal/metal_plating_5_stairs_outer.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/outer_stairs",
"textures": {
"bottom": "addemall:block/generated/metal/metal_plating_5_block",
"top": "addemall:block/generated/metal/metal_plating_5_block",
"side": "addemall:block/generated/metal/metal_plating_5_block"
}
}
3 changes: 3 additions & 0 deletions common/src/main/resources/assets/addemall/models/item/generated/metal/metal_plating_5.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "addemall:block/generated/metal/metal_plating_5_block"
}
3 changes: 3 additions & 0 deletions .../src/main/resources/assets/addemall/models/item/generated/metal/metal_plating_5_slab.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "addemall:block/generated/metal/metal_plating_5_slab"
}
3 changes: 3 additions & 0 deletions ...rc/main/resources/assets/addemall/models/item/generated/metal/metal_plating_5_stairs.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "addemall:block/generated/metal/metal_plating_5_stairs"
}
Binary file added ...ources/assets/addemall/textures/block/generated/metal/metal_plating_5_block.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added definitions/assets/blocks/metal_plating_5.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions definitions/blocks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,20 @@
"generateSlab": true,
"generateStair": true
},
{
"id": "metal_plating_5",
"translation": "Metal Plating 5",
"material": "METAL",
"soundType": "METAL",
"strengthOne": 12,
"strengthTwo": 12,
"lightLevel": 0,
"explosionResistance": 12,
"requiresCorrectTool": true,
"instabreak": false,
"generateSlab": true,
"generateStair": true
},
{
"id": "metal_roof_1",
"translation": "Metal Roof 1",
Expand Down

0 comments on commit 0ab7f7e

Please sign in to comment.