diff --git a/common/src/main/java/de/griefed/addemall/CommonClass.java b/common/src/main/java/de/griefed/addemall/CommonClass.java index a2daa6c..d136095 100644 --- a/common/src/main/java/de/griefed/addemall/CommonClass.java +++ b/common/src/main/java/de/griefed/addemall/CommonClass.java @@ -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 tooltip) { diff --git a/common/src/main/java/de/griefed/addemall/block/GeneratedModBlocks.java b/common/src/main/java/de/griefed/addemall/block/GeneratedModBlocks.java index 7842074..0576c86 100644 --- a/common/src/main/java/de/griefed/addemall/block/GeneratedModBlocks.java +++ b/common/src/main/java/de/griefed/addemall/block/GeneratedModBlocks.java @@ -109,6 +109,12 @@ public class GeneratedModBlocks { public static final RegistryObject 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 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 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 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 METAL_PLATING_5_ITEM = ITEMS.register("generated/metal/metal_plating_5", () -> new BlockItem(METAL_PLATING_5.get(), itemBuilder())); + public static final RegistryObject 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 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 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 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 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 METAL_ROOF_1_ITEM = ITEMS.register("generated/metal/metal_roof_1", () -> new BlockItem(METAL_ROOF_1.get(), itemBuilder())); public static final RegistryObject METAL_ROOF_1_SLAB = BLOCKS.register("generated/metal/metal_roof_1_slab", () -> new SlabBlock(BlockBehaviour.Properties.copy(METAL_ROOF_1.get()))); diff --git a/common/src/main/resources/assets/addemall/blockstates/generated/metal/metal_plating_5_block.json b/common/src/main/resources/assets/addemall/blockstates/generated/metal/metal_plating_5_block.json new file mode 100644 index 0000000..f457832 --- /dev/null +++ b/common/src/main/resources/assets/addemall/blockstates/generated/metal/metal_plating_5_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "addemall:block/generated/metal/metal_plating_5_block" } + } +} diff --git a/common/src/main/resources/assets/addemall/blockstates/generated/metal/metal_plating_5_slab.json b/common/src/main/resources/assets/addemall/blockstates/generated/metal/metal_plating_5_slab.json new file mode 100644 index 0000000..32d3c67 --- /dev/null +++ b/common/src/main/resources/assets/addemall/blockstates/generated/metal/metal_plating_5_slab.json @@ -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" + } + } +} diff --git a/common/src/main/resources/assets/addemall/blockstates/generated/metal/metal_plating_5_stairs.json b/common/src/main/resources/assets/addemall/blockstates/generated/metal/metal_plating_5_stairs.json new file mode 100644 index 0000000..bf071ae --- /dev/null +++ b/common/src/main/resources/assets/addemall/blockstates/generated/metal/metal_plating_5_stairs.json @@ -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 + } + } +} diff --git a/common/src/main/resources/assets/addemall/lang/en_us.json b/common/src/main/resources/assets/addemall/lang/en_us.json index b97108c..2d4d4eb 100644 --- a/common/src/main/resources/assets/addemall/lang/en_us.json +++ b/common/src/main/resources/assets/addemall/lang/en_us.json @@ -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", diff --git a/common/src/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_block.json b/common/src/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_block.json new file mode 100644 index 0000000..32927d3 --- /dev/null +++ b/common/src/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "addemall:block/generated/metal/metal_plating_5_block" + } +} diff --git a/common/src/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_slab.json b/common/src/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_slab.json new file mode 100644 index 0000000..6c58098 --- /dev/null +++ b/common/src/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_slab.json @@ -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" + } +} diff --git a/common/src/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_slab_top.json b/common/src/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_slab_top.json new file mode 100644 index 0000000..79b1a42 --- /dev/null +++ b/common/src/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_slab_top.json @@ -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" + } +} diff --git a/common/src/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_stairs.json b/common/src/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_stairs.json new file mode 100644 index 0000000..6b9cd31 --- /dev/null +++ b/common/src/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_stairs.json @@ -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" + } +} diff --git a/common/src/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_stairs_inner.json b/common/src/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_stairs_inner.json new file mode 100644 index 0000000..77134cd --- /dev/null +++ b/common/src/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_stairs_inner.json @@ -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" + } +} diff --git a/common/src/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_stairs_outer.json b/common/src/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_stairs_outer.json new file mode 100644 index 0000000..b055346 --- /dev/null +++ b/common/src/main/resources/assets/addemall/models/block/generated/metal/metal_plating_5_stairs_outer.json @@ -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" + } +} diff --git a/common/src/main/resources/assets/addemall/models/item/generated/metal/metal_plating_5.json b/common/src/main/resources/assets/addemall/models/item/generated/metal/metal_plating_5.json new file mode 100644 index 0000000..15f7926 --- /dev/null +++ b/common/src/main/resources/assets/addemall/models/item/generated/metal/metal_plating_5.json @@ -0,0 +1,3 @@ +{ + "parent": "addemall:block/generated/metal/metal_plating_5_block" +} diff --git a/common/src/main/resources/assets/addemall/models/item/generated/metal/metal_plating_5_slab.json b/common/src/main/resources/assets/addemall/models/item/generated/metal/metal_plating_5_slab.json new file mode 100644 index 0000000..0446dc5 --- /dev/null +++ b/common/src/main/resources/assets/addemall/models/item/generated/metal/metal_plating_5_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "addemall:block/generated/metal/metal_plating_5_slab" +} diff --git a/common/src/main/resources/assets/addemall/models/item/generated/metal/metal_plating_5_stairs.json b/common/src/main/resources/assets/addemall/models/item/generated/metal/metal_plating_5_stairs.json new file mode 100644 index 0000000..27e92b1 --- /dev/null +++ b/common/src/main/resources/assets/addemall/models/item/generated/metal/metal_plating_5_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "addemall:block/generated/metal/metal_plating_5_stairs" +} diff --git a/common/src/main/resources/assets/addemall/textures/block/generated/metal/metal_plating_5_block.png b/common/src/main/resources/assets/addemall/textures/block/generated/metal/metal_plating_5_block.png new file mode 100644 index 0000000..2f71619 Binary files /dev/null and b/common/src/main/resources/assets/addemall/textures/block/generated/metal/metal_plating_5_block.png differ diff --git a/definitions/assets/blocks/metal_plating_5.png b/definitions/assets/blocks/metal_plating_5.png new file mode 100644 index 0000000..2f71619 Binary files /dev/null and b/definitions/assets/blocks/metal_plating_5.png differ diff --git a/definitions/blocks.json b/definitions/blocks.json index 53bf264..05660df 100644 --- a/definitions/blocks.json +++ b/definitions/blocks.json @@ -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",