diff --git a/gradle.properties b/gradle.properties index a48a883..357f52c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,4 +5,4 @@ version_minecraft=1.16.4 version_forge_minecraft=1.16.4-35.1.10 version_fml_mappings=20201028-1.16.3 version_jei=1.16.4:7.6.1.63 -version_engineersdecor=1.1.7 +version_engineersdecor=1.1.8-b1 diff --git a/meta/update.json b/meta/update.json index 8365b68..a49cb8a 100644 --- a/meta/update.json +++ b/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.16.4": { + "1.1.8-b1": "[F] Fluid Funnel waterlogged fluid picking fixed (issue #158, thx ZoMadeStuff).\n[F] Roof rendering fixes (issues #153/#159, thx Salamance73/Murph).\n[A] Recessed Clinkers, Vertically Slit Clinkers, and Structured Vertical Clinker Slab added.", "1.1.7": "[M] 1.16.5 support.\n[F] Fixed Labeled Crate include (issue #157, ty NillerMedDild).", "1.1.6": "[F] Added common-config opt-out specification for pack level opt-outs (issue #154, ty gekkone), will replace server config opt-out in MC1.17.", "1.1.6-b3": "[M] Config logging edited, E-Furnace GUI capacitor tooltip added, E-Furnace power consumption independent of config speed setting (issue #152 ty Staegrin).", @@ -26,6 +27,6 @@ }, "promos": { "1.16.4-recommended": "1.1.7", - "1.16.4-latest": "1.1.7" + "1.16.4-latest": "1.1.8-b1" } } \ No newline at end of file diff --git a/readme.md b/readme.md index 96a0db0..ebce605 100644 --- a/readme.md +++ b/readme.md @@ -11,6 +11,10 @@ Mod sources for Minecraft version 1.16.x. ## Version history + - v1.1.8-b1 [F] Fluid Funnel waterlogged fluid picking fixed (issue #158, thx ZoMadeStuff). + [F] Roof rendering fixes (issues #153/#159, thx Salamance73/Murph). + [A] Recessed Clinkers, Vertically Slit Clinkers, and Structured Vertical Clinker Slab added. + - v1.1.7 [M] 1.16.5 support. [F] Fixed Labeled Crate include (issue #157, ty NillerMedDild). diff --git a/src/main/java/wile/engineersdecor/ModContent.java b/src/main/java/wile/engineersdecor/ModContent.java index f57d868..34bb6b0 100644 --- a/src/main/java/wile/engineersdecor/ModContent.java +++ b/src/main/java/wile/engineersdecor/ModContent.java @@ -116,6 +116,34 @@ public class ModContent new Block[]{CLINKER_BRICK_BLOCK, CLINKER_BRICK_STAINED_BLOCK, CLINKER_BRICK_SLAB, CLINKER_BRICK_STAIRS, CLINKER_BRICK_STAINED_SLAB, CLINKER_BRICK_STAINED_STAIRS} )).setRegistryName(new ResourceLocation(MODID, "clinker_brick_sastor_corner_block")); + public static final DecorBlock.HorizontalWaterLoggable CLINKER_BRICK_RECESSED = (DecorBlock.HorizontalWaterLoggable)(new DecorBlock.HorizontalWaterLoggable( + DecorBlock.CFG_CUTOUT|DecorBlock.CFG_HORIZIONTAL|DecorBlock.CFG_LOOK_PLACEMENT, + Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(3f, 50f).sound(SoundType.STONE), + new AxisAlignedBB[] { + Auxiliaries.getPixeledAABB( 3,0, 0, 13,16, 1), + Auxiliaries.getPixeledAABB( 0,0, 1, 16,16,11), + Auxiliaries.getPixeledAABB( 4,0,11, 12,16,13) + } + )).setRegistryName(new ResourceLocation(MODID, "clinker_brick_recessed")); + + public static final DecorBlock.HorizontalWaterLoggable CLINKER_BRICK_SASTOR_VERTICAL_SLOTTED = (DecorBlock.HorizontalWaterLoggable)(new DecorBlock.HorizontalWaterLoggable( + DecorBlock.CFG_CUTOUT|DecorBlock.CFG_HORIZIONTAL|DecorBlock.CFG_LOOK_PLACEMENT, + Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(3f, 50f).sound(SoundType.STONE), + new AxisAlignedBB[] { + Auxiliaries.getPixeledAABB( 3,0, 0, 13,16, 1), + Auxiliaries.getPixeledAABB( 3,0,15, 13,16,16), + Auxiliaries.getPixeledAABB( 0,0, 1, 16,16,15) + } + )).setRegistryName(new ResourceLocation(MODID, "clinker_brick_vertically_slit")); + + public static final DecorBlock.HorizontalWaterLoggable CLINKER_BRICK_VERTICAL_SLAB_STRUCTURED = (DecorBlock.HorizontalWaterLoggable)(new DecorBlock.HorizontalWaterLoggable( + DecorBlock.CFG_CUTOUT|DecorBlock.CFG_HORIZIONTAL|DecorBlock.CFG_LOOK_PLACEMENT, + Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(3f, 50f).sound(SoundType.STONE), + new AxisAlignedBB[] { + Auxiliaries.getPixeledAABB( 0,0, 0, 16,16, 8), + } + )).setRegistryName(new ResourceLocation(MODID, "clinker_brick_vertical_slab_structured")); + // ------------------------------------------------------------------------------------------------------------------- public static final DecorBlock.Normal SLAG_BRICK_BLOCK = (DecorBlock.Normal)(new DecorBlock.Normal( @@ -228,50 +256,43 @@ public class ModContent // ------------------------------------------------------------------------------------------------------------------- public static final EdRoofBlock DARK_CERAMIC_SHINGLE_ROOF = (EdRoofBlock)(new EdRoofBlock( - DecorBlock.CFG_DEFAULT, - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) + DecorBlock.CFG_CUTOUT, + Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE).notSolid().variableOpacity().setAllowsSpawn(ModContent::disallowSpawn) )).setRegistryName(new ResourceLocation(MODID, "dark_shingle_roof")); - public static final DecorBlock.Normal DARK_CERAMIC_SHINGLE_ROOF_BLOCK = (DecorBlock.Normal)(new DecorBlock.Normal( - DecorBlock.CFG_DEFAULT, - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) - .notSolid().variableOpacity().setEmmisiveRendering((s,w,p)->true).variableOpacity() - )).setRegistryName(new ResourceLocation(MODID, "dark_shingle_roof_block")); - - public static final EdSlabBlock DARK_CERAMIC_SHINGLE_ROOF_SLAB = (EdSlabBlock)(new EdSlabBlock( - DecorBlock.CFG_DEFAULT, - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) - .notSolid().variableOpacity().setEmmisiveRendering((s,w,p)->true).variableOpacity() - )).setRegistryName(new ResourceLocation(MODID, "dark_shingle_roof_slab")); - - public static final EdSlabSliceBlock HALFSLAB_DARK_CERAMIC_SHINGLE_ROOF = (EdSlabSliceBlock)(new EdSlabSliceBlock( - DecorBlock.CFG_DEFAULT, - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) - )).setRegistryName(new ResourceLocation(MODID, "dark_shingle_roof_slabslice")); - public static final EdRoofBlock DARK_CERAMIC_SHINGLE_ROOF_METALIZED = (EdRoofBlock)(new EdRoofBlock( - DecorBlock.CFG_DEFAULT, - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) + DecorBlock.CFG_CUTOUT, + Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE).notSolid().variableOpacity().setAllowsSpawn(ModContent::disallowSpawn) )).setRegistryName(new ResourceLocation(MODID, "dark_shingle_roof_metallized")); public static final EdRoofBlock DARK_CERAMIC_SHINGLE_ROOF_SKYLIGHT = (EdRoofBlock)(new EdRoofBlock( DecorBlock.CFG_TRANSLUCENT, - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) + Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE).notSolid().variableOpacity().setAllowsSpawn(ModContent::disallowSpawn) )).setRegistryName(new ResourceLocation(MODID, "dark_shingle_roof_skylight")); public static final EdChimneyTrunkBlock DARK_CERAMIC_SHINGLE_ROOF_CHIMNEYTRUNK = (EdChimneyTrunkBlock)(new EdChimneyTrunkBlock( - DecorBlock.CFG_DEFAULT, - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE), + DecorBlock.CFG_CUTOUT, + Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE).notSolid().variableOpacity().setAllowsSpawn(ModContent::disallowSpawn), VoxelShapes.create(Auxiliaries.getPixeledAABB(3, 0, 3, 13, 16, 13)), VoxelShapes.create(Auxiliaries.getPixeledAABB(5, 0, 5, 11, 16, 11)) )).setRegistryName(new ResourceLocation(MODID, "dark_shingle_roof_chimneytrunk")); public static final EdChimneyBlock DARK_CERAMIC_SHINGLE_ROOF_CHIMNEY = (EdChimneyBlock)(new EdChimneyBlock( DecorBlock.CFG_CUTOUT|DecorBlock.CFG_AI_PASSABLE, - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(5f, 2000f).sound(SoundType.STONE), + Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(5f, 2000f).sound(SoundType.STONE).variableOpacity().setAllowsSpawn(ModContent::disallowSpawn), Auxiliaries.getPixeledAABB(3, 0, 3, 13, 6, 13) )).setRegistryName(new ResourceLocation(MODID, "dark_shingle_roof_chimney")); + public static final DecorBlock.Normal DARK_CERAMIC_SHINGLE_ROOF_BLOCK = (DecorBlock.Normal)(new DecorBlock.Normal( + DecorBlock.CFG_DEFAULT, + Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) + )).setRegistryName(new ResourceLocation(MODID, "dark_shingle_roof_block")); + + public static final EdSlabBlock DARK_CERAMIC_SHINGLE_ROOF_SLAB = (EdSlabBlock)(new EdSlabBlock( + DecorBlock.CFG_DEFAULT, + Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) + )).setRegistryName(new ResourceLocation(MODID, "dark_shingle_roof_slab")); + // ------------------------------------------------------------------------------------------------------------------- public static final EdGroundBlock DENSE_GRIT_SAND = (EdGroundBlock)(new EdGroundBlock( @@ -284,6 +305,11 @@ public class ModContent Block.Properties.create(Material.EARTH, MaterialColor.DIRT).hardnessAndResistance(0.5f, 3f).sound(SoundType.GROUND).harvestTool(ToolType.SHOVEL) )).setRegistryName(new ResourceLocation(MODID, "dense_grit_dirt_block")); + public static final EdSlabSliceBlock HALFSLAB_DARK_CERAMIC_SHINGLE_ROOF = (EdSlabSliceBlock)(new EdSlabSliceBlock( + DecorBlock.CFG_DEFAULT, + Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) + )).setRegistryName(new ResourceLocation(MODID, "dark_shingle_roof_slabslice")); + // ------------------------------------------------------------------------------------------------------------------- public static final EdLadderBlock METAL_RUNG_LADDER = (EdLadderBlock)(new EdLadderBlock( @@ -989,6 +1015,9 @@ public class ModContent CLINKER_BRICK_STAINED_BLOCK, CLINKER_BRICK_STAINED_SLAB, CLINKER_BRICK_STAINED_STAIRS, + CLINKER_BRICK_SASTOR_VERTICAL_SLOTTED, + CLINKER_BRICK_RECESSED, + CLINKER_BRICK_VERTICAL_SLAB_STRUCTURED, SLAG_BRICK_BLOCK, SLAG_BRICK_SLAB, SLAG_BRICK_STAIRS, diff --git a/src/main/java/wile/engineersdecor/blocks/EdFluidFunnel.java b/src/main/java/wile/engineersdecor/blocks/EdFluidFunnel.java index b05472c..24b8f1c 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdFluidFunnel.java +++ b/src/main/java/wile/engineersdecor/blocks/EdFluidFunnel.java @@ -10,9 +10,8 @@ */ package wile.engineersdecor.blocks; +import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.world.IWorldReader; -import wile.engineersdecor.ModConfig; -import wile.engineersdecor.ModContent; import net.minecraft.block.*; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -40,7 +39,8 @@ import net.minecraftforge.fluids.*; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; -import wile.engineersdecor.ModEngineersDecor; +import wile.engineersdecor.ModConfig; +import wile.engineersdecor.ModContent; import wile.engineersdecor.libmc.detail.Fluidics; import javax.annotation.Nullable; @@ -257,6 +257,8 @@ public class EdFluidFunnel BlockState state = world.getBlockState(pos); if(state instanceof IBucketPickupHandler) { ((IBucketPickupHandler)state).pickupFluid(world, pos, state); + } else if((state.getBlock() instanceof IWaterLoggable) && (state.hasProperty(BlockStateProperties.WATERLOGGED))) { + world.setBlockState(pos, state.with(BlockStateProperties.WATERLOGGED, false), 1|2); } else { world.setBlockState(pos, Blocks.AIR.getDefaultState(), 1|2); // ok we can't leave the block, that would be an infinite source of an unknown fluid. } diff --git a/src/main/java/wile/engineersdecor/libmc/detail/Auxiliaries.java b/src/main/java/wile/engineersdecor/libmc/detail/Auxiliaries.java index a8a204c..4d7bf8a 100644 --- a/src/main/java/wile/engineersdecor/libmc/detail/Auxiliaries.java +++ b/src/main/java/wile/engineersdecor/libmc/detail/Auxiliaries.java @@ -342,7 +342,7 @@ public class Auxiliaries public static final VoxelShape getUnionShape(AxisAlignedBB ... aabbs) { VoxelShape shape = VoxelShapes.empty(); - for(AxisAlignedBB aabb: aabbs) shape = VoxelShapes.combine(shape, VoxelShapes.create(aabb), IBooleanFunction.OR); + for(AxisAlignedBB aabb: aabbs) shape = VoxelShapes.combineAndSimplify(shape, VoxelShapes.create(aabb), IBooleanFunction.OR); return shape; } diff --git a/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_recessed.json b/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_recessed.json new file mode 100644 index 0000000..4c3b846 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_recessed.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "engineersdecor:block/brick/clinker_brick_recessed_model" }, + "facing=south": { "model": "engineersdecor:block/brick/clinker_brick_recessed_model", "y":180 }, + "facing=west": { "model": "engineersdecor:block/brick/clinker_brick_recessed_model", "y":270 }, + "facing=east": { "model": "engineersdecor:block/brick/clinker_brick_recessed_model", "y":90 } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_vertical_slab_structured.json b/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_vertical_slab_structured.json new file mode 100644 index 0000000..de7b0ee --- /dev/null +++ b/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_vertical_slab_structured.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "engineersdecor:block/brick/clinker_brick_vertical_slab_structured_model" }, + "facing=south": { "model": "engineersdecor:block/brick/clinker_brick_vertical_slab_structured_model", "y":180 }, + "facing=west": { "model": "engineersdecor:block/brick/clinker_brick_vertical_slab_structured_model", "y":270 }, + "facing=east": { "model": "engineersdecor:block/brick/clinker_brick_vertical_slab_structured_model", "y":90 } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_vertically_slit.json b/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_vertically_slit.json new file mode 100644 index 0000000..eb471aa --- /dev/null +++ b/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_vertically_slit.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "engineersdecor:block/brick/clinker_brick_vertically_slit_model" }, + "facing=south": { "model": "engineersdecor:block/brick/clinker_brick_vertically_slit_model", "y":180 }, + "facing=west": { "model": "engineersdecor:block/brick/clinker_brick_vertically_slit_model", "y":270 }, + "facing=east": { "model": "engineersdecor:block/brick/clinker_brick_vertically_slit_model", "y":90 } + } +} \ 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 b15b5ce..8cdc2f8 100644 --- a/src/main/resources/assets/engineersdecor/lang/en_us.json +++ b/src/main/resources/assets/engineersdecor/lang/en_us.json @@ -51,6 +51,7 @@ "engineersdecor.tooltip.slabpickup.help": "\n§rFast pickup by left-clicking while\n looking up/down and holding this slab.", "block.engineersdecor.clinker_brick_block": "Clinker Brick Block", "block.engineersdecor.clinker_brick_block.help": "A brick block with position\n dependent texture variations.\n Looks slightly darker and more\n color intensive than the\n vanilla brick block.", + "block.engineersdecor.clinker_brick_recessed": "Recessed Clinker Brick", "block.engineersdecor.clinker_brick_sastor_corner_block": "Sandstone Ornated Clinker Brick", "block.engineersdecor.clinker_brick_sastor_corner_block.help": "Quoin decoration for clinker\n wall accentuation. Place looking\n horizontally to generate a\n building corner ornamentation.\n Place while looking almost\n straight up/down for window\n ornamentation. The style of\n adjacent Sandstone Ornated\n Blocks are copied (preferred) to\n facilitate placements for\n higher buildings.", "block.engineersdecor.clinker_brick_slab": "Clinker Brick Slab", @@ -63,6 +64,8 @@ "block.engineersdecor.clinker_brick_stained_stairs.help": "Looks slightly darker and more\n color intensive than the vanilla\n brick block. Has more visible\n traces of grime or stain.", "block.engineersdecor.clinker_brick_stairs": "Clinker Brick Stairs", "block.engineersdecor.clinker_brick_stairs.help": "Looks slightly darker and more\n color intensive than the vanilla\n brick block.", + "block.engineersdecor.clinker_brick_vertical_slab_structured": "Structured Vertical Clinker Slab", + "block.engineersdecor.clinker_brick_vertically_slit": "Vertically Slit Clinker Bricks", "block.engineersdecor.clinker_brick_wall": "Clinker Brick Wall", "block.engineersdecor.clinker_brick_wall.help": "Simplistic Clinker Brick Wall.", "block.engineersdecor.dark_shingle_roof": "Dark Shingle Roof", diff --git a/src/main/resources/assets/engineersdecor/lang/ru_ru.json b/src/main/resources/assets/engineersdecor/lang/ru_ru.json index 18ecc7b..f181510 100644 --- a/src/main/resources/assets/engineersdecor/lang/ru_ru.json +++ b/src/main/resources/assets/engineersdecor/lang/ru_ru.json @@ -51,6 +51,7 @@ "engineersdecor.tooltip.slabpickup.help": "§rБыстрое поднятие щелчком ЛКМ, смотря вверх/вниз с этой плитой в руках.", "block.engineersdecor.clinker_brick_block": "Клинкерный кирпич", "block.engineersdecor.clinker_brick_block.help": "Кирпичный блок с вариациями текстуры, зависящими от положения.\nВыглядит темнее и интенсивнее, чем Кирпичный блок.", + "block.engineersdecor.clinker_brick_recessed": "Recessed Clinker Brick", "block.engineersdecor.clinker_brick_sastor_corner_block": "Украшенный песчанником клинкерный кирпич", "block.engineersdecor.clinker_brick_sastor_corner_block.help": "Угловое украшение для акцентирования клинкерных стен.\nРазмещайте, смотря горизонтально, чтобы создать орнамент угла здания.\nРазмещайте, глядя вверх/вниз для украшений оконных проёмов.\nСтиль соседних таких блоков копируется (привилегирует), чтобы облегчить стройку высоких зданий.", "block.engineersdecor.clinker_brick_slab": "Клинкерная плита", @@ -63,6 +64,8 @@ "block.engineersdecor.clinker_brick_stained_stairs.help": "Выглядят немного темнее и интенсивнее, чем Кирпичный блок. Имеют более заметные следы грязи или пятен.", "block.engineersdecor.clinker_brick_stairs": "Клинкерные кирпичные ступеньки", "block.engineersdecor.clinker_brick_stairs.help": "По цвету выглядят немного темнее и интенсивнее, чем Кирпичный блок", + "block.engineersdecor.clinker_brick_vertical_slab_structured": "Structured Vertical Clinker Slab", + "block.engineersdecor.clinker_brick_vertically_slit": "Vertically Slit Clinker Bricks", "block.engineersdecor.clinker_brick_wall": "Клинкерная кирпичная стена", "block.engineersdecor.clinker_brick_wall.help": "Обыкновенная клинкерная кирпичная стена.", "block.engineersdecor.dark_shingle_roof": "Тёмная керамическая черепица", diff --git a/src/main/resources/assets/engineersdecor/lang/zh_cn.json b/src/main/resources/assets/engineersdecor/lang/zh_cn.json index 398c68a..4b9798a 100644 --- a/src/main/resources/assets/engineersdecor/lang/zh_cn.json +++ b/src/main/resources/assets/engineersdecor/lang/zh_cn.json @@ -51,6 +51,7 @@ "engineersdecor.tooltip.slabpickup.help": "§r手持同类台阶往上/下看时单击该台阶可无需破坏快速拾起。", "block.engineersdecor.clinker_brick_block": "过烧砖块", "block.engineersdecor.clinker_brick_block.help": "§6一种放在不同位置贴图有不同变化的砖块。§r\n比原版砖看起来颜色更深，色度也更高。", + "block.engineersdecor.clinker_brick_recessed": "Recessed Clinker Brick", "block.engineersdecor.clinker_brick_sastor_corner_block": "Sandstone Ornated Clinker Brick", "block.engineersdecor.clinker_brick_sastor_corner_block.help": "§6Quoin decoration for clinker wall accentuation.§r\nPlace looking horizontally to generate a building corner ornamentation. Place while looking almost straight up/down for window ornamentation. The style of adjacent Sandstone Ornated Blocks are copied (preferred) to facilitate placements for higher buildings.", "block.engineersdecor.clinker_brick_slab": "过烧砖台阶", @@ -63,6 +64,8 @@ "block.engineersdecor.clinker_brick_stained_stairs.help": "§6比原版砖看起来颜色更深，色度也更高。有更多可见的污垢或污迹。", "block.engineersdecor.clinker_brick_stairs": "过烧砖楼梯", "block.engineersdecor.clinker_brick_stairs.help": "§6比原版砖看起来颜色更深，色度也更高。", + "block.engineersdecor.clinker_brick_vertical_slab_structured": "Structured Vertical Clinker Slab", + "block.engineersdecor.clinker_brick_vertically_slit": "Vertically Slit Clinker Bricks", "block.engineersdecor.clinker_brick_wall": "过烧砖墙", "block.engineersdecor.clinker_brick_wall.help": "§6简单的过烧砖墙。", "block.engineersdecor.dark_shingle_roof": "Dark Ceramic Shingle Roof", diff --git a/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_recessed_model.json b/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_recessed_model.json new file mode 100644 index 0000000..baa034a --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_recessed_model.json @@ -0,0 +1,59 @@ +{ + "parent": "block/block", + "textures": { + "f": "engineersdecor:block/clinker_brick/clinker_brick_pole_side", + "s": "engineersdecor:block/clinker_brick/clinker_brick_sastor_upplate_top_texture", + "particle": "engineersdecor:block/clinker_brick/clinker_brick_texture0", + "d": "engineersdecor:block/clinker_brick/clinker_brick_texture0" + }, + "elements": [ + { + "from": [4, 0, 11], + "to": [12, 16, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6]}, + "faces": { + "east": {"uv": [3, 0, 5, 16], "texture": "#d"}, + "south": {"uv": [4, 0, 12, 16], "texture": "#d"}, + "west": {"uv": [11, 0, 13, 16], "texture": "#d"}, + "up": {"uv": [4, 11, 12, 13], "texture": "#s"}, + "down": {"uv": [4, 3, 12, 5], "texture": "#s"} + } + }, + { + "from": [0, 0, 1], + "to": [8, 16, 11], + "faces": { + "north": {"uv": [4, 0, 12, 16], "texture": "#f"}, + "south": {"uv": [4, 0, 12, 16], "texture": "#f"}, + "west": {"uv": [1, 0, 11, 16], "texture": "#d"}, + "up": {"uv": [0, 1, 8, 11], "texture": "#d"}, + "down": {"uv": [0, 5, 8, 15], "texture": "#d"} + } + }, + { + "from": [8, 0, 1], + "to": [16, 16, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 8, 8]}, + "faces": { + "north": {"uv": [4, 0, 12, 16], "texture": "#f"}, + "east": {"uv": [5, 0, 15, 16], "texture": "#d"}, + "south": {"uv": [4, 0, 12, 16], "texture": "#f"}, + "up": {"uv": [8, 1, 16, 11], "texture": "#d"}, + "down": {"uv": [8, 5, 16, 15], "texture": "#d"} + } + }, + { + "from": [3, 0, 0], + "to": [13, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -3]}, + "faces": { + "north": {"uv": [4, 0, 14, 16], "texture": "#d"}, + "east": {"uv": [15, 0, 16, 16], "texture": "#s"}, + "south": {"uv": [4, 0, 12, 16], "texture": "#d"}, + "west": {"uv": [0, 0, 1, 16], "texture": "#s"}, + "up": {"uv": [4, 0, 12, 1], "texture": "#s"}, + "down": {"uv": [4, 15, 12, 16], "texture": "#s"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_vertical_slab_structured_model.json b/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_vertical_slab_structured_model.json new file mode 100644 index 0000000..88cf48e --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_vertical_slab_structured_model.json @@ -0,0 +1,69 @@ +{ + "parent": "block/block", + "textures": { + "particle": "engineersdecor:block/clinker_brick/clinker_brick_texture0", + "d": "engineersdecor:block/clinker_brick/clinker_brick_texture0" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 8], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#d"}, + "east": {"uv": [8, 0, 16, 16], "texture": "#d"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#d"}, + "west": {"uv": [0, 0, 8, 16], "texture": "#d"}, + "up": {"uv": [0, 0, 16, 8], "texture": "#d"}, + "down": {"uv": [0, 8, 16, 16], "texture": "#d"} + } + }, + { + "from": [0, 9, 8], + "to": [16, 12, 8.5], + "faces": { + "north": {"uv": [0, 4, 16, 7], "texture": "#d"}, + "east": {"uv": [7.5, 4, 8, 7], "texture": "#d"}, + "south": {"uv": [0, 4, 16, 7], "texture": "#d"}, + "west": {"uv": [8, 4, 8.5, 7], "texture": "#d"}, + "up": {"uv": [0, 6, 16, 7], "texture": "#d"}, + "down": {"uv": [0, 6, 16, 7], "texture": "#d"} + } + }, + { + "from": [0, 13, 8], + "to": [16, 16, 8.5], + "faces": { + "north": {"uv": [0, 0, 16, 3], "texture": "#d"}, + "east": {"uv": [7.5, 0, 8, 3], "texture": "#d"}, + "south": {"uv": [0, 0, 16, 3], "texture": "#d"}, + "west": {"uv": [8, 0, 8.5, 3], "texture": "#d"}, + "up": {"uv": [0, 8, 16, 8.5], "texture": "#d"}, + "down": {"uv": [0, 9, 16, 10], "texture": "#d"} + } + }, + { + "from": [0, 1, 8], + "to": [16, 4, 8.5], + "faces": { + "north": {"uv": [0, 12, 16, 15], "texture": "#d"}, + "east": {"uv": [7.5, 12, 8, 15], "texture": "#d"}, + "south": {"uv": [0, 12, 16, 15], "texture": "#d"}, + "west": {"uv": [8, 12, 8.5, 15], "texture": "#d"}, + "up": {"uv": [0, 6, 16, 7], "texture": "#d"}, + "down": {"uv": [0, 14, 16, 15], "texture": "#d"} + } + }, + { + "from": [0, 5, 8], + "to": [16, 8, 8.5], + "faces": { + "north": {"uv": [0, 8, 16, 11], "texture": "#d"}, + "east": {"uv": [7.5, 8, 8, 11], "texture": "#d"}, + "south": {"uv": [0, 8, 16, 11], "texture": "#d"}, + "west": {"uv": [8, 8, 8.5, 11], "texture": "#d"}, + "up": {"uv": [0, 8, 16, 8.5], "texture": "#d"}, + "down": {"uv": [0, 10, 16, 11], "texture": "#d"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_vertically_slit_model.json b/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_vertically_slit_model.json new file mode 100644 index 0000000..4252def --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_vertically_slit_model.json @@ -0,0 +1,55 @@ +{ + "parent": "block/block", + "textures": { + "f": "engineersdecor:block/clinker_brick/clinker_brick_pole_side", + "s": "engineersdecor:block/clinker_brick/clinker_brick_sastor_upplate_top_texture", + "particle": "engineersdecor:block/clinker_brick/clinker_brick_texture0", + "d": "engineersdecor:block/clinker_brick/clinker_brick_texture0" + }, + "elements": [ + { + "from": [0, 0, 1], + "to": [8, 16, 15], + "faces": { + "north": {"uv": [4, 0, 12, 16], "texture": "#f"}, + "south": {"uv": [4, 0, 12, 16], "texture": "#f"}, + "west": {"uv": [1, 0, 15, 16], "texture": "#d"}, + "up": {"uv": [0, 1, 8, 15], "texture": "#d"}, + "down": {"uv": [0, 1, 8, 15], "texture": "#d"} + } + }, + { + "from": [8, 0, 1], + "to": [16, 16, 15], + "faces": { + "north": {"uv": [4, 0, 12, 16], "texture": "#f"}, + "east": {"uv": [1, 0, 15, 16], "texture": "#d"}, + "south": {"uv": [4, 0, 12, 16], "texture": "#f"}, + "up": {"uv": [8, 1, 16, 15], "texture": "#d"}, + "down": {"uv": [8, 1, 16, 15], "texture": "#d"} + } + }, + { + "from": [3, 0, 0], + "to": [13, 16, 1], + "faces": { + "north": {"uv": [3, 0, 13, 16], "texture": "#d"}, + "east": {"uv": [15, 0, 16, 16], "texture": "#s"}, + "west": {"uv": [0, 0, 1, 16], "texture": "#s"}, + "up": {"uv": [3, 0, 13, 1], "texture": "#s"}, + "down": {"uv": [3, 15, 13, 16], "texture": "#s"} + } + }, + { + "from": [3, 0, 15], + "to": [13, 16, 16], + "faces": { + "east": {"uv": [0, 0, 1, 16], "texture": "#s"}, + "south": {"uv": [3, 0, 13, 16], "texture": "#d"}, + "west": {"uv": [15, 0, 16, 16], "texture": "#s"}, + "up": {"uv": [3, 15, 13, 16], "texture": "#s"}, + "down": {"uv": [3, 0, 13, 1], "texture": "#s"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_chimney_model.json b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_chimney_model.json index c87a2ff..e6d9c54 100644 --- a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_chimney_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_chimney_model.json @@ -9,7 +9,6 @@ { "from": [3, 0, 3], "to": [13, 6, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 11.5, 7]}, "faces": { "north": {"texture": "#t"}, "east": {"texture": "#t"}, @@ -22,7 +21,6 @@ { "from": [3, 0, 11], "to": [13, 6, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 11.5, 15]}, "faces": { "north": {"texture": "#t"}, "east": {"texture": "#t"}, @@ -35,7 +33,6 @@ { "from": [11, 0, 5], "to": [13, 6, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [13, 11.5, 12]}, "faces": { "east": {"texture": "#t"}, "west": {"texture": "#t"}, @@ -46,7 +43,6 @@ { "from": [3, 0, 5], "to": [5, 6, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [5, 11.5, 12]}, "faces": { "east": {"texture": "#t"}, "west": {"texture": "#t"}, @@ -57,7 +53,6 @@ { "from": [5, 0, 5], "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [7, 11.5, 12]}, "faces": { "up": {"texture": "#t"}, "down": {"texture": "#t"} diff --git a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_chimneytrunk_model.json b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_chimneytrunk_model.json index b071094..a21a679 100644 --- a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_chimneytrunk_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_chimneytrunk_model.json @@ -1,6 +1,5 @@ { "parent": "block/block", - "ambientocclusion": false, "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof", @@ -22,7 +21,6 @@ { "from": [4, 0, 0], "to": [8, 7.5, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -35,7 +33,6 @@ { "from": [4, 0, 13], "to": [8, 7.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 21]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -48,7 +45,6 @@ { "from": [3, 1, 3], "to": [12, 11.5, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -61,7 +57,6 @@ { "from": [4, 0, 3], "to": [12, 1, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 8]}, "faces": { "north": {"texture": "#s"}, "south": {"texture": "#t"}, @@ -73,7 +68,6 @@ { "from": [4, 0, 11], "to": [12, 1, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 16]}, "faces": { "north": {"texture": "#s"}, "south": {"texture": "#t"}, @@ -85,7 +79,6 @@ { "from": [3, 1, 11], "to": [12, 11.5, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 16]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -98,7 +91,6 @@ { "from": [3, 11.5, 3], "to": [13, 16, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 23, 7]}, "faces": { "north": {"texture": "#t"}, "east": {"texture": "#t"}, @@ -110,7 +102,6 @@ { "from": [3, 11.5, 11], "to": [13, 16, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 23, 15]}, "faces": { "north": {"texture": "#t"}, "south": {"texture": "#t"}, @@ -121,7 +112,6 @@ { "from": [11, 11.5, 5], "to": [13, 16, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [13, 23, 12]}, "faces": { "east": {"texture": "#t"}, "west": {"texture": "#t"}, @@ -132,7 +122,6 @@ { "from": [3, 11.5, 5], "to": [5, 16, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [5, 23, 12]}, "faces": { "east": {"texture": "#t"}, "west": {"texture": "#t"}, @@ -143,7 +132,6 @@ { "from": [3, 1, 5], "to": [5, 11.5, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [5, 18.5, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -156,7 +144,6 @@ { "from": [11, 0, 5], "to": [12, 11.5, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 18.5, 12]}, "faces": { "east": {"texture": "#t"}, "west": {"texture": "#t"}, @@ -167,7 +154,6 @@ { "from": [4, 0, 5], "to": [5, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [4.75, 18.5, 12]}, "faces": { "east": {"texture": "#t"}, "west": {"texture": "#t"}, @@ -190,7 +176,6 @@ { "from": [8, 0, 13], "to": [12, 11.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 19]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -203,7 +188,6 @@ { "from": [12, 0, 0], "to": [16, 15.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -216,7 +200,6 @@ { "from": [4, 7.5, 0], "to": [8, 7.9375, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -229,7 +212,6 @@ { "from": [12, 15.5, 0], "to": [16, 15.9375, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -242,7 +224,6 @@ { "from": [13, 15.5, 3], "to": [16, 15.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 11]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -255,7 +236,6 @@ { "from": [15, 15.5, 4], "to": [16, 15.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -268,7 +248,6 @@ { "from": [15.9375, 15.9375, 0], "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5625, 12]}, "faces": { "east": {"texture": "#s"}, "west": {"texture": "#s"}, @@ -278,7 +257,6 @@ { "from": [11, 11.5, 0], "to": [12, 11.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -291,7 +269,6 @@ { "from": [3, 3.5, 0], "to": [4, 3.9375, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -304,7 +281,6 @@ { "from": [15, 15.5, 12], "to": [16, 15.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 20]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -317,7 +293,6 @@ { "from": [7, 7.5, 13], "to": [8, 7.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 20]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -330,7 +305,6 @@ { "from": [0, 3.5, 4], "to": [3, 3.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -343,7 +317,6 @@ { "from": [0, 3.5, 12], "to": [4, 3.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 20]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -356,7 +329,6 @@ { "from": [8, 11.5, 13], "to": [12, 11.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 20]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -369,7 +341,6 @@ { "from": [13, 15.5, 8], "to": [16, 15.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 16]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, 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 index e5892e1..899d68d 100644 --- 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 @@ -1,6 +1,5 @@ { "parent": "block/block", - "ambientocclusion": false, "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof", @@ -22,7 +21,6 @@ { "from": [4, 0, 0], "to": [8, 7.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -47,7 +45,6 @@ { "from": [12, 0, 0], "to": [16, 15.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -60,7 +57,6 @@ { "from": [4, 7.5, 0], "to": [8, 7.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -73,7 +69,6 @@ { "from": [12, 15.5, 0], "to": [16, 15.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -86,7 +81,6 @@ { "from": [15, 15.5, 4], "to": [16, 15.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -99,7 +93,6 @@ { "from": [15.9375, 15.9375, 0], "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5625, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -112,7 +105,6 @@ { "from": [11, 11.5, 0], "to": [12, 11.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -125,7 +117,6 @@ { "from": [3, 3.5, 0], "to": [4, 3.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -138,7 +129,6 @@ { "from": [11, 11.5, 8], "to": [12, 11.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 16]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -151,7 +141,6 @@ { "from": [3, 3.5, 8], "to": [4, 3.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 16]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -164,7 +153,6 @@ { "from": [7, 7.5, 4], "to": [8, 7.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -177,7 +165,6 @@ { "from": [15, 15.5, 12], "to": [16, 15.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 20]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -190,7 +177,6 @@ { "from": [7, 7.5, 12], "to": [8, 7.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 20]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -203,7 +189,6 @@ { "from": [0, 3.5, 4], "to": [4, 3.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -216,7 +201,6 @@ { "from": [8, 11.5, 4], "to": [12, 11.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -229,7 +213,6 @@ { "from": [0, 3.5, 12], "to": [4, 3.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 20]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -242,7 +225,6 @@ { "from": [8, 11.5, 12], "to": [12, 11.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 20]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -255,7 +237,6 @@ { "from": [4, 7.5, 8], "to": [8, 7.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 16]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -268,7 +249,6 @@ { "from": [12, 15.5, 8], "to": [16, 15.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 16]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -281,7 +261,6 @@ { "from": [0, 3.5, 0], "to": [1, 6, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 11.5, 8]}, "faces": { "north": {"texture": "#f"}, "east": {"texture": "#f"}, @@ -293,7 +272,6 @@ { "from": [0, 3.9375, 15], "to": [1, 6, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 23]}, "faces": { "north": {"texture": "#f"}, "east": {"texture": "#f"}, @@ -305,7 +283,6 @@ { "from": [0, 5, 1], "to": [1, 6, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 22]}, "faces": { "east": {"texture": "#f"}, "west": {"texture": "#f"}, 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 index d745712..84d33dc 100644 --- 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 @@ -1,5 +1,4 @@ { - "ambientocclusion": false, "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof", @@ -21,7 +20,6 @@ { "from": [0, 0, 12], "to": [16, 15.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 16]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -34,7 +32,6 @@ { "from": [4, 15.5, 12], "to": [8, 15.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12.5, 16]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -47,7 +44,6 @@ { "from": [0, 11.5, 8], "to": [8, 11.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -60,7 +56,6 @@ { "from": [8, 11.5, 4], "to": [12, 11.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 8.5, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -73,7 +68,6 @@ { "from": [8, 15.5, 15], "to": [12, 15.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 12.5, 16]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -86,7 +80,6 @@ { "from": [0, 15.5, 15], "to": [4, 15.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5, 16]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -99,7 +92,6 @@ { "from": [0, 15.9375, 15.9375], "to": [15.9375, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5625, 16]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -112,7 +104,6 @@ { "from": [0, 7.5, 7], "to": [4, 7.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4.5, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -125,7 +116,6 @@ { "from": [15, 15.5, 4], "to": [16, 15.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 12.5, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -138,7 +128,6 @@ { "from": [15.9375, 15.9375, 0], "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 12.5625, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -151,7 +140,6 @@ { "from": [11, 11.5, 0], "to": [12, 11.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 8.5, 4]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -164,7 +152,6 @@ { "from": [11, 11.5, 8], "to": [12, 11.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 8.5, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -177,7 +164,6 @@ { "from": [3, 4, 0], "to": [4, 4.4375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 4]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -190,7 +176,6 @@ { "from": [4, 7.5, 0], "to": [8, 7.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 4.5, 4]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -203,7 +188,6 @@ { "from": [12, 15.5, 8], "to": [16, 15.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 12.5, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -216,7 +200,6 @@ { "from": [12, 15.5, 0], "to": [16, 15.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 12.5, 4]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -229,7 +212,6 @@ { "from": [0, 0, 8], "to": [12, 11.5, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -242,7 +224,6 @@ { "from": [0, 0, 4], "to": [8, 7.5, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -255,7 +236,6 @@ { "from": [8, 0, 0], "to": [12, 11.5, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -268,7 +248,6 @@ { "from": [4, 0, 0], "to": [8, 7.5, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -281,7 +260,6 @@ { "from": [0, 0, 0], "to": [4, 4, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -294,7 +272,6 @@ { "from": [0, 4, 0], "to": [1, 6, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { "north": {"texture": "#f"}, "east": {"texture": "#f"}, 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 index c32c868..d7cf056 100644 --- 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 @@ -1,5 +1,4 @@ { - "ambientocclusion": false, "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof", @@ -21,7 +20,6 @@ { "from": [4, 3.5, 4], "to": [16, 7.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -45,7 +43,6 @@ { "from": [12, 11.5, 12], "to": [16, 15.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -57,7 +54,6 @@ { "from": [14, 15.5, 14], "to": [16, 15.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -69,7 +65,6 @@ { "from": [15.9375, 15.9375, 14], "to": [16, 16, 15.9375], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5625, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -81,7 +76,6 @@ { "from": [14, 15.9375, 15.9375], "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5625, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -93,7 +87,6 @@ { "from": [12, 11.5, 11], "to": [16, 11.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 4]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -104,7 +97,6 @@ { "from": [12, 7.5, 7], "to": [16, 7.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4.5, 0]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -114,7 +106,6 @@ { "from": [8, 3.5, 3], "to": [12, 3.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 0.5, -4]}, "faces": { "north": {"texture": "#s"}, "up": {"texture": "#s"} @@ -123,7 +114,6 @@ { "from": [7, 7.5, 12], "to": [8, 8, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 4.5, 5]}, "faces": { "south": {"texture": "#s"}, "west": {"texture": "#s"}, @@ -133,7 +123,6 @@ { "from": [3, 3.5, 8], "to": [4, 3.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [-4, 0.5, 1]}, "faces": { "west": {"texture": "#s"}, "up": {"texture": "#s"} @@ -142,7 +131,6 @@ { "from": [8, 11.5, 12], "to": [12, 11.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 8.5, 4]}, "faces": { "north": {"texture": "#s"}, "south": {"texture": "#s"}, @@ -153,7 +141,6 @@ { "from": [8, 7.5, 4], "to": [12, 7.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 4.5, -4]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -164,7 +151,6 @@ { "from": [4, 7.5, 8], "to": [8, 7.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 4.5, 0]}, "faces": { "north": {"texture": "#s"}, "south": {"texture": "#s"}, @@ -175,7 +161,6 @@ { "from": [0, 3.5, 12], "to": [4, 3.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [-4, 0.5, 4]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -187,7 +172,6 @@ { "from": [0, 3.5, 4], "to": [4, 3.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [-4, 0.5, -4]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -199,7 +183,6 @@ { "from": [4, 3.5, 0], "to": [8, 3.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0.5, -8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -211,7 +194,6 @@ { "from": [12, 3.5, 0], "to": [16, 3.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.5, -8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -223,7 +205,6 @@ { "from": [15, 3.9375, 0], "to": [16, 6, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [23, 12, 8]}, "faces": { "north": {"texture": "#f"}, "east": {"texture": "#f"}, @@ -235,7 +216,6 @@ { "from": [1, 5, 0], "to": [15, 6, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [22, 12, 8]}, "faces": { "north": {"texture": "#f"}, "south": {"texture": "#f"}, @@ -246,7 +226,6 @@ { "from": [0, 5, 1], "to": [1, 6, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 12, 9]}, "faces": { "east": {"texture": "#f"}, "west": {"texture": "#f"}, @@ -257,7 +236,6 @@ { "from": [0, 3.5, 0], "to": [1, 6, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { "north": {"texture": "#f"}, "east": {"texture": "#f"}, @@ -269,7 +247,6 @@ { "from": [0, 3.9375, 15], "to": [1, 6, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 23]}, "faces": { "north": {"texture": "#f"}, "east": {"texture": "#f"}, diff --git a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model.json b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model.json index 029a2c6..94a1d6f 100644 --- a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model.json @@ -1,15 +1,13 @@ { "parent": "block/block", - "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof" }, "elements": [ { - "from": [3, 3.5, 0], - "to": [16, 3.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 8]}, + "from": [12, 0, 0], + "to": [16, 15.5, 16], "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -20,9 +18,8 @@ } }, { - "from": [0, 3.5, 4], - "to": [3, 3.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 12]}, + "from": [8, 0, 0], + "to": [12, 11.5, 16], "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -33,9 +30,8 @@ } }, { - "from": [0, 3.5, 12], - "to": [3, 3.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 20]}, + "from": [4, 0, 0], + "to": [8, 7.5, 16], "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -46,113 +42,8 @@ } }, { - "from": [4, 7.5, 0], - "to": [7, 7.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 8]}, - "faces": { - "north": {"texture": "#s"}, - "east": {"texture": "#s"}, - "south": {"texture": "#s"}, - "west": {"texture": "#s"}, - "up": {"texture": "#s"}, - "down": {"texture": "#s"} - } - }, - { - "from": [4, 7.5, 8], - "to": [7, 7.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 16]}, - "faces": { - "north": {"texture": "#s"}, - "east": {"texture": "#s"}, - "south": {"texture": "#s"}, - "west": {"texture": "#s"}, - "up": {"texture": "#s"}, - "down": {"texture": "#s"} - } - }, - { - "from": [7, 7.5, 0], - "to": [16, 7.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 20]}, - "faces": { - "north": {"texture": "#s"}, - "east": {"texture": "#s"}, - "south": {"texture": "#s"}, - "west": {"texture": "#s"}, - "up": {"texture": "#s"}, - "down": {"texture": "#s"} - } - }, - { - "from": [11, 11.5, 0], - "to": [16, 11.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 8]}, - "faces": { - "north": {"texture": "#s"}, - "east": {"texture": "#s"}, - "south": {"texture": "#s"}, - "west": {"texture": "#s"}, - "up": {"texture": "#s"}, - "down": {"texture": "#s"} - } - }, - { - "from": [8, 11.5, 4], - "to": [11, 11.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 12]}, - "faces": { - "north": {"texture": "#s"}, - "east": {"texture": "#s"}, - "south": {"texture": "#s"}, - "west": {"texture": "#s"}, - "up": {"texture": "#s"}, - "down": {"texture": "#s"} - } - }, - { - "from": [8, 11.5, 12], - "to": [11, 11.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 20]}, - "faces": { - "north": {"texture": "#s"}, - "east": {"texture": "#s"}, - "south": {"texture": "#s"}, - "west": {"texture": "#s"}, - "up": {"texture": "#s"}, - "down": {"texture": "#s"} - } - }, - { - "from": [12, 15.5, 0], - "to": [15, 15.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 8]}, - "faces": { - "north": {"texture": "#s"}, - "east": {"texture": "#s"}, - "south": {"texture": "#s"}, - "west": {"texture": "#s"}, - "up": {"texture": "#s"}, - "down": {"texture": "#s"} - } - }, - { - "from": [12, 15.5, 8], - "to": [15, 15.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 16]}, - "faces": { - "north": {"texture": "#s"}, - "east": {"texture": "#s"}, - "south": {"texture": "#s"}, - "west": {"texture": "#s"}, - "up": {"texture": "#s"}, - "down": {"texture": "#s"} - } - }, - { - "from": [15, 15.5, 0], - "to": [16, 15.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 20]}, + "from": [0, 0, 0], + "to": [4, 3.5, 16], "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -165,7 +56,6 @@ { "from": [15.9375, 15.9375, 0], "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5625, 20]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -176,53 +66,126 @@ } }, { - "from": [0, 0, 0], - "to": [16, 3.5, 16], + "from": [3, 3.5, 0], + "to": [4, 4, 16], "faces": { "north": {"texture": "#s"}, - "east": {"texture": "#s"}, "south": {"texture": "#s"}, "west": {"texture": "#s"}, - "up": {"texture": "#s"}, - "down": {"texture": "#s"} + "up": {"texture": "#s"} } }, { - "from": [4, 3.9375, 0], - "to": [16, 7.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "from": [0, 3.5, 4], + "to": [3, 4, 8], "faces": { "north": {"texture": "#s"}, - "east": {"texture": "#s"}, "south": {"texture": "#s"}, "west": {"texture": "#s"}, - "up": {"texture": "#s"}, - "down": {"texture": "#s"} + "up": {"texture": "#s"} } }, { - "from": [8, 7.9375, 0], - "to": [16, 11.5, 16], + "from": [0, 3.5, 12], + "to": [3, 4, 16], "faces": { "north": {"texture": "#s"}, - "east": {"texture": "#s"}, "south": {"texture": "#s"}, "west": {"texture": "#s"}, - "up": {"texture": "#s"}, - "down": {"texture": "#s"} + "up": {"texture": "#s"} } }, { - "from": [12, 11.9375, 0], - "to": [16, 15.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "from": [4, 7.5, 0], + "to": [7, 8, 4], "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, "south": {"texture": "#s"}, "west": {"texture": "#s"}, - "up": {"texture": "#s"}, - "down": {"texture": "#s"} + "up": {"texture": "#s"} + } + }, + { + "from": [4, 7.5, 8], + "to": [7, 8, 12], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} + } + }, + { + "from": [7, 7.5, 0], + "to": [8, 8, 16], + "faces": { + "north": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} + } + }, + { + "from": [11, 11.5, 0], + "to": [12, 12, 16], + "faces": { + "north": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} + } + }, + { + "from": [8, 11.5, 4], + "to": [11, 12, 8], + "faces": { + "north": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} + } + }, + { + "from": [8, 11.5, 12], + "to": [11, 12, 16], + "faces": { + "north": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} + } + }, + { + "from": [12, 15.5, 0], + "to": [15, 15.9375, 4], + "faces": { + "north": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} + } + }, + { + "from": [12, 15.5, 8], + "to": [15, 15.9375, 12], + "faces": { + "north": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} + } + }, + { + "from": [15, 15.5, 0], + "to": [16, 15.9375, 16], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } } ], diff --git a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model_inner.json b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model_inner.json index 76235c0..db79509 100644 --- a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model_inner.json +++ b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model_inner.json @@ -1,5 +1,4 @@ { - "ambientocclusion": false, "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof" @@ -20,7 +19,6 @@ { "from": [0, 0, 12], "to": [16, 15.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 16]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -33,7 +31,6 @@ { "from": [4, 15.5, 12], "to": [8, 15.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12.5, 16]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -46,7 +43,6 @@ { "from": [0, 11.5, 8], "to": [8, 11.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -59,7 +55,6 @@ { "from": [8, 11.5, 4], "to": [12, 11.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 8.5, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -72,7 +67,6 @@ { "from": [8, 15.5, 15], "to": [12, 15.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 12.5, 16]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -85,7 +79,6 @@ { "from": [0, 15.5, 15], "to": [4, 15.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5, 16]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -98,7 +91,6 @@ { "from": [0, 15.9375, 15.9375], "to": [15.9375, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5625, 16]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -111,7 +103,6 @@ { "from": [0, 7.5, 7], "to": [4, 7.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4.5, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -124,7 +115,6 @@ { "from": [15, 15.5, 4], "to": [16, 15.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 12.5, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -137,7 +127,6 @@ { "from": [15.9375, 15.9375, 0], "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 12.5625, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -150,7 +139,6 @@ { "from": [11, 11.5, 0], "to": [12, 11.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 8.5, 4]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -163,7 +151,6 @@ { "from": [11, 11.5, 8], "to": [12, 11.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 8.5, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -176,7 +163,6 @@ { "from": [3, 4, 0], "to": [4, 4.4375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 4]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -189,7 +175,6 @@ { "from": [4, 7.5, 0], "to": [8, 7.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 4.5, 4]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -202,7 +187,6 @@ { "from": [12, 15.5, 8], "to": [16, 15.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 12.5, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -215,7 +199,6 @@ { "from": [12, 15.5, 0], "to": [16, 15.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 12.5, 4]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -228,7 +211,6 @@ { "from": [0, 0, 8], "to": [12, 11.5, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -241,7 +223,6 @@ { "from": [0, 0, 4], "to": [8, 7.5, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -254,7 +235,6 @@ { "from": [8, 0, 0], "to": [12, 11.5, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -267,7 +247,6 @@ { "from": [4, 0, 0], "to": [8, 7.5, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -280,7 +259,6 @@ { "from": [0, 0, 0], "to": [4, 4, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, diff --git a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model_outer.json b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model_outer.json index 38459cc..339a0ba 100644 --- a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model_outer.json +++ b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model_outer.json @@ -1,5 +1,4 @@ { - "ambientocclusion": false, "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof" @@ -20,7 +19,6 @@ { "from": [4, 3.5, 4], "to": [16, 7.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -44,7 +42,6 @@ { "from": [12, 11.5, 12], "to": [16, 15.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -56,7 +53,6 @@ { "from": [14, 15.5, 14], "to": [16, 15.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -68,7 +64,6 @@ { "from": [15.9375, 15.9375, 14], "to": [16, 16, 15.9375], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5625, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -80,7 +75,6 @@ { "from": [14, 15.9375, 15.9375], "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5625, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -92,7 +86,6 @@ { "from": [12, 11.5, 11], "to": [16, 11.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 4]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -103,7 +96,6 @@ { "from": [12, 7.5, 7], "to": [16, 7.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4.5, 0]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -113,7 +105,6 @@ { "from": [8, 3.5, 3], "to": [12, 3.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 0.5, -4]}, "faces": { "north": {"texture": "#s"}, "up": {"texture": "#s"} @@ -122,7 +113,6 @@ { "from": [7, 7.5, 12], "to": [8, 7.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 4.5, 5]}, "faces": { "south": {"texture": "#s"}, "west": {"texture": "#s"}, @@ -132,7 +122,6 @@ { "from": [3, 3.5, 8], "to": [4, 3.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [-4, 0.5, 1]}, "faces": { "west": {"texture": "#s"}, "up": {"texture": "#s"} @@ -141,7 +130,6 @@ { "from": [8, 11.5, 12], "to": [12, 11.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 8.5, 4]}, "faces": { "north": {"texture": "#s"}, "south": {"texture": "#s"}, @@ -152,7 +140,6 @@ { "from": [8, 7.5, 4], "to": [12, 7.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [4, 4.5, -4]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -163,7 +150,6 @@ { "from": [4, 7.5, 8], "to": [8, 7.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 4.5, 0]}, "faces": { "north": {"texture": "#s"}, "south": {"texture": "#s"}, @@ -174,7 +160,6 @@ { "from": [0, 3.5, 12], "to": [4, 3.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [-4, 0.5, 4]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -186,7 +171,6 @@ { "from": [0, 3.5, 4], "to": [4, 3.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [-4, 0.5, -4]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -198,7 +182,6 @@ { "from": [4, 3.5, 0], "to": [8, 3.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0.5, -8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -210,7 +193,6 @@ { "from": [12, 3.5, 0], "to": [16, 3.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.5, -8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, diff --git a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_skylight_model.json b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_skylight_model.json index 6611105..dfcea40 100644 --- a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_skylight_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_skylight_model.json @@ -1,6 +1,5 @@ { "parent": "block/block", - "ambientocclusion": false, "textures": { "2": "engineersdecor:block/material/steel_texture", "particle": "engineersdecor:block/roof/dark_shingle_roof", @@ -11,7 +10,6 @@ { "from": [4, 0, 12], "to": [8, 7.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -24,7 +22,6 @@ { "from": [4, 0, 0], "to": [8, 7.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, -4]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -49,7 +46,6 @@ { "from": [8, 0, 0], "to": [12, 11.5, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -4]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -62,7 +58,6 @@ { "from": [12, 0, 0], "to": [16, 15.5, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -75,7 +70,6 @@ { "from": [4, 0, 4], "to": [16, 4.5, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -88,7 +82,6 @@ { "from": [12, 11.5, 4], "to": [16, 15.5, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -101,7 +94,6 @@ { "from": [12, 0, 12], "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -114,7 +106,6 @@ { "from": [12, 12, 12], "to": [16, 15.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -127,7 +118,6 @@ { "from": [12, 15.5, 0], "to": [16, 15.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -140,7 +130,6 @@ { "from": [15, 15.5, 4], "to": [16, 15.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -153,7 +142,6 @@ { "from": [11, 11.5, 0], "to": [12, 11.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -166,7 +154,6 @@ { "from": [3, 3.5, 0], "to": [4, 3.9375, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 8]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -179,7 +166,6 @@ { "from": [3, 3.5, 8], "to": [4, 3.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 16]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -192,7 +178,6 @@ { "from": [15, 15.5, 12], "to": [16, 15.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 20]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -205,7 +190,6 @@ { "from": [7, 7.5, 12], "to": [8, 7.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 20]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -218,7 +202,6 @@ { "from": [0, 3.5, 4], "to": [4, 3.9375, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -231,7 +214,6 @@ { "from": [0, 3.5, 12], "to": [4, 3.9375, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 20]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -244,7 +226,6 @@ { "from": [8, 11.5, 4], "to": [12, 11.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 16]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -257,7 +238,6 @@ { "from": [12, 15.5, 8], "to": [16, 15.9375, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 16]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -270,7 +250,6 @@ { "from": [15.9375, 15.9375, 0], "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5625, 12]}, "faces": { "north": {"texture": "#s"}, "east": {"texture": "#s"}, @@ -295,7 +274,6 @@ { "from": [8, 4, 4], "to": [8, 11.5, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 16, 12]}, "faces": { "west": {"texture": "#g"} } @@ -303,7 +281,6 @@ { "from": [15, 4, 4], "to": [15, 11.5, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 16, 12]}, "faces": { "east": {"texture": "#g"} } @@ -311,7 +288,6 @@ { "from": [7.5, 4.5, 4], "to": [8.5, 11.5, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 12, 12]}, "faces": { "north": {"texture": "#2"}, "east": {"texture": "#2"}, @@ -324,7 +300,6 @@ { "from": [7.5, 10.5, 5], "to": [8.5, 11.5, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 12, 13]}, "faces": { "north": {"texture": "#2"}, "east": {"texture": "#2"}, @@ -337,7 +312,6 @@ { "from": [7.5, 4.5, 5], "to": [8.5, 5.5, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 6, 13]}, "faces": { "north": {"texture": "#2"}, "east": {"texture": "#2"}, @@ -350,7 +324,6 @@ { "from": [7.5, 4.5, 11], "to": [8.5, 11.5, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 12, 19]}, "faces": { "north": {"texture": "#2"}, "east": {"texture": "#2"}, @@ -363,7 +336,6 @@ { "from": [14.5, 10.5, 5], "to": [15.5, 11.5, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [22.5, 12, 13]}, "faces": { "north": {"texture": "#2"}, "east": {"texture": "#2"}, @@ -376,7 +348,6 @@ { "from": [14.5, 4.5, 4], "to": [15.5, 11.5, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [22.5, 12, 12]}, "faces": { "north": {"texture": "#2"}, "east": {"texture": "#2"}, @@ -389,7 +360,6 @@ { "from": [14.5, 4.5, 5], "to": [15.5, 5.5, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [22.5, 6, 13]}, "faces": { "north": {"texture": "#2"}, "east": {"texture": "#2"}, @@ -402,7 +372,6 @@ { "from": [14.5, 4.5, 11], "to": [15.5, 11.5, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [22.5, 12, 19]}, "faces": { "north": {"texture": "#2"}, "east": {"texture": "#2"}, diff --git a/src/main/resources/assets/engineersdecor/models/item/clinker_brick_recessed.json b/src/main/resources/assets/engineersdecor/models/item/clinker_brick_recessed.json new file mode 100644 index 0000000..593057d --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/item/clinker_brick_recessed.json @@ -0,0 +1 @@ +{ "parent": "engineersdecor:block/brick/clinker_brick_recessed_model" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/clinker_brick_vertical_slab_structured.json b/src/main/resources/assets/engineersdecor/models/item/clinker_brick_vertical_slab_structured.json new file mode 100644 index 0000000..0ef40c9 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/item/clinker_brick_vertical_slab_structured.json @@ -0,0 +1 @@ +{ "parent": "engineersdecor:block/brick/clinker_brick_vertical_slab_structured_model" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/clinker_brick_vertically_slit.json b/src/main/resources/assets/engineersdecor/models/item/clinker_brick_vertically_slit.json new file mode 100644 index 0000000..3bbbec3 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/item/clinker_brick_vertically_slit.json @@ -0,0 +1 @@ +{ "parent": "engineersdecor:block/brick/clinker_brick_vertically_slit_model" } \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/loot_tables/blocks/clinker_brick_sastor_corner_block.json b/src/main/resources/data/engineersdecor/loot_tables/blocks/clinker_brick_recessed.json similarity index 71% rename from src/main/resources/data/engineersdecor/loot_tables/blocks/clinker_brick_sastor_corner_block.json rename to src/main/resources/data/engineersdecor/loot_tables/blocks/clinker_brick_recessed.json index 8b71ae2..228b3b2 100644 --- a/src/main/resources/data/engineersdecor/loot_tables/blocks/clinker_brick_sastor_corner_block.json +++ b/src/main/resources/data/engineersdecor/loot_tables/blocks/clinker_brick_recessed.json @@ -2,7 +2,7 @@ "type": "minecraft:block", "pools": [ { - "name": "clinker_brick_sastor_corner_block_dlt", + "name": "clinker_brick_recessed_dlt", "rolls": 1, "entries": [ { @@ -13,7 +13,7 @@ "source": "block_entity" } ], - "name": "engineersdecor:clinker_brick_sastor_corner_block" + "name": "engineersdecor:clinker_brick_recessed" } ] } diff --git a/src/main/resources/data/engineersdecor/loot_tables/blocks/clinker_brick_vertical_slab_structured.json b/src/main/resources/data/engineersdecor/loot_tables/blocks/clinker_brick_vertical_slab_structured.json new file mode 100644 index 0000000..405a025 --- /dev/null +++ b/src/main/resources/data/engineersdecor/loot_tables/blocks/clinker_brick_vertical_slab_structured.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "clinker_brick_vertical_slab_structured_dlt", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:copy_name", + "source": "block_entity" + } + ], + "name": "engineersdecor:clinker_brick_vertical_slab_structured" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/loot_tables/blocks/clinker_brick_vertically_slit.json b/src/main/resources/data/engineersdecor/loot_tables/blocks/clinker_brick_vertically_slit.json new file mode 100644 index 0000000..44fe7ca --- /dev/null +++ b/src/main/resources/data/engineersdecor/loot_tables/blocks/clinker_brick_vertically_slit.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "clinker_brick_vertically_slit_dlt", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:copy_name", + "source": "block_entity" + } + ], + "name": "engineersdecor:clinker_brick_vertically_slit" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_recessed_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_recessed_recipe.json new file mode 100644 index 0000000..99da198 --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_recessed_recipe.json @@ -0,0 +1,23 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:clinker_brick_recessed", + "required": ["engineersdecor:clinker_brick_vertically_slit"] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "engineersdecor:clinker_brick_vertically_slit" } + ], + "result": { + "item": "engineersdecor:clinker_brick_recessed" + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_vertical_slab_structured_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_vertical_slab_structured_recipe.json new file mode 100644 index 0000000..35fb69d --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_vertical_slab_structured_recipe.json @@ -0,0 +1,31 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:clinker_brick_vertical_slab_structured", + "required": ["engineersdecor:clinker_brick_block"] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "C", + "C", + "C" + ], + "key": { + "C": { + "item": "engineersdecor:clinker_brick_block" + } + }, + "result": { + "item": "engineersdecor:clinker_brick_vertical_slab_structured", + "count": 6 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_vertically_slit_from_recessed_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_vertically_slit_from_recessed_recipe.json new file mode 100644 index 0000000..8f884e0 --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_vertically_slit_from_recessed_recipe.json @@ -0,0 +1,23 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:clinker_brick_vertically_slit", + "required": ["engineersdecor:clinker_brick_recessed"] + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "engineersdecor:clinker_brick_recessed" } + ], + "result": { + "item": "engineersdecor:clinker_brick_vertically_slit" + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_vertically_slit_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_vertically_slit_recipe.json new file mode 100644 index 0000000..28d7f12 --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/clinker_brick_vertically_slit_recipe.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:clinker_brick_vertically_slit", + "required": ["engineersdecor:clinker_brick_block", "engineersdecor:clinker_brick_vertical_slab_structured"] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "BS", + "BS", + "BS" + ], + "key": { + "B": { "item": "engineersdecor:clinker_brick_block" }, + "S": { "item": "engineersdecor:clinker_brick_vertical_slab_structured" } + }, + "result": { + "item": "engineersdecor:clinker_brick_vertically_slit", + "count": 3 + } + } + } + ] +}