From 83090f5e883a919823d5bc0507d99cedd01f4bc8 Mon Sep 17 00:00:00 2001 From: stfwi Date: Thu, 20 Aug 2020 21:51:03 +0200 Subject: [PATCH] Experimental roof almost done. --- gradle.properties | 2 +- readme.md | 6 +- .../java/wile/engineersdecor/ModContent.java | 22 +- .../dark_shingle_roof_chimneytrunk.json | 44 ++ .../dark_shingle_roof_skylight.json | 44 ++ .../passive_fluid_accumulator.json | 11 +- .../assets/engineersdecor/lang/en_us.json | 15 +- .../assets/engineersdecor/lang/ru_ru.json | 1 - .../assets/engineersdecor/lang/zh_cn.json | 1 - .../dark_shingle_roof_chimneytrunk_model.json | 277 ++++++++++++ .../dark_shingle_roof_skylight_model.json | 396 ++++++++++++++++++ .../item/dark_shingle_roof_chimneytrunk.json | 1 + .../item/dark_shingle_roof_skylight.json | 1 + .../models/item/metal_crafting_table.json | 1 + .../item/passive_fluid_accumulator.json | 2 +- ...passive_fluid_accumulator_back_texture.png | Bin 639 -> 0 bytes ...assive_fluid_accumulator_front_texture.png | Bin 680 -> 0 bytes ...passive_fluid_accumulator_side_texture.png | Bin 618 -> 0 bytes ...on => dark_shingle_roof_chimneytrunk.json} | 9 +- .../blocks/dark_shingle_roof_skylight.json | 21 + .../en_us/categories/crafting.json | 2 +- .../entries/crafting/crafting_table.json | 4 +- .../fluidics/passive_fluid_accumulator.json | 18 - .../passive_fluid_accumulator_recipe.json | 56 --- ...dark_shingle_roof_chimneytrunk_recipe.json | 33 ++ .../dark_shingle_roof_metallized_recipe.json | 33 ++ .../dark_shingle_roof_skylight_recipe.json | 33 ++ 27 files changed, 918 insertions(+), 115 deletions(-) create mode 100644 src/main/resources/assets/engineersdecor/blockstates/dark_shingle_roof_chimneytrunk.json create mode 100644 src/main/resources/assets/engineersdecor/blockstates/dark_shingle_roof_skylight.json create mode 100644 src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_chimneytrunk_model.json create mode 100644 src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_skylight_model.json create mode 100644 src/main/resources/assets/engineersdecor/models/item/dark_shingle_roof_chimneytrunk.json create mode 100644 src/main/resources/assets/engineersdecor/models/item/dark_shingle_roof_skylight.json create mode 100644 src/main/resources/assets/engineersdecor/models/item/metal_crafting_table.json delete mode 100644 src/main/resources/assets/engineersdecor/textures/block/pipe/passive_fluid_accumulator_back_texture.png delete mode 100644 src/main/resources/assets/engineersdecor/textures/block/pipe/passive_fluid_accumulator_front_texture.png delete mode 100644 src/main/resources/assets/engineersdecor/textures/block/pipe/passive_fluid_accumulator_side_texture.png rename src/main/resources/data/engineersdecor/loot_tables/blocks/{passive_fluid_accumulator.json => dark_shingle_roof_chimneytrunk.json} (55%) create mode 100644 src/main/resources/data/engineersdecor/loot_tables/blocks/dark_shingle_roof_skylight.json delete mode 100644 src/main/resources/data/engineersdecor/patchouli_books/engineersdecor_manual/en_us/entries/fluidics/passive_fluid_accumulator.json delete mode 100644 src/main/resources/data/engineersdecor/recipes/dependent/passive_fluid_accumulator_recipe.json create mode 100644 src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_chimneytrunk_recipe.json create mode 100644 src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_metallized_recipe.json create mode 100644 src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_skylight_recipe.json diff --git a/gradle.properties b/gradle.properties index 2c879d3..3b6d859 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,4 +5,4 @@ version_minecraft=1.16.1 version_forge_minecraft=1.16.1-32.0.106 version_fml_mappings=20200514-1.16 version_jei=1.16.1:7.0.0.6 -version_engineersdecor=1.1.1-b7 +version_engineersdecor=1.1.1 diff --git a/readme.md b/readme.md index 6d55d01..3ebe0d6 100644 --- a/readme.md +++ b/readme.md @@ -1,7 +1,7 @@ -## Engineer's Decor (MC1.15.1) +## Engineer's Decor (MC1.16.1) -Mod sources for Minecraft version 1.15.1. +Mod sources for Minecraft version 1.16.1. - Description, credits, and features: Please see the readme in the repository root. @@ -11,6 +11,8 @@ Mod sources for Minecraft version 1.15.1. ## Version history + ~ v1.1.1 [R] Intial 1.16.1 release. + - v1.1.1-b7 [F] Fixed AI-open-path bug (issue #116, ty KrAzYGEEK32, desht). [F] Conditional recipes extended to additional vanilla ingredients in case of oredict tag issues. [M] Lang file update zh_cn (PR#117, Moonisky). diff --git a/src/main/java/wile/engineersdecor/ModContent.java b/src/main/java/wile/engineersdecor/ModContent.java index 2eebf60..a0fb673 100644 --- a/src/main/java/wile/engineersdecor/ModContent.java +++ b/src/main/java/wile/engineersdecor/ModContent.java @@ -217,12 +217,12 @@ public class ModContent )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "dark_shingle_roof")); public static final DecorBlock.Normal DARK_CERAMIC_SHINGLE_ROOF_BLOCK = (DecorBlock.Normal)(new DecorBlock.Normal( - DecorBlock.CFG_DEFAULT|DecorBlock.CFG_EXPERIMENTAL, + DecorBlock.CFG_CUTOUT|DecorBlock.CFG_EXPERIMENTAL, Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "dark_shingle_roof_block")); public static final EdSlabBlock DARK_CERAMIC_SHINGLE_ROOF_SLAB = (EdSlabBlock)(new EdSlabBlock( - DecorBlock.CFG_DEFAULT|DecorBlock.CFG_EXPERIMENTAL, + DecorBlock.CFG_CUTOUT|DecorBlock.CFG_EXPERIMENTAL, Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "dark_shingle_roof_slab")); @@ -236,8 +236,17 @@ public class ModContent Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "dark_shingle_roof_metallized")); - // ------------------------------------------------------------------------------------------------------------------- + public static final EdRoofBlock DARK_CERAMIC_SHINGLE_ROOF_SKYLIGHT = (EdRoofBlock)(new EdRoofBlock( + DecorBlock.CFG_TRANSLUCENT|DecorBlock.CFG_EXPERIMENTAL, + Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE).notSolid() + )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "dark_shingle_roof_skylight")); + public static final EdRoofBlock DARK_CERAMIC_SHINGLE_ROOF_CHIMNEYTRUNK = (EdRoofBlock)(new EdRoofBlock( + DecorBlock.CFG_CUTOUT|DecorBlock.CFG_EXPERIMENTAL, + Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 15f).sound(SoundType.STONE) + )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "dark_shingle_roof_chimneytrunk")); + + // ------------------------------------------------------------------------------------------------------------------- public static final EdGroundBlock DENSE_GRIT_SAND = (EdGroundBlock)(new EdGroundBlock( DecorBlock.CFG_DEFAULT, Block.Properties.create(Material.EARTH, MaterialColor.DIRT).hardnessAndResistance(0.5f, 3f).sound(SoundType.GROUND).harvestTool(ToolType.SHOVEL) @@ -471,7 +480,6 @@ public class ModContent // ------------------------------------------------------------------------------------------------------------------- - @Deprecated // @todo: rename to "crafting_table" in 1.16.2 or 1.17 public static final EdCraftingTable.CraftingTableBlock CRAFTING_TABLE = (EdCraftingTable.CraftingTableBlock)(new EdCraftingTable.CraftingTableBlock( DecorBlock.CFG_CUTOUT|DecorBlock.CFG_HORIZIONTAL|DecorBlock.CFG_LOOK_PLACEMENT|DecorBlock.CFG_OPPOSITE_PLACEMENT, Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(1f, 15f).sound(SoundType.METAL).notSolid(), @@ -660,7 +668,7 @@ public class ModContent )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "straight_pipe_valve_redstone_analog")); public static final EdFluidAccumulator.FluidAccumulatorBlock PASSIVE_FLUID_ACCUMULATOR = (EdFluidAccumulator.FluidAccumulatorBlock)(new EdFluidAccumulator.FluidAccumulatorBlock( - DecorBlock.CFG_CUTOUT|DecorBlock.CFG_FACING_PLACEMENT|DecorBlock.CFG_OPPOSITE_PLACEMENT, + DecorBlock.CFG_CUTOUT|DecorBlock.CFG_FACING_PLACEMENT|DecorBlock.CFG_OPPOSITE_PLACEMENT|DecorBlock.CFG_EXPERIMENTAL, Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL).notSolid(), new AxisAlignedBB[]{ Auxiliaries.getPixeledAABB(3,3,0, 13,13, 1), @@ -698,8 +706,6 @@ public class ModContent // ------------------------------------------------------------------------------------------------------------------- - //todo: REMOVE IN 1.17/1.16.2 - @Deprecated public static final EdWallBlock CONCRETE_WALL = (EdWallBlock)(new EdWallBlock( DecorBlock.CFG_CUTOUT, Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 50f).sound(SoundType.STONE).notSolid() @@ -822,6 +828,8 @@ public class ModContent PANZERGLASS_SLAB, DARK_CERAMIC_SHINGLE_ROOF, DARK_CERAMIC_SHINGLE_ROOF_METALIZED, + DARK_CERAMIC_SHINGLE_ROOF_SKYLIGHT, + DARK_CERAMIC_SHINGLE_ROOF_CHIMNEYTRUNK, DARK_CERAMIC_SHINGLE_ROOF_BLOCK, DARK_CERAMIC_SHINGLE_ROOF_SLAB, HALFSLAB_DARK_CERAMIC_SHINGLE_ROOF, diff --git a/src/main/resources/assets/engineersdecor/blockstates/dark_shingle_roof_chimneytrunk.json b/src/main/resources/assets/engineersdecor/blockstates/dark_shingle_roof_chimneytrunk.json new file mode 100644 index 0000000..37597ae --- /dev/null +++ b/src/main/resources/assets/engineersdecor/blockstates/dark_shingle_roof_chimneytrunk.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_chimneytrunk_model" }, + "facing=west,half=bottom,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_chimneytrunk_model", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_chimneytrunk_model", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_chimneytrunk_model", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_chimneytrunk_model", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_chimneytrunk_model", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_chimneytrunk_model", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_chimneytrunk_model", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "x": 180, "y": 270, "uvlock": true } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/blockstates/dark_shingle_roof_skylight.json b/src/main/resources/assets/engineersdecor/blockstates/dark_shingle_roof_skylight.json new file mode 100644 index 0000000..b9c12ae --- /dev/null +++ b/src/main/resources/assets/engineersdecor/blockstates/dark_shingle_roof_skylight.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_skylight_model" }, + "facing=west,half=bottom,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_skylight_model", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_skylight_model", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_skylight_model", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_skylight_model", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_skylight_model", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_skylight_model", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "engineersdecor:block/roof/dark_shingle_roof_skylight_model", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "engineersdecor:block/roof/dark_shingle_roof_model_inner", "x": 180, "y": 270, "uvlock": true } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/blockstates/passive_fluid_accumulator.json b/src/main/resources/assets/engineersdecor/blockstates/passive_fluid_accumulator.json index a267c3a..549880f 100644 --- a/src/main/resources/assets/engineersdecor/blockstates/passive_fluid_accumulator.json +++ b/src/main/resources/assets/engineersdecor/blockstates/passive_fluid_accumulator.json @@ -1,10 +1 @@ -{ - "variants": { - "facing=north": { "model": "engineersdecor:block/pipe/passive_fluid_accumulator_model" }, - "facing=south": { "model": "engineersdecor:block/pipe/passive_fluid_accumulator_model", "y":180 }, - "facing=west": { "model": "engineersdecor:block/pipe/passive_fluid_accumulator_model", "y":270 }, - "facing=east": { "model": "engineersdecor:block/pipe/passive_fluid_accumulator_model", "y":90 }, - "facing=up": { "model": "engineersdecor:block/pipe/passive_fluid_accumulator_model", "x":270 }, - "facing=down": { "model": "engineersdecor:block/pipe/passive_fluid_accumulator_model", "x":90 } - } -} +{ "variants": { "": { "model": "minecraft:block/barrier" } } } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/lang/en_us.json b/src/main/resources/assets/engineersdecor/lang/en_us.json index 60fb67d..580799a 100644 --- a/src/main/resources/assets/engineersdecor/lang/en_us.json +++ b/src/main/resources/assets/engineersdecor/lang/en_us.json @@ -67,11 +67,13 @@ "block.engineersdecor.clinker_brick_wall.help": "§6Simplistic Clinker Brick Wall.", "block.engineersdecor.concrete_wall": "Concrete Wall", "block.engineersdecor.concrete_wall.help": "§6Wall made of solid concrete.", - "block.engineersdecor.dark_shingle_roof": "Dark Ceramic Shingle Roof", - "block.engineersdecor.dark_shingle_roof_metallized": "Metallized Dark Ceramic Shingle Roof", - "block.engineersdecor.dark_shingle_roof_block": "Dark Ceramic Shingle Roof Block", - "block.engineersdecor.dark_shingle_roof_slab": "Dark Ceramic Shingle Roof Slab", - "block.engineersdecor.dark_shingle_roof_slabslice": "Dark Ceramic Shingle Roof Slab Slice", + "block.engineersdecor.dark_shingle_roof": "Dark Shingle Roof", + "block.engineersdecor.dark_shingle_roof_metallized": "Dark Shingle Roof Show Guard", + "block.engineersdecor.dark_shingle_roof_skylight": "Dark Shingle Roof Skylight", + "block.engineersdecor.dark_shingle_roof_chimneytrunk": "Dark Shingle Roof Chimney Trunk", + "block.engineersdecor.dark_shingle_roof_block": "Dark Shingle Roof Block", + "block.engineersdecor.dark_shingle_roof_slab": "Dark Shingle Roof Slab", + "block.engineersdecor.dark_shingle_roof_slabslice": "Dark Shingle Roof Slab Slice", "block.engineersdecor.dense_grit_dirt_block": "Dense Grit Dirt", "block.engineersdecor.dense_grit_dirt_block.help": "§6A compressed dirt-like soil, plain texture with some cracks.§r Known from often used paths or trampled yard grounds. Dirt and coarse dirt can be mixed in for accentuation. Position dependent texture variations. Prevents grass spreading.", "block.engineersdecor.dense_grit_sand_block": "Dense Grit Sand", @@ -114,8 +116,6 @@ "block.engineersdecor.gas_concrete_stairs.help": "§6Low hardness concrete stairs.§r Easy to break decorative concrete.", "block.engineersdecor.gas_concrete_wall": "Gas Concrete Wall", "block.engineersdecor.gas_concrete_wall.help": "§6Low hardness concrete wall.§r Easy to break decorative concrete.", - "block.engineersdecor.halfslab_concrete": "Concrete Slice", - "block.engineersdecor.halfslab_concrete.help": "§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices.", "block.engineersdecor.halfslab_gas_concrete": "Gas Concrete Slice", "block.engineersdecor.halfslab_gas_concrete.help": "§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices.", "block.engineersdecor.halfslab_rebar_concrete": "Rebar Concrete Slice", @@ -154,7 +154,6 @@ "block.engineersdecor.panzerglass_slab": "Panzer Glass Slab", "block.engineersdecor.panzerglass_slab.help": "§6Reinforced glass slab.§r Expensive, explosion-proof. Dark gray tint, faint structural lines visible.", "block.engineersdecor.passive_fluid_accumulator": "Passive Fluid Accumulator", - "block.engineersdecor.passive_fluid_accumulator.help": "§6Vacuum suction based fluid collector.§r Has one output, all other sides are input. Drains fluids from adjacent tanks when being drained from the output port by a pump.", "block.engineersdecor.rebar_concrete": "Rebar Concrete Block", "block.engineersdecor.rebar_concrete.help": "§6Steel reinforced concrete block.§r Expensive but Creeper-proof like obsidian.", "block.engineersdecor.rebar_concrete_slab": "Rebar Concrete Slab", diff --git a/src/main/resources/assets/engineersdecor/lang/ru_ru.json b/src/main/resources/assets/engineersdecor/lang/ru_ru.json index 37c781a..3730fae 100644 --- a/src/main/resources/assets/engineersdecor/lang/ru_ru.json +++ b/src/main/resources/assets/engineersdecor/lang/ru_ru.json @@ -153,7 +153,6 @@ "block.engineersdecor.panzerglass_slab": "Плита из бронированного стекла", "block.engineersdecor.panzerglass_slab.help": "§6Усиленная стеклянная плита.§r Дорогая, взрывоустойчивая. Имеет тёмно-серый оттенок, слегка видны структурные линии.", "block.engineersdecor.passive_fluid_accumulator": "Пассивный жидкостный накопитель", - "block.engineersdecor.passive_fluid_accumulator.help": "§6Вакуумный всасывающий жидкостный коллектор.§r Имеет один выход, все остальные стороны входные. Сливает жидкости из соседних резервуаров при выкачивании жидкости из выходного порта.", "block.engineersdecor.rebar_concrete": "Железобетон", "block.engineersdecor.rebar_concrete.help": "§6Стальной железобетонный блок.§r Дорогой, но взрывоустойчивый, как обсидиан.", "block.engineersdecor.rebar_concrete_slab": "Железобетонная плита", diff --git a/src/main/resources/assets/engineersdecor/lang/zh_cn.json b/src/main/resources/assets/engineersdecor/lang/zh_cn.json index 872087b..8b30b52 100644 --- a/src/main/resources/assets/engineersdecor/lang/zh_cn.json +++ b/src/main/resources/assets/engineersdecor/lang/zh_cn.json @@ -153,7 +153,6 @@ "block.engineersdecor.panzerglass_slab": "装甲玻璃台阶", "block.engineersdecor.panzerglass_slab.help": "§6强化的玻璃台阶。§r昂贵，防爆。深灰色调，有隐约可见的结构线和多种纹理。", "block.engineersdecor.passive_fluid_accumulator": "被动流体累积器。", - "block.engineersdecor.passive_fluid_accumulator.help": "§6基于真空吸力的流体收集器。§r有一个输出面，其他面都是输入。 当从输出面被泵抽取时，从输入面邻接储罐抽取液体。", "block.engineersdecor.rebar_concrete": "钢筋混凝土", "block.engineersdecor.rebar_concrete.help": "§6钢强化的混凝土。§r昂贵但像黑曜石一样防爬行者爆炸。", "block.engineersdecor.rebar_concrete_slab": "钢筋混凝土台阶", 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 new file mode 100644 index 0000000..5a2a61b --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_chimneytrunk_model.json @@ -0,0 +1,277 @@ +{ + "parent": "block/block", + "textures": { + "particle": "engineersdecor:block/roof/dark_shingle_roof", + "s": "engineersdecor:block/roof/dark_shingle_roof", + "t": "engineersdecor:block/pole/thick_steel_pole_top_texture" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [4, 3.5, 16], + "faces": { + "north": {"uv": [12, 12, 16, 16], "texture": "#s"}, + "south": {"uv": [0, 12, 4, 16], "texture": "#s"}, + "west": {"uv": [0, 12, 16, 16], "texture": "#s"}, + "up": {"uv": [0, 0, 4, 16], "texture": "#s"}, + "down": {"uv": [0, 0, 4, 16], "texture": "#s"} + } + }, + { + "from": [4, 0, 0], + "to": [8, 7.5, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [8, 8, 12, 16], "texture": "#s"}, + "south": {"uv": [4, 8, 8, 16], "texture": "#s"}, + "west": {"uv": [0, 8, 16, 16], "texture": "#s"}, + "up": {"uv": [4, 0, 8, 16], "texture": "#s"}, + "down": {"uv": [4, 0, 8, 16], "texture": "#s"} + } + }, + { + "from": [3, 3, 3], + "to": [11, 11.5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]}, + "faces": { + "north": {"uv": [5, 4.5, 13, 13], "texture": "#s"}, + "south": {"uv": [3, 4.5, 11, 13], "texture": "#s"}, + "west": {"uv": [3, 4.5, 13, 13], "texture": "#s"}, + "up": {"uv": [3, 3, 11, 13], "texture": "#t"} + } + }, + { + "from": [3, 11.5, 3], + "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"} + } + }, + { + "from": [3, 11.5, 11], + "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"} + } + }, + { + "from": [11, 11.5, 5], + "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"} + } + }, + { + "from": [3, 11.5, 5], + "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"} + } + }, + { + "from": [8, 0, 0], + "to": [12, 11.5, 5], + "faces": { + "north": {"uv": [4, 4.5, 8, 16], "texture": "#s"}, + "west": {"uv": [0, 4.5, 5, 16], "texture": "#s"}, + "up": {"uv": [8, 0, 12, 5], "texture": "#s"}, + "down": {"uv": [8, 11, 12, 16], "texture": "#s"} + } + }, + { + "from": [8, 0, 5], + "to": [12, 5.5, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]}, + "faces": { + "down": {"uv": [8, 5, 12, 11], "texture": "#s"} + } + }, + { + "from": [8, 0, 11], + "to": [12, 11.5, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 19]}, + "faces": { + "south": {"uv": [8, 4.5, 12, 16], "texture": "#s"}, + "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"} + } + }, + { + "from": [12, 0, 0], + "to": [16, 15.5, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [0, 0, 4, 16], "texture": "#s"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#s"}, + "south": {"uv": [12, 0, 16, 16], "texture": "#s"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#s"}, + "up": {"uv": [12, 0, 16, 16], "texture": "#s"}, + "down": {"uv": [12, 0, 16, 16], "texture": "#s"} + } + }, + { + "from": [4, 7.5, 0], + "to": [8, 8, 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"} + } + }, + { + "from": [12, 15.5, 0], + "to": [16, 16, 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"} + } + }, + { + "from": [13, 15.5, 3], + "to": [16, 16, 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"} + } + }, + { + "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, 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"} + } + }, + { + "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, 13], + "to": [8, 8, 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"} + } + }, + { + "from": [0, 3.5, 4], + "to": [3, 4, 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"} + } + }, + { + "from": [0, 3.5, 12], + "to": [4, 4, 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, 13], + "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": [13, 4, 16, 4.5], "texture": "#s"}, + "up": {"uv": [8, 13, 12, 16], "texture": "#s"} + } + }, + { + "from": [13, 15.5, 8], + "to": [16, 16, 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"} + } + } + ], + "display": { + "thirdperson_lefthand": { + "rotation": [75, -135, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "gui": { + "rotation": [30, 135, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [0, -90, 0] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_skylight_model.json b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_skylight_model.json new file mode 100644 index 0000000..da7b15a --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_skylight_model.json @@ -0,0 +1,396 @@ +{ + "parent": "block/block", + "textures": { + "2": "engineersdecor:block/material/steel_texture", + "particle": "engineersdecor:block/roof/dark_shingle_roof", + "s": "engineersdecor:block/roof/dark_shingle_roof", + "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"}, + "south": {"uv": [0, 12, 4, 16], "texture": "#s"}, + "west": {"uv": [0, 12, 16, 16], "texture": "#s"}, + "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"}, + "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"} + } + }, + { + "from": [4, 0, 0], + "to": [8, 7.5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, -4]}, + "faces": { + "north": {"uv": [8, 8.5, 12, 16], "texture": "#s"}, + "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"} + } + }, + { + "from": [8, 0, 12], + "to": [12, 11.5, 16], + "faces": { + "north": {"uv": [4, 4.5, 8, 16], "texture": "#s"}, + "south": {"uv": [8, 4.5, 12, 16], "texture": "#s"}, + "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"} + } + }, + { + "from": [8, 0, 0], + "to": [12, 11.5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -4]}, + "faces": { + "north": {"uv": [4, 4.5, 8, 16], "texture": "#s"}, + "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"} + } + }, + { + "from": [12, 0, 0], + "to": [16, 15.5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [0, 0.5, 4, 16], "texture": "#s"}, + "east": {"uv": [12, 0.5, 16, 16], "texture": "#s"}, + "south": {"uv": [12, 0.5, 16, 16], "texture": "#s"}, + "west": {"uv": [0, 0.5, 4, 16], "texture": "#s"}, + "up": {"uv": [12, 0, 16, 4], "texture": "#s"}, + "down": {"uv": [12, 12, 16, 16], "texture": "#s"} + } + }, + { + "from": [4, 0, 4], + "to": [16, 4.5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 12]}, + "faces": { + "north": {"uv": [8, 12, 12, 16], "texture": "#s"}, + "east": {"uv": [4, 12, 12, 16], "texture": "#s"}, + "south": {"uv": [4, 12, 8, 16], "texture": "#s"}, + "west": {"uv": [4, 12, 12, 16], "texture": "#s"}, + "up": {"uv": [4, 4, 8, 12], "texture": "#s"}, + "down": {"uv": [4, 4, 8, 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"} + } + }, + { + "from": [12, 11.5, 4], + "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"}, + "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"} + } + }, + { + "from": [12, 0, 12], + "to": [16, 15.5, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [0, 0.5, 4, 16], "texture": "#s"}, + "east": {"uv": [0, 0.5, 4, 16], "texture": "#s"}, + "south": {"uv": [12, 0.5, 16, 16], "texture": "#s"}, + "west": {"uv": [12, 0.5, 16, 16], "texture": "#s"}, + "up": {"uv": [12, 12, 16, 16], "texture": "#s"}, + "down": {"uv": [12, 0, 16, 4], "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"} + } + }, + { + "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], + "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": [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": [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": { + "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"} + } + }, + { + "from": [0, 3.5, 4], + "to": [4, 4, 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": [0, 3.5, 12], + "to": [4, 4, 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"} + } + }, + { + "from": [8, 11.5, 4], + "to": [12, 12, 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"} + } + }, + { + "from": [12, 15.5, 8], + "to": [16, 16, 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"} + } + }, + { + "from": [7.5, 4.5, 4], + "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"} + } + }, + { + "from": [7.5, 10.5, 5], + "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"} + } + }, + { + "from": [7.5, 4.5, 5], + "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"} + } + }, + { + "from": [7.5, 4.5, 11], + "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"} + } + }, + { + "from": [14.5, 10.5, 5], + "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"} + } + }, + { + "from": [14.5, 4.5, 4], + "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"} + } + }, + { + "from": [14.5, 4.5, 5], + "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"} + } + }, + { + "from": [14.5, 4.5, 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"}, + "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"} + } + } + ], + "display": { + "thirdperson_lefthand": { + "rotation": [75, -135, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "gui": { + "rotation": [30, 135, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [0, -90, 0] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/dark_shingle_roof_chimneytrunk.json b/src/main/resources/assets/engineersdecor/models/item/dark_shingle_roof_chimneytrunk.json new file mode 100644 index 0000000..eec70b0 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/item/dark_shingle_roof_chimneytrunk.json @@ -0,0 +1 @@ +{ "parent": "engineersdecor:block/roof/dark_shingle_roof_chimneytrunk_model" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/dark_shingle_roof_skylight.json b/src/main/resources/assets/engineersdecor/models/item/dark_shingle_roof_skylight.json new file mode 100644 index 0000000..d99dbc4 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/item/dark_shingle_roof_skylight.json @@ -0,0 +1 @@ +{ "parent": "engineersdecor:block/roof/dark_shingle_roof_skylight_model" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/metal_crafting_table.json b/src/main/resources/assets/engineersdecor/models/item/metal_crafting_table.json new file mode 100644 index 0000000..31c0717 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/item/metal_crafting_table.json @@ -0,0 +1 @@ +{ "parent": "engineersdecor:block/crafting_table/metal_crafting_table_model" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/passive_fluid_accumulator.json b/src/main/resources/assets/engineersdecor/models/item/passive_fluid_accumulator.json index 9b904f8..abb28e4 100644 --- a/src/main/resources/assets/engineersdecor/models/item/passive_fluid_accumulator.json +++ b/src/main/resources/assets/engineersdecor/models/item/passive_fluid_accumulator.json @@ -1 +1 @@ -{ "parent": "engineersdecor:block/pipe/passive_fluid_accumulator_model" } \ No newline at end of file +{ "parent": "minecraft:block/barrier" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/textures/block/pipe/passive_fluid_accumulator_back_texture.png b/src/main/resources/assets/engineersdecor/textures/block/pipe/passive_fluid_accumulator_back_texture.png deleted file mode 100644 index 2d9fcd6896ac25c4f1d684d99cf92a3386b0fef2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 639 zcmV-_0)YLAP)VGd00JLLL_t(I%T<%XYFjZ7MbC`%-m~iz zvI>L{Z$biDcGF!UztA7(Pvuwo7uhA7kOqQRPHZp~+W0+5BXwaUnuQREnX5bZ-jUne z+v2@v7zRoyq?B;ZAtIsQr8EE$VgGx>pUsNTpTFY0r<4LfjFGPE01g22`5aXxr364q z3039Cw-exml+p+4^^^I0j<1wTDToNuG_l=oSu7Sf=ji*s{kmGMST2_UhzKHrH#2h1 zlu|G=cDo&qkB^O2j1g7k>gtM@mlw{?&RTuW8DB~vgwR|#Iyzz)25xR{h%u6L=I!l` z^Ye3_o}OBxnGr%j&8$(3F_KcE?|VWB%w{t-n+@CT7Bj=lNGVZS=bX`sSRELK0aYdE z%-!7`4-XHNQW|)zt3BR1M?C;JXU1{l_4O4I;q>&BaU4l0k#qhKGUpr~Kvn7co@tse zGp?_%SuU5Pl!!4BLg4uL7*)l4UjuZwopW?uhpI9R1JBRTtk-Mq@9z&Ysy2(OeU Z)_-VGd00Kx!L_t(I%Y~CaPuxHd#ed#Ew$Dgt zuS5dr(xi=aO{$~050KBsC!tD70UQz)9R<25A{9Cg#T&u-Y_E4W1@TH$S!t!6k>2dQ z_hz!Qv$LqRrYH(xj10qol#(pV5JDiO#5spj3L!+w_kB;-btt72MNx2YaDWhk5CT$4 z`o8D;kBZ&zC%%0t(OLr_r3650jrSg*ltL+m)|#eisOy^DZpZ8EEBimsygmQo;o*U@ zEGf$pYc1>bI>kaM#bh#Jx7)E=t%xzwG!52TKI@-+{Uiw?u-R1N;DJjbm zHS*f;_sr*Wo}Qjk0c$M)#u!2fR8_^%(GmCe_heZ{mSrgKJs|`plL>EcZ!}HAzur*RfiyFvb8Ngur``a}MFX zC(AMbrqe0b+5~parFYx5SZi4>m&6zeArL}9j6t5~TwGl6zjJ;7mG#GAcTNY>fMF$rx+su zRaG&Y%`nD%u+bPpRaJ?Kl#)EpQCXG|LZGf|rqk&MzRTs3ySqE;y8e*6y}c!bfcG9X z3VGd00Ih0L_t(I%T<#-P8>lHg}?5qo*9i0 zI3s{{KmdpfI3w~Md;*_|d-xz^8?1;Bfwe4J$f5AR@f~S+je6=JfO{W=5?Q5h3T?(Wt62O%tk0DFqQ}mHGL70W8Ql6GEWY zN+|{JJtD$9&uD|wI`4Kn-rnAr=Na!k!!Y2SBc;U4%L`XmS9tFMaL%En6q?mq*>1P2 zRx74y!h26j3GY4E*VjBhKeJdY`iRas)Xa!6GEEa^#>vSEAq4L4?@1|PX1u<>a&d9N z)6)}XhI8)!I5}r(t;85fDUow#97ke|jN`~=vthH@P)Z@^+|A661!}FGVKZYG2E6x} z8IO;TESF0FQc8Wyk2$KUh)8EP#>jrZXT4tIoa6lboWtSJySDfyGIh=&B8=lm&KZE) z+gmO#FDa#vQX-|q+1VK)LI|M?Dd&u~a+;tg0Rnv>O1pySwA& z<^~Y~AjWuvs*3lX!{Ind*&Y2h^BGQ%Em=+P<-`@!#bm6qv5WNZ2`kDbe%V-Ap~;H{qoxS+P{>-KmXHU>rWw75C8xG07*qoM6N<$ Ef>M+ne*gdg diff --git a/src/main/resources/data/engineersdecor/loot_tables/blocks/passive_fluid_accumulator.json b/src/main/resources/data/engineersdecor/loot_tables/blocks/dark_shingle_roof_chimneytrunk.json similarity index 55% rename from src/main/resources/data/engineersdecor/loot_tables/blocks/passive_fluid_accumulator.json rename to src/main/resources/data/engineersdecor/loot_tables/blocks/dark_shingle_roof_chimneytrunk.json index 41cc2f0..280b7a9 100644 --- a/src/main/resources/data/engineersdecor/loot_tables/blocks/passive_fluid_accumulator.json +++ b/src/main/resources/data/engineersdecor/loot_tables/blocks/dark_shingle_roof_chimneytrunk.json @@ -2,7 +2,7 @@ "type": "minecraft:block", "pools": [ { - "name": "passive_fluid_accumulator_dlt", + "name": "dark_shingle_roof_chimneytrunk_dlt", "rolls": 1, "entries": [ { @@ -11,14 +11,9 @@ { "function": "minecraft:copy_name", "source": "block_entity" - }, - { - "function": "minecraft:copy_nbt", - "source": "block_entity", - "ops": [] } ], - "name": "engineersdecor:passive_fluid_accumulator" + "name": "engineersdecor:dark_shingle_roof_chimneytrunk" } ] } diff --git a/src/main/resources/data/engineersdecor/loot_tables/blocks/dark_shingle_roof_skylight.json b/src/main/resources/data/engineersdecor/loot_tables/blocks/dark_shingle_roof_skylight.json new file mode 100644 index 0000000..c4c1c31 --- /dev/null +++ b/src/main/resources/data/engineersdecor/loot_tables/blocks/dark_shingle_roof_skylight.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "dark_shingle_roof_skylight_dlt", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:copy_name", + "source": "block_entity" + } + ], + "name": "engineersdecor:dark_shingle_roof_skylight" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/patchouli_books/engineersdecor_manual/en_us/categories/crafting.json b/src/main/resources/data/engineersdecor/patchouli_books/engineersdecor_manual/en_us/categories/crafting.json index f70bbea..81eda14 100644 --- a/src/main/resources/data/engineersdecor/patchouli_books/engineersdecor_manual/en_us/categories/crafting.json +++ b/src/main/resources/data/engineersdecor/patchouli_books/engineersdecor_manual/en_us/categories/crafting.json @@ -1,6 +1,6 @@ { "name": "Crafting and Smelting", "description": "Getting things build, cooked, smelted or liquified. ", - "icon": "engineersdecor:treated_wood_crafting_table", + "icon": "engineersdecor:metal_crafting_table", "sortnum": 5000 } \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/patchouli_books/engineersdecor_manual/en_us/entries/crafting/crafting_table.json b/src/main/resources/data/engineersdecor/patchouli_books/engineersdecor_manual/en_us/entries/crafting/crafting_table.json index b1152b6..835a673 100644 --- a/src/main/resources/data/engineersdecor/patchouli_books/engineersdecor_manual/en_us/entries/crafting/crafting_table.json +++ b/src/main/resources/data/engineersdecor/patchouli_books/engineersdecor_manual/en_us/entries/crafting/crafting_table.json @@ -1,13 +1,13 @@ { "name": "Metal Crafting Table", - "icon": "engineersdecor:treated_wood_crafting_table", + "icon": "engineersdecor:metal_crafting_table", "category": "crafting", "sortnum": 5010, "pages": [ { "type": "spotlight", "title": "Crafting Table", - "item": "engineersdecor:treated_wood_crafting_table", + "item": "engineersdecor:metal_crafting_table", "text": "This engineering themed workbench allows manual 3x3 crafting. It comes with some convenience tweaks, which are not visible at the first look. These features will be explained on the next pages." }, { diff --git a/src/main/resources/data/engineersdecor/patchouli_books/engineersdecor_manual/en_us/entries/fluidics/passive_fluid_accumulator.json b/src/main/resources/data/engineersdecor/patchouli_books/engineersdecor_manual/en_us/entries/fluidics/passive_fluid_accumulator.json deleted file mode 100644 index 42d635b..0000000 --- a/src/main/resources/data/engineersdecor/patchouli_books/engineersdecor_manual/en_us/entries/fluidics/passive_fluid_accumulator.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "Passive Fluid Accumulator", - "icon": "engineersdecor:passive_fluid_accumulator", - "category": "fluidics", - "sortnum": 7040, - "pages": [ - { - "type": "spotlight", - "title": "Fluid Accumulator", - "item": "engineersdecor:passive_fluid_accumulator", - "text": "This passive collector is useful to drain multiple tanks with one pump. It is basically an empty liquid container with one outlet connector for a suction pump, as well as five inlets for adjacent tanks.$(br)When the pump drains the Fluid Accumulator, the connected tanks will be drained in turn." - }, - { - "type": "text", - "text": "The Fluid Accumulator supports pressurised (\"high speed\") fluid transfer of $(o)Immersive Engineering$() pumps, and can drain tanks very quickly. Note that the initial flow rate is low, because the container volume needs to be filled up first by the pump vacuum.$(br2)To place the device, click on the input side of the pump (the outlet is on the face you click). Shift-click placement flips the placement direction." - } - ] -} diff --git a/src/main/resources/data/engineersdecor/recipes/dependent/passive_fluid_accumulator_recipe.json b/src/main/resources/data/engineersdecor/recipes/dependent/passive_fluid_accumulator_recipe.json deleted file mode 100644 index b3b49df..0000000 --- a/src/main/resources/data/engineersdecor/recipes/dependent/passive_fluid_accumulator_recipe.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "engineersdecor:optional", - "result": "engineersdecor:passive_fluid_accumulator", - "required": ["#forge:sheetmetal/iron", "immersiveengineering:component_iron", "immersiveengineering:fluid_pipe"] - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "SPS", - "PMP", - "SPS" - ], - "key": { - "P": { "item": "immersiveengineering:fluid_pipe" }, - "M": { "item": "immersiveengineering:component_iron" }, - "S": { "tag" : "forge:sheetmetal/iron" } - }, - "result": { - "item": "engineersdecor:passive_fluid_accumulator", - "count": 1 - } - } - }, - { - "conditions": [ - { - "type": "engineersdecor:optional", - "result": "engineersdecor:passive_fluid_accumulator", - "required": ["engineersdecor:straight_pipe_valve"] - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "SPS", - "P P", - "SPS" - ], - "key": { - "P": { "item": "engineersdecor:straight_pipe_valve" }, - "S": { "item": "minecraft:iron_ingot" } - }, - "result": { - "item": "engineersdecor:passive_fluid_accumulator", - "count": 1 - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_chimneytrunk_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_chimneytrunk_recipe.json new file mode 100644 index 0000000..7e96ede --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_chimneytrunk_recipe.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:dark_shingle_roof_chimneytrunk", + "required": [ "engineersdecor:dark_shingle_roof", "engineersdecor:thick_steel_pole" ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "P", + "R" + ], + "key": { + "R": { + "item": "engineersdecor:dark_shingle_roof" + }, + "P": { + "item": "engineersdecor:thick_steel_pole" + } + }, + "result": { + "item": "engineersdecor:dark_shingle_roof_chimneytrunk", + "count": 1 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_metallized_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_metallized_recipe.json new file mode 100644 index 0000000..92c44f3 --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_metallized_recipe.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:dark_shingle_roof_metallized", + "required": [ "engineersdecor:dark_shingle_roof" ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "NNN", + "RRR" + ], + "key": { + "N": { + "item": "minecraft:iron_nugget" + }, + "R": { + "item": "engineersdecor:dark_shingle_roof" + } + }, + "result": { + "item": "engineersdecor:dark_shingle_roof_metallized", + "count": 4 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_skylight_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_skylight_recipe.json new file mode 100644 index 0000000..eb71b68 --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_skylight_recipe.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:dark_shingle_roof_skylight", + "required": [ "engineersdecor:dark_shingle_roof" ] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R ", + "PR" + ], + "key": { + "P": { + "item": "minecraft:glass_pane" + }, + "R": { + "item": "engineersdecor:dark_shingle_roof" + } + }, + "result": { + "item": "engineersdecor:dark_shingle_roof_skylight", + "count": 3 + } + } + } + ] +} \ No newline at end of file