Added 'defence sign' (issue #26). Factory dropper GUI adapted (issue #27). Lang files updated. Credits updated.

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.7-b1
+version_engineersdecor=1.0.7-b2

1.12/meta/update.json

@@ -1,10 +1,11 @@
 {
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
   "1.12.2": {
-    "1.0.7-b1": "[A] Factory dropper (config:experimental) button placement fixed, GUI vs external view x/y markers added, internal trigger logic simplified. Thx @overchoice for beta testing!",
+    "1.0.7-b2": "[A] Added Defense System Warning sign (design by J. Carver).\n[M] Factory dropper non-experimental now. GUI click area tuning. \"Fast drop\" symbol replaced from arrow to dog icon (thx overchoice for that icon).\n[M] Lang files updated.",
+    "1.0.7-b1": "[M] Factory dropper (config:experimental) button placement fixed, GUI vs external view x/y markers added, internal trigger logic simplified. Thx @overchoice for beta testing!",
     "1.0.6": "[R] Release based on v1.0.6-b1. Release-to-release changes: * Fixed FML remapping issue (COULD CAUSE CRASHES). * Small waste incinerator added. * Lang files updated/corrections. * Metal ladder easier to break.\n[A] Added factory dropper (config:experimental).\n[C] Thx to abdurraslan for the detailed issue #25.",
     "1.0.6-b1": "[A] Added small waste incinerator (delayed fifo-buffered item disposal).\n[M] Fixed item/block name capitalization (by Voxelo).\n[M] Metal ladders are easier to break/harvest.\n[F] Fixed FML remapping issue by using dedicated IItemHandler instances.",
-    "1.0.5": "[R] Release based on v1.0.5-b1. Release-to-release changes: * Small electrical passthrough-furnace added. * Passive fluid accumulator added. * Config options added. * Sign plates added. * Minor bug fixes.\n[A] Added sign \"Electrical hazzard\"/\"Caution hot wire\".\n[A] Added sign \"Caution dangerous there\" (skull/bones).",
+    "1.0.5": "[R] Release based on v1.0.5-b1. Release-to-release changes: * Small electrical passthrough-furnace added. * Passive fluid accumulator added. * Config options added. * Sign plates added. * Minor bug fixes.\n[A] Added sign \"Electrical hazard\"/\"Caution hot wire\".\n[A] Added sign \"Caution dangerous there\" (skull/bones).",
     "1.0.5-b1": "[A] Added passive fluid accumulator.\n[A] Added small electrical passthrough-furnace.\n[F] Fixed version check URL.\n[M] Opt-out config options for valves, passive fluid accumulator, and furni.",
     "1.0.4": "[R] Release based on v1.0.4-b9. Release-to-release changes: * Crafting table: Quick crafting history re-fab, JEI integration. * Rendering improvements and issue fixes (stairs, ambient occlusion, optifine, etc). * Walls with texture variations. * Thin/thick steel poles with support feet/heads. * Horizontal steel double-T support beams added. * Fluid pipe valves added: Check valve, redstone controlled valve, analog redstone controlled valve. Support pressurized transfer. * Tool tip documentation (CTRL-SHIFT) for stairs added. * Internal code cleanups. * Recipes tuned.\n[E] Added pass-through electrical furnace (experimental, see config).",
     "1.0.4-b9": "[F] Inserting fluids with pressurized tag only into IE piping.\n[F] Valve redstone connector rendering does not check for \"can connect redstone\" but only for \"can provide power\".\n[M] Valves are adapted to be detected as pipe by IE.",
@@ -39,6 +40,6 @@
   },
   "promos": {
     "1.12.2-recommended": "1.0.6",
-    "1.12.2-latest": "1.0.7-b1"
+    "1.12.2-latest": "1.0.7-b2"
   }
 }

1.12/readme.md

@@ -10,7 +10,13 @@ Mod sources for Minecraft version 1.12.2.
 ----
 ## Revision history
 
-    - v1.0.7-b1 [A] Factory dropper (config:experimental) button placement fixed,
+    - v1.0.7-b2 [A] Added Defense System Warning sign (design by J. Carver).
+                [M] Factory dropper non-experimental now. GUI click area tuning.
+                    "Fast drop" symbol replaced from arrow to dog icon (thx
+                    overchoice for that icon).
+                [M] Lang files updated.
+
+    - v1.0.7-b1 [M] Factory dropper (config:experimental) button placement fixed,
                     GUI vs external view x/y markers added, internal trigger logic
                     simplified. Thx @overchoice for beta testing!
 
@@ -37,7 +43,7 @@ Mod sources for Minecraft version 1.12.2.
                     * Sign plates added.
                     * Minor bug fixes.
                 -------------------------------------------------------------------
-                [A] Added sign "Electrical hazzard"/"Caution hot wire".
+                [A] Added sign "Electrical hazard"/"Caution hot wire".
                 [A] Added sign "Caution dangerous there" (skull/bones).
 
     - v1.0.5-b1 [A] Added passive fluid accumulator.

1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorDropper.java

@@ -231,9 +231,9 @@ public class BlockDecorDropper extends BlockDecorDirected
       } else if(isPointInRegion(129, 50, 44, 10, mouseX, mouseY)) {
         int period = (mx-135);
         if(period < -1) {
-          period = container.fields_[6] - 1; // -
+          period = container.fields_[6] - 3; // -
         } else if(period >= 34) {
-          period = container.fields_[6] + 1; // +
+          period = container.fields_[6] + 3; // +
         } else {
           period = (int)(0.5 + ((100.0 * period)/34));
         }
@@ -306,7 +306,7 @@ public class BlockDecorDropper extends BlockDecorDirected
       }
       // drop period
       {
-        int px = ((container.fields_[6] * 34) / 100);
+        int px = (int)Math.round(((33.0 * container.fields_[6]) / 100) + 1);
         int x = x0 + 134 - 2 + MathHelper.clamp(px, 0, 33);
         int y = y0 + 56;
         drawTexturedModalRect(x, y, 190, 31, 5, 5);

1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java

@@ -242,6 +242,13 @@ public class ModBlocks
     ModAuxiliaries.getPixeledAABB(2,2,15.6, 14,14,16)
   );
 
+  public static final BlockDecorDirected SIGN_DEFENSE = new BlockDecorDirected(
+    "sign_defense",
+    BlockDecor.CFG_CUTOUT|BlockDecor.CFG_OPPOSITE_PLACEMENT|(1<<BlockDecor.CFG_LIGHT_VALUE_SHIFT),
+    Material.WOOD, 0.1f, 1f, SoundType.WOOD,
+    ModAuxiliaries.getPixeledAABB(2,2,15.6, 14,14,16)
+  );
+
   public static final BlockDecorWasteIncinerator SMALL_WASTE_INCINERATOR = new BlockDecorWasteIncinerator(
     "small_waste_incinerator",
     BlockDecor.CFG_DEFAULT|BlockDecor.CFG_ELECTRICAL,
@@ -332,11 +339,12 @@ public class ModBlocks
     SMALL_ELECTRICAL_FURNACE, SMALL_ELECTRICAL_FURNACE_TEI,
     SIGN_HOTWIRE, SIGN_DANGER,
     SMALL_WASTE_INCINERATOR, WASTE_INCINERATOR_TEI,
+    SIGN_DEFENSE,
+    FACTORY_DROPPER, FACTORY_DROPPER_TEI
   };
 
   private static final Object dev_content[] = {
     SIGN_MINDSTEP,
-    FACTORY_DROPPER, FACTORY_DROPPER_TEI
   };
 
   //--------------------------------------------------------------------------------------------------------------------

1.12/src/main/resources/assets/engineersdecor/blockstates/sign_defense.json

@@ -0,0 +1,9 @@
+{
+  "forge_marker": 1,
+  "defaults": { "model": "engineersdecor:sign/sign_defense_model" },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}],
+    "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":0}, "down": {"x":0} }
+  }
+}

1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang

@@ -132,11 +132,13 @@ tile.engineersdecor.factory_dropper.help=§6Dropper suitable for advanced factor
 tile.engineersdecor.sign_decor.name=Sign Plate (Engineer's decor)
 tile.engineersdecor.sign_decor.help=§6This should not be craftable or visible in JEI. Used for creative tab and screenshots.
 tile.engineersdecor.sign_hotwire.name=Sign "Caution Hot Wire"
-tile.engineersdecor.sign_hotwire.help=§6Placable on walls (horizontally).
+tile.engineersdecor.sign_hotwire.help=§6Electrical hazard warning. Don't forget to place around HV, or you'll have a mark in the next audit.
 tile.engineersdecor.sign_mindstep.name=Sign "Mind The Step"
 tile.engineersdecor.sign_mindstep.help=§6Placable on walls (horizontally).
-tile.engineersdecor.sign_danger.name=Sign "Caution Really dangerous there"
+tile.engineersdecor.sign_danger.name=Sign "Caution Really Dangerous There"
-tile.engineersdecor.sign_danger.help=§6Placable on walls (horizontally).
+tile.engineersdecor.sign_danger.help=§6General danger warning.
+tile.engineersdecor.sign_defense.name=Sign "Caution Defense System Ahead"
+tile.engineersdecor.sign_defense.help=§6Warning sign for turrets, Tesla Coils, and traps.
 
 #-----------------------------------------------------------------------------------------------------------
 # EOF

1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang

@@ -125,11 +125,13 @@ tile.engineersdecor.factory_dropper.name=Factory dropper
 tile.engineersdecor.sign_decor.name=Sign plate (Engineer's decor logo)
 #tile.engineersdecor.sign_decor.help=§6This should not be craftable or visible in JEI. Used for creative tab and screenshots.
 tile.engineersdecor.sign_hotwire.name=Sign "Caution hot wire"
-#tile.engineersdecor.sign_hotwire.help=§6Placable on walls (horizontally).
+#tile.engineersdecor.sign_hotwire.help=§6Electrical hazard warning. Don't forget to place around HV, or you'll have a mark in the next audit.
 tile.engineersdecor.sign_mindstep.name=Sign "Mind the step"
 #tile.engineersdecor.sign_mindstep.help=§6Placable on walls (horizontally).
 tile.engineersdecor.sign_danger.name=Sign "Caution really dangerous there"
-#tile.engineersdecor.sign_danger.help=§6Placable on walls (horizontally).
+#tile.engineersdecor.sign_danger.help=§6General danger warning.
+tile.engineersdecor.sign_defense.name=Sign "Caution Defense System Ahead"
+#tile.engineersdecor.sign_defense.help=§6Warning sign for turrets, Tesla Coils, and traps.
 
 #-----------------------------------------------------------------------------------------------------------
 # EOF

1.12/src/main/resources/assets/engineersdecor/models/block/sign/sign_defense_model.json

@@ -0,0 +1,4 @@
+{
+  "parent": "engineersdecor:block/sign/sign_decor_model",
+  "textures": { "f": "engineersdecor:blocks/sign/sign_defense_texture" }
+}

1.12/src/main/resources/assets/engineersdecor/recipes/sign_defense_recipe.json

@@ -0,0 +1,16 @@
+{
+  "conditions": [
+    {
+      "type": "engineersdecor:grc",
+      "result": "engineersdecor:sign_defense",
+      "required": ["engineersdecor:sign_danger"]
+    }
+  ],
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    { "item": "engineersdecor:sign_danger" }
+  ],
+  "result": {
+    "item": "engineersdecor:sign_defense"
+  }
+}

1.12/src/main/resources/assets/engineersdecor/recipes/sign_hotwire_recipe_backcycle.json

@@ -3,12 +3,12 @@
     {
       "type": "engineersdecor:grc",
       "result": "engineersdecor:sign_hotwire",
-      "required": ["engineersdecor:sign_danger"]
+      "required": ["engineersdecor:sign_defense"]
     }
   ],
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
-    { "item": "engineersdecor:sign_danger" }
+    { "item": "engineersdecor:sign_defense" }
   ],
   "result": {
     "item": "engineersdecor:sign_hotwire"

1.13/readme.md

@@ -11,7 +11,7 @@ Mod sources for Minecraft version 1.13.2.
 ## Revision history
 
     - v1.0.4-b4 [U] Updated forge dependency: REQUIRES FORGE >= 1.13.2-25.0.214.
-                [A] Added sign "Electrical hazzard"/"Caution hot wire".
+                [A] Added sign "Electrical hazard"/"Caution hot wire".
                 [A] Added sign "Caution dangerous there" (skull/bones).
                 [A] Added horizontal steel double-T support beam with pole connections.
 

credits.md

@@ -26,6 +26,8 @@ IE components used in this mod:
   - immersiveengineering:textures/block/metal_device1_fluid_pipe.png (for
     valves).
 
+  - Fluid accumulator texture is a modified IE metal barrel texture.
+
 Source codes derived (inspected e.g. for trouble shooting and learning how things work):
 
   - Ore dict based recipe registration from blusunrize.immersiveengineering.common.IERecipes.

meta/update.json

@@ -1,10 +1,11 @@
 {
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
   "1.12.2": {
-    "1.0.7-b1": "[A] Factory dropper (config:experimental) button placement fixed, GUI vs external view x/y markers added, internal trigger logic simplified. Thx @overchoice for beta testing!",
+    "1.0.7-b2": "[A] Added Defense System Warning sign (design by J. Carver).\n[M] Factory dropper non-experimental now. GUI click area tuning. \"Fast drop\" symbol replaced from arrow to dog icon (thx overchoice for that icon).\n[M] Lang files updated.",
+    "1.0.7-b1": "[M] Factory dropper (config:experimental) button placement fixed, GUI vs external view x/y markers added, internal trigger logic simplified. Thx @overchoice for beta testing!",
     "1.0.6": "[R] Release based on v1.0.6-b1. Release-to-release changes: * Fixed FML remapping issue (COULD CAUSE CRASHES). * Small waste incinerator added. * Lang files updated/corrections. * Metal ladder easier to break.\n[A] Added factory dropper (config:experimental).\n[C] Thx to abdurraslan for the detailed issue #25.",
     "1.0.6-b1": "[A] Added small waste incinerator (delayed fifo-buffered item disposal).\n[M] Fixed item/block name capitalization (by Voxelo).\n[M] Metal ladders are easier to break/harvest.\n[F] Fixed FML remapping issue by using dedicated IItemHandler instances.",
-    "1.0.5": "[R] Release based on v1.0.5-b1. Release-to-release changes: * Small electrical passthrough-furnace added. * Passive fluid accumulator added. * Config options added. * Sign plates added. * Minor bug fixes.\n[A] Added sign \"Electrical hazzard\"/\"Caution hot wire\".\n[A] Added sign \"Caution dangerous there\" (skull/bones).",
+    "1.0.5": "[R] Release based on v1.0.5-b1. Release-to-release changes: * Small electrical passthrough-furnace added. * Passive fluid accumulator added. * Config options added. * Sign plates added. * Minor bug fixes.\n[A] Added sign \"Electrical hazard\"/\"Caution hot wire\".\n[A] Added sign \"Caution dangerous there\" (skull/bones).",
     "1.0.5-b1": "[A] Added passive fluid accumulator.\n[A] Added small electrical passthrough-furnace.\n[F] Fixed version check URL.\n[M] Opt-out config options for valves, passive fluid accumulator, and furni.",
     "1.0.4": "[R] Release based on v1.0.4-b9. Release-to-release changes: * Crafting table: Quick crafting history re-fab, JEI integration. * Rendering improvements and issue fixes (stairs, ambient occlusion, optifine, etc). * Walls with texture variations. * Thin/thick steel poles with support feet/heads. * Horizontal steel double-T support beams added. * Fluid pipe valves added: Check valve, redstone controlled valve, analog redstone controlled valve. Support pressurized transfer. * Tool tip documentation (CTRL-SHIFT) for stairs added. * Internal code cleanups. * Recipes tuned.\n[E] Added pass-through electrical furnace (experimental, see config).",
     "1.0.4-b9": "[F] Inserting fluids with pressurized tag only into IE piping.\n[F] Valve redstone connector rendering does not check for \"can connect redstone\" but only for \"can provide power\".\n[M] Valves are adapted to be detected as pipe by IE.",
@@ -38,7 +39,7 @@
     "1.0.0-b1": "[A] Initial structure.\n[A] Added clinker bricks and clinker brick stairs.\n[A] Added slag bricks and slag brick stairs.\n[A] Added metal rung ladder.\n[A] Added staggered metal steps ladder.\n[A] Added treated wood ladder.\n[A] Added treated wood pole.\n[A] Added treated wood table."
   },
   "1.13.2": {
-    "1.0.4-b4": "[U] Updated forge dependency: REQUIRES FORGE >= 1.13.2-25.0.214.\n[A] Added sign \"Electrical hazzard\"/\"Caution hot wire\".\n[A] Added sign \"Caution dangerous there\" (skull/bones).\n[A] Added horizontal steel double-T support beam with pole connections.",
+    "1.0.4-b4": "[U] Updated forge dependency: REQUIRES FORGE >= 1.13.2-25.0.214.\n[A] Added sign \"Electrical hazard\"/\"Caution hot wire\".\n[A] Added sign \"Caution dangerous there\" (skull/bones).\n[A] Added horizontal steel double-T support beam with pole connections.",
     "1.0.4-b3": "[V] Version assignment: All features of v1.0.4-b3-1.12.2 that can be ported to 1.13.2 implemented/prepared, therefore version re-iterated.\n[A] Lab furnace ported to 1.13.\n[A] Treated wood crafting table: Added crafting table history/quick craft.\n[A] Treated wood stool: Sitting on the stool implemented.\n[A] Steel poles (thick/thin) with support heads/foots added.\n[E] Prepared position dependent texture variation for walls (clinker, slag, rebar concrete), missing one forge feature yet for completion.\n[E] Prepared multi-layer rendering for windows, needs forge feature implementation.",
     "1.0.2-b3": "[A] Added treated wood window.\n[A] Added treated wood pole support.\n[A] Added treated wood pole head.\n[A] Added steel framed window.",
     "1.0.2-b2": "[A] Added wall decomposition recipes.\n[A] Added slag brick wall.\n[M] Climbing/descending mod ladders is faster when looking up or down and not sneaking.\n[M] Panzer glass material definition changed.",
@@ -49,7 +50,7 @@
   },
   "promos": {
     "1.12.2-recommended": "1.0.6",
-    "1.12.2-latest": "1.0.7-b1",
+    "1.12.2-latest": "1.0.7-b2",
     "1.13.2-recommended": "",
     "1.13.2-latest": "1.0.4-b4"
   }