From bcb088b1a47291c43ab88c92ad7045239cb1a757 Mon Sep 17 00:00:00 2001 From: stfwi Date: Sat, 20 Apr 2019 12:51:14 +0200 Subject: [PATCH] Added steel support poles with support heads. --- 1.12/gradle.properties | 2 +- 1.12/meta/update.json | 3 +- 1.12/readme.md | 3 + .../wile/engineersdecor/blocks/ModBlocks.java | 34 ++++- .../blockstates/thick_steel_pole.json | 17 +++ .../blockstates/thick_steel_pole_head.json | 17 +++ .../blockstates/thin_steel_pole.json | 17 +++ .../blockstates/thin_steel_pole_head.json | 17 +++ .../assets/engineersdecor/lang/en_us.lang | 8 ++ .../assets/engineersdecor/lang/ru_ru.lang | 8 ++ .../straight_thick_metal_pole_head_model.json | 114 ++++++++++++++++ .../pole/straight_thick_metal_pole_model.json | 66 ++++++++++ .../straight_thin_metal_pole_head_model.json | 122 ++++++++++++++++++ .../pole/straight_thin_metal_pole_model.json | 66 ++++++++++ .../engineersdecor/recipes/_constants.json | 4 + .../recipes/thick_steel_pole_head_recipe.json | 17 +++ .../thick_steel_pole_recipe_backcycle.json | 17 +++ .../recipes/thin_steel_pole_head_recipe.json | 17 +++ .../recipes/thin_steel_pole_recipe.json | 25 ++++ .../thin_steel_pole_recipe_backcycle.json | 17 +++ .../thin_steel_pole_recipe_leftalign.json | 25 ++++ .../thin_steel_pole_recipe_rightalign.json | 25 ++++ .../pole/thick_steel_pole_side_texture.png | Bin 0 -> 402 bytes .../pole/thick_steel_pole_top_texture.png | Bin 0 -> 348 bytes .../pole/thin_steel_pole_side_texture.png | Bin 0 -> 342 bytes .../pole/thin_steel_pole_top_texture.png | Bin 0 -> 373 bytes meta/update.json | 3 +- 27 files changed, 640 insertions(+), 4 deletions(-) create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/thick_steel_pole.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/thick_steel_pole_head.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/thin_steel_pole.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/thin_steel_pole_head.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/pole/straight_thick_metal_pole_head_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/pole/straight_thick_metal_pole_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/pole/straight_thin_metal_pole_head_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/pole/straight_thin_metal_pole_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_head_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_recipe_backcycle.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_head_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_backcycle.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_leftalign.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_rightalign.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/pole/thick_steel_pole_side_texture.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/pole/thick_steel_pole_top_texture.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/pole/thin_steel_pole_side_texture.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/pole/thin_steel_pole_top_texture.png diff --git a/1.12/gradle.properties b/1.12/gradle.properties index 250ed7c..1f35193 100644 --- a/1.12/gradle.properties +++ b/1.12/gradle.properties @@ -4,4 +4,4 @@ org.gradle.jvmargs=-Xmx8G version_minecraft=1.12.2 version_forge=14.23.5.2768 version_jei=4.10.0.198 -version_engineersdecor=1.0.4-b2 +version_engineersdecor=1.0.4-b3 diff --git a/1.12/meta/update.json b/1.12/meta/update.json index bee53dc..69f0d43 100644 --- a/1.12/meta/update.json +++ b/1.12/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.12.2": { + "1.0.4-b3": "[A] Added thin (4x4x16) and thick (6x6x16) steel hollow poles.\n[A] Added support head/foot components for thin and thick steel poles.", "1.0.4-b2": "[A] Added position dependent texture variation to clinker wall, slag brick wall and rebar concrete wall.", "1.0.4-b1": "[A] Crafting table: JEI integration for recipe placement added.\n[A] Crafting table: History re-fab added, allowing to quickly select and re-craft recent recipes. Selection with arrow buttons, ingredient placement by clicking the result slot. Automatic item distribution on shift-click. Quick-move buttons.\n[F] Crafting table textures modified to prevent optifine glitches on the edges of the legs.", "1.0.3": "[R] Release based on v1.0.3-b5. Release-to-release changes: * Small laboratory furnace added. * Extensive config options for mod packing and tuning added. * Rendering issues fixes (window bleeding, optifine). * Steel framed window added. * Treated wood pole \"end pieces\" added (two support variants). * Sitting on treated wood stool added including mobs (but not villagers, as these are obviously very upright people). * Lang ru_ru added (github contribution from Yaroslavik). * Creative tab logo changed to mod logo. * Table/crafting table bounding boxes refined. * Standalone \"escape\" recipes added if IE is not installed.", @@ -26,6 +27,6 @@ }, "promos": { "1.12.2-recommended": "1.0.3", - "1.12.2-latest": "1.0.4-b2" + "1.12.2-latest": "1.0.4-b3" } } \ No newline at end of file diff --git a/1.12/readme.md b/1.12/readme.md index 482cd39..53d6d1c 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,6 +10,9 @@ Mod sources for Minecraft version 1.12.2. ---- ## Revision history + - v1.0.4-b3 [A] Added thin (4x4x16) and thick (6x6x16) steel hollow poles. + [A] Added support head/foot components for thin and thick steel poles. + - v1.0.4-b2 [A] Added position dependent texture variation to clinker wall, slag brick wall and rebar concrete wall. diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java index cc64623..86adbe4 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java @@ -78,6 +78,34 @@ public class ModBlocks ModAuxiliaries.getPixeledAABB(5.8,5.8,0, 10.2,10.2,16) ); + public static final BlockDecorStraightPole THIN_STEEL_POLE = new BlockDecorStraightPole( + "thin_steel_pole", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_FACING_PLACEMENT, + Material.IRON, 1.0f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(6,6,0, 10,10,16) + ); + + public static final BlockDecorStraightPole THIN_STEEL_POLE_HEAD = new BlockDecorStraightPole( + "thin_steel_pole_head", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_IF_SAME, + Material.IRON, 1.0f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(6,6,0, 10,10,16) + ); + + public static final BlockDecorStraightPole THICK_STEEL_POLE = new BlockDecorStraightPole( + "thick_steel_pole", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_FACING_PLACEMENT, + Material.IRON, 1.0f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(5,5,0, 11,11,16) + ); + + public static final BlockDecorStraightPole THICK_STEEL_POLE_HEAD = new BlockDecorStraightPole( + "thick_steel_pole_head", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_IF_SAME, + Material.IRON, 1.0f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(5,5,0, 11,11,16) + ); + public static final BlockDecor TREATED_WOOD_TABLE = new BlockDecor( "treated_wood_table", BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT, @@ -169,7 +197,11 @@ public class ModBlocks STEEL_FRAMED_WINDOW, TREATED_WOOD_POLE_SUPPORT, TREATED_WOOD_POLE_HEAD, - SIGN_MODLOGO + SIGN_MODLOGO, + THIN_STEEL_POLE, + THICK_STEEL_POLE, + THIN_STEEL_POLE_HEAD, + THICK_STEEL_POLE_HEAD }; private static final Block devBlocks[] = { diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/thick_steel_pole.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/thick_steel_pole.json new file mode 100644 index 0000000..a000062 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/thick_steel_pole.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "engineersdecor:pole/straight_thick_metal_pole_model", + "x":-90, + "textures": { + "particle": "engineersdecor:blocks/pole/thick_steel_pole_side_texture", + "side": "engineersdecor:blocks/pole/thick_steel_pole_side_texture", + "top": "engineersdecor:blocks/pole/thick_steel_pole_top_texture" + } + }, + "variants": { + "normal": [{}], + "facing": { "north": {"y":0}, "south": {"y":0}, "west": {"y":90}, "east": {"y":90}, "up": {"x":90}, "down": {"x":90} }, + "inventory": [{}] + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/thick_steel_pole_head.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/thick_steel_pole_head.json new file mode 100644 index 0000000..3391774 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/thick_steel_pole_head.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "engineersdecor:pole/straight_thick_metal_pole_head_model", + "x":-90, + "textures": { + "particle": "engineersdecor:blocks/pole/thick_steel_pole_side_texture", + "side": "engineersdecor:blocks/pole/thick_steel_pole_side_texture", + "top": "engineersdecor:blocks/pole/thick_steel_pole_top_texture" + } + }, + "variants": { + "normal": [{}], + "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":-90}, "down": {"x":90} }, + "inventory": [{}] + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/thin_steel_pole.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/thin_steel_pole.json new file mode 100644 index 0000000..66b63ad --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/thin_steel_pole.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "engineersdecor:pole/straight_thin_metal_pole_model", + "x":-90, + "textures": { + "particle": "engineersdecor:blocks/pole/thin_steel_pole_side_texture", + "side": "engineersdecor:blocks/pole/thin_steel_pole_side_texture", + "top": "engineersdecor:blocks/pole/thin_steel_pole_top_texture" + } + }, + "variants": { + "normal": [{}], + "facing": { "north": {"y":0}, "south": {"y":0}, "west": {"y":90}, "east": {"y":90}, "up": {"x":90}, "down": {"x":90} }, + "inventory": [{}] + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/thin_steel_pole_head.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/thin_steel_pole_head.json new file mode 100644 index 0000000..8f6bfae --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/thin_steel_pole_head.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "engineersdecor:pole/straight_thin_metal_pole_head_model", + "x":-90, + "textures": { + "particle": "engineersdecor:blocks/pole/thin_steel_pole_side_texture", + "side": "engineersdecor:blocks/pole/thin_steel_pole_side_texture", + "top": "engineersdecor:blocks/pole/thin_steel_pole_top_texture" + } + }, + "variants": { + "normal": [{}], + "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":-90}, "down": {"x":90} }, + "inventory": [{}] + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang b/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang index eb5607d..0e4ae4c 100644 --- a/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang +++ b/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang @@ -56,6 +56,14 @@ tile.engineersdecor.treated_wood_pole_head.name=Straight treated wood pole head/ tile.engineersdecor.treated_wood_pole_head.help=§6Wooden part fitting as foot or head of straight poles. tile.engineersdecor.treated_wood_pole_support.name=Straight treated wood pole support tile.engineersdecor.treated_wood_pole_support.help=§6Heavy duty wooden support part fitting as foot or head of straight poles. +tile.engineersdecor.thick_steel_pole.name=Straight thick steel pole +tile.engineersdecor.thick_steel_pole.help=§6Straight hollow pole fragment (6x6x16) for structural support purposes. +tile.engineersdecor.thin_steel_pole.name=Straight thin steel pole +tile.engineersdecor.thin_steel_pole.help=§6Straight hollow pole fragment (4x4x16) for structural support purposes. +tile.engineersdecor.thin_steel_pole_head.name=Straight thin steel pole head/foot +tile.engineersdecor.thin_steel_pole_head.help=§6Steel part fitting as foot or head of the thin steel pole (4x4x16). +tile.engineersdecor.thick_steel_pole_head.name=Straight thick steel pole head/foot +tile.engineersdecor.thick_steel_pole_head.help=§6Steel part fitting as foot or head of the thick steel pole (6x6x16). #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.treated_wood_table.name=Treated wood table tile.engineersdecor.treated_wood_table.help=§6Robust four-legged wood table.§r Indoor and outdoor use. diff --git a/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang b/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang index 688945f..dd469bc 100644 --- a/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang +++ b/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang @@ -56,6 +56,14 @@ tile.engineersdecor.treated_wood_pole_head.name=Прямой обработан #tile.engineersdecor.treated_wood_pole_head.help=§6Wooden part fitting as foot or head of straight poles. tile.engineersdecor.treated_wood_pole_support.name=Прямой обработанный деревянный столб #tile.engineersdecor.treated_wood_pole_support.help=§6Heavy duty wooden support part fitting as foot or head of straight poles. +tile.engineersdecor.thick_steel_pole.name=Straight thick steel pole +#tile.engineersdecor.thick_steel_pole.help=§6Straight hollow pole fragment (6x6x16) for structural support purposes. +tile.engineersdecor.thin_steel_pole.name=Straight thin steel pole +#tile.engineersdecor.thin_steel_pole.help=§6Straight hollow pole fragment (4x4x16) for structural support purposes. +tile.engineersdecor.thin_steel_pole_head.name=Straight thin steel pole head/foot +#tile.engineersdecor.thin_steel_pole_head.help=§6Steel part fitting as foot or head of the thin steel pole (4x4x16). +tile.engineersdecor.thick_steel_pole_head.name=Straight thick steel pole head/foot +#tile.engineersdecor.thick_steel_pole_head.help=§6Steel part fitting as foot or head of the thick steel pole (6x6x16). #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.treated_wood_table.name=Стол из обработанного дерева tile.engineersdecor.treated_wood_table.help=§6Прочный деревянный стол с четырьмя ножками .§r Для использования в помещении и на улице. diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/pole/straight_thick_metal_pole_head_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/pole/straight_thick_metal_pole_head_model.json new file mode 100644 index 0000000..aeccde5 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/pole/straight_thick_metal_pole_head_model.json @@ -0,0 +1,114 @@ +{ + "parent": "block/cube", + "textures": { + "side": "engineersdecor:blocks/pole/thick_steel_pole_side_texture", + "particle": "engineersdecor:blocks/pole/thick_steel_pole_side_texture", + "top": "engineersdecor:blocks/pole/thick_steel_pole_top_texture" + }, + "elements": [ + { + "from": [6, 10, 0], + "to": [10, 11, 14], + "faces": { + "north": {"uv": [6, 5, 10, 6], "texture": "#top"}, + "up": {"uv": [6, 0, 10, 16], "texture": "#side"}, + "down": {"uv": [6, 0, 10, 16], "texture": "#side"} + } + }, + { + "from": [10, 5, 0], + "to": [11, 11, 14], + "faces": { + "north": {"uv": [5, 5, 6, 11], "texture": "#top", "cullface": "north"}, + "east": {"uv": [5, 0, 11, 16], "rotation": 90, "texture": "#side"}, + "west": {"uv": [5, 0, 11, 16], "rotation": 90, "texture": "#side"}, + "up": {"uv": [10, 0, 11, 16], "texture": "#side"}, + "down": {"uv": [10, 0, 11, 16], "texture": "#side"} + } + }, + { + "from": [5, 5, 0], + "to": [6, 11, 14], + "faces": { + "north": {"uv": [10, 5, 11, 11], "texture": "#top", "cullface": "north"}, + "east": {"uv": [5, 0, 11, 16], "rotation": 90, "texture": "#side"}, + "west": {"uv": [5, 0, 11, 16], "rotation": 90, "texture": "#side"}, + "up": {"uv": [5, 0, 6, 16], "texture": "#side"}, + "down": {"uv": [5, 0, 6, 16], "texture": "#side"} + } + }, + { + "from": [6, 5, 0], + "to": [10, 6, 14], + "faces": { + "north": {"uv": [6, 10, 10, 11], "texture": "#top"}, + "up": {"uv": [6, 0, 10, 16], "texture": "#side"}, + "down": {"uv": [6, 0, 10, 16], "texture": "#side"} + } + }, + { + "from": [3, 3, 14], + "to": [13, 13, 16], + "faces": { + "north": {"uv": [4, 4, 12, 12], "texture": "#top", "cullface": "north"}, + "east": {"uv": [4, 5, 6, 13], "texture": "#side"}, + "south": {"uv": [3, 3, 13, 13], "texture": "#top", "cullface": "south"}, + "west": {"uv": [14, 4, 16, 12], "texture": "#side"}, + "up": {"uv": [12, 4, 14, 12], "rotation": 90, "texture": "#side"}, + "down": {"uv": [10, 1, 12, 10], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [6, 11, 13], + "to": [10, 11.5, 15], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 11.25, 14]}, + "faces": { + "east": {"uv": [2, 5.5, 4, 6], "texture": "#top"}, + "west": {"uv": [12, 5.5, 14, 6], "texture": "#top"}, + "up": {"uv": [6, 13, 10, 15], "texture": "#top"} + } + }, + { + "from": [6, 4.5, 13], + "to": [10, 5, 15], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 4.75, 14]}, + "faces": { + "east": {"uv": [2, 5.5, 4, 6], "texture": "#top"}, + "west": {"uv": [12, 5.5, 14, 6], "texture": "#top"}, + "down": {"uv": [6, 1, 10, 3], "texture": "#top"} + } + }, + { + "from": [4.5, 6, 13], + "to": [5, 10, 15], + "rotation": {"angle": -45, "axis": "y", "origin": [4.75, 8, 14]}, + "faces": { + "west": {"uv": [6, 1, 10, 3], "rotation": 270, "texture": "#top"}, + "up": {"uv": [12, 5.5, 14, 6], "rotation": 90, "texture": "#top"}, + "down": {"uv": [2, 5.5, 4, 6], "rotation": 270, "texture": "#top"} + } + }, + { + "from": [11, 6, 13], + "to": [11.5, 10, 15], + "rotation": {"angle": 45, "axis": "y", "origin": [11.25, 8, 14]}, + "faces": { + "east": {"uv": [6, 13, 10, 15], "rotation": 270, "texture": "#top"}, + "up": {"uv": [12, 5.5, 14, 6], "rotation": 90, "texture": "#top"}, + "down": {"uv": [2, 5.5, 4, 6], "rotation": 270, "texture": "#top"} + } + } + ], + "display": { + "ground": { + "scale": [0.2, 0.2, 0.2] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/pole/straight_thick_metal_pole_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/pole/straight_thick_metal_pole_model.json new file mode 100644 index 0000000..db77562 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/pole/straight_thick_metal_pole_model.json @@ -0,0 +1,66 @@ +{ + "parent": "block/cube", + "textures": { + "side": "engineersdecor:blocks/pole/thick_steel_pole_side_texture", + "particle": "engineersdecor:blocks/pole/thick_steel_pole_side_texture", + "top": "engineersdecor:blocks/pole/thick_steel_pole_top_texture" + }, + "elements": [ + { + "from": [6, 10, 0], + "to": [10, 11, 16], + "faces": { + "north": {"uv": [6, 5, 9.5, 5.75], "texture": "#top"}, + "south": {"uv": [6, 6, 9.5, 6.75], "texture": "#top"}, + "up": {"uv": [6.25, 0, 9.75, 16], "texture": "#side"}, + "down": {"uv": [6.25, 0, 9.75, 16], "texture": "#side"} + } + }, + { + "from": [10, 5, 0], + "to": [11, 11, 16], + "faces": { + "north": {"uv": [5, 5, 5.75, 10], "texture": "#top", "cullface": "north"}, + "east": {"uv": [5, 0, 11, 16], "rotation": 90, "texture": "#side"}, + "south": {"uv": [10, 5, 10.75, 10], "texture": "#top", "cullface": "south"}, + "west": {"uv": [5, 0, 11, 16], "rotation": 90, "texture": "#side"}, + "up": {"uv": [10, 0, 11, 16], "texture": "#side"}, + "down": {"uv": [10, 0, 10.75, 16], "texture": "#side"} + } + }, + { + "from": [5, 5, 0], + "to": [6, 11, 16], + "faces": { + "north": {"uv": [10, 6, 10.75, 11], "texture": "#top", "cullface": "north"}, + "east": {"uv": [5, 0, 11, 16], "rotation": 90, "texture": "#side"}, + "south": {"uv": [5, 6, 5.75, 11], "texture": "#top", "cullface": "south"}, + "west": {"uv": [5, 0, 11, 16], "rotation": 90, "texture": "#side"}, + "up": {"uv": [5, 0, 6, 16], "texture": "#side"}, + "down": {"uv": [5, 0, 5.75, 16], "texture": "#side"} + } + }, + { + "from": [6, 5, 0], + "to": [10, 6, 16], + "faces": { + "north": {"uv": [6, 10, 9.5, 10.75], "texture": "#top"}, + "south": {"uv": [6, 10, 9.5, 10.75], "texture": "#top"}, + "up": {"uv": [6.25, 0, 9.75, 16], "texture": "#side"}, + "down": {"uv": [6.25, 0, 9.75, 16], "texture": "#side"} + } + } + ], + "display": { + "ground": { + "scale": [0.2, 0.2, 0.2] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/pole/straight_thin_metal_pole_head_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/pole/straight_thin_metal_pole_head_model.json new file mode 100644 index 0000000..ae017f8 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/pole/straight_thin_metal_pole_head_model.json @@ -0,0 +1,122 @@ +{ + "parent": "block/cube", + "textures": { + "side": "engineersdecor:blocks/pole/thin_steel_pole_side_texture", + "particle": "engineersdecor:blocks/pole/thin_steel_pole_side_texture", + "top": "engineersdecor:blocks/pole/thin_steel_pole_top_texture" + }, + "elements": [ + { + "from": [7, 9, 0], + "to": [9, 10, 14], + "faces": { + "north": {"uv": [7, 6, 9, 7], "texture": "#top"}, + "south": {"uv": [7, 6, 9, 7], "texture": "#top"}, + "up": {"uv": [7, 0, 9, 16], "texture": "#side"}, + "down": {"uv": [7, 0, 9, 16], "texture": "#side"} + } + }, + { + "from": [9, 6, 0], + "to": [10, 10, 14], + "faces": { + "north": {"uv": [6, 6, 7, 10], "texture": "#top", "cullface": "north"}, + "east": {"uv": [6, 0, 10, 16], "rotation": 90, "texture": "#side"}, + "south": {"uv": [9, 6, 10, 10], "texture": "#top", "cullface": "south"}, + "west": {"uv": [6, 0, 10, 16], "rotation": 90, "texture": "#side"}, + "up": {"uv": [9, 0, 10, 16], "texture": "#side"}, + "down": {"uv": [9, 0, 10, 16], "texture": "#side"} + } + }, + { + "from": [6, 6, 0], + "to": [7, 10, 14], + "faces": { + "north": {"uv": [9, 6, 10, 10], "texture": "#top", "cullface": "north"}, + "east": {"uv": [6, 0, 10, 16], "rotation": 90, "texture": "#side"}, + "south": {"uv": [6, 6, 7, 10], "texture": "#top", "cullface": "south"}, + "west": {"uv": [6, 0, 10, 16], "rotation": 90, "texture": "#side"}, + "up": {"uv": [6, 0, 7, 16], "texture": "#side"}, + "down": {"uv": [6, 0, 7, 16], "texture": "#side"} + } + }, + { + "from": [7, 6, 0], + "to": [9, 7, 14], + "faces": { + "north": {"uv": [7, 9, 9, 10], "texture": "#top"}, + "south": {"uv": [7, 9, 9, 10], "texture": "#top"}, + "up": {"uv": [7, 0, 9, 16], "texture": "#side"}, + "down": {"uv": [7, 0, 9, 16], "texture": "#side"} + } + }, + { + "from": [4, 4, 14], + "to": [12, 12, 16], + "faces": { + "north": {"uv": [4, 4, 12, 12], "texture": "#top", "cullface": "north"}, + "east": {"uv": [5, 5, 7, 13], "texture": "#side"}, + "south": {"uv": [4, 4, 12, 12], "texture": "#top", "cullface": "south"}, + "west": {"uv": [14, 4, 16, 12], "texture": "#side"}, + "up": {"uv": [12, 4, 14, 12], "rotation": 90, "texture": "#side"}, + "down": {"uv": [10, 1, 12, 10], "rotation": 90, "texture": "#side"} + } + }, + { + "from": [7, 10, 13], + "to": [9, 10.5, 15], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 10.25, 14]}, + "faces": { + "east": {"uv": [2, 5.5, 4, 6], "texture": "#top"}, + "west": {"uv": [12, 5.5, 14, 6], "texture": "#top"}, + "up": {"uv": [7, 13, 9, 15], "texture": "#top"}, + "down": {"uv": [7, 2, 9, 4], "texture": "#top"} + } + }, + { + "from": [7, 5.5, 13], + "to": [9, 6, 15], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 5.75, 14]}, + "faces": { + "east": {"uv": [2, 5.5, 4, 6], "texture": "#top"}, + "west": {"uv": [12, 5.5, 14, 6], "texture": "#top"}, + "up": {"uv": [7, 12, 9, 14], "texture": "#top"}, + "down": {"uv": [7, 1, 9, 3], "texture": "#top"} + } + }, + { + "from": [5.5, 7, 13], + "to": [6, 9, 15], + "rotation": {"angle": -45, "axis": "y", "origin": [5.75, 8, 14]}, + "faces": { + "east": {"uv": [7, 12, 9, 14], "rotation": 270, "texture": "#top"}, + "west": {"uv": [7, 1, 9, 3], "rotation": 270, "texture": "#top"}, + "up": {"uv": [12, 5.5, 14, 6], "rotation": 90, "texture": "#top"}, + "down": {"uv": [2, 5.5, 4, 6], "rotation": 270, "texture": "#top"} + } + }, + { + "from": [10, 7, 13], + "to": [10.5, 9, 15], + "rotation": {"angle": 45, "axis": "y", "origin": [10.25, 8, 14]}, + "faces": { + "east": {"uv": [7, 13, 9, 15], "rotation": 270, "texture": "#top"}, + "west": {"uv": [7, 2, 9, 4], "rotation": 270, "texture": "#top"}, + "up": {"uv": [12, 5.5, 14, 6], "rotation": 90, "texture": "#top"}, + "down": {"uv": [2, 5.5, 4, 6], "rotation": 270, "texture": "#top"} + } + } + ], + "display": { + "ground": { + "scale": [0.2, 0.2, 0.2] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/pole/straight_thin_metal_pole_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/pole/straight_thin_metal_pole_model.json new file mode 100644 index 0000000..398cc19 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/pole/straight_thin_metal_pole_model.json @@ -0,0 +1,66 @@ +{ + "parent": "block/cube", + "textures": { + "side": "engineersdecor:blocks/pole/thin_steel_pole_side_texture", + "particle": "engineersdecor:blocks/pole/thin_steel_pole_side_texture", + "top": "engineersdecor:blocks/pole/thin_steel_pole_top_texture" + }, + "elements": [ + { + "from": [7, 9, 0], + "to": [9, 10, 16], + "faces": { + "north": {"uv": [7, 6, 9, 7], "texture": "#top"}, + "south": {"uv": [7, 6, 9, 7], "texture": "#top"}, + "up": {"uv": [7, 0, 9, 16], "texture": "#side"}, + "down": {"uv": [7, 0, 9, 16], "texture": "#side"} + } + }, + { + "from": [9, 6, 0], + "to": [10, 10, 16], + "faces": { + "north": {"uv": [6, 6, 7, 10], "texture": "#top", "cullface": "north"}, + "east": {"uv": [6, 0, 10, 16], "rotation": 90, "texture": "#side"}, + "south": {"uv": [9, 6, 10, 10], "texture": "#top", "cullface": "south"}, + "west": {"uv": [6, 0, 10, 16], "rotation": 90, "texture": "#side"}, + "up": {"uv": [9, 0, 10, 16], "texture": "#side"}, + "down": {"uv": [9, 0, 10, 16], "texture": "#side"} + } + }, + { + "from": [6, 6, 0], + "to": [7, 10, 16], + "faces": { + "north": {"uv": [9, 6, 10, 10], "texture": "#top", "cullface": "north"}, + "east": {"uv": [6, 0, 10, 16], "rotation": 90, "texture": "#side"}, + "south": {"uv": [6, 6, 7, 10], "texture": "#top", "cullface": "south"}, + "west": {"uv": [6, 0, 10, 16], "rotation": 90, "texture": "#side"}, + "up": {"uv": [6, 0, 7, 16], "texture": "#side"}, + "down": {"uv": [6, 0, 7, 16], "texture": "#side"} + } + }, + { + "from": [7, 6, 0], + "to": [9, 7, 16], + "faces": { + "north": {"uv": [7, 9, 9, 10], "texture": "#top"}, + "south": {"uv": [7, 9, 9, 10], "texture": "#top"}, + "up": {"uv": [7, 0, 9, 16], "texture": "#side"}, + "down": {"uv": [7, 0, 9, 16], "texture": "#side"} + } + } + ], + "display": { + "ground": { + "scale": [0.2, 0.2, 0.2] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json b/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json index 6f68018..36329d4 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json @@ -27,6 +27,10 @@ "ingredient": { "type": "forge:ore_dict", "ore": "plateIron" }, "name": "plateIron" }, + { + "ingredient": { "type": "forge:ore_dict", "ore": "ingotSteel" }, + "name": "ingotSteel" + }, { "ingredient": { "type": "forge:ore_dict", "ore": "plateSteel" }, "name": "plateSteel" diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_head_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_head_recipe.json new file mode 100644 index 0000000..e2efd5d --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_head_recipe.json @@ -0,0 +1,17 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:thick_steel_pole_head" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "engineersdecor:thick_steel_pole" + } + ], + "result": { + "item": "engineersdecor:thick_steel_pole_head" + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_recipe_backcycle.json b/1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_recipe_backcycle.json new file mode 100644 index 0000000..8d4bc27 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_recipe_backcycle.json @@ -0,0 +1,17 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:thick_steel_pole" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "engineersdecor:thick_steel_pole_head" + } + ], + "result": { + "item": "engineersdecor:thick_steel_pole" + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_head_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_head_recipe.json new file mode 100644 index 0000000..88613a9 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_head_recipe.json @@ -0,0 +1,17 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:thin_steel_pole_head" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "engineersdecor:thin_steel_pole" + } + ], + "result": { + "item": "engineersdecor:thin_steel_pole_head" + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe.json new file mode 100644 index 0000000..da91bfa --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:thin_steel_pole", + "required": ["immersiveengineering:material"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " S", + " S ", + "S " + ], + "key": { + "S": { + "item": "#ingotSteel", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:thin_steel_pole", + "count": 18 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_backcycle.json b/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_backcycle.json new file mode 100644 index 0000000..9623469 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_backcycle.json @@ -0,0 +1,17 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:thin_steel_pole" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "engineersdecor:thin_steel_pole_head" + } + ], + "result": { + "item": "engineersdecor:thin_steel_pole" + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_leftalign.json b/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_leftalign.json new file mode 100644 index 0000000..e7554e1 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_leftalign.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:thin_steel_pole", + "required": ["engineersdecor:thin_steel_pole"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "PP ", + "PP ", + "PP " + ], + "key": { + "P": { + "item": "engineersdecor:thin_steel_pole", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:thick_steel_pole", + "count": 4 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_rightalign.json b/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_rightalign.json new file mode 100644 index 0000000..6c57651 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_rightalign.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:thin_steel_pole", + "required": ["engineersdecor:thin_steel_pole"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " PP", + " PP", + " PP" + ], + "key": { + "P": { + "item": "engineersdecor:thin_steel_pole", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:thick_steel_pole", + "count": 4 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/pole/thick_steel_pole_side_texture.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/pole/thick_steel_pole_side_texture.png new file mode 100644 index 0000000000000000000000000000000000000000..ebd2abc1304c2231e9470ebf8b675295b9c9e690 GIT binary patch literal 402 zcmV;D0d4+?P)N+BkNz0pc4hj@7CKzu8q4eTDgaeQRfz~Pljrlv?REpe-8qhf%)D?_#ZXlMGLsgn zDnx|LTuJ-cTtuJ%RYjkj*uqtXyYm;Ps*Hv^keQ4z5E15_E1?B>-A(J@chdJu?3}iu zh+t+^6=sH+F~&euF|$ki&1L4V2VF5U5fR*-F$TwRtg+1O!mSZ@S6lslzhh?1Ial>> z&djcR5D{z30N(HSWu#7SE+QDcT`kn@^~&x~wi~*((abKc_73b-_7AjkRmF&i)m|sN w`|1GTJkK@CH#hpSf9VF=i-=eq?VOqM1KVY3zjmkYUjP6A07*qoM6N<$g4uDjxc~qF literal 0 HcmV?d00001 diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/pole/thick_steel_pole_top_texture.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/pole/thick_steel_pole_top_texture.png new file mode 100644 index 0000000000000000000000000000000000000000..a5f670c4ace5467d2dacd97606681f0448d4f43f GIT binary patch literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=Dh+K$tP>S|=w^@Q zBWv)d9_`#zV`heq6I&jfn7U@xCKs0Hl};`TR>jstPJ4Iv%mE%37Ntj=|4xbtP6@IK z)%SDBs?Rm@eDk|6_x7r#%IZq}O(7E}ZN6S}Y1hQ!@BbyAY`C-cTX}4_Z%O%ztm6}1 zJS~3vbf~=hy{>lomub~+9hqM53NzTQH+AcrnG3h<_WP6?{Q9@Jd+6I`R=1{bn?BA+ syBp#@`&N_iJIg2X7Pqd5{drXPS|=w^@SCTLV~EA+(n*1REe1T!bC(Ep6rcUO-dNt`Yt5RNr8$mH3tp*i zoO|o}XGMk`)^}uQa!yj{e7)~h+<)2U zO;h)%^&4KOo*#7IV!h_;4a?&9zTcr1A1dbQa)c+~sP($gh9`5Jg!X=ansa=o&~$fS zwa&*D%if#k?PQPYw+TC$f9K2sFL9G&4lZY!WS=u#iG7$cwe-F9y3}WrviAO;X<6%i lc5?CCuaXnOBERo@Tz6C=RMpA4IRF>}44$rjF6*2UngGs!l#KuY literal 0 HcmV?d00001 diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/pole/thin_steel_pole_top_texture.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/pole/thin_steel_pole_top_texture.png new file mode 100644 index 0000000000000000000000000000000000000000..8a14fa402563933aa1c1782c62ac9aaf2f26e9ad GIT binary patch literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=Dh+K$tP>S|=w11EZ*?i(`nz>DnO2z7_+X&6As21Re$d`L7+5=H{evR?h7tn{JNZ zQj2wOTW)W&Wa!{XWq$wlb>cj;BLSd^H`&ma3SZ`sT6NCUR)kcPz`ht4o4=uY~R=J1J0u8nbP(+`V2 z75+nEhl8&2y!l$SRJQ!MMW5%BcbS16aepSAX}DH;bd%0Xr8To6S7n$ks8D2D6{;@a zRm|_?np;->=679S$kdisVV8T;LXX;<7f+ZgaPrLaP3(dXo_{`AFIrZ__4Vt$>PfAC zcC0Qd;tvshUb$#%TWVxNnz-pyjRI3+!_7XXZ>|_#y=ePjU;D0k{w?J@