From 8ecf02d3e8a288e6bb36165b54bc5d217816266d Mon Sep 17 00:00:00 2001 From: stfwi Date: Sat, 20 Jul 2019 14:52:32 +0200 Subject: [PATCH] 1.12: Added Exit sign (issue #34). Added treated wood side table recipe. --- 1.12/meta/update.json | 3 +- 1.12/readme.md | 4 +- .../wile/engineersdecor/blocks/ModBlocks.java | 192 ++++++++++-------- .../engineersdecor/blockstates/sign_exit.json | 9 + .../assets/engineersdecor/lang/en_us.lang | 2 + .../assets/engineersdecor/lang/ru_ru.lang | 2 + .../assets/engineersdecor/lang/zh_cn.lang | 2 + .../models/block/sign/sign_exit_model.json | 45 ++++ .../treated_wood_side_table_recipe.json | 29 +++ .../recipes/sign/sign_exit_recipe.json | 16 ++ .../sign/sign_hotwire_recipe_backcycle.json | 4 +- ...ted_wood_side_table_recipe_standalone.json | 30 +++ .../blocks/sign/sign_exit_texture.png | Bin 0 -> 934 bytes meta/update.json | 3 +- 14 files changed, 249 insertions(+), 92 deletions(-) create mode 100644 1.12/src/main/resources/assets/engineersdecor/blockstates/sign_exit.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/models/block/sign/sign_exit_model.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/furniture/treated_wood_side_table_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/sign/sign_exit_recipe.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_side_table_recipe_standalone.json create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/sign/sign_exit_texture.png diff --git a/1.12/meta/update.json b/1.12/meta/update.json index 3e70560..0581559 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.10-b1": "[A] Treated wood side table added.\n[F] Fixed recipe collision of Metal Rung Ladder (issue #37, thx ProsperCraft for reporting).\n[A] Added Exit Sign (texture design by J. Carver).", "1.0.9": "[R] Release based on v1.0.9-b3. Release-to-release changes: * Slabs for clinker, concrete, slag bricks. * Slab slices for sheet metals, treated wood, and concretes. * Language updates. * Block hardness adaptions. * 1st/3rd person item model fixes. * Furnace initialisation issue fixed.", "1.0.9-b3": "[A] Added missing recipes for slabs.\n[A] Added slab slices for IE sheet metals, treated wood, and concretes (stackable \"quater-slabs\").\n[M] Updated 1st/3rd person item model rotations/translations.\n[M] Hardness of valves and furni slightly increased.", "1.0.9-b2": "[A] Added slabs for Clinker Brick, Slag Brick, Rebar Concrete, and Stained Clinker. Texture variations like the base blocks. Allow fast pick-up (see tooltip help or config).\n[F] Fixed lab/electrical furnace initialisation issue (first item inserted was smelted directly).", @@ -48,6 +49,6 @@ }, "promos": { "1.12.2-recommended": "1.0.9", - "1.12.2-latest": "1.0.9" + "1.12.2-latest": "1.0.10-b1" } } \ No newline at end of file diff --git a/1.12/readme.md b/1.12/readme.md index bbe0fa3..9c9bfec 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,10 +10,10 @@ Mod sources for Minecraft version 1.12.2. ---- ## Version history - ~ v1.0.10-b1 [I] Features WIP - [A] Treated wood side table added. + - v1.0.10-b1 [A] Treated wood side table added. [F] Fixed recipe collision of Metal Rung Ladder (issue #37, thx ProsperCraft for reporting). + [A] Added Exit Sign (texture design by J. Carver). ------------------------------------------------------------------- - v1.0.9 [R] Release based on v1.0.9-b3. Release-to-release changes: 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 3865179..de5d527 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java @@ -73,6 +73,86 @@ public class ModBlocks public static final BlockDecorGlassBlock PANZERGLASS_BLOCK = new BlockDecorGlassBlock("panzerglass_block", 0, Material.GLASS, 1f, 2000f, SoundType.GLASS); public static final BlockDecorSlab PANZERGLASS_SLAB = new BlockDecorSlab("panzerglass_slab", BlockDecor.CFG_TRANSLUCENT, Material.GLASS, 1f, 2000f, SoundType.GLASS); + //-------------------------------------------------------------------------------------------------------------------- + + public static final BlockDecorCraftingTable TREATED_WOOD_CRAFTING_TABLE = new BlockDecorCraftingTable( + "treated_wood_crafting_table", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT, + Material.WOOD, 1.0f, 15f, SoundType.WOOD, + ModAuxiliaries.getPixeledAABB(1,0,1, 15,15.9,15) + ); + + public static final BlockDecorFurnace SMALL_LAB_FURNACE = new BlockDecorFurnace( + "small_lab_furnace", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT| + BlockDecor.CFG_ELECTRICAL, + Material.IRON, 0.5f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(1,0,1, 15,15,16) + ); + + public static final BlockDecorFurnaceElectrical SMALL_ELECTRICAL_FURNACE = new BlockDecorFurnaceElectrical( + "small_electrical_furnace", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT|BlockDecor.CFG_ELECTRICAL, + Material.IRON, 0.5f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(0,0,0, 16,16,16) + ); + + public static final BlockDecorDropper FACTORY_DROPPER = new BlockDecorDropper( + "factory_dropper", + BlockDecor.CFG_LOOK_PLACEMENT|BlockDecor.CFG_REDSTONE_CONTROLLED, + Material.IRON, 1f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(0,0,0, 16,16,15) + ); + + public static final BlockDecorWasteIncinerator SMALL_WASTE_INCINERATOR = new BlockDecorWasteIncinerator( + "small_waste_incinerator", + BlockDecor.CFG_DEFAULT|BlockDecor.CFG_ELECTRICAL, + Material.IRON, 1f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(0,0,0, 16,16,16) + ); + + public static final BlockDecorMineralSmelter SMALL_MINERAL_SMELTER = new BlockDecorMineralSmelter( + "small_mineral_smelter", + BlockDecor.CFG_LOOK_PLACEMENT, + Material.IRON, 1f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(1.1,0,1.1, 14.9,16,14.9) + ); + + //-------------------------------------------------------------------------------------------------------------------- + + public static final BlockDecorPipeValve STRAIGHT_CHECK_VALVE = new BlockDecorPipeValve( + "straight_pipe_valve", + BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_SHIFTCLICK| + BlockDecor.CFG_CUTOUT, + Material.IRON, 0.7f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(4,4,0, 12,12,16) + ); + + public static final BlockDecorPipeValve STRAIGHT_REDSTONE_VALVE = new BlockDecorPipeValve( + "straight_pipe_valve_redstone", + BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_SHIFTCLICK| + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_REDSTONE_CONTROLLED, + Material.IRON, 0.7f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(4,4,0, 12,12,16) + ); + + public static final BlockDecorPipeValve STRAIGHT_REDSTONE_ANALOG_VALVE = new BlockDecorPipeValve( + "straight_pipe_valve_redstone_analog", + BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_SHIFTCLICK| + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_REDSTONE_CONTROLLED|BlockDecor.CFG_ANALOG, + Material.IRON, 0.7f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(4,4,0, 12,12,16) + ); + + public static final BlockDecorPassiveFluidAccumulator PASSIVE_FLUID_ACCUMULATOR = new BlockDecorPassiveFluidAccumulator( + "passive_fluid_accumulator", + BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_SHIFTCLICK| + BlockDecor.CFG_CUTOUT, + Material.IRON, 0.7f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(0,0,0, 16,16,16) + ); + + //-------------------------------------------------------------------------------------------------------------------- public static final BlockDecorStraightPole TREATED_WOOD_POLE = new BlockDecorStraightPole( "treated_wood_pole", @@ -123,6 +203,15 @@ public class ModBlocks ModAuxiliaries.getPixeledAABB(5,5,0, 11,11,16) ); + public static final BlockDecorHorizontalSupport STEEL_DOUBLE_T_SUPPORT = new BlockDecorHorizontalSupport( + "steel_double_t_support", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT, + Material.IRON, 2.0f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(5,11,0, 11,16,16) + ); + + //-------------------------------------------------------------------------------------------------------------------- + public static final BlockDecor TREATED_WOOD_TABLE = new BlockDecor( "treated_wood_table", BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT, @@ -144,11 +233,11 @@ public class ModBlocks ModAuxiliaries.getPixeledAABB(2,0,2, 14,15.9,14) ); - public static final BlockDecorCraftingTable TREATED_WOOD_CRAFTING_TABLE = new BlockDecorCraftingTable( - "treated_wood_crafting_table", - BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT, - Material.WOOD, 1.0f, 15f, SoundType.WOOD, - ModAuxiliaries.getPixeledAABB(1,0,1, 15,15.9,15) + public static final BlockDecorDirected TREATED_WOOD_WINDOWSILL = new BlockDecorDirected( + "treated_wood_windowsill", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_FACING_PLACEMENT, + Material.WOOD, 1.0f, 10f, SoundType.WOOD, + ModAuxiliaries.getPixeledAABB(0.5,15,10.5, 15.5,16,16) ); public static final BlockDecorDirected INSET_LIGHT_IRON = new BlockDecorDirected( @@ -158,12 +247,7 @@ public class ModBlocks ModAuxiliaries.getPixeledAABB(5.2,5.2,15.7, 10.8,10.8,16.0) ); - public static final BlockDecorDirected TREATED_WOOD_WINDOWSILL = new BlockDecorDirected( - "treated_wood_windowsill", - BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_FACING_PLACEMENT, - Material.WOOD, 1.0f, 10f, SoundType.WOOD, - ModAuxiliaries.getPixeledAABB(0.5,15,10.5, 15.5,16,16) - ); + //-------------------------------------------------------------------------------------------------------------------- public static final BlockDecorWindow TREATED_WOOD_WINDOW = new BlockDecorWindow( "treated_wood_window", @@ -179,20 +263,7 @@ public class ModBlocks ModAuxiliaries.getPixeledAABB(0,0,7.5, 16,16,8.5) ); - public static final BlockDecorFurnace SMALL_LAB_FURNACE = new BlockDecorFurnace( - "small_lab_furnace", - BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT| - BlockDecor.CFG_ELECTRICAL, - Material.IRON, 0.5f, 15f, SoundType.METAL, - ModAuxiliaries.getPixeledAABB(1,0,1, 15,15,16) - ); - - public static final BlockDecorFurnaceElectrical SMALL_ELECTRICAL_FURNACE = new BlockDecorFurnaceElectrical( - "small_electrical_furnace", - BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT|BlockDecor.CFG_ELECTRICAL, - Material.IRON, 0.5f, 15f, SoundType.METAL, - ModAuxiliaries.getPixeledAABB(0,0,0, 16,16,16) - ); + //-------------------------------------------------------------------------------------------------------------------- public static final BlockDecorDirected SIGN_MODLOGO = new BlockDecorDirected( "sign_decor", @@ -201,66 +272,6 @@ public class ModBlocks ModAuxiliaries.getPixeledAABB(0,0,15.6, 16,16,16) ); - public static final BlockDecorHorizontalSupport STEEL_DOUBLE_T_SUPPORT = new BlockDecorHorizontalSupport( - "steel_double_t_support", - BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT, - Material.IRON, 2.0f, 15f, SoundType.METAL, - ModAuxiliaries.getPixeledAABB(5,11,0, 11,16,16) - ); - - public static final BlockDecorPipeValve STRAIGHT_CHECK_VALVE = new BlockDecorPipeValve( - "straight_pipe_valve", - BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_SHIFTCLICK| - BlockDecor.CFG_CUTOUT, - Material.IRON, 0.7f, 15f, SoundType.METAL, - ModAuxiliaries.getPixeledAABB(4,4,0, 12,12,16) - ); - - public static final BlockDecorPipeValve STRAIGHT_REDSTONE_VALVE = new BlockDecorPipeValve( - "straight_pipe_valve_redstone", - BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_SHIFTCLICK| - BlockDecor.CFG_CUTOUT|BlockDecor.CFG_REDSTONE_CONTROLLED, - Material.IRON, 0.7f, 15f, SoundType.METAL, - ModAuxiliaries.getPixeledAABB(4,4,0, 12,12,16) - ); - - public static final BlockDecorPipeValve STRAIGHT_REDSTONE_ANALOG_VALVE = new BlockDecorPipeValve( - "straight_pipe_valve_redstone_analog", - BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_SHIFTCLICK| - BlockDecor.CFG_CUTOUT|BlockDecor.CFG_REDSTONE_CONTROLLED|BlockDecor.CFG_ANALOG, - Material.IRON, 0.7f, 15f, SoundType.METAL, - ModAuxiliaries.getPixeledAABB(4,4,0, 12,12,16) - ); - - public static final BlockDecorPassiveFluidAccumulator PASSIVE_FLUID_ACCUMULATOR = new BlockDecorPassiveFluidAccumulator( - "passive_fluid_accumulator", - BlockDecor.CFG_FACING_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT|BlockDecor.CFG_FLIP_PLACEMENT_SHIFTCLICK| - BlockDecor.CFG_CUTOUT, - Material.IRON, 0.7f, 15f, SoundType.METAL, - ModAuxiliaries.getPixeledAABB(0,0,0, 16,16,16) - ); - - public static final BlockDecorWasteIncinerator SMALL_WASTE_INCINERATOR = new BlockDecorWasteIncinerator( - "small_waste_incinerator", - BlockDecor.CFG_DEFAULT|BlockDecor.CFG_ELECTRICAL, - Material.IRON, 1f, 15f, SoundType.METAL, - ModAuxiliaries.getPixeledAABB(0,0,0, 16,16,16) - ); - - public static final BlockDecorDropper FACTORY_DROPPER = new BlockDecorDropper( - "factory_dropper", - BlockDecor.CFG_LOOK_PLACEMENT|BlockDecor.CFG_REDSTONE_CONTROLLED, - Material.IRON, 1f, 15f, SoundType.METAL, - ModAuxiliaries.getPixeledAABB(0,0,0, 16,16,15) - ); - - public static final BlockDecorMineralSmelter SMALL_MINERAL_SMELTER = new BlockDecorMineralSmelter( - "small_mineral_smelter", - BlockDecor.CFG_LOOK_PLACEMENT, - Material.IRON, 1f, 15f, SoundType.METAL, - ModAuxiliaries.getPixeledAABB(1.1,0,1.1, 14.9,16,14.9) - ); - public static final BlockDecorDirected SIGN_HOTWIRE = new BlockDecorDirected( "sign_hotwire", BlockDecor.CFG_CUTOUT|BlockDecor.CFG_OPPOSITE_PLACEMENT|(1<Q0&g=qONQa6vRal7yf{&2&q2{7uJxr6fBl1EhZS0wp8k96U784>7>()O&}R# zXWlt3-ZXh_MoT5`auyHX;hyu|d(Qd3d)c}EP9I8G*@y)rNtl6z69x(r0vcduf$G8n zC*)OsCA9L@KrtVv;D5FifE$|Aa_P2p_xXNI$A>-7BcW;}C=#ftLIkQNLKqBCGl3@r zNHx3KRHzvUf-rNQl#*+mbGhMj?ys^=<}a;ICJsN7TE>lU?$57ICQE@j=SfOu4{oiq zrdyT~U?`1r-*2_?n2XHr%~<(LvHP1^7Z3kF`}OOOMvnGx+n1fqZ|L7uslIb8m7S1Q zErWFrREX2NrP^?~1!e&_nLB$tJ2XC*kM2}80N{lGu?U_>Pv-Fck)t(U%%i;Z$nMtL z@6P-&8c_p}D7z@jZ^Fp)mw$ib%*S6o@%B^4Uz;dS4O}?$VDjFU`ZbXgD9l92s+IYt ziY*`<%YNVU*vqr!KPToc*86qeKHanZtJgOjdVX;Q2%t)Ztb2g48=#u*-mpErZtHvJ zJ_qnz%eKvTY|NxT+265uaS05Bkkm-Ju%+5PcwP1-t+p^~WM=%K#Qg_GPncPAeN$UQ zOQb}AnScoN+QTmy8(HGnlx+Pj|I?}b`LWr_4?6bD2c-{(zW@-}VlMGQEi&_$2vQV- zy<4uEfzDNH3F$hq@9|@=B;xfCBwAi=+xh0%PXQP-G6xol9fegSFT|)yf*+^HM(1+b zt^pk`)a6mz)MB^rEB*tx#RnF%d`m;t!v z`QeFpM4;x0m|573vZ)zCBj|e-zmU2}0@74%<=L_VumTX;--A7i@x6I~^Z)<=07*qo IM6N<$f*cXYbN~PV literal 0 HcmV?d00001 diff --git a/meta/update.json b/meta/update.json index 9767d4e..8551d7d 100644 --- a/meta/update.json +++ b/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.12.2": { + "1.0.10-b1": "[A] Treated wood side table added.\n[F] Fixed recipe collision of Metal Rung Ladder (issue #37, thx ProsperCraft for reporting).\n[A] Added Exit Sign (texture design by J. Carver).", "1.0.9": "[R] Release based on v1.0.9-b3. Release-to-release changes: * Slabs for clinker, concrete, slag bricks. * Slab slices for sheet metals, treated wood, and concretes. * Language updates. * Block hardness adaptions. * 1st/3rd person item model fixes. * Furnace initialisation issue fixed.", "1.0.9-b3": "[A] Added missing recipes for slabs.\n[A] Added slab slices for IE sheet metals, treated wood, and concretes (stackable \"quater-slabs\").\n[M] Updated 1st/3rd person item model rotations/translations.\n[M] Hardness of valves and furni slightly increased.", "1.0.9-b2": "[A] Added slabs for Clinker Brick, Slag Brick, Rebar Concrete, and Stained Clinker. Texture variations like the base blocks. Allow fast pick-up (see tooltip help or config).\n[F] Fixed lab/electrical furnace initialisation issue (first item inserted was smelted directly).", @@ -78,7 +79,7 @@ }, "promos": { "1.12.2-recommended": "1.0.9", - "1.12.2-latest": "1.0.9", + "1.12.2-latest": "1.0.10-b1", "1.13.2-recommended": "", "1.13.2-latest": "1.0.7-b5", "1.14.3-recommended": "",