diff --git a/build.gradle b/build.gradle index 265873b..f15ba21 100644 --- a/build.gradle +++ b/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. diff --git a/changelog.md b/changelog.md index 40cfa35..acc3bc4 100644 --- a/changelog.md +++ b/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 diff --git a/src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityRSPanelConn.java b/src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityRSPanelConn.java index 5be5886..d09afc1 100644 --- a/src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityRSPanelConn.java +++ b/src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityRSPanelConn.java @@ -322,7 +322,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; } } diff --git a/src/main/java/malte0811/industrialWires/client/panelmodel/PanelModel.java b/src/main/java/malte0811/industrialWires/client/panelmodel/PanelModel.java index 3912edc..c5d4369 100644 --- a/src/main/java/malte0811/industrialWires/client/panelmodel/PanelModel.java +++ b/src/main/java/malte0811/industrialWires/client/panelmodel/PanelModel.java @@ -151,7 +151,7 @@ public class PanelModel implements IBakedModel { new ItemTransformVec3f(new Vector3f(), new Vector3f(0, .1F, 0), new Vector3f(.25F, .25F, .25F)),//Ground new ItemTransformVec3f(new Vector3f(0, 180, 45), new Vector3f(0, 0, -.1875F), new Vector3f(.5F, .5F, .5F)));//Fixed; @Override - public ItemCameraTransforms getItemCameraTransforms() {//TODO very much cache this! + public ItemCameraTransforms getItemCameraTransforms() { return transform; } diff --git a/src/main/java/malte0811/industrialWires/controlpanel/CoveredToggleSwitch.java b/src/main/java/malte0811/industrialWires/controlpanel/CoveredToggleSwitch.java index 7b5dadf..aa4780a 100644 --- a/src/main/java/malte0811/industrialWires/controlpanel/CoveredToggleSwitch.java +++ b/src/main/java/malte0811/industrialWires/controlpanel/CoveredToggleSwitch.java @@ -147,6 +147,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; diff --git a/src/main/resources/assets/industrialwires/lang/en_US.lang b/src/main/resources/assets/industrialwires/lang/en_US.lang index bf5b46d..e399046 100644 --- a/src/main/resources/assets/industrialwires/lang/en_US.lang +++ b/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) diff --git a/src/main/resources/assets/industrialwires/models/item/panel_component/toggle_switch.json b/src/main/resources/assets/industrialwires/models/item/panel_component/toggle_switch.json new file mode 100644 index 0000000..934ac92 --- /dev/null +++ b/src/main/resources/assets/industrialwires/models/item/panel_component/toggle_switch.json @@ -0,0 +1,6 @@ +{ + "parent":"item/generated", + "textures": { + "layer0":"industrialwires:items/switch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/models/item/panel_component/toggle_switch_covered.json b/src/main/resources/assets/industrialwires/models/item/panel_component/toggle_switch_covered.json new file mode 100644 index 0000000..1765dff --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/models/item/panel_component/variac.json b/src/main/resources/assets/industrialwires/models/item/panel_component/variac.json index d5f234d..275556a 100644 --- a/src/main/resources/assets/industrialwires/models/item/panel_component/variac.json +++ b/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" } } \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/textures/items/background.png b/src/main/resources/assets/industrialwires/textures/items/background.png index 9b7fe16..83f1b89 100644 Binary files a/src/main/resources/assets/industrialwires/textures/items/background.png and b/src/main/resources/assets/industrialwires/textures/items/background.png differ diff --git a/src/main/resources/assets/industrialwires/textures/items/indicator_light.png b/src/main/resources/assets/industrialwires/textures/items/indicator_light.png index 8e4e1c6..0447936 100644 Binary files a/src/main/resources/assets/industrialwires/textures/items/indicator_light.png and b/src/main/resources/assets/industrialwires/textures/items/indicator_light.png differ diff --git a/src/main/resources/assets/industrialwires/textures/items/indicator_light_back.png b/src/main/resources/assets/industrialwires/textures/items/indicator_light_back.png index b6af7aa..60406aa 100644 Binary files a/src/main/resources/assets/industrialwires/textures/items/indicator_light_back.png and b/src/main/resources/assets/industrialwires/textures/items/indicator_light_back.png differ diff --git a/src/main/resources/assets/industrialwires/textures/items/label.png b/src/main/resources/assets/industrialwires/textures/items/label.png index d2c6b5e..31a7b4a 100644 Binary files a/src/main/resources/assets/industrialwires/textures/items/label.png and b/src/main/resources/assets/industrialwires/textures/items/label.png differ diff --git a/src/main/resources/assets/industrialwires/textures/items/slider_track.png b/src/main/resources/assets/industrialwires/textures/items/slider_track.png index eff3758..887ad67 100644 Binary files a/src/main/resources/assets/industrialwires/textures/items/slider_track.png and b/src/main/resources/assets/industrialwires/textures/items/slider_track.png differ diff --git a/src/main/resources/assets/industrialwires/textures/items/switch.png b/src/main/resources/assets/industrialwires/textures/items/switch.png new file mode 100644 index 0000000..54e4a62 Binary files /dev/null and b/src/main/resources/assets/industrialwires/textures/items/switch.png differ diff --git a/src/main/resources/assets/industrialwires/textures/items/switch_cover.png b/src/main/resources/assets/industrialwires/textures/items/switch_cover.png new file mode 100644 index 0000000..dc48c70 Binary files /dev/null and b/src/main/resources/assets/industrialwires/textures/items/switch_cover.png differ diff --git a/src/main/resources/assets/industrialwires/textures/items/variac.png b/src/main/resources/assets/industrialwires/textures/items/variac.png new file mode 100644 index 0000000..1eabdaf Binary files /dev/null and b/src/main/resources/assets/industrialwires/textures/items/variac.png differ