Merge remote-tracking branch 'origin/master' into MC1.11

build.gradle

@@ -1,5 +1,5 @@
-def mainVersion = "1.3"
-def buildNumber = "8"
+def mainVersion = "1.4"
+def buildNumber = "9"
 
 /*
  * This file is part of Industrial Wires.

changelog.md

@@ -1,3 +1,6 @@
+#####Version 1.4-9
+ - added Control Panels
+   - They can be used to control and monitor a lot of redstone signals from a few blocks
 #####Version 1.3-8
  - the converters and the motor don't have missing textures any more when using Chisel
 #####Version 1.3-7

src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityRSPanelConn.java

@@ -323,7 +323,7 @@ public class TileEntityRSPanelConn extends TileEntityImmersiveConnectable implem
 				aabb = new AxisAlignedBB(0, 0, 0, h, 1, 1);
 				break;
 			case EAST:
-				aabb = new AxisAlignedBB(1-h, 0, 0, 0, 1, 1);
+				aabb = new AxisAlignedBB(1-h, 0, 0, 1, 1, 1);
 				break;
 			}
 		}

src/main/java/malte0811/industrialWires/client/panelmodel/PanelModel.java

@@ -160,7 +160,7 @@ public class PanelModel implements IBakedModel {
 
 		@Nonnull
 		@Override
-		public ItemCameraTransforms getItemCameraTransforms() {//TODO very much cache this!
+		public ItemCameraTransforms getItemCameraTransforms() {
 			return transform;
 		}
 

src/main/java/malte0811/industrialWires/controlpanel/CoveredToggleSwitch.java

@@ -146,6 +146,11 @@ public class CoveredToggleSwitch extends ToggleSwitch {
 		return super.fomatConfigDescription(type, id);
 	}
 
+	@Override
+	public int getColor() {
+		return color;
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) return true;

src/main/resources/assets/industrialwires/lang/en_US.lang

@@ -33,6 +33,8 @@ item.industrialwires.panel_component.label.name=Label
 item.industrialwires.panel_component.indicator_light.name=Indicator Light
 item.industrialwires.panel_component.slider.name=Slider
 item.industrialwires.panel_component.variac.name=Variac®
+item.industrialwires.panel_component.toggle_switch.name=Toggle Switch
+item.industrialwires.panel_component.toggle_switch_covered.name=Covered Toggle Switch
 
 
 industrialwires.desc.wireLength=Wire length: %1s block(s)

src/main/resources/assets/industrialwires/models/item/panel_component/toggle_switch.json

@@ -0,0 +1,6 @@
+{
+  "parent":"item/generated",
+  "textures": {
+    "layer0":"industrialwires:items/switch"
+  }
+}

src/main/resources/assets/industrialwires/models/item/panel_component/toggle_switch_covered.json

@@ -0,0 +1,7 @@
+{
+  "parent":"item/generated",
+  "textures": {
+    "layer0":"industrialwires:items/switch",
+    "layer1":"industrialwires:items/switch_cover"
+  }
+}

src/main/resources/assets/industrialwires/models/item/panel_component/variac.json

@@ -1,7 +1,6 @@
 {
   "parent":"item/generated",
   "textures": {
-    "layer0":"industrialwires:items/background",
-    "layer1":"industrialwires:items/button"//TODO change when there is a proper texture for it
+    "layer0":"industrialwires:items/variac"
   }
 }