constructor / destructor connectivity

This commit is contained in:
Raoul Van den Berge
2016-09-28 01:16:15 +02:00
parent 78337ac17a
commit 35c538a202
12 changed files with 20 additions and 16 deletions

View File

@@ -16,7 +16,6 @@ import refinedstorage.tile.TileConstructor;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
// @TODO: Constructor connected / disconnected
public class BlockConstructor extends BlockCable { public class BlockConstructor extends BlockCable {
public static final AxisAlignedBB HOLDER_NORTH_AABB = createAABB(7, 7, 2, 9, 9, 6); public static final AxisAlignedBB HOLDER_NORTH_AABB = createAABB(7, 7, 2, 9, 9, 6);
public static final AxisAlignedBB HOLDER_EAST_AABB = createAABB(10, 7, 7, 14, 9, 9); public static final AxisAlignedBB HOLDER_EAST_AABB = createAABB(10, 7, 7, 14, 9, 9);

View File

@@ -16,7 +16,6 @@ import refinedstorage.tile.TileDestructor;
import java.util.List; import java.util.List;
// @TODO: Destructor connected / disconnected
public class BlockDestructor extends BlockCable { public class BlockDestructor extends BlockCable {
public BlockDestructor(String name) { public BlockDestructor(String name) {
super(name); super(name);

View File

@@ -17,7 +17,7 @@ import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageGui; import refinedstorage.RefinedStorageGui;
import refinedstorage.tile.TileDetector; import refinedstorage.tile.TileDetector;
// @TODO: Fix detector model connectivity // @TODO: Fix detector model connectivity (also HITBOX)
public class BlockDetector extends BlockNode { public class BlockDetector extends BlockNode {
private static final AxisAlignedBB AABB_DETECTOR = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 4D / 16D, 1.0D); private static final AxisAlignedBB AABB_DETECTOR = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 4D / 16D, 1.0D);

View File

@@ -17,7 +17,7 @@ public class SideButtonDetectorMode extends SideButton {
@Override @Override
protected void drawButtonIcon(int x, int y) { protected void drawButtonIcon(int x, int y) {
// @TODO: Detector side icons // @TODO: Detector sidebutton icons
} }
@Override @Override

View File

@@ -2,9 +2,9 @@
"forge_marker": 1, "forge_marker": 1,
"defaults": { "defaults": {
"textures": { "textures": {
"all": "refinedstorage:blocks/cable", "all": "refinedstorage:blocks/cable_new",
"particle": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable_new",
"front": "refinedstorage:blocks/constructor_connected", "front": "refinedstorage:blocks/constructor_disconnected",
"line": "refinedstorage:blocks/importer_exporter_external_storage" "line": "refinedstorage:blocks/importer_exporter_external_storage"
}, },
"model": "refinedstorage:cable_core", "model": "refinedstorage:cable_core",
@@ -19,6 +19,9 @@
], ],
"connected": { "connected": {
"true": { "true": {
"textures": {
"front": "refinedstorage:blocks/constructor_connected"
}
}, },
"false": { "false": {
} }

View File

@@ -2,9 +2,9 @@
"forge_marker": 1, "forge_marker": 1,
"defaults": { "defaults": {
"textures": { "textures": {
"all": "refinedstorage:blocks/cable", "all": "refinedstorage:blocks/cable_new",
"particle": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable_new",
"front": "refinedstorage:blocks/destructor_connected", "front": "refinedstorage:blocks/destructor_disconnected",
"line": "refinedstorage:blocks/importer_exporter_external_storage" "line": "refinedstorage:blocks/importer_exporter_external_storage"
}, },
"model": "refinedstorage:cable_core", "model": "refinedstorage:cable_core",
@@ -19,6 +19,9 @@
], ],
"connected": { "connected": {
"true": { "true": {
"textures": {
"front": "refinedstorage:blocks/destructor_connected"
}
}, },
"false": { "false": {
} }

View File

@@ -2,8 +2,8 @@
"forge_marker": 1, "forge_marker": 1,
"defaults": { "defaults": {
"textures": { "textures": {
"all": "refinedstorage:blocks/cable", "all": "refinedstorage:blocks/cable_new",
"particle": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable_new",
"line": "refinedstorage:blocks/importer_exporter_external_storage" "line": "refinedstorage:blocks/importer_exporter_external_storage"
}, },
"model": "refinedstorage:cable_core", "model": "refinedstorage:cable_core",

View File

@@ -2,8 +2,8 @@
"forge_marker": 1, "forge_marker": 1,
"defaults": { "defaults": {
"textures": { "textures": {
"all": "refinedstorage:blocks/cable", "all": "refinedstorage:blocks/cable_new",
"particle": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable_new",
"line": "refinedstorage:blocks/importer_exporter_external_storage" "line": "refinedstorage:blocks/importer_exporter_external_storage"
}, },
"model": "refinedstorage:cable_core", "model": "refinedstorage:cable_core",

View File

@@ -2,8 +2,8 @@
"forge_marker": 1, "forge_marker": 1,
"defaults": { "defaults": {
"textures": { "textures": {
"all": "refinedstorage:blocks/cable", "all": "refinedstorage:blocks/cable_new",
"particle": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable_new",
"line": "refinedstorage:blocks/importer_exporter_external_storage" "line": "refinedstorage:blocks/importer_exporter_external_storage"
}, },
"model": "refinedstorage:cable_core", "model": "refinedstorage:cable_core",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 308 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB