diff --git a/src/main/java/wile/engineersdecor/ModConfig.java b/src/main/java/wile/engineersdecor/ModConfig.java index 0db30eb..8af5e65 100644 --- a/src/main/java/wile/engineersdecor/ModConfig.java +++ b/src/main/java/wile/engineersdecor/ModConfig.java @@ -521,8 +521,6 @@ public class ModConfig // Cache //-------------------------------------------------------------------------------------------------------------------- - @Deprecated - private static String const_exclude_patterns = "dark_shingle_*"; // experimental private static final CompoundNBT server_config_ = new CompoundNBT(); private static HashSet optouts_ = new HashSet<>(); private static boolean with_experimental_features_ = false; @@ -553,7 +551,6 @@ public class ModConfig { String exc = SERVER.pattern_excludes.get().toLowerCase().replaceAll(MODID+":", "").replaceAll("[^*_,a-z0-9]", ""); if(!exc.isEmpty()) LOGGER.info("Config pattern excludes: '" + exc + "'"); - if(!const_exclude_patterns.isEmpty()) exc += "," + const_exclude_patterns; String[] excl = exc.split(","); excludes_.clear(); for(int i=0; i< excl.length; ++i) { diff --git a/src/main/java/wile/engineersdecor/ModContent.java b/src/main/java/wile/engineersdecor/ModContent.java index 0925dfa..67844ab 100644 --- a/src/main/java/wile/engineersdecor/ModContent.java +++ b/src/main/java/wile/engineersdecor/ModContent.java @@ -212,25 +212,30 @@ public class ModContent // ------------------------------------------------------------------------------------------------------------------- public static final EdRoofBlock DARK_CERAMIC_SHINGLE_ROOF = (EdRoofBlock)(new EdRoofBlock( - DecorBlock.CFG_DEFAULT, + DecorBlock.CFG_DEFAULT|DecorBlock.CFG_EXPERIMENTAL, Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "dark_shingle_roof")); public static final DecorBlock.Normal DARK_CERAMIC_SHINGLE_ROOF_BLOCK = (DecorBlock.Normal)(new DecorBlock.Normal( - DecorBlock.CFG_DEFAULT, + DecorBlock.CFG_DEFAULT|DecorBlock.CFG_EXPERIMENTAL, Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "dark_shingle_roof_block")); public static final EdSlabBlock DARK_CERAMIC_SHINGLE_ROOF_SLAB = (EdSlabBlock)(new EdSlabBlock( - DecorBlock.CFG_DEFAULT, + DecorBlock.CFG_DEFAULT|DecorBlock.CFG_EXPERIMENTAL, Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "dark_shingle_roof_slab")); public static final EdSlabSliceBlock HALFSLAB_DARK_CERAMIC_SHINGLE_ROOF = (EdSlabSliceBlock)(new EdSlabSliceBlock( - DecorBlock.CFG_CUTOUT, + DecorBlock.CFG_CUTOUT|DecorBlock.CFG_EXPERIMENTAL, Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "dark_shingle_roof_slabslice")); + public static final EdRoofBlock DARK_CERAMIC_SHINGLE_ROOF_METALIZED = (EdRoofBlock)(new EdRoofBlock( + DecorBlock.CFG_CUTOUT|DecorBlock.CFG_EXPERIMENTAL, + Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) + )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "dark_shingle_roof_metallized")); + // ------------------------------------------------------------------------------------------------------------------- public static final EdGroundBlock DENSE_GRIT_SAND = (EdGroundBlock)(new EdGroundBlock( @@ -816,6 +821,7 @@ public class ModContent PANZERGLASS_BLOCK, PANZERGLASS_SLAB, DARK_CERAMIC_SHINGLE_ROOF, + DARK_CERAMIC_SHINGLE_ROOF_METALIZED, DARK_CERAMIC_SHINGLE_ROOF_BLOCK, DARK_CERAMIC_SHINGLE_ROOF_SLAB, HALFSLAB_DARK_CERAMIC_SHINGLE_ROOF, @@ -1050,8 +1056,9 @@ public class ModContent return blocks; } + @SuppressWarnings("deprecation") public static boolean isExperimentalBlock(Block block) - { return ArrayUtils.contains(devBlocks, block); } + { return ArrayUtils.contains(devBlocks, block) || ((block instanceof IDecorBlock) && ((((IDecorBlock)block).config() & DecorBlock.CFG_EXPERIMENTAL))!=0); } @Nonnull public static List getRegisteredBlocks() diff --git a/src/main/java/wile/engineersdecor/blocks/DecorBlock.java b/src/main/java/wile/engineersdecor/blocks/DecorBlock.java index 9e808c1..df767a9 100644 --- a/src/main/java/wile/engineersdecor/blocks/DecorBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/DecorBlock.java @@ -39,6 +39,7 @@ public class DecorBlock public static final long CFG_STRICT_CONNECTIONS = StandardBlocks.CFG_STRICT_CONNECTIONS; public static final long CFG_AI_PASSABLE = StandardBlocks.CFG_AI_PASSABLE; public static final long CFG_HARD_IE_DEPENDENT = 0x8000000000000000L; + @Deprecated public static final long CFG_EXPERIMENTAL = 0x4000000000000000L; public static class Normal extends StandardBlocks.BaseBlock implements IDecorBlock { diff --git a/src/main/resources/assets/engineersdecor/blockstates/dark_shingle_roof_metallized.json b/src/main/resources/assets/engineersdecor/blockstates/dark_shingle_roof_metallized.json new file mode 100644 index 0000000..e80b352 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/blockstates/dark_shingle_roof_metallized.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model" }, + "facing=west,half=bottom,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_inner", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_metallized_model_inner", "x": 180, "y": 270, "uvlock": true } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/lang/en_us.json b/src/main/resources/assets/engineersdecor/lang/en_us.json index a91499d..60fb67d 100644 --- a/src/main/resources/assets/engineersdecor/lang/en_us.json +++ b/src/main/resources/assets/engineersdecor/lang/en_us.json @@ -68,6 +68,7 @@ "block.engineersdecor.concrete_wall": "Concrete Wall", "block.engineersdecor.concrete_wall.help": "ยง6Wall made of solid concrete.", "block.engineersdecor.dark_shingle_roof": "Dark Ceramic Shingle Roof", + "block.engineersdecor.dark_shingle_roof_metallized": "Metallized Dark Ceramic Shingle Roof", "block.engineersdecor.dark_shingle_roof_block": "Dark Ceramic Shingle Roof Block", "block.engineersdecor.dark_shingle_roof_slab": "Dark Ceramic Shingle Roof Slab", "block.engineersdecor.dark_shingle_roof_slabslice": "Dark Ceramic Shingle Roof Slab Slice", diff --git a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model.json b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model.json new file mode 100644 index 0000000..48e0840 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model.json @@ -0,0 +1,106 @@ +{ + "parent": "block/block", + "textures": { + "f": "engineersdecor:block/material/steel_texture", + "particle": "engineersdecor:block/roof/dark_shingle_roof", + "s": "engineersdecor:block/roof/dark_shingle_roof" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 4, 16], + "faces": { + "north": {"uv": [0, 12, 16, 16], "texture": "#s"}, + "east": {"uv": [0, 12, 16, 16], "texture": "#s"}, + "south": {"uv": [0, 12, 16, 16], "texture": "#s"}, + "west": {"uv": [0, 12, 16, 16], "texture": "#s"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#s"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#s"} + } + }, + { + "from": [4, 4, 0], + "to": [16, 8, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [0, 8, 12, 12], "texture": "#s"}, + "east": {"uv": [0, 8, 16, 12], "texture": "#s"}, + "south": {"uv": [4, 8, 16, 12], "texture": "#s"}, + "west": {"uv": [0, 8, 16, 12], "texture": "#s"}, + "up": {"uv": [4, 0, 16, 16], "texture": "#s"} + } + }, + { + "from": [8, 8, 0], + "to": [16, 12, 16], + "faces": { + "north": {"uv": [0, 4, 8, 8], "texture": "#s"}, + "east": {"uv": [0, 4, 16, 8], "texture": "#s"}, + "south": {"uv": [8, 4, 16, 8], "texture": "#s"}, + "west": {"uv": [0, 4, 16, 8], "texture": "#s"}, + "up": {"uv": [8, 0, 16, 16], "texture": "#s"} + } + }, + { + "from": [12, 12, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#s"}, + "east": {"uv": [0, 0, 16, 4], "texture": "#s"}, + "south": {"uv": [12, 0, 16, 4], "texture": "#s"}, + "west": {"uv": [0, 0, 16, 4], "texture": "#s"}, + "up": {"uv": [12, 0, 16, 16], "texture": "#s"} + } + }, + { + "from": [0, 4, 0], + "to": [1, 6, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#f"} + } + }, + { + "from": [0, 4, 15], + "to": [1, 6, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 23]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#f"} + } + }, + { + "from": [0, 5, 1], + "to": [1, 6, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 22]}, + "faces": { + "east": {"uv": [0, 0, 14, 1], "texture": "#f"}, + "west": {"uv": [0, 0, 14, 1], "texture": "#f"}, + "up": {"uv": [0, 0, 1, 14], "texture": "#f"}, + "down": {"uv": [0, 0, 1, 14], "texture": "#f"} + } + } + ], + "display": { + "thirdperson_lefthand": { + "rotation": [75, -135, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "gui": { + "rotation": [30, 135, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [0, -90, 0] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model_inner.json b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model_inner.json new file mode 100644 index 0000000..a9d5dc3 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model_inner.json @@ -0,0 +1,101 @@ +{ + "textures": { + "f": "engineersdecor:block/material/steel_texture", + "particle": "engineersdecor:block/roof/dark_shingle_roof", + "s": "engineersdecor:block/roof/dark_shingle_roof" + }, + "elements": [ + { + "from": [12, 0, 0], + "to": [16, 16, 12], + "faces": { + "north": {"uv": [0, 0, 4, 16], "texture": "#s"}, + "east": {"uv": [4, 0, 16, 16], "texture": "#s"}, + "west": {"uv": [0, 0, 12, 16], "texture": "#s"}, + "up": {"uv": [12, 0, 16, 12], "texture": "#s"}, + "down": {"uv": [12, 4, 16, 16], "texture": "#s"} + } + }, + { + "from": [0, 0, 12], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 16]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#s"}, + "east": {"uv": [0, 0, 4, 16], "texture": "#s"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#s"}, + "west": {"uv": [12, 0, 16, 16], "texture": "#s"}, + "up": {"uv": [0, 12, 16, 16], "texture": "#s"}, + "down": {"uv": [0, 0, 16, 4], "texture": "#s"} + } + }, + { + "from": [0, 0, 8], + "to": [12, 12, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 12]}, + "faces": { + "north": {"uv": [4, 4, 16, 16], "texture": "#s"}, + "west": {"uv": [8, 4, 12, 16], "texture": "#s"}, + "up": {"uv": [0, 8, 12, 12], "texture": "#s"}, + "down": {"uv": [0, 4, 12, 8], "texture": "#s"} + } + }, + { + "from": [0, 0, 4], + "to": [8, 8, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [8, 8, 16, 16], "texture": "#s"}, + "west": {"uv": [4, 8, 8, 16], "texture": "#s"}, + "up": {"uv": [0, 4, 8, 8], "texture": "#s"}, + "down": {"uv": [0, 8, 8, 12], "texture": "#s"} + } + }, + { + "from": [8, 0, 0], + "to": [12, 12, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [4, 4, 8, 16], "texture": "#s"}, + "west": {"uv": [0, 4, 8, 16], "texture": "#s"}, + "up": {"uv": [8, 0, 12, 8], "texture": "#s"}, + "down": {"uv": [8, 8, 12, 16], "texture": "#s"} + } + }, + { + "from": [4, 0, 0], + "to": [8, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 12, 8]}, + "faces": { + "north": {"uv": [8, 8, 12, 16], "texture": "#s"}, + "west": {"uv": [0, 8, 4, 16], "texture": "#s"}, + "up": {"uv": [4, 0, 8, 4], "texture": "#s"}, + "down": {"uv": [4, 12, 8, 16], "texture": "#s"} + } + }, + { + "from": [0, 0, 0], + "to": [4, 4, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 12, 8]}, + "faces": { + "north": {"uv": [12, 12, 16, 16], "texture": "#s"}, + "east": {"uv": [12, 12, 16, 16], "texture": "#s"}, + "west": {"uv": [0, 12, 4, 16], "texture": "#s"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#s"}, + "down": {"uv": [0, 12, 4, 16], "texture": "#s"} + } + }, + { + "from": [0, 4, 0], + "to": [1, 6, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [15, 10, 16, 12], "texture": "#f"}, + "east": {"uv": [15, 10, 16, 12], "texture": "#f"}, + "south": {"uv": [0, 10, 1, 12], "texture": "#f"}, + "west": {"uv": [0, 10, 1, 12], "texture": "#f"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#f"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model_outer.json b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model_outer.json new file mode 100644 index 0000000..0c32921 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model_outer.json @@ -0,0 +1,114 @@ +{ + "textures": { + "particle": "engineersdecor:block/roof/dark_shingle_roof", + "s": "engineersdecor:block/roof/dark_shingle_roof", + "f": "engineersdecor:block/material/steel_texture" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 4, 16], + "faces": { + "north": {"uv": [0, 12, 16, 16], "texture": "#s"}, + "east": {"uv": [0, 12, 16, 16], "texture": "#s"}, + "south": {"uv": [0, 12, 16, 16], "texture": "#s"}, + "west": {"uv": [0, 12, 16, 16], "texture": "#s"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#s"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#s"} + } + }, + { + "from": [4, 4, 4], + "to": [16, 8, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [0, 8, 12, 12], "texture": "#s"}, + "east": {"uv": [0, 8, 12, 12], "texture": "#s"}, + "south": {"uv": [4, 8, 16, 12], "texture": "#s"}, + "west": {"uv": [4, 8, 16, 12], "texture": "#s"}, + "up": {"uv": [4, 4, 16, 16], "texture": "#s"} + } + }, + { + "from": [8, 8, 8], + "to": [16, 12, 16], + "faces": { + "north": {"uv": [0, 4, 8, 8], "texture": "#s"}, + "east": {"uv": [0, 4, 8, 8], "texture": "#s"}, + "south": {"uv": [8, 4, 16, 8], "texture": "#s"}, + "west": {"uv": [8, 4, 16, 8], "texture": "#s"}, + "up": {"uv": [8, 8, 16, 16], "texture": "#s"} + } + }, + { + "from": [12, 12, 12], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#s"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#s"}, + "south": {"uv": [12, 0, 16, 4], "texture": "#s"}, + "west": {"uv": [12, 0, 16, 4], "texture": "#s"}, + "up": {"uv": [12, 12, 16, 16], "texture": "#s"} + } + }, + { + "from": [0, 4, 0], + "to": [1, 6, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#f"} + } + }, + { + "from": [15, 4, 0], + "to": [16, 6, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [23, 12, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#f"} + } + }, + { + "from": [0, 4, 15], + "to": [1, 6, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 23]}, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#f"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#f"} + } + }, + { + "from": [1, 5, 0], + "to": [15, 6, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 11, 8]}, + "faces": { + "north": {"uv": [0, 0, 14, 1], "texture": "#f"}, + "south": {"uv": [0, 0, 14, 1], "texture": "#f"}, + "up": {"uv": [0, 0, 14, 1], "texture": "#f"}, + "down": {"uv": [0, 0, 14, 1], "texture": "#f"} + } + }, + { + "from": [0, 5, 1], + "to": [1, 6, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 9]}, + "faces": { + "east": {"uv": [0, 0, 14, 1], "texture": "#f"}, + "west": {"uv": [0, 0, 14, 1], "texture": "#f"}, + "up": {"uv": [0, 0, 1, 14], "texture": "#f"}, + "down": {"uv": [0, 0, 1, 14], "texture": "#f"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/dark_shingle_roof_metallized.json b/src/main/resources/assets/engineersdecor/models/item/dark_shingle_roof_metallized.json new file mode 100644 index 0000000..4bb86f1 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/item/dark_shingle_roof_metallized.json @@ -0,0 +1 @@ +{ "parent": "engineersdecor:block/roof/dark_shingle_roof_metallized_model" } \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/loot_tables/blocks/dark_shingle_roof_metallized.json b/src/main/resources/data/engineersdecor/loot_tables/blocks/dark_shingle_roof_metallized.json new file mode 100644 index 0000000..d26189e --- /dev/null +++ b/src/main/resources/data/engineersdecor/loot_tables/blocks/dark_shingle_roof_metallized.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "dark_shingle_roof_metallized_dlt", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:copy_name", + "source": "block_entity" + } + ], + "name": "engineersdecor:dark_shingle_roof_metallized" + } + ] + } + ] +} \ No newline at end of file