diff --git a/build.gradle b/build.gradle index 1424b24..15abcd7 100644 --- a/build.gradle +++ b/build.gradle @@ -65,8 +65,8 @@ minecraft { dependencies { minecraft "net.minecraftforge:forge:${version_forge_minecraft}" - compileOnly fg.deobf("mezz.jei:jei-${version_jei}:api") - runtimeOnly fg.deobf("mezz.jei:jei-${version_jei}") + //compileOnly fg.deobf("mezz.jei:jei-${version_jei}:api") + //runtimeOnly fg.deobf("mezz.jei:jei-${version_jei}") } processResources { diff --git a/gradle.properties b/gradle.properties index 9ebd200..eb48707 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ # @file gradle.properties org.gradle.daemon=false org.gradle.jvmargs=-Xmx8G -version_minecraft=1.16.2 -version_forge_minecraft=1.16.2-33.0.37 +version_minecraft=1.16.3 +version_forge_minecraft=1.16.3-34.0.1 version_fml_mappings=20200723-1.16.1 -version_jei=1.16.2:7.1.3.19 -version_engineersdecor=1.1.2-b6 +version_jei=1.16.3:7.1.3.19 +version_engineersdecor=1.1.2-b7 diff --git a/meta/update.json b/meta/update.json index 7884244..09e3be7 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.2": { + "1.16.3": { + "1.1.2-b7": "[U] Ported to MC1.16.3.\n[F] Roof lighting improved.", "1.1.2-b6": "[A] Signs added: Generic Caution, Magical Hazard, Radioactive Hazard, Laser Hazard, Fire Hazard, Caution Hot Surface, Magnetic Field Caution, Frost Warning.\n[A] Water Freezer added (generates Ice, Packed Ice, Blue Ice from water).\n[F] Mineral Smelter GUI model facing fixed.\n[M] Hatch handling improved.\n[M] Ladder fast-move improved.\n[F] Roof Chimney Trunk shape hollow to allow feeding IE Wire power over the roof into the building.\n[A] Roof Chimney added (smoking offset for Dark Shingle Roof Chimney Trunk block).\n[A] Metal Bar (ingredient item) added to circumvent recipe collisions with other mods.\n[M] Recipes for metallic blocks modified accordingly to depend on Metal Bars.", "1.1.2-b5": "[A] Sandstone Ornamented Clinker Brick added.\n[A] Old Industrial Wood Planks/Stairs/Slabs/Slab Slices added.\n[A] Old Industrial Wood Door added.\n[M] Wood textures made slightly darker.\n[F] Milking Machine fluid transfer re-added (thx gebcrafter).\n[F] Fluid Barrel status overlay message format fixed.\n[F] Fixed missing Dense Grit Dirt loot table (issue #124, thx vaelzan).", "1.1.2-b4": "[F] Mapping adaption to Forge 1.16.2-33.0.22/20200723-1.16.1.\n[F] Fixed conditional recipe tag dependency (thx Blu, Cyborgmas).", @@ -9,7 +10,7 @@ "1.1.2-b1": "[U] Ported to MC1.16.2." }, "promos": { - "1.16.2-recommended": "1.1.2-b6", - "1.16.2-latest": "1.1.2-b6" + "1.16.3-recommended": "1.1.2-b7", + "1.16.3-latest": "1.1.2-b7" } } \ No newline at end of file diff --git a/readme.md b/readme.md index 816bdb6..36bc055 100644 --- a/readme.md +++ b/readme.md @@ -1,7 +1,7 @@ -## Engineer's Decor (MC1.16.2) +## Engineer's Decor (MC1.16.3) -Mod sources for Minecraft version 1.16.2. +Mod sources for Minecraft version 1.16.3. - Description, credits, and features: Please see the readme in the repository root. @@ -11,6 +11,9 @@ Mod sources for Minecraft version 1.16.2. ## Version history + - v1.1.2-b7 [U] Ported to MC1.16.3. + [F] Roof lighting improved. + - v1.1.2-b6 [A] Signs added: Generic Caution, Magical Hazard, Radioactive Hazard, Laser Hazard, Fire Hazard, Caution Hot Surface, Magnetic Field Caution, Frost Warning. [A] Water Freezer added (generates Ice, Packed Ice, Blue Ice from water). diff --git a/src/main/java/wile/engineersdecor/ModConfig.java b/src/main/java/wile/engineersdecor/ModConfig.java index 8d8ba67..832915b 100644 --- a/src/main/java/wile/engineersdecor/ModConfig.java +++ b/src/main/java/wile/engineersdecor/ModConfig.java @@ -1,7 +1,7 @@ /* * @file ModConfig.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2018 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Main class for module settings. Handles reading and diff --git a/src/main/java/wile/engineersdecor/ModContent.java b/src/main/java/wile/engineersdecor/ModContent.java index cfa606a..f8c4f7c 100644 --- a/src/main/java/wile/engineersdecor/ModContent.java +++ b/src/main/java/wile/engineersdecor/ModContent.java @@ -1,7 +1,7 @@ /* * @file ModContent.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2018 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Definition and initialisation of blocks of this @@ -219,37 +219,39 @@ public class ModContent // ------------------------------------------------------------------------------------------------------------------- public static final EdRoofBlock DARK_CERAMIC_SHINGLE_ROOF = (EdRoofBlock)(new EdRoofBlock( - DecorBlock.CFG_CUTOUT, + DecorBlock.CFG_DEFAULT, Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) )).setRegistryName(new ResourceLocation(MODID, "dark_shingle_roof")); public static final DecorBlock.Normal DARK_CERAMIC_SHINGLE_ROOF_BLOCK = (DecorBlock.Normal)(new DecorBlock.Normal( - DecorBlock.CFG_CUTOUT, + 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_CUTOUT, + 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_CUTOUT, + 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_CUTOUT, + DecorBlock.CFG_DEFAULT, Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) )).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).notSolid() + Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) )).setRegistryName(new ResourceLocation(MODID, "dark_shingle_roof_skylight")); public static final EdRoofBlock DARK_CERAMIC_SHINGLE_ROOF_CHIMNEYTRUNK = (EdRoofBlock)(new EdRoofBlock( - DecorBlock.CFG_CUTOUT, + DecorBlock.CFG_DEFAULT, Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE), VoxelShapes.create(Auxiliaries.getPixeledAABB(3, 0, 3, 13, 16, 13)), VoxelShapes.create(Auxiliaries.getPixeledAABB(5, 0, 5, 11, 16, 11)) @@ -424,7 +426,8 @@ public class ModContent public static final EdWindowBlock TREATED_WOOD_WINDOW = (EdWindowBlock)(new EdWindowBlock( DecorBlock.CFG_LOOK_PLACEMENT, - Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(2f, 15f).sound(SoundType.GLASS).notSolid(), + Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(2f, 15f) + .sound(SoundType.GLASS).notSolid().setBlocksVision((s,w,p)->false), Auxiliaries.getPixeledAABB(0,0,7, 16,16,9) )).setRegistryName(new ResourceLocation(MODID, "treated_wood_window")); @@ -765,12 +768,6 @@ public class ModContent } )).setRegistryName(new ResourceLocation(MODID, "straight_pipe_valve_redstone_analog")); - @Deprecated // remove in 1.17/1.16.3, not needed by anyone - public static final DecorBlock.Normal PASSIVE_FLUID_ACCUMULATOR = (DecorBlock.Normal)(new DecorBlock.Normal( - DecorBlock.CFG_EXPERIMENTAL, - Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL) - )).setRegistryName(new ResourceLocation(MODID, "passive_fluid_accumulator")); - public static final EdFluidBarrel.FluidBarrelBlock FLUID_BARREL = (EdFluidBarrel.FluidBarrelBlock)(new EdFluidBarrel.FluidBarrelBlock( DecorBlock.CFG_CUTOUT|DecorBlock.CFG_LOOK_PLACEMENT|DecorBlock.CFG_OPPOSITE_PLACEMENT, Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL).notSolid(), @@ -874,7 +871,6 @@ public class ModContent STRAIGHT_CHECK_VALVE, STRAIGHT_REDSTONE_VALVE, STRAIGHT_REDSTONE_ANALOG_VALVE, - PASSIVE_FLUID_ACCUMULATOR, SMALL_FLUID_FUNNEL, DENSE_GRIT_SAND, DENSE_GRIT_DIRT, diff --git a/src/main/java/wile/engineersdecor/blocks/DecorBlock.java b/src/main/java/wile/engineersdecor/blocks/DecorBlock.java index df767a9..3677673 100644 --- a/src/main/java/wile/engineersdecor/blocks/DecorBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/DecorBlock.java @@ -1,7 +1,7 @@ /* * @file DecorBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Common functionality class for decor blocks. diff --git a/src/main/java/wile/engineersdecor/blocks/EdBreaker.java b/src/main/java/wile/engineersdecor/blocks/EdBreaker.java index 0cee872..b909a97 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdBreaker.java +++ b/src/main/java/wile/engineersdecor/blocks/EdBreaker.java @@ -1,7 +1,7 @@ /* * @file EdBreaker.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Small Block Breaker diff --git a/src/main/java/wile/engineersdecor/blocks/EdChair.java b/src/main/java/wile/engineersdecor/blocks/EdChair.java index 264478a..b48785f 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdChair.java +++ b/src/main/java/wile/engineersdecor/blocks/EdChair.java @@ -1,7 +1,7 @@ /* * @file EdChair.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Full block characteristics class. diff --git a/src/main/java/wile/engineersdecor/blocks/EdChimneyBlock.java b/src/main/java/wile/engineersdecor/blocks/EdChimneyBlock.java index e419955..4e92b65 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdChimneyBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdChimneyBlock.java @@ -1,7 +1,7 @@ /* * @file EdChimneyBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Block type for smoking chimneys. diff --git a/src/main/java/wile/engineersdecor/blocks/EdCornerOrnamentedBlock.java b/src/main/java/wile/engineersdecor/blocks/EdCornerOrnamentedBlock.java index 37eb321..cacadb5 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdCornerOrnamentedBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdCornerOrnamentedBlock.java @@ -1,7 +1,7 @@ /* * @file EdCornerOrnamentedBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Block for corner/quoin ornamentation. diff --git a/src/main/java/wile/engineersdecor/blocks/EdCraftingTable.java b/src/main/java/wile/engineersdecor/blocks/EdCraftingTable.java index 9816d74..d9f3137 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdCraftingTable.java +++ b/src/main/java/wile/engineersdecor/blocks/EdCraftingTable.java @@ -1,7 +1,7 @@ /* * @file EdCraftingTable.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Crafting table diff --git a/src/main/java/wile/engineersdecor/blocks/EdDoorBlock.java b/src/main/java/wile/engineersdecor/blocks/EdDoorBlock.java index cf2f7db..193930b 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdDoorBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdDoorBlock.java @@ -1,7 +1,7 @@ /* * @file EdDoorBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Door blocks. diff --git a/src/main/java/wile/engineersdecor/blocks/EdDoubleGateBlock.java b/src/main/java/wile/engineersdecor/blocks/EdDoubleGateBlock.java index bc9e81e..b9d3bd1 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdDoubleGateBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdDoubleGateBlock.java @@ -1,7 +1,7 @@ /* * @file EdDoubleGateBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Gate blocks that can be one or two segments high. diff --git a/src/main/java/wile/engineersdecor/blocks/EdDropper.java b/src/main/java/wile/engineersdecor/blocks/EdDropper.java index d961195..3a54da8 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdDropper.java +++ b/src/main/java/wile/engineersdecor/blocks/EdDropper.java @@ -1,7 +1,7 @@ /* * @file EdDropper.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Dropper factory automation suitable. diff --git a/src/main/java/wile/engineersdecor/blocks/EdElectricalFurnace.java b/src/main/java/wile/engineersdecor/blocks/EdElectricalFurnace.java index 437c12a..374fa9d 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdElectricalFurnace.java +++ b/src/main/java/wile/engineersdecor/blocks/EdElectricalFurnace.java @@ -1,7 +1,7 @@ /* * @file EdElectricalFurnace.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * ED small electrical pass-through furnace. diff --git a/src/main/java/wile/engineersdecor/blocks/EdFenceBlock.java b/src/main/java/wile/engineersdecor/blocks/EdFenceBlock.java index 06b2932..937687b 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdFenceBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdFenceBlock.java @@ -1,7 +1,7 @@ /* * @file EdFenceBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Wall blocks. diff --git a/src/main/java/wile/engineersdecor/blocks/EdFloorGratingBlock.java b/src/main/java/wile/engineersdecor/blocks/EdFloorGratingBlock.java index 8421b11..70c4cab 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdFloorGratingBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdFloorGratingBlock.java @@ -1,7 +1,7 @@ /* * @file EdFloorGratingBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Floor gratings. diff --git a/src/main/java/wile/engineersdecor/blocks/EdFluidBarrel.java b/src/main/java/wile/engineersdecor/blocks/EdFluidBarrel.java index 62c5db4..7396661 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdFluidBarrel.java +++ b/src/main/java/wile/engineersdecor/blocks/EdFluidBarrel.java @@ -1,7 +1,7 @@ /* * @file EdFluidBarrel.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Simple fluid tank with a built-in gauge. diff --git a/src/main/java/wile/engineersdecor/blocks/EdFluidFunnel.java b/src/main/java/wile/engineersdecor/blocks/EdFluidFunnel.java index 33ccaa8..7a0566e 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdFluidFunnel.java +++ b/src/main/java/wile/engineersdecor/blocks/EdFluidFunnel.java @@ -1,7 +1,7 @@ /* * @file EdFluidFunnel.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * A device that collects and stores fluid blocks above it. diff --git a/src/main/java/wile/engineersdecor/blocks/EdFreezer.java b/src/main/java/wile/engineersdecor/blocks/EdFreezer.java index 09123ac..982de1d 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdFreezer.java +++ b/src/main/java/wile/engineersdecor/blocks/EdFreezer.java @@ -1,7 +1,7 @@ /* * @file EdFreezer.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Small highly insulated stone liquification furnace diff --git a/src/main/java/wile/engineersdecor/blocks/EdFurnace.java b/src/main/java/wile/engineersdecor/blocks/EdFurnace.java index ee51f21..e8efc83 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdFurnace.java +++ b/src/main/java/wile/engineersdecor/blocks/EdFurnace.java @@ -1,7 +1,7 @@ /* * @file EdFurnace.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * ED Lab furnace. diff --git a/src/main/java/wile/engineersdecor/blocks/EdGlassBlock.java b/src/main/java/wile/engineersdecor/blocks/EdGlassBlock.java index 48a76bc..ef5b5f6 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdGlassBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdGlassBlock.java @@ -1,7 +1,7 @@ /* * @file EdGlassBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Full block characteristics class. Explicitly overrides some diff --git a/src/main/java/wile/engineersdecor/blocks/EdGroundBlock.java b/src/main/java/wile/engineersdecor/blocks/EdGroundBlock.java index f2d87aa..dc46bbc 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdGroundBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdGroundBlock.java @@ -1,7 +1,7 @@ /* * @file EdGroundBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Block type for soils, floors, etc. Drawn out into a class diff --git a/src/main/java/wile/engineersdecor/blocks/EdHatchBlock.java b/src/main/java/wile/engineersdecor/blocks/EdHatchBlock.java index cb65b2e..9a59d55 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdHatchBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdHatchBlock.java @@ -1,7 +1,7 @@ /* * @file EdFloorGratingBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Floor gratings. diff --git a/src/main/java/wile/engineersdecor/blocks/EdHopper.java b/src/main/java/wile/engineersdecor/blocks/EdHopper.java index fe1f879..9a317af 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdHopper.java +++ b/src/main/java/wile/engineersdecor/blocks/EdHopper.java @@ -1,7 +1,7 @@ /* * @file EdHopper.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Hopper, factory automation suitable. diff --git a/src/main/java/wile/engineersdecor/blocks/EdHorizontalSupportBlock.java b/src/main/java/wile/engineersdecor/blocks/EdHorizontalSupportBlock.java index 26e2774..70d243c 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdHorizontalSupportBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdHorizontalSupportBlock.java @@ -1,7 +1,7 @@ /* * @file EdHorizontalSupportBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Horizontal ceiling support. Symmetric x axis, fixed in diff --git a/src/main/java/wile/engineersdecor/blocks/EdLabeledCrate.java b/src/main/java/wile/engineersdecor/blocks/EdLabeledCrate.java index d5c520a..28770ae 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdLabeledCrate.java +++ b/src/main/java/wile/engineersdecor/blocks/EdLabeledCrate.java @@ -1,7 +1,7 @@ /* * @file EdLabeledCrate.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Storage crate with a content hint. diff --git a/src/main/java/wile/engineersdecor/blocks/EdLadderBlock.java b/src/main/java/wile/engineersdecor/blocks/EdLadderBlock.java index ca0e667..b9aebe4 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdLadderBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdLadderBlock.java @@ -1,7 +1,7 @@ /* * @file EdLadderBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Ladder block. The implementation is based on the vanilla diff --git a/src/main/java/wile/engineersdecor/blocks/EdMilker.java b/src/main/java/wile/engineersdecor/blocks/EdMilker.java index 88d63a4..856bd1e 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdMilker.java +++ b/src/main/java/wile/engineersdecor/blocks/EdMilker.java @@ -1,7 +1,7 @@ /* * @file EdMilker.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Frequently attracts and milks nearby cows diff --git a/src/main/java/wile/engineersdecor/blocks/EdMineralSmelter.java b/src/main/java/wile/engineersdecor/blocks/EdMineralSmelter.java index e6327b1..2f09046 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdMineralSmelter.java +++ b/src/main/java/wile/engineersdecor/blocks/EdMineralSmelter.java @@ -1,7 +1,7 @@ /* * @file EdMineralSmelter.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Small highly insulated stone liquification furnace diff --git a/src/main/java/wile/engineersdecor/blocks/EdPipeValve.java b/src/main/java/wile/engineersdecor/blocks/EdPipeValve.java index 7e6fefc..d6bca1f 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdPipeValve.java +++ b/src/main/java/wile/engineersdecor/blocks/EdPipeValve.java @@ -1,7 +1,7 @@ /* * @file EdPipeValve.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Basically a piece of pipe that does not connect to diff --git a/src/main/java/wile/engineersdecor/blocks/EdPlacer.java b/src/main/java/wile/engineersdecor/blocks/EdPlacer.java index a77da6e..05fbed7 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdPlacer.java +++ b/src/main/java/wile/engineersdecor/blocks/EdPlacer.java @@ -1,7 +1,7 @@ /* * @file EdPlacer.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Block placer and planter, factory automation suitable. diff --git a/src/main/java/wile/engineersdecor/blocks/EdRoofBlock.java b/src/main/java/wile/engineersdecor/blocks/EdRoofBlock.java index 13fa6c6..9ec634b 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdRoofBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdRoofBlock.java @@ -1,7 +1,7 @@ /* * @file EdRoofBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Roof blocks. @@ -29,6 +29,8 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; import net.minecraft.block.*; import net.minecraft.block.BlockState; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import wile.engineersdecor.libmc.blocks.StandardBlocks; import wile.engineersdecor.libmc.detail.Auxiliaries; @@ -40,7 +42,7 @@ public class EdRoofBlock extends StandardBlocks.HorizontalWaterLoggable implemen private final VoxelShape[][][] shape_cache_; public EdRoofBlock(long config, Block.Properties properties) - { this(config, properties, VoxelShapes.empty(), VoxelShapes.empty()); } + { this(config, properties.variableOpacity(), VoxelShapes.empty(), VoxelShapes.empty()); } public EdRoofBlock(long config, Block.Properties properties, VoxelShape add, VoxelShape cut) { @@ -52,7 +54,17 @@ public class EdRoofBlock extends StandardBlocks.HorizontalWaterLoggable implemen @Override @SuppressWarnings("deprecation") public boolean isTransparent(BlockState state) - { return true; } + { return false; } + + @OnlyIn(Dist.CLIENT) + @SuppressWarnings("deprecation") + public float getAmbientOcclusionLightValue(BlockState state, IBlockReader world, BlockPos pos) + { return 0.98f; } + + @Override + @SuppressWarnings("deprecation") + public int getOpacity(BlockState state, IBlockReader world, BlockPos pos) + { return 1; } @Override public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext context) diff --git a/src/main/java/wile/engineersdecor/blocks/EdSlabBlock.java b/src/main/java/wile/engineersdecor/blocks/EdSlabBlock.java index 5b7254a..37ba23f 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdSlabBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdSlabBlock.java @@ -1,7 +1,7 @@ /* * @file EdSlabBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Standard half block horizontal slab characteristics class. diff --git a/src/main/java/wile/engineersdecor/blocks/EdSlabSliceBlock.java b/src/main/java/wile/engineersdecor/blocks/EdSlabSliceBlock.java index b05f590..317a19c 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdSlabSliceBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdSlabSliceBlock.java @@ -1,7 +1,7 @@ /* * @file EdSlabSliceBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Half slab ("slab slices") characteristics class. Actually diff --git a/src/main/java/wile/engineersdecor/blocks/EdSolarPanel.java b/src/main/java/wile/engineersdecor/blocks/EdSolarPanel.java index 9f51383..b0b1d6b 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdSolarPanel.java +++ b/src/main/java/wile/engineersdecor/blocks/EdSolarPanel.java @@ -1,7 +1,7 @@ /* * @file EdSolarPanel.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Smaller (cutout) block with a defined facing. diff --git a/src/main/java/wile/engineersdecor/blocks/EdStairsBlock.java b/src/main/java/wile/engineersdecor/blocks/EdStairsBlock.java index 5d7d244..afc1792 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdStairsBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdStairsBlock.java @@ -1,7 +1,7 @@ /* * @file EdStairsBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Stairs and roof blocks, almost entirely based on vanilla stairs. diff --git a/src/main/java/wile/engineersdecor/blocks/EdStraightPoleBlock.java b/src/main/java/wile/engineersdecor/blocks/EdStraightPoleBlock.java index 7ab9bc7..0c6fd9e 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdStraightPoleBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdStraightPoleBlock.java @@ -1,7 +1,7 @@ /* * @file EdStraightPoleBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Smaller (cutout) block with a defined facing. diff --git a/src/main/java/wile/engineersdecor/blocks/EdTestBlock.java b/src/main/java/wile/engineersdecor/blocks/EdTestBlock.java index 24d5753..37949b4 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdTestBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdTestBlock.java @@ -1,7 +1,7 @@ /* * @file EdTestBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Creative mod testing block diff --git a/src/main/java/wile/engineersdecor/blocks/EdTreeCutter.java b/src/main/java/wile/engineersdecor/blocks/EdTreeCutter.java index 4053bf1..b0fb762 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdTreeCutter.java +++ b/src/main/java/wile/engineersdecor/blocks/EdTreeCutter.java @@ -1,7 +1,7 @@ /* * @file EdTreeCutter.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Small Tree Cutter diff --git a/src/main/java/wile/engineersdecor/blocks/EdWallBlock.java b/src/main/java/wile/engineersdecor/blocks/EdWallBlock.java index 9f86fa9..a43cf68 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdWallBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdWallBlock.java @@ -1,7 +1,7 @@ /* * @file EdWallBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Wall blocks. diff --git a/src/main/java/wile/engineersdecor/blocks/EdWasteIncinerator.java b/src/main/java/wile/engineersdecor/blocks/EdWasteIncinerator.java index 03e58d3..b2edbaf 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdWasteIncinerator.java +++ b/src/main/java/wile/engineersdecor/blocks/EdWasteIncinerator.java @@ -1,7 +1,7 @@ /* * @file EdWasteIncinerator.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Trash/void/nullifier device with internal fifos. diff --git a/src/main/java/wile/engineersdecor/blocks/EdWindowBlock.java b/src/main/java/wile/engineersdecor/blocks/EdWindowBlock.java index febf456..68ef8e6 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdWindowBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/EdWindowBlock.java @@ -1,7 +1,7 @@ /* * @file EdWindowBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Mod windows. diff --git a/src/main/java/wile/engineersdecor/blocks/IDecorBlock.java b/src/main/java/wile/engineersdecor/blocks/IDecorBlock.java index 89b35b9..d372643 100644 --- a/src/main/java/wile/engineersdecor/blocks/IDecorBlock.java +++ b/src/main/java/wile/engineersdecor/blocks/IDecorBlock.java @@ -1,7 +1,7 @@ /* * @file IDecorBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Interface for tagging and common default behaviour. diff --git a/src/main/java/wile/engineersdecor/detail/ExternalObjects.java b/src/main/java/wile/engineersdecor/detail/ExternalObjects.java index 35af653..66d49ec 100644 --- a/src/main/java/wile/engineersdecor/detail/ExternalObjects.java +++ b/src/main/java/wile/engineersdecor/detail/ExternalObjects.java @@ -1,7 +1,7 @@ /* * @file ExtItems.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Object holder based item references. diff --git a/src/main/java/wile/engineersdecor/detail/ModRenderers.java b/src/main/java/wile/engineersdecor/detail/ModRenderers.java index b373404..1d4fd5b 100644 --- a/src/main/java/wile/engineersdecor/detail/ModRenderers.java +++ b/src/main/java/wile/engineersdecor/detail/ModRenderers.java @@ -1,7 +1,7 @@ /* * @file ModTesrs.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2018 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Yet unstructured initial experiments with TESRs. diff --git a/src/main/java/wile/engineersdecor/detail/TreeCutting.java b/src/main/java/wile/engineersdecor/detail/TreeCutting.java index bcd060f..8ac6e57 100644 --- a/src/main/java/wile/engineersdecor/detail/TreeCutting.java +++ b/src/main/java/wile/engineersdecor/detail/TreeCutting.java @@ -1,7 +1,7 @@ /* * @file TreeCutting.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Simple tree cutting algorithm. diff --git a/src/main/java/wile/engineersdecor/eapi/jei/JEIPlugin.java b/src/main/java/wile/engineersdecor/eapi/jei/JEIPlugin.java index 975ac7d..998045b 100644 --- a/src/main/java/wile/engineersdecor/eapi/jei/JEIPlugin.java +++ b/src/main/java/wile/engineersdecor/eapi/jei/JEIPlugin.java @@ -1,14 +1,15 @@ /* * @file JEIPlugin.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * JEI plugin (see https://github.com/mezz/JustEnoughItems/wiki/Creating-Plugins) */ package wile.engineersdecor.eapi.jei; -//public class JEIPlugin {} +public class JEIPlugin {} +/* import wile.engineersdecor.ModEngineersDecor; import wile.engineersdecor.ModConfig; import wile.engineersdecor.ModContent; @@ -74,3 +75,4 @@ public class JEIPlugin implements mezz.jei.api.IModPlugin } } } +*/ \ No newline at end of file diff --git a/src/main/java/wile/engineersdecor/libmc/blocks/SlabSliceBlock.java b/src/main/java/wile/engineersdecor/libmc/blocks/SlabSliceBlock.java index fbfe5fb..34d2063 100644 --- a/src/main/java/wile/engineersdecor/libmc/blocks/SlabSliceBlock.java +++ b/src/main/java/wile/engineersdecor/libmc/blocks/SlabSliceBlock.java @@ -1,7 +1,7 @@ /* * @file BlockDecorHalfSlab.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Half slab ("slab slices") characteristics class. Actually diff --git a/src/main/java/wile/engineersdecor/libmc/blocks/StandardBlocks.java b/src/main/java/wile/engineersdecor/libmc/blocks/StandardBlocks.java index e2407d3..fdc9084 100644 --- a/src/main/java/wile/engineersdecor/libmc/blocks/StandardBlocks.java +++ b/src/main/java/wile/engineersdecor/libmc/blocks/StandardBlocks.java @@ -1,7 +1,7 @@ /* * @file StandardBlocks.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Common functionality class for decor blocks. diff --git a/src/main/java/wile/engineersdecor/libmc/blocks/StandardDoorBlock.java b/src/main/java/wile/engineersdecor/libmc/blocks/StandardDoorBlock.java index d9b7606..8685ccf 100644 --- a/src/main/java/wile/engineersdecor/libmc/blocks/StandardDoorBlock.java +++ b/src/main/java/wile/engineersdecor/libmc/blocks/StandardDoorBlock.java @@ -1,7 +1,7 @@ /* * @file StandardDoorBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Door blocks, almost entirely based on vanilla. diff --git a/src/main/java/wile/engineersdecor/libmc/blocks/StandardFenceBlock.java b/src/main/java/wile/engineersdecor/libmc/blocks/StandardFenceBlock.java index 17157b8..7315c12 100644 --- a/src/main/java/wile/engineersdecor/libmc/blocks/StandardFenceBlock.java +++ b/src/main/java/wile/engineersdecor/libmc/blocks/StandardFenceBlock.java @@ -1,7 +1,7 @@ /* * @file StandardFenceBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Wall blocks. diff --git a/src/main/java/wile/engineersdecor/libmc/blocks/StandardStairsBlock.java b/src/main/java/wile/engineersdecor/libmc/blocks/StandardStairsBlock.java index a39df32..b74a899 100644 --- a/src/main/java/wile/engineersdecor/libmc/blocks/StandardStairsBlock.java +++ b/src/main/java/wile/engineersdecor/libmc/blocks/StandardStairsBlock.java @@ -1,7 +1,7 @@ /* * @file StandardStairsBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Stairs and roof blocks, almost entirely based on vanilla stairs. diff --git a/src/main/java/wile/engineersdecor/libmc/blocks/VariantSlabBlock.java b/src/main/java/wile/engineersdecor/libmc/blocks/VariantSlabBlock.java index a4aa516..1567778 100644 --- a/src/main/java/wile/engineersdecor/libmc/blocks/VariantSlabBlock.java +++ b/src/main/java/wile/engineersdecor/libmc/blocks/VariantSlabBlock.java @@ -1,7 +1,7 @@ /* * @file VariantSlabBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Standard half block horizontal slab characteristics class. diff --git a/src/main/java/wile/engineersdecor/libmc/blocks/VariantWallBlock.java b/src/main/java/wile/engineersdecor/libmc/blocks/VariantWallBlock.java index 21a0f2b..89e575e 100644 --- a/src/main/java/wile/engineersdecor/libmc/blocks/VariantWallBlock.java +++ b/src/main/java/wile/engineersdecor/libmc/blocks/VariantWallBlock.java @@ -1,7 +1,7 @@ /* * @file VariantWallBlock.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Wall blocks. diff --git a/src/main/java/wile/engineersdecor/libmc/datagen/AssetsDataGen.java b/src/main/java/wile/engineersdecor/libmc/datagen/AssetsDataGen.java index 0f1070a..80b1a5c 100644 --- a/src/main/java/wile/engineersdecor/libmc/datagen/AssetsDataGen.java +++ b/src/main/java/wile/engineersdecor/libmc/datagen/AssetsDataGen.java @@ -1,7 +1,7 @@ /* * @file BlockStateDataGen.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Blockstate data generator. diff --git a/src/main/java/wile/engineersdecor/libmc/datagen/LootTableGen.java b/src/main/java/wile/engineersdecor/libmc/datagen/LootTableGen.java index abe7701..c7bb252 100644 --- a/src/main/java/wile/engineersdecor/libmc/datagen/LootTableGen.java +++ b/src/main/java/wile/engineersdecor/libmc/datagen/LootTableGen.java @@ -1,7 +1,7 @@ /* * @file LootTableGen.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Loot table generator. diff --git a/src/main/java/wile/engineersdecor/libmc/detail/Auxiliaries.java b/src/main/java/wile/engineersdecor/libmc/detail/Auxiliaries.java index aa6f412..1ae0350 100644 --- a/src/main/java/wile/engineersdecor/libmc/detail/Auxiliaries.java +++ b/src/main/java/wile/engineersdecor/libmc/detail/Auxiliaries.java @@ -1,7 +1,7 @@ /* * @file Auxiliaries.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2018 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * General commonly used functionality. diff --git a/src/main/java/wile/engineersdecor/libmc/detail/Fluidics.java b/src/main/java/wile/engineersdecor/libmc/detail/Fluidics.java index e4cfb8e..f79375f 100644 --- a/src/main/java/wile/engineersdecor/libmc/detail/Fluidics.java +++ b/src/main/java/wile/engineersdecor/libmc/detail/Fluidics.java @@ -1,7 +1,7 @@ /* * @file Fluidics.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * General fluid handling functionality. diff --git a/src/main/java/wile/engineersdecor/libmc/detail/Inventories.java b/src/main/java/wile/engineersdecor/libmc/detail/Inventories.java index e56ee56..2860334 100644 --- a/src/main/java/wile/engineersdecor/libmc/detail/Inventories.java +++ b/src/main/java/wile/engineersdecor/libmc/detail/Inventories.java @@ -1,7 +1,7 @@ /* * @file Inventories.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * General inventory item handling functionality. diff --git a/src/main/java/wile/engineersdecor/libmc/detail/Networking.java b/src/main/java/wile/engineersdecor/libmc/detail/Networking.java index 4596569..a60ce6f 100644 --- a/src/main/java/wile/engineersdecor/libmc/detail/Networking.java +++ b/src/main/java/wile/engineersdecor/libmc/detail/Networking.java @@ -1,7 +1,7 @@ /* * @file Networking.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Main client/server message handling. diff --git a/src/main/java/wile/engineersdecor/libmc/detail/OptionalRecipeCondition.java b/src/main/java/wile/engineersdecor/libmc/detail/OptionalRecipeCondition.java index 015e088..8684d9f 100644 --- a/src/main/java/wile/engineersdecor/libmc/detail/OptionalRecipeCondition.java +++ b/src/main/java/wile/engineersdecor/libmc/detail/OptionalRecipeCondition.java @@ -1,7 +1,7 @@ /* * @file OptionalRecipeCondition.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2018 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Recipe condition to enable opt'ing out JSON based recipes. diff --git a/src/main/java/wile/engineersdecor/libmc/detail/Overlay.java b/src/main/java/wile/engineersdecor/libmc/detail/Overlay.java index 5ea14c0..527eade 100644 --- a/src/main/java/wile/engineersdecor/libmc/detail/Overlay.java +++ b/src/main/java/wile/engineersdecor/libmc/detail/Overlay.java @@ -1,7 +1,7 @@ /* * @file Overlay.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2018 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Renders status messages in one line. diff --git a/src/main/java/wile/engineersdecor/libmc/detail/SidedProxy.java b/src/main/java/wile/engineersdecor/libmc/detail/SidedProxy.java index fa6c337..3210df2 100644 --- a/src/main/java/wile/engineersdecor/libmc/detail/SidedProxy.java +++ b/src/main/java/wile/engineersdecor/libmc/detail/SidedProxy.java @@ -1,7 +1,7 @@ /* * @file SidedProxy.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2018 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * General client/server sideness selection proxy. diff --git a/src/main/java/wile/engineersdecor/libmc/detail/TooltipDisplay.java b/src/main/java/wile/engineersdecor/libmc/detail/TooltipDisplay.java index abccca8..3b12d18 100644 --- a/src/main/java/wile/engineersdecor/libmc/detail/TooltipDisplay.java +++ b/src/main/java/wile/engineersdecor/libmc/detail/TooltipDisplay.java @@ -1,7 +1,7 @@ /* * @file Tooltip.java * @author Stefan Wilhelm (wile) - * @copyright (C) 2018 Stefan Wilhelm + * @copyright (C) 2020 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * * Delayed tooltip for a selected area. Constructed with a diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 29fa11a..e03eaef 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -19,13 +19,13 @@ logoFile="logo.png" [[dependencies.engineersdecor]] modId="forge" mandatory=true - versionRange="[33.0.37,)" + versionRange="[34.0.1,)" ordering="NONE" side="BOTH" [[dependencies.engineersdecor]] modId="minecraft" mandatory=true - versionRange="[1.16.2]" + versionRange="[1.16.3]" ordering="NONE" side="BOTH" 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 df2808f..c87a2ff 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 @@ -11,12 +11,12 @@ "to": [13, 6, 5], "rotation": {"angle": 0, "axis": "y", "origin": [12, 11.5, 7]}, "faces": { - "north": {"uv": [3, 10, 13, 16], "texture": "#t"}, - "east": {"uv": [11, 10, 13, 16], "texture": "#t"}, - "south": {"uv": [3, 10, 13, 16], "texture": "#t"}, - "west": {"uv": [3, 10, 5, 16], "texture": "#t"}, - "up": {"uv": [3, 3, 13, 5], "texture": "#t"}, - "down": {"uv": [3, 11, 13, 13], "texture": "#t"} + "north": {"texture": "#t"}, + "east": {"texture": "#t"}, + "south": {"texture": "#t"}, + "west": {"texture": "#t"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} } }, { @@ -24,12 +24,12 @@ "to": [13, 6, 13], "rotation": {"angle": 0, "axis": "y", "origin": [12, 11.5, 15]}, "faces": { - "north": {"uv": [3, 10, 13, 16], "texture": "#t"}, - "east": {"uv": [3, 10, 5, 16], "texture": "#t"}, - "south": {"uv": [3, 10, 13, 16], "texture": "#t"}, - "west": {"uv": [11, 10, 13, 16], "texture": "#t"}, - "up": {"uv": [3, 11, 13, 13], "texture": "#t"}, - "down": {"uv": [3, 3, 13, 5], "texture": "#t"} + "north": {"texture": "#t"}, + "east": {"texture": "#t"}, + "south": {"texture": "#t"}, + "west": {"texture": "#t"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} } }, { @@ -37,10 +37,10 @@ "to": [13, 6, 11], "rotation": {"angle": 0, "axis": "y", "origin": [13, 11.5, 12]}, "faces": { - "east": {"uv": [5, 10, 11, 16], "texture": "#t"}, - "west": {"uv": [5, 10, 11, 16], "texture": "#t"}, - "up": {"uv": [11, 5, 13, 11], "texture": "#t"}, - "down": {"uv": [11, 5, 13, 11], "texture": "#t"} + "east": {"texture": "#t"}, + "west": {"texture": "#t"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} } }, { @@ -48,10 +48,10 @@ "to": [5, 6, 11], "rotation": {"angle": 0, "axis": "y", "origin": [5, 11.5, 12]}, "faces": { - "east": {"uv": [5, 10, 11, 16], "texture": "#t"}, - "west": {"uv": [5, 10, 11, 16], "texture": "#t"}, - "up": {"uv": [3, 5, 5, 11], "texture": "#t"}, - "down": {"uv": [3, 5, 5, 11], "texture": "#t"} + "east": {"texture": "#t"}, + "west": {"texture": "#t"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} } }, { @@ -59,8 +59,8 @@ "to": [11, 1, 11], "rotation": {"angle": 0, "axis": "y", "origin": [7, 11.5, 12]}, "faces": { - "up": {"uv": [5, 5, 11, 11], "texture": "#t"}, - "down": {"uv": [5, 5, 11, 11], "texture": "#t"} + "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 9250729..b071094 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 @@ -11,11 +11,12 @@ "from": [0, 0, 0], "to": [4, 3.5, 16], "faces": { - "north": {"uv": [12, 12, 16, 16], "texture": "#s", "cullface": "north"}, - "south": {"uv": [0, 12, 4, 16], "texture": "#s", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#s", "cullface": "west"}, - "up": {"uv": [0, 0, 4, 16], "texture": "#s"}, - "down": {"uv": [0, 0, 4, 16], "texture": "#s", "cullface": "down"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -23,11 +24,12 @@ "to": [8, 7.5, 3], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { - "north": {"uv": [8, 8.5, 12, 16], "texture": "#s", "cullface": "north"}, - "south": {"uv": [4, 8.5, 8, 16], "texture": "#s", "cullface": "south"}, - "west": {"uv": [0, 8.5, 3, 16], "texture": "#s"}, - "up": {"uv": [4, 0, 8, 3], "texture": "#s"}, - "down": {"uv": [4, 13, 8, 16], "texture": "#s", "cullface": "down"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -35,11 +37,12 @@ "to": [8, 7.5, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 21]}, "faces": { - "north": {"uv": [8, 8.5, 12, 16], "texture": "#s", "cullface": "north"}, - "south": {"uv": [4, 8.5, 8, 16], "texture": "#s", "cullface": "south"}, - "west": {"uv": [13, 8.5, 16, 16], "texture": "#s"}, - "up": {"uv": [4, 13, 8, 16], "texture": "#s"}, - "down": {"uv": [4, 0, 8, 3], "texture": "#s", "cullface": "down"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -47,22 +50,24 @@ "to": [12, 11.5, 5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]}, "faces": { - "north": {"uv": [4, 4.5, 13, 15], "texture": "#s"}, - "south": {"uv": [3, 4.5, 12, 15], "texture": "#t"}, - "west": {"uv": [3, 4.5, 5, 15], "texture": "#s"}, - "up": {"uv": [3, 3, 12, 5], "texture": "#t"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [4, 0, 3], - "to": [12, 1.25, 5], + "to": [12, 1, 5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 8]}, "faces": { - "north": {"uv": [4, 14.75, 12, 16], "texture": "#s"}, - "south": {"uv": [4, 14.75, 12, 16], "texture": "#t"}, - "west": {"uv": [3, 14.75, 5, 16], "texture": "#s"}, - "up": {"uv": [4, 3, 12, 5], "texture": "#t"}, - "down": {"uv": [4, 11, 12, 13], "texture": "#t"} + "north": {"texture": "#s"}, + "south": {"texture": "#t"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} } }, { @@ -70,11 +75,11 @@ "to": [12, 1, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 16]}, "faces": { - "north": {"uv": [4, 15, 12, 16], "texture": "#s"}, - "south": {"uv": [4, 15, 12, 16], "texture": "#t"}, - "west": {"uv": [11, 15, 13, 16], "texture": "#s"}, - "up": {"uv": [4, 11, 12, 13], "texture": "#t"}, - "down": {"uv": [4, 3, 12, 5], "texture": "#t"} + "north": {"texture": "#s"}, + "south": {"texture": "#t"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} } }, { @@ -82,10 +87,12 @@ "to": [12, 11.5, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 16]}, "faces": { - "north": {"uv": [4, 4.5, 13, 15], "texture": "#t"}, - "south": {"uv": [3, 4.5, 12, 15], "texture": "#s"}, - "west": {"uv": [11, 4.5, 13, 15], "texture": "#s"}, - "up": {"uv": [3, 11, 12, 13], "texture": "#t"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -93,11 +100,11 @@ "to": [13, 16, 5], "rotation": {"angle": 0, "axis": "y", "origin": [12, 23, 7]}, "faces": { - "north": {"uv": [3, 0, 13, 4.5], "texture": "#t"}, - "east": {"uv": [11, 0, 13, 4.5], "texture": "#t"}, - "south": {"uv": [3, 0, 13, 4.5], "texture": "#t"}, - "west": {"uv": [3, 0, 5, 4.5], "texture": "#t"}, - "up": {"uv": [3, 3, 13, 5], "texture": "#t"} + "north": {"texture": "#t"}, + "east": {"texture": "#t"}, + "south": {"texture": "#t"}, + "west": {"texture": "#t"}, + "up": {"texture": "#t"} } }, { @@ -105,10 +112,10 @@ "to": [13, 16, 13], "rotation": {"angle": 0, "axis": "y", "origin": [12, 23, 15]}, "faces": { - "north": {"uv": [3, 0, 13, 4.5], "texture": "#t"}, - "south": {"uv": [3, 0, 13, 4.5], "texture": "#t"}, - "west": {"uv": [11, 0, 13, 4.5], "texture": "#t"}, - "up": {"uv": [3, 11, 13, 13], "texture": "#t"} + "north": {"texture": "#t"}, + "south": {"texture": "#t"}, + "west": {"texture": "#t"}, + "up": {"texture": "#t"} } }, { @@ -116,10 +123,10 @@ "to": [13, 16, 11], "rotation": {"angle": 0, "axis": "y", "origin": [13, 23, 12]}, "faces": { - "east": {"uv": [5, 0, 11, 4.5], "texture": "#t"}, - "west": {"uv": [5, 0, 11, 4.5], "texture": "#t"}, - "up": {"uv": [11, 5, 13, 11], "texture": "#t"}, - "down": {"uv": [11, 5, 13, 11], "texture": "#s"} + "east": {"texture": "#t"}, + "west": {"texture": "#t"}, + "up": {"texture": "#t"}, + "down": {"texture": "#s"} } }, { @@ -127,10 +134,10 @@ "to": [5, 16, 11], "rotation": {"angle": 0, "axis": "y", "origin": [5, 23, 12]}, "faces": { - "east": {"uv": [5, 0, 11, 4.5], "texture": "#t"}, - "west": {"uv": [5, 0, 11, 4.5], "texture": "#t"}, - "up": {"uv": [3, 5, 5, 11], "texture": "#t"}, - "down": {"uv": [3, 5, 5, 11], "texture": "#s"} + "east": {"texture": "#t"}, + "west": {"texture": "#t"}, + "up": {"texture": "#t"}, + "down": {"texture": "#s"} } }, { @@ -138,10 +145,12 @@ "to": [5, 11.5, 11], "rotation": {"angle": 0, "axis": "y", "origin": [5, 18.5, 12]}, "faces": { - "east": {"uv": [5, 4.5, 11, 15], "texture": "#t"}, - "west": {"uv": [5, 4.5, 11, 15], "texture": "#s"}, - "up": {"uv": [3, 5, 5, 11], "texture": "#t"}, - "down": {"uv": [3, 5, 5, 11], "texture": "#t"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -149,10 +158,10 @@ "to": [12, 11.5, 11], "rotation": {"angle": 0, "axis": "y", "origin": [12, 18.5, 12]}, "faces": { - "east": {"uv": [5, 4.5, 11, 16], "texture": "#t"}, - "west": {"uv": [5, 4.5, 11, 16], "texture": "#t"}, - "up": {"uv": [11, 5, 12, 11], "texture": "#t"}, - "down": {"uv": [11, 5, 12, 11], "texture": "#t"} + "east": {"texture": "#t"}, + "west": {"texture": "#t"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} } }, { @@ -160,20 +169,22 @@ "to": [5, 1, 11], "rotation": {"angle": 0, "axis": "y", "origin": [4.75, 18.5, 12]}, "faces": { - "east": {"uv": [5, 15, 11, 16], "texture": "#t"}, - "west": {"uv": [5, 15, 11, 16], "texture": "#t"}, - "up": {"uv": [4, 5, 5, 11], "texture": "#t"}, - "down": {"uv": [4, 5, 5, 11], "texture": "#t"} + "east": {"texture": "#t"}, + "west": {"texture": "#t"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} } }, { "from": [8, 0, 0], "to": [12, 11.5, 3], "faces": { - "north": {"uv": [4, 4.5, 8, 16], "texture": "#s", "cullface": "north"}, - "west": {"uv": [0, 4.5, 3, 16], "texture": "#s"}, - "up": {"uv": [8, 0, 12, 3], "texture": "#s"}, - "down": {"uv": [8, 13, 12, 16], "texture": "#s", "cullface": "down"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -181,10 +192,12 @@ "to": [12, 11.5, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 19]}, "faces": { - "south": {"uv": [8, 4.5, 12, 16], "texture": "#s", "cullface": "south"}, - "west": {"uv": [11, 4.5, 16, 16], "texture": "#s"}, - "up": {"uv": [8, 11, 12, 16], "texture": "#s"}, - "down": {"uv": [8, 0, 12, 5], "texture": "#s", "cullface": "down"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -192,144 +205,178 @@ "to": [16, 15.5, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { - "north": {"uv": [0, 0, 4, 16], "texture": "#s", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#s", "cullface": "east"}, - "south": {"uv": [12, 0, 16, 16], "texture": "#s", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#s"}, - "up": {"uv": [12, 0, 16, 16], "texture": "#s"}, - "down": {"uv": [12, 0, 16, 16], "texture": "#s", "cullface": "down"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [4, 7.5, 0], - "to": [8, 8, 3], + "to": [8, 7.9375, 3], "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 8]}, "faces": { - "north": {"uv": [8, 8, 12, 8.5], "texture": "#s"}, - "south": {"uv": [4, 8, 8, 8.5], "texture": "#s"}, - "west": {"uv": [0, 8, 3, 8.5], "texture": "#s"}, - "up": {"uv": [4, 0, 8, 3], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [12, 15.5, 0], - "to": [16, 16, 3], + "to": [16, 15.9375, 3], "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 8]}, "faces": { - "north": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "east": {"uv": [13, 0, 16, 0.5], "texture": "#s"}, - "south": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "west": {"uv": [0, 0, 3, 0.5], "texture": "#s"}, - "up": {"uv": [12, 0, 16, 3], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [13, 15.5, 3], - "to": [16, 16, 4], + "to": [16, 15.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 11]}, "faces": { - "north": {"uv": [0, 0, 3, 0.5], "texture": "#s"}, - "east": {"uv": [12, 0, 13, 0.5], "texture": "#s"}, - "south": {"uv": [13, 0, 16, 0.5], "texture": "#s"}, - "west": {"uv": [3, 0, 4, 0.5], "texture": "#s"}, - "up": {"uv": [13, 3, 16, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [15, 15.5, 4], - "to": [16, 16, 8], + "to": [16, 15.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 12]}, "faces": { - "east": {"uv": [8, 0, 12, 0.5], "texture": "#s"}, - "west": {"uv": [4, 0, 8, 0.5], "texture": "#s"}, - "up": {"uv": [15, 4, 16, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "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"}, + "up": {"texture": "#s"} } }, { "from": [11, 11.5, 0], - "to": [12, 12, 4], + "to": [12, 11.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 8]}, "faces": { - "north": {"uv": [4, 4, 5, 4.5], "texture": "#s"}, - "west": {"uv": [0, 4, 4, 4.5], "texture": "#s"}, - "up": {"uv": [11, 0, 12, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [3, 3.5, 0], - "to": [4, 4, 3], + "to": [4, 3.9375, 3], "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 8]}, "faces": { - "north": {"uv": [12, 12, 13, 12.5], "texture": "#s"}, - "west": {"uv": [0, 12, 3, 12.5], "texture": "#s"}, - "up": {"uv": [3, 0, 4, 3], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [15, 15.5, 12], - "to": [16, 16, 16], + "to": [16, 15.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 20]}, "faces": { - "east": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "south": {"uv": [15, 0, 16, 0.5], "texture": "#s"}, - "west": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "up": {"uv": [15, 12, 16, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [7, 7.5, 13], - "to": [8, 8, 16], + "to": [8, 7.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 20]}, "faces": { - "east": {"uv": [0, 8, 3, 8.5], "texture": "#s"}, - "south": {"uv": [7, 8, 8, 8.5], "texture": "#s"}, - "west": {"uv": [13, 8, 16, 8.5], "texture": "#s"}, - "up": {"uv": [7, 13, 8, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [0, 3.5, 4], - "to": [3, 4, 8], + "to": [3, 3.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 12]}, "faces": { - "north": {"uv": [13, 12, 16, 12.5], "texture": "#s"}, - "south": {"uv": [0, 12, 3, 12.5], "texture": "#s"}, - "west": {"uv": [4, 12, 8, 12.5], "texture": "#s"}, - "up": {"uv": [0, 4, 3, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [0, 3.5, 12], - "to": [4, 4, 16], + "to": [4, 3.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 20]}, "faces": { - "north": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "south": {"uv": [0, 12, 4, 12.5], "texture": "#s"}, - "west": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "up": {"uv": [0, 12, 4, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [8, 11.5, 13], - "to": [12, 12, 16], + "to": [12, 11.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 20]}, "faces": { - "north": {"uv": [4, 4, 8, 4.5], "texture": "#s"}, - "south": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "west": {"uv": [13, 4, 16, 4.5], "texture": "#s"}, - "up": {"uv": [8, 13, 12, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [13, 15.5, 8], - "to": [16, 16, 12], + "to": [16, 15.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 16]}, "faces": { - "north": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "east": {"uv": [4, 0, 8, 0.5], "texture": "#s"}, - "south": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "west": {"uv": [8, 0, 12, 0.5], "texture": "#s"}, - "up": {"uv": [12, 8, 16, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"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 09f79a6..e5892e1 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,6 @@ { - "parent": "block/block", - "ambientocclusion": false, + "parent": "block/block", + "ambientocclusion": false, "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof", @@ -11,11 +11,12 @@ "from": [0, 0, 0], "to": [4, 3.5, 16], "faces": { - "north": {"uv": [12, 12, 16, 16], "texture": "#s", "cullface": "north"}, - "south": {"uv": [0, 12, 4, 16], "texture": "#s", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#s", "cullface": "west"}, - "up": {"uv": [0, 0, 4, 16], "texture": "#s"}, - "down": {"uv": [0, 0, 4, 16], "texture": "#s", "cullface": "down"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -23,22 +24,24 @@ "to": [8, 7.5, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { - "north": {"uv": [8, 8, 12, 16], "texture": "#s", "cullface": "north"}, - "south": {"uv": [4, 8, 8, 16], "texture": "#s", "cullface": "south"}, - "west": {"uv": [0, 8, 16, 16], "texture": "#s"}, - "up": {"uv": [4, 0, 8, 16], "texture": "#s"}, - "down": {"uv": [4, 0, 8, 16], "texture": "#s", "cullface": "down"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [8, 0, 0], "to": [12, 11.5, 16], "faces": { - "north": {"uv": [4, 4, 8, 16], "texture": "#s", "cullface": "north"}, - "south": {"uv": [8, 4, 12, 16], "texture": "#s", "cullface": "south"}, - "west": {"uv": [0, 4, 16, 16], "texture": "#s"}, - "up": {"uv": [8, 0, 12, 16], "texture": "#s"}, - "down": {"uv": [8, 0, 12, 16], "texture": "#s", "cullface": "down"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -46,182 +49,233 @@ "to": [16, 15.5, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { - "north": {"uv": [0, 0, 4, 16], "texture": "#s", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#s", "cullface": "east"}, - "south": {"uv": [12, 0, 16, 16], "texture": "#s", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#s"}, - "up": {"uv": [12, 0, 16, 16], "texture": "#s"}, - "down": {"uv": [12, 0, 16, 16], "texture": "#s", "cullface": "down"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [4, 7.5, 0], - "to": [8, 8, 4], + "to": [8, 7.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 8]}, "faces": { - "north": {"uv": [8, 8, 12, 8.5], "texture": "#s"}, - "south": {"uv": [4, 8, 8, 8.5], "texture": "#s"}, - "west": {"uv": [0, 8, 4, 8.5], "texture": "#s"}, - "up": {"uv": [4, 0, 8, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [12, 15.5, 0], - "to": [16, 16, 4], + "to": [16, 15.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 8]}, "faces": { - "north": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "east": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "south": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "west": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "up": {"uv": [12, 0, 16, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [15, 15.5, 4], - "to": [16, 16, 8], + "to": [16, 15.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 12]}, "faces": { - "east": {"uv": [8, 0, 12, 0.5], "texture": "#s"}, - "west": {"uv": [4, 0, 8, 0.5], "texture": "#s"}, - "up": {"uv": [15, 4, 16, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "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"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [11, 11.5, 0], - "to": [12, 12, 4], + "to": [12, 11.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 8]}, "faces": { - "north": {"uv": [4, 4, 5, 4.5], "texture": "#s"}, - "west": {"uv": [0, 4, 4, 4.5], "texture": "#s"}, - "up": {"uv": [11, 0, 12, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [3, 3.5, 0], - "to": [4, 4, 4], + "to": [4, 3.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 8]}, "faces": { - "north": {"uv": [4, 4, 5, 4.5], "texture": "#s"}, - "west": {"uv": [0, 4, 4, 4.5], "texture": "#s"}, - "up": {"uv": [11, 0, 12, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [11, 11.5, 8], - "to": [12, 12, 12], + "to": [12, 11.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 16]}, "faces": { - "west": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "up": {"uv": [11, 8, 12, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [3, 3.5, 8], - "to": [4, 4, 12], + "to": [4, 3.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 16]}, "faces": { - "west": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "up": {"uv": [11, 8, 12, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [7, 7.5, 4], - "to": [8, 8, 8], + "to": [8, 7.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 12]}, "faces": { - "east": {"uv": [8, 8, 12, 8.5], "texture": "#s"}, - "west": {"uv": [4, 8, 8, 8.5], "texture": "#s"}, - "up": {"uv": [7, 4, 8, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [15, 15.5, 12], - "to": [16, 16, 16], + "to": [16, 15.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 20]}, "faces": { - "east": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "south": {"uv": [15, 0, 16, 0.5], "texture": "#s"}, - "west": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "up": {"uv": [15, 12, 16, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [7, 7.5, 12], - "to": [8, 8, 16], + "to": [8, 7.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 20]}, "faces": { - "east": {"uv": [0, 8, 4, 8.5], "texture": "#s"}, - "south": {"uv": [7, 8, 8, 8.5], "texture": "#s"}, - "west": {"uv": [12, 8, 16, 8.5], "texture": "#s"}, - "up": {"uv": [7, 12, 8, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [0, 3.5, 4], - "to": [4, 4, 8], + "to": [4, 3.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 12]}, "faces": { - "north": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "south": {"uv": [0, 12, 4, 12.5], "texture": "#s"}, - "west": {"uv": [4, 12, 8, 12.5], "texture": "#s"}, - "up": {"uv": [0, 4, 4, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [8, 11.5, 4], - "to": [12, 12, 8], + "to": [12, 11.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 12]}, "faces": { - "north": {"uv": [4, 4, 8, 4.5], "texture": "#s"}, - "south": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "west": {"uv": [4, 4, 8, 4.5], "texture": "#s"}, - "up": {"uv": [8, 4, 12, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [0, 3.5, 12], - "to": [4, 4, 16], + "to": [4, 3.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 20]}, "faces": { - "north": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "south": {"uv": [0, 12, 4, 12.5], "texture": "#s"}, - "west": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "up": {"uv": [0, 12, 4, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [8, 11.5, 12], - "to": [12, 12, 16], + "to": [12, 11.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 20]}, "faces": { - "north": {"uv": [4, 4, 8, 4.5], "texture": "#s"}, - "south": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "west": {"uv": [12, 4, 16, 4.5], "texture": "#s"}, - "up": {"uv": [8, 12, 12, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [4, 7.5, 8], - "to": [8, 8, 12], + "to": [8, 7.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 16]}, "faces": { - "north": {"uv": [8, 8, 12, 8.5], "texture": "#s"}, - "south": {"uv": [4, 8, 8, 8.5], "texture": "#s"}, - "west": {"uv": [8, 8, 12, 8.5], "texture": "#s"}, - "up": {"uv": [4, 8, 8, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [12, 15.5, 8], - "to": [16, 16, 12], + "to": [16, 15.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 16]}, "faces": { - "north": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "east": {"uv": [4, 0, 8, 0.5], "texture": "#s"}, - "south": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "west": {"uv": [8, 0, 12, 0.5], "texture": "#s"}, - "up": {"uv": [12, 8, 16, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -229,23 +283,23 @@ "to": [1, 6, 1], "rotation": {"angle": 0, "axis": "y", "origin": [8, 11.5, 8]}, "faces": { - "north": {"uv": [0, 0, 1, 2.5], "texture": "#f"}, - "east": {"uv": [0, 0, 1, 2.5], "texture": "#f"}, - "south": {"uv": [0, 0, 1, 2.5], "texture": "#f"}, - "west": {"uv": [0, 0, 1, 2.5], "texture": "#f"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#f"} + "north": {"texture": "#f"}, + "east": {"texture": "#f"}, + "south": {"texture": "#f"}, + "west": {"texture": "#f"}, + "up": {"texture": "#f"} } }, { - "from": [0, 4, 15], + "from": [0, 3.9375, 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"} + "north": {"texture": "#f"}, + "east": {"texture": "#f"}, + "south": {"texture": "#f"}, + "west": {"texture": "#f"}, + "up": {"texture": "#f"} } }, { @@ -253,10 +307,10 @@ "to": [1, 6, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 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"} + "east": {"texture": "#f"}, + "west": {"texture": "#f"}, + "up": {"texture": "#f"}, + "down": {"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 3cd072e..d745712 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,5 @@ { - "ambientocclusion": false, + "ambientocclusion": false, "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof", @@ -10,12 +10,12 @@ "from": [12, 0, 0], "to": [16, 15.5, 12], "faces": { - "north": {"uv": [0, 0.5, 4, 16], "texture": "#s", "cullface": "north"}, - "east": {"uv": [4, 0.5, 16, 16], "texture": "#s", "cullface": "east"}, - "south": {"uv": [12, 0.5, 16, 16], "texture": "#s"}, - "west": {"uv": [0, 0.5, 12, 16], "texture": "#s"}, - "up": {"uv": [12, 0, 16, 12], "texture": "#s"}, - "down": {"uv": [12, 4, 16, 16], "texture": "#s", "cullface": "down"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -23,152 +23,207 @@ "to": [16, 15.5, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 16]}, "faces": { - "north": {"uv": [0, 0.5, 16, 16], "texture": "#s"}, - "east": {"uv": [0, 0.5, 4, 16], "texture": "#s", "cullface": "east"}, - "south": {"uv": [0, 0.5, 16, 16], "texture": "#s", "cullface": "south"}, - "west": {"uv": [12, 0.5, 16, 16], "texture": "#s", "cullface": "west"}, - "up": {"uv": [0, 12, 16, 16], "texture": "#s"}, - "down": {"uv": [0, 0, 16, 4], "texture": "#s", "cullface": "down"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [4, 15.5, 12], - "to": [8, 16, 16], + "to": [8, 15.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [12, 12.5, 16]}, "faces": { - "north": {"uv": [8, 0, 12, 0.5], "texture": "#s"}, - "east": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "south": {"uv": [4, 0, 8, 0.5], "texture": "#s"}, - "west": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "up": {"uv": [4, 12, 8, 16], "texture": "#s"}, - "down": {"uv": [4, 0, 8, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [0, 11.5, 8], - "to": [8, 12, 12], + "to": [8, 11.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 12]}, "faces": { - "north": {"uv": [8, 4, 16, 4.5], "texture": "#s"}, - "east": {"uv": [4, 4, 8, 4.5], "texture": "#s"}, - "west": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "up": {"uv": [0, 8, 8, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [8, 11.5, 4], - "to": [12, 12, 8], + "to": [12, 11.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [16, 8.5, 8]}, "faces": { - "north": {"uv": [4, 4, 8, 4.5], "texture": "#s"}, - "east": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "south": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "west": {"uv": [4, 4, 8, 4.5], "texture": "#s"}, - "up": {"uv": [8, 4, 12, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [8, 15.5, 15], - "to": [12, 16, 16], + "to": [12, 15.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [16, 12.5, 16]}, "faces": { - "north": {"uv": [4, 0, 8, 0.5], "texture": "#s"}, - "south": {"uv": [8, 0, 12, 0.5], "texture": "#s"}, - "up": {"uv": [8, 15, 12, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [0, 15.5, 15], - "to": [4, 16, 16], + "to": [4, 15.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5, 16]}, "faces": { - "north": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "south": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "west": {"uv": [15, 0, 16, 0.5], "texture": "#s"}, - "up": {"uv": [0, 15, 4, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "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"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [0, 7.5, 7], - "to": [4, 8, 8], + "to": [4, 7.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4.5, 8]}, "faces": { - "north": {"uv": [12, 8, 16, 8.5], "texture": "#s"}, - "west": {"uv": [7, 8, 8, 8.5], "texture": "#s"}, - "up": {"uv": [0, 7, 4, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [15, 15.5, 4], - "to": [16, 16, 8], + "to": [16, 15.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [20, 12.5, 8]}, "faces": { - "east": {"uv": [8, 0, 12, 0.5], "texture": "#s"}, - "west": {"uv": [4, 0, 8, 0.5], "texture": "#s"}, - "up": {"uv": [15, 4, 16, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "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"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [11, 11.5, 0], - "to": [12, 12, 4], + "to": [12, 11.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [16, 8.5, 4]}, "faces": { - "north": {"uv": [4, 4, 5, 4.5], "texture": "#s"}, - "west": {"uv": [0, 4, 4, 4.5], "texture": "#s"}, - "up": {"uv": [11, 0, 12, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [11, 11.5, 8], - "to": [12, 12, 12], + "to": [12, 11.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [16, 8.5, 12]}, "faces": { - "west": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "up": {"uv": [11, 8, 12, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [3, 4, 0], - "to": [4, 4.5, 4], + "to": [4, 4.4375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 4]}, "faces": { - "north": {"uv": [12, 11.5, 13, 12], "texture": "#s"}, - "west": {"uv": [0, 11.5, 4, 12], "texture": "#s"}, - "up": {"uv": [3, 0, 4, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [4, 7.5, 0], - "to": [8, 8, 8], + "to": [8, 7.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [12, 4.5, 4]}, "faces": { - "north": {"uv": [8, 8, 12, 8.5], "texture": "#s"}, - "west": {"uv": [0, 8, 8, 8.5], "texture": "#s"}, - "up": {"uv": [4, 0, 8, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [12, 15.5, 8], - "to": [16, 16, 16], + "to": [16, 15.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [20, 12.5, 12]}, "faces": { - "north": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "east": {"uv": [0, 0, 8, 0.5], "texture": "#s"}, - "south": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "west": {"uv": [8, 0, 16, 0.5], "texture": "#s"}, - "up": {"uv": [12, 8, 16, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [12, 15.5, 0], - "to": [16, 16, 4], + "to": [16, 15.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [20, 12.5, 4]}, "faces": { - "north": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "east": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "south": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "west": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "up": {"uv": [12, 0, 16, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -176,10 +231,12 @@ "to": [12, 11.5, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 12]}, "faces": { - "north": {"uv": [4, 4.5, 16, 16], "texture": "#s"}, - "west": {"uv": [8, 4.5, 12, 16], "texture": "#s", "cullface": "west"}, - "up": {"uv": [0, 8, 12, 12], "texture": "#s"}, - "down": {"uv": [0, 4, 12, 8], "texture": "#s", "cullface": "down"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -187,10 +244,12 @@ "to": [8, 7.5, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { - "north": {"uv": [8, 8.5, 16, 16], "texture": "#s"}, - "west": {"uv": [4, 8.5, 8, 16], "texture": "#s", "cullface": "west"}, - "up": {"uv": [0, 4, 8, 8], "texture": "#s"}, - "down": {"uv": [0, 8, 8, 12], "texture": "#s", "cullface": "down"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -198,10 +257,12 @@ "to": [12, 11.5, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { - "north": {"uv": [4, 4.5, 8, 16], "texture": "#s", "cullface": "north"}, - "west": {"uv": [0, 4.5, 8, 16], "texture": "#s"}, - "up": {"uv": [8, 0, 12, 8], "texture": "#s"}, - "down": {"uv": [8, 8, 12, 16], "texture": "#s", "cullface": "down"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -209,10 +270,12 @@ "to": [8, 7.5, 4], "rotation": {"angle": 0, "axis": "y", "origin": [4, 12, 8]}, "faces": { - "north": {"uv": [8, 8.5, 12, 16], "texture": "#s", "cullface": "north"}, - "west": {"uv": [0, 8.5, 4, 16], "texture": "#s"}, - "up": {"uv": [4, 0, 8, 4], "texture": "#s"}, - "down": {"uv": [4, 12, 8, 16], "texture": "#s", "cullface": "down"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -220,10 +283,12 @@ "to": [4, 4, 4], "rotation": {"angle": 0, "axis": "y", "origin": [0, 12, 8]}, "faces": { - "north": {"uv": [12, 12, 16, 16], "texture": "#s", "cullface": "north"}, - "west": {"uv": [0, 12, 4, 16], "texture": "#s", "cullface": "west"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#s"}, - "down": {"uv": [0, 12, 4, 16], "texture": "#s", "cullface": "down"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -231,11 +296,11 @@ "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"} + "north": {"texture": "#f"}, + "east": {"texture": "#f"}, + "south": {"texture": "#f"}, + "west": {"texture": "#f"}, + "up": {"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 e59b900..c32c868 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,5 @@ { - "ambientocclusion": false, + "ambientocclusion": false, "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof", @@ -10,12 +10,12 @@ "from": [0, 0, 0], "to": [16, 3.5, 16], "faces": { - "north": {"uv": [0, 12.5, 16, 16], "texture": "#s", "cullface": "north"}, - "east": {"uv": [0, 12.5, 16, 16], "texture": "#s", "cullface": "east"}, - "south": {"uv": [0, 12.5, 16, 16], "texture": "#s", "cullface": "south"}, - "west": {"uv": [0, 12.5, 16, 16], "texture": "#s", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#s"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -23,23 +23,23 @@ "to": [16, 7.5, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { - "north": {"uv": [0, 8.5, 12, 12.5], "texture": "#s"}, - "east": {"uv": [0, 8.5, 12, 12.5], "texture": "#s", "cullface": "east"}, - "south": {"uv": [4, 8.5, 16, 12.5], "texture": "#s", "cullface": "south"}, - "west": {"uv": [4, 8.5, 16, 12.5], "texture": "#s"}, - "up": {"uv": [4, 4, 16, 16], "texture": "#s"}, - "down": {"uv": [4, 0, 16, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [8, 7.5, 8], "to": [16, 11.5, 16], "faces": { - "north": {"uv": [0, 4.5, 8, 8.5], "texture": "#s"}, - "east": {"uv": [0, 4.5, 8, 8.5], "texture": "#s", "cullface": "east"}, - "south": {"uv": [8, 4.5, 16, 8.5], "texture": "#s", "cullface": "south"}, - "west": {"uv": [8, 4.5, 16, 8.5], "texture": "#s"}, - "up": {"uv": [8, 8, 16, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { @@ -47,53 +47,77 @@ "to": [16, 15.5, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { - "north": {"uv": [0, 0.5, 4, 4.5], "texture": "#s"}, - "east": {"uv": [0, 0.5, 4, 4.5], "texture": "#s", "cullface": "east"}, - "south": {"uv": [12, 0.5, 16, 4.5], "texture": "#s", "cullface": "south"}, - "west": {"uv": [12, 0.5, 16, 4.5], "texture": "#s"}, - "up": {"uv": [12, 12, 16, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [14, 15.5, 14], - "to": [16, 16, 16], + "to": [16, 15.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 0.5], "texture": "#s"}, - "east": {"uv": [0, 0, 2, 0.5], "texture": "#s"}, - "south": {"uv": [14, 0, 16, 0.5], "texture": "#s"}, - "west": {"uv": [14, 0, 16, 0.5], "texture": "#s"}, - "up": {"uv": [14, 14, 16, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} + } + }, + { + "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"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} + } + }, + { + "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"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [12, 11.5, 11], - "to": [16, 12, 12], + "to": [16, 11.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 4]}, "faces": { - "north": {"uv": [0, 4, 4, 4.5], "texture": "#s"}, - "east": {"uv": [4, 4, 5, 4.5], "texture": "#s"}, - "west": {"uv": [11, 4, 12, 4.5], "texture": "#s"}, - "up": {"uv": [12, 11, 16, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [12, 7.5, 7], - "to": [16, 8, 8], + "to": [16, 7.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4.5, 0]}, "faces": { - "north": {"uv": [0, 8, 4, 8.5], "texture": "#s"}, - "east": {"uv": [8, 8, 9, 8.5], "texture": "#s"}, - "up": {"uv": [12, 7, 16, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [8, 3.5, 3], - "to": [12, 4, 4], + "to": [12, 3.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [4, 0.5, -4]}, "faces": { - "north": {"uv": [4, 12, 8, 12.5], "texture": "#s"}, - "up": {"uv": [8, 3, 12, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { @@ -101,111 +125,111 @@ "to": [8, 8, 16], "rotation": {"angle": 0, "axis": "y", "origin": [0, 4.5, 5]}, "faces": { - "south": {"uv": [7, 8, 8, 8.5], "texture": "#s"}, - "west": {"uv": [12, 8, 16, 8.5], "texture": "#s"}, - "up": {"uv": [7, 12, 8, 16], "texture": "#s"} + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [3, 3.5, 8], - "to": [4, 4, 12], + "to": [4, 3.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [-4, 0.5, 1]}, "faces": { - "west": {"uv": [8, 12, 12, 12.5], "texture": "#s"}, - "up": {"uv": [3, 8, 4, 12], "texture": "#s"} + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [8, 11.5, 12], - "to": [12, 12, 16], + "to": [12, 11.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [4, 8.5, 4]}, "faces": { - "north": {"uv": [4, 4, 8, 4.5], "texture": "#s"}, - "south": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "west": {"uv": [12, 4, 16, 4.5], "texture": "#s"}, - "up": {"uv": [8, 12, 12, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [8, 7.5, 4], - "to": [12, 8, 8], + "to": [12, 7.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [4, 4.5, -4]}, "faces": { - "north": {"uv": [4, 8, 8, 8.5], "texture": "#s"}, - "east": {"uv": [8, 8, 12, 8.5], "texture": "#s"}, - "west": {"uv": [4, 8, 8, 8.5], "texture": "#s"}, - "up": {"uv": [8, 4, 12, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [4, 7.5, 8], - "to": [8, 8, 12], + "to": [8, 7.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [0, 4.5, 0]}, "faces": { - "north": {"uv": [8, 8, 12, 8.5], "texture": "#s"}, - "south": {"uv": [4, 8, 8, 8.5], "texture": "#s"}, - "west": {"uv": [8, 8, 12, 8.5], "texture": "#s"}, - "up": {"uv": [4, 8, 8, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [0, 3.5, 12], - "to": [4, 4, 16], + "to": [4, 3.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [-4, 0.5, 4]}, "faces": { - "north": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "east": {"uv": [0, 12, 4, 12.5], "texture": "#s"}, - "south": {"uv": [0, 12, 4, 12.5], "texture": "#s"}, - "west": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "up": {"uv": [0, 12, 4, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [0, 3.5, 4], - "to": [4, 4, 8], + "to": [4, 3.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [-4, 0.5, -4]}, "faces": { - "north": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "east": {"uv": [8, 12, 12, 12.5], "texture": "#s"}, - "south": {"uv": [0, 12, 4, 12.5], "texture": "#s"}, - "west": {"uv": [4, 12, 8, 12.5], "texture": "#s"}, - "up": {"uv": [0, 4, 4, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [4, 3.5, 0], - "to": [8, 4, 4], + "to": [8, 3.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0.5, -8]}, "faces": { - "north": {"uv": [8, 12, 12, 12.5], "texture": "#s"}, - "east": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "south": {"uv": [4, 12, 8, 12.5], "texture": "#s"}, - "west": {"uv": [0, 12, 4, 12.5], "texture": "#s"}, - "up": {"uv": [4, 0, 8, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [12, 3.5, 0], - "to": [16, 4, 4], + "to": [16, 3.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.5, -8]}, "faces": { - "north": {"uv": [0, 12, 4, 12.5], "texture": "#s"}, - "east": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "south": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "west": {"uv": [0, 12, 4, 12.5], "texture": "#s"}, - "up": {"uv": [12, 0, 16, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { - "from": [15, 4, 0], + "from": [15, 3.9375, 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"} + "north": {"texture": "#f"}, + "east": {"texture": "#f"}, + "south": {"texture": "#f"}, + "west": {"texture": "#f"}, + "up": {"texture": "#f"} } }, { @@ -213,10 +237,10 @@ "to": [15, 6, 1], "rotation": {"angle": 0, "axis": "y", "origin": [22, 12, 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"} + "north": {"texture": "#f"}, + "south": {"texture": "#f"}, + "up": {"texture": "#f"}, + "down": {"texture": "#f"} } }, { @@ -224,10 +248,10 @@ "to": [1, 6, 15], "rotation": {"angle": 0, "axis": "y", "origin": [21, 12, 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"} + "east": {"texture": "#f"}, + "west": {"texture": "#f"}, + "up": {"texture": "#f"}, + "down": {"texture": "#f"} } }, { @@ -235,23 +259,23 @@ "to": [1, 6, 1], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { - "north": {"uv": [0, 0, 1, 2.5], "texture": "#f"}, - "east": {"uv": [0, 0, 1, 2.5], "texture": "#f"}, - "south": {"uv": [0, 0, 1, 2.5], "texture": "#f"}, - "west": {"uv": [0, 0, 1, 2.5], "texture": "#f"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#f"} + "north": {"texture": "#f"}, + "east": {"texture": "#f"}, + "south": {"texture": "#f"}, + "west": {"texture": "#f"}, + "up": {"texture": "#f"} } }, { - "from": [0, 4, 15], + "from": [0, 3.9375, 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"} + "north": {"texture": "#f"}, + "east": {"texture": "#f"}, + "south": {"texture": "#f"}, + "west": {"texture": "#f"}, + "up": {"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 e70e864..029a2c6 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,253 +1,228 @@ { - "parent": "block/block", - "ambientocclusion": false, + "parent": "block/block", + "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof" }, "elements": [ - { - "from": [0, 0, 0], - "to": [4, 3.5, 16], - "faces": { - "north": {"uv": [12, 12, 16, 16], "texture": "#s", "cullface": "north"}, - "south": {"uv": [0, 12, 4, 16], "texture": "#s", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#s", "cullface": "west"}, - "up": {"uv": [0, 0, 4, 16], "texture": "#s"}, - "down": {"uv": [0, 0, 4, 16], "texture": "#s", "cullface": "down"} - } - }, - { - "from": [4, 0, 0], - "to": [8, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [8, 12, 12, 16], "texture": "#s", "cullface": "north"}, - "south": {"uv": [4, 12, 8, 16], "texture": "#s", "cullface": "south"}, - "down": {"uv": [4, 0, 8, 16], "texture": "#s", "cullface": "down"} - } - }, - { - "from": [4, 4, 0], - "to": [8, 7.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [8, 8.5, 12, 12], "texture": "#s", "cullface": "north"}, - "south": {"uv": [4, 8.5, 8, 12], "texture": "#s", "cullface": "south"}, - "west": {"uv": [0, 8.5, 16, 12], "texture": "#s"}, - "up": {"uv": [4, 0, 8, 16], "texture": "#s"} - } - }, - { - "from": [8, 0, 0], - "to": [12, 8, 16], - "faces": { - "north": {"uv": [4, 8, 8, 16], "texture": "#s", "cullface": "north"}, - "south": {"uv": [8, 8, 12, 16], "texture": "#s", "cullface": "south"}, - "down": {"uv": [8, 0, 12, 16], "texture": "#s", "cullface": "down"} - } - }, - { - "from": [8, 8, 0], - "to": [12, 11.5, 16], - "faces": { - "north": {"uv": [4, 4.5, 8, 8], "texture": "#s", "cullface": "north"}, - "south": {"uv": [8, 4.5, 12, 8], "texture": "#s", "cullface": "south"}, - "west": {"uv": [0, 4.5, 16, 8], "texture": "#s"}, - "up": {"uv": [8, 0, 12, 16], "texture": "#s"} - } - }, - { - "from": [12, 12, 0], - "to": [16, 15.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 0.5, 4, 4], "texture": "#s", "cullface": "north"}, - "east": {"uv": [0, 0.5, 16, 4], "texture": "#s", "cullface": "east"}, - "south": {"uv": [12, 0.5, 16, 4], "texture": "#s", "cullface": "south"}, - "west": {"uv": [0, 0.5, 16, 4], "texture": "#s"}, - "up": {"uv": [12, 0, 16, 16], "texture": "#s"} - } - }, - { - "from": [12, 0, 0], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, - "faces": { - "north": {"uv": [0, 4, 4, 16], "texture": "#s", "cullface": "north"}, - "east": {"uv": [0, 4, 16, 16], "texture": "#s", "cullface": "east"}, - "south": {"uv": [12, 4, 16, 16], "texture": "#s", "cullface": "south"}, - "down": {"uv": [12, 0, 16, 16], "texture": "#s", "cullface": "down"} - } - }, - { - "from": [4, 7.5, 0], - "to": [8, 8, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 8]}, - "faces": { - "north": {"uv": [8, 8, 12, 8.5], "texture": "#s"}, - "south": {"uv": [4, 8, 8, 8.5], "texture": "#s"}, - "west": {"uv": [0, 8, 4, 8.5], "texture": "#s"}, - "up": {"uv": [4, 0, 8, 4], "texture": "#s"} - } - }, - { - "from": [12, 15.5, 0], - "to": [16, 16, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "east": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "south": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "west": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "up": {"uv": [12, 0, 16, 4], "texture": "#s"} - } - }, - { - "from": [15, 15.5, 4], - "to": [16, 16, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 12]}, - "faces": { - "east": {"uv": [8, 0, 12, 0.5], "texture": "#s"}, - "west": {"uv": [4, 0, 8, 0.5], "texture": "#s"}, - "up": {"uv": [15, 4, 16, 8], "texture": "#s"} - } - }, - { - "from": [11, 11.5, 0], - "to": [12, 12, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 8]}, - "faces": { - "north": {"uv": [4, 4, 5, 4.5], "texture": "#s"}, - "west": {"uv": [0, 4, 4, 4.5], "texture": "#s"}, - "up": {"uv": [11, 0, 12, 4], "texture": "#s"} - } - }, { "from": [3, 3.5, 0], - "to": [4, 4, 4], + "to": [16, 3.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 8]}, "faces": { - "north": {"uv": [4, 4, 5, 4.5], "texture": "#s"}, - "west": {"uv": [0, 4, 4, 4.5], "texture": "#s"}, - "up": {"uv": [11, 0, 12, 4], "texture": "#s"} - } - }, - { - "from": [11, 11.5, 8], - "to": [12, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 16]}, - "faces": { - "west": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "up": {"uv": [11, 8, 12, 12], "texture": "#s"} - } - }, - { - "from": [3, 3.5, 8], - "to": [4, 4, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 16]}, - "faces": { - "west": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "up": {"uv": [11, 8, 12, 12], "texture": "#s"} - } - }, - { - "from": [7, 7.5, 4], - "to": [8, 8, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 12]}, - "faces": { - "east": {"uv": [8, 8, 12, 8.5], "texture": "#s"}, - "west": {"uv": [4, 8, 8, 8.5], "texture": "#s"}, - "up": {"uv": [7, 4, 8, 8], "texture": "#s"} - } - }, - { - "from": [15, 15.5, 12], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 20]}, - "faces": { - "east": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "south": {"uv": [15, 0, 16, 0.5], "texture": "#s"}, - "west": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "up": {"uv": [15, 12, 16, 16], "texture": "#s"} - } - }, - { - "from": [7, 7.5, 12], - "to": [8, 8, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 20]}, - "faces": { - "east": {"uv": [0, 8, 4, 8.5], "texture": "#s"}, - "south": {"uv": [7, 8, 8, 8.5], "texture": "#s"}, - "west": {"uv": [12, 8, 16, 8.5], "texture": "#s"}, - "up": {"uv": [7, 12, 8, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [0, 3.5, 4], - "to": [4, 4, 8], + "to": [3, 3.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 12]}, "faces": { - "north": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "south": {"uv": [0, 12, 4, 12.5], "texture": "#s"}, - "west": {"uv": [4, 12, 8, 12.5], "texture": "#s"}, - "up": {"uv": [0, 4, 4, 8], "texture": "#s"} - } - }, - { - "from": [8, 11.5, 4], - "to": [12, 12, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 12]}, - "faces": { - "north": {"uv": [4, 4, 8, 4.5], "texture": "#s"}, - "south": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "west": {"uv": [4, 4, 8, 4.5], "texture": "#s"}, - "up": {"uv": [8, 4, 12, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [0, 3.5, 12], - "to": [4, 4, 16], + "to": [3, 3.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 20]}, "faces": { - "north": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "south": {"uv": [0, 12, 4, 12.5], "texture": "#s"}, - "west": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "up": {"uv": [0, 12, 4, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { - "from": [8, 11.5, 12], - "to": [12, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 20]}, + "from": [4, 7.5, 0], + "to": [7, 7.9375, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 8]}, "faces": { - "north": {"uv": [4, 4, 8, 4.5], "texture": "#s"}, - "south": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "west": {"uv": [12, 4, 16, 4.5], "texture": "#s"}, - "up": {"uv": [8, 12, 12, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [4, 7.5, 8], - "to": [8, 8, 12], + "to": [7, 7.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 16]}, "faces": { - "north": {"uv": [8, 8, 12, 8.5], "texture": "#s"}, - "south": {"uv": [4, 8, 8, 8.5], "texture": "#s"}, - "west": {"uv": [8, 8, 12, 8.5], "texture": "#s"}, - "up": {"uv": [4, 8, 8, 12], "texture": "#s"} + "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": [16, 16, 12], + "to": [15, 15.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 16]}, "faces": { - "north": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "east": {"uv": [4, 0, 8, 0.5], "texture": "#s"}, - "south": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "west": {"uv": [8, 0, 12, 0.5], "texture": "#s"}, - "up": {"uv": [12, 8, 16, 12], "texture": "#s"} + "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]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "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"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 3.5, 16], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "from": [4, 3.9375, 0], + "to": [16, 7.5, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "from": [8, 7.9375, 0], + "to": [16, 11.5, 16], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "from": [12, 11.9375, 0], + "to": [16, 15.5, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"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 f5ea24c..76235c0 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,6 +1,6 @@ { - "ambientocclusion": false, - "textures": { + "ambientocclusion": false, + "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof" }, @@ -9,12 +9,12 @@ "from": [12, 0, 0], "to": [16, 15.5, 12], "faces": { - "north": {"uv": [0, 0.5, 4, 16], "texture": "#s", "cullface": "north"}, - "east": {"uv": [4, 0.5, 16, 16], "texture": "#s", "cullface": "east"}, - "south": {"uv": [12, 0.5, 16, 16], "texture": "#s"}, - "west": {"uv": [0, 0.5, 12, 16], "texture": "#s"}, - "up": {"uv": [12, 0, 16, 12], "texture": "#s"}, - "down": {"uv": [12, 4, 16, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -22,152 +22,207 @@ "to": [16, 15.5, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 16]}, "faces": { - "north": {"uv": [0, 0.5, 16, 16], "texture": "#s"}, - "east": {"uv": [0, 0.5, 4, 16], "texture": "#s", "cullface": "east"}, - "south": {"uv": [0, 0.5, 16, 16], "texture": "#s", "cullface": "south"}, - "west": {"uv": [12, 0.5, 16, 16], "texture": "#s", "cullface": "west"}, - "up": {"uv": [0, 12, 16, 16], "texture": "#s"}, - "down": {"uv": [0, 0, 16, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [4, 15.5, 12], - "to": [8, 16, 16], + "to": [8, 15.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [12, 12.5, 16]}, "faces": { - "north": {"uv": [8, 0, 12, 0.5], "texture": "#s"}, - "east": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "south": {"uv": [4, 0, 8, 0.5], "texture": "#s"}, - "west": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "up": {"uv": [4, 12, 8, 16], "texture": "#s"}, - "down": {"uv": [4, 0, 8, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [0, 11.5, 8], - "to": [8, 12, 12], + "to": [8, 11.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 12]}, "faces": { - "north": {"uv": [8, 4, 16, 4.5], "texture": "#s"}, - "east": {"uv": [4, 4, 8, 4.5], "texture": "#s"}, - "west": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "up": {"uv": [0, 8, 8, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [8, 11.5, 4], - "to": [12, 12, 8], + "to": [12, 11.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [16, 8.5, 8]}, "faces": { - "north": {"uv": [4, 4, 8, 4.5], "texture": "#s"}, - "east": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "south": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "west": {"uv": [4, 4, 8, 4.5], "texture": "#s"}, - "up": {"uv": [8, 4, 12, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [8, 15.5, 15], - "to": [12, 16, 16], + "to": [12, 15.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [16, 12.5, 16]}, "faces": { - "north": {"uv": [4, 0, 8, 0.5], "texture": "#s"}, - "south": {"uv": [8, 0, 12, 0.5], "texture": "#s"}, - "up": {"uv": [8, 15, 12, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [0, 15.5, 15], - "to": [4, 16, 16], + "to": [4, 15.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5, 16]}, "faces": { - "north": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "south": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "west": {"uv": [15, 0, 16, 0.5], "texture": "#s"}, - "up": {"uv": [0, 15, 4, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "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"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [0, 7.5, 7], - "to": [4, 8, 8], + "to": [4, 7.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4.5, 8]}, "faces": { - "north": {"uv": [12, 8, 16, 8.5], "texture": "#s"}, - "west": {"uv": [7, 8, 8, 8.5], "texture": "#s"}, - "up": {"uv": [0, 7, 4, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [15, 15.5, 4], - "to": [16, 16, 8], + "to": [16, 15.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [20, 12.5, 8]}, "faces": { - "east": {"uv": [8, 0, 12, 0.5], "texture": "#s"}, - "west": {"uv": [4, 0, 8, 0.5], "texture": "#s"}, - "up": {"uv": [15, 4, 16, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "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"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [11, 11.5, 0], - "to": [12, 12, 4], + "to": [12, 11.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [16, 8.5, 4]}, "faces": { - "north": {"uv": [4, 4, 5, 4.5], "texture": "#s"}, - "west": {"uv": [0, 4, 4, 4.5], "texture": "#s"}, - "up": {"uv": [11, 0, 12, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [11, 11.5, 8], - "to": [12, 12, 12], + "to": [12, 11.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [16, 8.5, 12]}, "faces": { - "west": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "up": {"uv": [11, 8, 12, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [3, 4, 0], - "to": [4, 4.5, 4], + "to": [4, 4.4375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 4]}, "faces": { - "north": {"uv": [12, 11.5, 13, 12], "texture": "#s"}, - "west": {"uv": [0, 11.5, 4, 12], "texture": "#s"}, - "up": {"uv": [3, 0, 4, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [4, 7.5, 0], - "to": [8, 8, 8], + "to": [8, 7.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [12, 4.5, 4]}, "faces": { - "north": {"uv": [8, 8, 12, 8.5], "texture": "#s"}, - "west": {"uv": [0, 8, 8, 8.5], "texture": "#s"}, - "up": {"uv": [4, 0, 8, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [12, 15.5, 8], - "to": [16, 16, 16], + "to": [16, 15.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [20, 12.5, 12]}, "faces": { - "north": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "east": {"uv": [0, 0, 8, 0.5], "texture": "#s"}, - "south": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "west": {"uv": [8, 0, 16, 0.5], "texture": "#s"}, - "up": {"uv": [12, 8, 16, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [12, 15.5, 0], - "to": [16, 16, 4], + "to": [16, 15.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [20, 12.5, 4]}, "faces": { - "north": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "east": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "south": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "west": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "up": {"uv": [12, 0, 16, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -175,10 +230,12 @@ "to": [12, 11.5, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 12]}, "faces": { - "north": {"uv": [4, 4.5, 16, 16], "texture": "#s"}, - "west": {"uv": [8, 4.5, 12, 16], "texture": "#s", "cullface": "west"}, - "up": {"uv": [0, 8, 12, 12], "texture": "#s"}, - "down": {"uv": [0, 4, 12, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -186,10 +243,12 @@ "to": [8, 7.5, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { - "north": {"uv": [8, 8.5, 16, 16], "texture": "#s"}, - "west": {"uv": [4, 8.5, 8, 16], "texture": "#s", "cullface": "west"}, - "up": {"uv": [0, 4, 8, 8], "texture": "#s"}, - "down": {"uv": [0, 8, 8, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -197,10 +256,12 @@ "to": [12, 11.5, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { - "north": {"uv": [4, 4.5, 8, 16], "texture": "#s", "cullface": "north"}, - "west": {"uv": [0, 4.5, 8, 16], "texture": "#s"}, - "up": {"uv": [8, 0, 12, 8], "texture": "#s"}, - "down": {"uv": [8, 8, 12, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -208,10 +269,12 @@ "to": [8, 7.5, 4], "rotation": {"angle": 0, "axis": "y", "origin": [4, 12, 8]}, "faces": { - "north": {"uv": [8, 8.5, 12, 16], "texture": "#s", "cullface": "north"}, - "west": {"uv": [0, 8.5, 4, 16], "texture": "#s"}, - "up": {"uv": [4, 0, 8, 4], "texture": "#s"}, - "down": {"uv": [4, 12, 8, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -219,10 +282,12 @@ "to": [4, 4, 4], "rotation": {"angle": 0, "axis": "y", "origin": [0, 12, 8]}, "faces": { - "north": {"uv": [12, 12, 16, 16], "texture": "#s", "cullface": "north"}, - "west": {"uv": [0, 12, 4, 16], "texture": "#s", "cullface": "west"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#s"}, - "down": {"uv": [0, 12, 4, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"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 d15e77e..38459cc 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,5 @@ { - "ambientocclusion": false, + "ambientocclusion": false, "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof" @@ -9,12 +9,12 @@ "from": [0, 0, 0], "to": [16, 3.5, 16], "faces": { - "north": {"uv": [0, 12.5, 16, 16], "texture": "#s"}, - "east": {"uv": [0, 12.5, 16, 16], "texture": "#s"}, - "south": {"uv": [0, 12.5, 16, 16], "texture": "#s"}, - "west": {"uv": [0, 12.5, 16, 16], "texture": "#s"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#s"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -22,23 +22,23 @@ "to": [16, 7.5, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { - "north": {"uv": [0, 8.5, 12, 12.5], "texture": "#s"}, - "east": {"uv": [0, 8.5, 12, 12.5], "texture": "#s"}, - "south": {"uv": [4, 8.5, 16, 12.5], "texture": "#s"}, - "west": {"uv": [4, 8.5, 16, 12.5], "texture": "#s"}, - "up": {"uv": [4, 4, 16, 16], "texture": "#s"}, - "down": {"uv": [4, 0, 16, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [8, 7.5, 8], "to": [16, 11.5, 16], "faces": { - "north": {"uv": [0, 4.5, 8, 8.5], "texture": "#s"}, - "east": {"uv": [0, 4.5, 8, 8.5], "texture": "#s"}, - "south": {"uv": [8, 4.5, 16, 8.5], "texture": "#s"}, - "west": {"uv": [8, 4.5, 16, 8.5], "texture": "#s"}, - "up": {"uv": [8, 8, 16, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { @@ -46,153 +46,177 @@ "to": [16, 15.5, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { - "north": {"uv": [0, 0.5, 4, 4.5], "texture": "#s"}, - "east": {"uv": [0, 0.5, 4, 4.5], "texture": "#s"}, - "south": {"uv": [12, 0.5, 16, 4.5], "texture": "#s"}, - "west": {"uv": [12, 0.5, 16, 4.5], "texture": "#s"}, - "up": {"uv": [12, 12, 16, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [14, 15.5, 14], - "to": [16, 16, 16], + "to": [16, 15.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 0.5], "texture": "#s"}, - "east": {"uv": [0, 0, 2, 0.5], "texture": "#s"}, - "south": {"uv": [14, 0, 16, 0.5], "texture": "#s"}, - "west": {"uv": [14, 0, 16, 0.5], "texture": "#s"}, - "up": {"uv": [14, 14, 16, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} + } + }, + { + "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"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} + } + }, + { + "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"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [12, 11.5, 11], - "to": [16, 12, 12], + "to": [16, 11.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 4]}, "faces": { - "north": {"uv": [0, 4, 4, 4.5], "texture": "#s"}, - "east": {"uv": [4, 4, 5, 4.5], "texture": "#s"}, - "west": {"uv": [11, 4, 12, 4.5], "texture": "#s"}, - "up": {"uv": [12, 11, 16, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [12, 7.5, 7], - "to": [16, 8, 8], + "to": [16, 7.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4.5, 0]}, "faces": { - "north": {"uv": [0, 8, 4, 8.5], "texture": "#s"}, - "east": {"uv": [8, 8, 9, 8.5], "texture": "#s"}, - "up": {"uv": [12, 7, 16, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [8, 3.5, 3], - "to": [12, 4, 4], + "to": [12, 3.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [4, 0.5, -4]}, "faces": { - "north": {"uv": [4, 12, 8, 12.5], "texture": "#s"}, - "up": {"uv": [8, 3, 12, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [7, 7.5, 12], - "to": [8, 8, 16], + "to": [8, 7.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [0, 4.5, 5]}, "faces": { - "south": {"uv": [7, 8, 8, 8.5], "texture": "#s"}, - "west": {"uv": [12, 8, 16, 8.5], "texture": "#s"}, - "up": {"uv": [7, 12, 8, 16], "texture": "#s"} + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [3, 3.5, 8], - "to": [4, 4, 12], + "to": [4, 3.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [-4, 0.5, 1]}, "faces": { - "west": {"uv": [8, 12, 12, 12.5], "texture": "#s"}, - "up": {"uv": [3, 8, 4, 12], "texture": "#s"} + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [8, 11.5, 12], - "to": [12, 12, 16], + "to": [12, 11.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [4, 8.5, 4]}, "faces": { - "north": {"uv": [4, 4, 8, 4.5], "texture": "#s"}, - "south": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "west": {"uv": [12, 4, 16, 4.5], "texture": "#s"}, - "up": {"uv": [8, 12, 12, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [8, 7.5, 4], - "to": [12, 8, 8], + "to": [12, 7.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [4, 4.5, -4]}, "faces": { - "north": {"uv": [4, 8, 8, 8.5], "texture": "#s"}, - "east": {"uv": [8, 8, 12, 8.5], "texture": "#s"}, - "west": {"uv": [4, 8, 8, 8.5], "texture": "#s"}, - "up": {"uv": [8, 4, 12, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [4, 7.5, 8], - "to": [8, 8, 12], + "to": [8, 7.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [0, 4.5, 0]}, "faces": { - "north": {"uv": [8, 8, 12, 8.5], "texture": "#s"}, - "south": {"uv": [4, 8, 8, 8.5], "texture": "#s"}, - "west": {"uv": [8, 8, 12, 8.5], "texture": "#s"}, - "up": {"uv": [4, 8, 8, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [0, 3.5, 12], - "to": [4, 4, 16], + "to": [4, 3.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [-4, 0.5, 4]}, "faces": { - "north": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "east": {"uv": [0, 12, 4, 12.5], "texture": "#s"}, - "south": {"uv": [0, 12, 4, 12.5], "texture": "#s"}, - "west": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "up": {"uv": [0, 12, 4, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [0, 3.5, 4], - "to": [4, 4, 8], + "to": [4, 3.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [-4, 0.5, -4]}, "faces": { - "north": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "east": {"uv": [8, 12, 12, 12.5], "texture": "#s"}, - "south": {"uv": [0, 12, 4, 12.5], "texture": "#s"}, - "west": {"uv": [4, 12, 8, 12.5], "texture": "#s"}, - "up": {"uv": [0, 4, 4, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [4, 3.5, 0], - "to": [8, 4, 4], + "to": [8, 3.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [0, 0.5, -8]}, "faces": { - "north": {"uv": [8, 12, 12, 12.5], "texture": "#s"}, - "east": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "south": {"uv": [4, 12, 8, 12.5], "texture": "#s"}, - "west": {"uv": [0, 12, 4, 12.5], "texture": "#s"}, - "up": {"uv": [4, 0, 8, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"} } }, { "from": [12, 3.5, 0], - "to": [16, 4, 4], + "to": [16, 3.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.5, -8]}, "faces": { - "north": {"uv": [0, 12, 4, 12.5], "texture": "#s"}, - "east": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "south": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "west": {"uv": [0, 12, 4, 12.5], "texture": "#s"}, - "up": {"uv": [12, 0, 16, 4], "texture": "#s"} + "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_skylight_model.json b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_skylight_model.json index bf9cd44..6611105 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,6 @@ { - "ambientocclusion": false, - "parent": "block/block", + "parent": "block/block", + "ambientocclusion": false, "textures": { "2": "engineersdecor:block/material/steel_texture", "particle": "engineersdecor:block/roof/dark_shingle_roof", @@ -8,50 +8,42 @@ "g": "engineersdecor:block/glass/panzerglass_block_texture0" }, "elements": [ - { - "from": [0, 0, 0], - "to": [4, 3.5, 16], - "faces": { - "north": {"uv": [12, 12, 16, 16], "texture": "#s", "cullface": "north"}, - "south": {"uv": [0, 12, 4, 16], "texture": "#s", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#s", "cullface": "west"}, - "up": {"uv": [0, 0, 4, 16], "texture": "#s"}, - "down": {"uv": [0, 0, 4, 16], "texture": "#s"} - } - }, { "from": [4, 0, 12], "to": [8, 7.5, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { - "north": {"uv": [8, 8.5, 12, 16], "texture": "#s"}, - "south": {"uv": [4, 8.5, 8, 16], "texture": "#s", "cullface": "south"}, - "west": {"uv": [12, 8.5, 16, 16], "texture": "#s"}, - "up": {"uv": [4, 12, 8, 16], "texture": "#s"}, - "down": {"uv": [4, 0, 8, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [4, 0, 0], - "to": [8, 7.5, 4], + "to": [8, 7.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, -4]}, "faces": { - "north": {"uv": [8, 8.5, 12, 16], "texture": "#s", "cullface": "north"}, - "south": {"uv": [4, 8.5, 8, 16], "texture": "#s"}, - "west": {"uv": [0, 8.5, 4, 16], "texture": "#s"}, - "up": {"uv": [4, 0, 8, 4], "texture": "#s"}, - "down": {"uv": [4, 12, 8, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [8, 0, 12], - "to": [12, 11.5, 16], + "to": [12, 11.9375, 16], "faces": { - "north": {"uv": [4, 4.5, 8, 16], "texture": "#s"}, - "south": {"uv": [8, 4.5, 12, 16], "texture": "#s", "cullface": "south"}, - "west": {"uv": [12, 4.5, 16, 16], "texture": "#s"}, - "up": {"uv": [8, 12, 12, 16], "texture": "#s"}, - "down": {"uv": [8, 0, 12, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -59,34 +51,25 @@ "to": [12, 11.5, 4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -4]}, "faces": { - "north": {"uv": [4, 4.5, 8, 16], "texture": "#s", "cullface": "north"}, - "south": {"uv": [8, 4.5, 12, 16], "texture": "#s"}, - "west": {"uv": [0, 4.5, 4, 16], "texture": "#s"}, - "up": {"uv": [8, 0, 12, 4], "texture": "#s"}, - "down": {"uv": [8, 12, 12, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [12, 0, 0], - "to": [16, 12, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 4, 4, 16], "texture": "#s", "cullface": "north"}, - "east": {"uv": [12, 4, 16, 16], "texture": "#s", "cullface": "east"}, - "south": {"uv": [12, 4, 16, 16], "texture": "#s"}, - "down": {"uv": [12, 12, 16, 16], "texture": "#s"} - } - }, - { - "from": [12, 12, 0], "to": [16, 15.5, 4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { - "north": {"uv": [0, 0.5, 4, 4], "texture": "#s", "cullface": "north"}, - "east": {"uv": [12, 0.5, 16, 4], "texture": "#s", "cullface": "east"}, - "south": {"uv": [12, 0.5, 16, 4], "texture": "#s"}, - "west": {"uv": [0, 0.5, 4, 4], "texture": "#s"}, - "up": {"uv": [12, 0, 16, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -94,26 +77,12 @@ "to": [16, 4.5, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 12]}, "faces": { - "east": {"uv": [4, 11.5, 12, 16], "texture": "#s", "cullface": "east"}, - "west": {"uv": [4, 11.5, 12, 16], "texture": "#s"}, - "up": {"uv": [4, 4, 16, 12], "texture": "#s"}, - "down": {"uv": [4, 4, 16, 12], "texture": "#s"} - } - }, - { - "from": [8, 4, 4], - "to": [8, 11.5, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 16, 12]}, - "faces": { - "west": {"uv": [4, 4.5, 12, 16], "texture": "#g"} - } - }, - { - "from": [15, 4, 4], - "to": [15, 11.5, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 16, 12]}, - "faces": { - "east": {"uv": [4, 4.5, 12, 16], "texture": "#g"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -121,12 +90,12 @@ "to": [16, 15.5, 12], "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 12]}, "faces": { - "north": {"uv": [0, 0.5, 4, 4.25], "texture": "#s"}, - "east": {"uv": [4, 0.5, 12, 4.25], "texture": "#s", "cullface": "east"}, - "south": {"uv": [12, 0.5, 16, 4.25], "texture": "#s"}, - "west": {"uv": [4, 0.5, 12, 4.25], "texture": "#s"}, - "up": {"uv": [12, 4, 16, 12], "texture": "#s"}, - "down": {"uv": [12, 4, 16, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -134,10 +103,12 @@ "to": [16, 12, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { - "north": {"uv": [0, 4, 4, 16], "texture": "#s"}, - "east": {"uv": [0, 4, 4, 16], "texture": "#s", "cullface": "east"}, - "south": {"uv": [12, 4, 16, 16], "texture": "#s", "cullface": "south"}, - "down": {"uv": [12, 0, 16, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { @@ -145,152 +116,196 @@ "to": [16, 15.5, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { - "north": {"uv": [0, 0.5, 4, 4], "texture": "#s"}, - "east": {"uv": [0, 0.5, 4, 4], "texture": "#s", "cullface": "east"}, - "south": {"uv": [12, 0.5, 16, 4], "texture": "#s", "cullface": "south"}, - "west": {"uv": [12, 0.5, 16, 4], "texture": "#s"}, - "up": {"uv": [12, 12, 16, 16], "texture": "#s"} - } - }, - { - "from": [4, 7.5, 0], - "to": [8, 8, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 8]}, - "faces": { - "north": {"uv": [8, 8, 12, 8.5], "texture": "#s"}, - "south": {"uv": [4, 8, 8, 8.5], "texture": "#s"}, - "west": {"uv": [0, 8, 4, 8.5], "texture": "#s"}, - "up": {"uv": [4, 0, 8, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [12, 15.5, 0], - "to": [16, 16, 4], + "to": [16, 15.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 8]}, "faces": { - "north": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "east": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "south": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "west": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "up": {"uv": [12, 0, 16, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [15, 15.5, 4], - "to": [16, 16, 8], + "to": [16, 15.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 12]}, "faces": { - "east": {"uv": [8, 0, 12, 0.5], "texture": "#s"}, - "west": {"uv": [4, 0, 8, 0.5], "texture": "#s"}, - "up": {"uv": [15, 4, 16, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [11, 11.5, 0], - "to": [12, 12, 4], + "to": [12, 11.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 8]}, "faces": { - "north": {"uv": [4, 4, 5, 4.5], "texture": "#s"}, - "west": {"uv": [0, 4, 4, 4.5], "texture": "#s"}, - "up": {"uv": [11, 0, 12, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [3, 3.5, 0], - "to": [4, 4, 4], + "to": [4, 3.9375, 4], "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 8]}, "faces": { - "north": {"uv": [4, 4, 5, 4.5], "texture": "#s"}, - "west": {"uv": [0, 4, 4, 4.5], "texture": "#s"}, - "up": {"uv": [11, 0, 12, 4], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [3, 3.5, 8], - "to": [4, 4, 12], + "to": [4, 3.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 16]}, "faces": { - "west": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "up": {"uv": [11, 8, 12, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [15, 15.5, 12], - "to": [16, 16, 16], + "to": [16, 15.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 20]}, "faces": { - "east": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "south": {"uv": [15, 0, 16, 0.5], "texture": "#s"}, - "west": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "up": {"uv": [15, 12, 16, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [7, 7.5, 12], - "to": [8, 8, 16], + "to": [8, 7.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [6, 11.5, 20]}, "faces": { - "north": {"uv": [8, 8, 9, 8.5], "texture": "#s"}, - "east": {"uv": [0, 8, 4, 8.5], "texture": "#s"}, - "south": {"uv": [7, 8, 8, 8.5], "texture": "#s"}, - "west": {"uv": [12, 8, 16, 8.5], "texture": "#s"}, - "up": {"uv": [7, 12, 8, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [0, 3.5, 4], - "to": [4, 4, 8], + "to": [4, 3.9375, 8], "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 12]}, "faces": { - "north": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "south": {"uv": [0, 12, 4, 12.5], "texture": "#s"}, - "west": {"uv": [4, 12, 8, 12.5], "texture": "#s"}, - "up": {"uv": [0, 4, 4, 8], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [0, 3.5, 12], - "to": [4, 4, 16], + "to": [4, 3.9375, 16], "rotation": {"angle": 0, "axis": "y", "origin": [2, 7.5, 20]}, "faces": { - "north": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "south": {"uv": [0, 12, 4, 12.5], "texture": "#s"}, - "west": {"uv": [12, 12, 16, 12.5], "texture": "#s"}, - "up": {"uv": [0, 12, 4, 16], "texture": "#s"} - } - }, - { - "from": [8, 11.5, 12], - "to": [12, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 20]}, - "faces": { - "north": {"uv": [4, 4, 8, 4.5], "texture": "#s"}, - "south": {"uv": [8, 4, 12, 4.5], "texture": "#s"}, - "west": {"uv": [12, 4, 16, 4.5], "texture": "#s"}, - "up": {"uv": [8, 12, 12, 16], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [8, 11.5, 4], - "to": [12, 12, 12], + "to": [12, 11.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [10, 15.5, 16]}, "faces": { - "north": {"uv": [4, 4, 9, 4.5], "texture": "#s"}, - "south": {"uv": [7, 4, 12, 4.5], "texture": "#s"}, - "west": {"uv": [4, 4, 12, 4.5], "texture": "#s"}, - "up": {"uv": [7, 4, 12, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} } }, { "from": [12, 15.5, 8], - "to": [16, 16, 12], + "to": [16, 15.9375, 12], "rotation": {"angle": 0, "axis": "y", "origin": [14, 19.5, 16]}, "faces": { - "north": {"uv": [0, 0, 4, 0.5], "texture": "#s"}, - "east": {"uv": [4, 0, 8, 0.5], "texture": "#s"}, - "south": {"uv": [12, 0, 16, 0.5], "texture": "#s"}, - "west": {"uv": [8, 0, 12, 0.5], "texture": "#s"}, - "up": {"uv": [12, 8, 16, 12], "texture": "#s"} + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "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"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "from": [0, 0, 0], + "to": [4, 3.5, 16], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "from": [8, 4, 4], + "to": [8, 11.5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 16, 12]}, + "faces": { + "west": {"texture": "#g"} + } + }, + { + "from": [15, 4, 4], + "to": [15, 11.5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 16, 12]}, + "faces": { + "east": {"texture": "#g"} } }, { @@ -298,12 +313,12 @@ "to": [8.5, 11.5, 5], "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 12, 12]}, "faces": { - "north": {"uv": [0, 0, 1, 7], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 7], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 7], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 7], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#2"} + "north": {"texture": "#2"}, + "east": {"texture": "#2"}, + "south": {"texture": "#2"}, + "west": {"texture": "#2"}, + "up": {"texture": "#2"}, + "down": {"texture": "#2"} } }, { @@ -311,12 +326,12 @@ "to": [8.5, 11.5, 11], "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 12, 13]}, "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 1], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} + "north": {"texture": "#2"}, + "east": {"texture": "#2"}, + "south": {"texture": "#2"}, + "west": {"texture": "#2"}, + "up": {"texture": "#2"}, + "down": {"texture": "#2"} } }, { @@ -324,12 +339,12 @@ "to": [8.5, 5.5, 11], "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 6, 13]}, "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 1], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} + "north": {"texture": "#2"}, + "east": {"texture": "#2"}, + "south": {"texture": "#2"}, + "west": {"texture": "#2"}, + "up": {"texture": "#2"}, + "down": {"texture": "#2"} } }, { @@ -337,12 +352,12 @@ "to": [8.5, 11.5, 12], "rotation": {"angle": 0, "axis": "y", "origin": [15.5, 12, 19]}, "faces": { - "north": {"uv": [0, 0, 1, 7], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 7], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 7], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 7], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#2"} + "north": {"texture": "#2"}, + "east": {"texture": "#2"}, + "south": {"texture": "#2"}, + "west": {"texture": "#2"}, + "up": {"texture": "#2"}, + "down": {"texture": "#2"} } }, { @@ -350,12 +365,12 @@ "to": [15.5, 11.5, 11], "rotation": {"angle": 0, "axis": "y", "origin": [22.5, 12, 13]}, "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 1], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} + "north": {"texture": "#2"}, + "east": {"texture": "#2"}, + "south": {"texture": "#2"}, + "west": {"texture": "#2"}, + "up": {"texture": "#2"}, + "down": {"texture": "#2"} } }, { @@ -363,12 +378,12 @@ "to": [15.5, 11.5, 5], "rotation": {"angle": 0, "axis": "y", "origin": [22.5, 12, 12]}, "faces": { - "north": {"uv": [0, 0, 1, 7], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 7], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 7], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 7], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#2"} + "north": {"texture": "#2"}, + "east": {"texture": "#2"}, + "south": {"texture": "#2"}, + "west": {"texture": "#2"}, + "up": {"texture": "#2"}, + "down": {"texture": "#2"} } }, { @@ -376,12 +391,12 @@ "to": [15.5, 5.5, 11], "rotation": {"angle": 0, "axis": "y", "origin": [22.5, 6, 13]}, "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 1], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} + "north": {"texture": "#2"}, + "east": {"texture": "#2"}, + "south": {"texture": "#2"}, + "west": {"texture": "#2"}, + "up": {"texture": "#2"}, + "down": {"texture": "#2"} } }, { @@ -389,11 +404,11 @@ "to": [15.5, 11.5, 12], "rotation": {"angle": 0, "axis": "y", "origin": [22.5, 12, 19]}, "faces": { - "north": {"uv": [0, 0, 1, 7], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 7], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 7], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#2"} + "north": {"texture": "#2"}, + "east": {"texture": "#2"}, + "west": {"texture": "#2"}, + "up": {"texture": "#2"}, + "down": {"texture": "#2"} } } ], diff --git a/src/main/resources/data/minecraft/tags/blocks/wither_immune.json b/src/main/resources/data/minecraft/tags/blocks/wither_immune.json new file mode 100644 index 0000000..5775704 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/wither_immune.json @@ -0,0 +1,15 @@ +{ + "replace": false, + "values": [ + "engineersdecor:panzerglass_block", + "engineersdecor:panzerglass_slab", + "engineersdecor:rebar_concrete", + "engineersdecor:rebar_concrete_slab", + "engineersdecor:rebar_concrete_wall", + "engineersdecor:rebar_concrete_stairs", + "engineersdecor:rebar_concrete_tile", + "engineersdecor:rebar_concrete_tile_slab", + "engineersdecor:rebar_concrete_tile_stairs", + "engineersdecor:halfslab_rebar_concrete" + ] +} \ No newline at end of file