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

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.help=§6Placable on walls (horizontally).
+tile.engineersdecor.sign_danger.name=Sign "Caution Really Dangerous There"
+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"