diff --git a/src/main/java/refinedstorage/RefinedStorageConfig.java b/src/main/java/refinedstorage/RefinedStorageConfig.java index 284c378ce..76f8a5a26 100755 --- a/src/main/java/refinedstorage/RefinedStorageConfig.java +++ b/src/main/java/refinedstorage/RefinedStorageConfig.java @@ -71,10 +71,6 @@ public final class RefinedStorageConfig { public int interdimensionalUpgradeUsage; //endregion - //region Misc - public boolean translucentCables; - //endregion - //region Categories private static final String ENERGY = "energy"; private static final String CONTROLLER = "controller"; @@ -161,10 +157,6 @@ public final class RefinedStorageConfig { interdimensionalUpgradeUsage = config.getInt("interdimensional", UPGRADES, 1000, 0, Integer.MAX_VALUE, "The additional energy used by the Interdimensional Upgrade"); //endregion - //region Misc - translucentCables = config.getBoolean("translucentCables", MISC, false, "For resource pack makers that want a translucent cable"); - //endregion - if (config.hasChanged()) { config.save(); } diff --git a/src/main/java/refinedstorage/block/BlockCable.java b/src/main/java/refinedstorage/block/BlockCable.java index d68b74c77..8a4486e8c 100755 --- a/src/main/java/refinedstorage/block/BlockCable.java +++ b/src/main/java/refinedstorage/block/BlockCable.java @@ -356,7 +356,6 @@ public class BlockCable extends BlockCoverable { @Override public BlockRenderLayer getBlockLayer() { - // @TODO: Remove config return BlockRenderLayer.CUTOUT; } } diff --git a/src/main/java/refinedstorage/block/BlockConstructor.java b/src/main/java/refinedstorage/block/BlockConstructor.java index 45a511c9f..6d44f8e94 100755 --- a/src/main/java/refinedstorage/block/BlockConstructor.java +++ b/src/main/java/refinedstorage/block/BlockConstructor.java @@ -16,7 +16,7 @@ import refinedstorage.tile.TileConstructor; import java.util.ArrayList; import java.util.List; -// @TODO: Connectivity +// @TODO: Constructor connected / disconnected public class BlockConstructor extends BlockCable { 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); diff --git a/src/main/java/refinedstorage/block/BlockDestructor.java b/src/main/java/refinedstorage/block/BlockDestructor.java index a5cede7ba..485434478 100755 --- a/src/main/java/refinedstorage/block/BlockDestructor.java +++ b/src/main/java/refinedstorage/block/BlockDestructor.java @@ -16,7 +16,7 @@ import refinedstorage.tile.TileDestructor; import java.util.List; -// @TODO: Connectivity +// @TODO: Destructor connected / disconnected public class BlockDestructor extends BlockCable { public BlockDestructor(String name) { super(name); diff --git a/src/main/java/refinedstorage/block/BlockDetector.java b/src/main/java/refinedstorage/block/BlockDetector.java index cb6b634f6..8c2822f16 100755 --- a/src/main/java/refinedstorage/block/BlockDetector.java +++ b/src/main/java/refinedstorage/block/BlockDetector.java @@ -17,6 +17,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileDetector; +// @TODO: Fix detector model connectivity 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); diff --git a/src/main/java/refinedstorage/block/BlockDiskManipulator.java b/src/main/java/refinedstorage/block/BlockDiskManipulator.java index ad22439bb..ce078fce8 100755 --- a/src/main/java/refinedstorage/block/BlockDiskManipulator.java +++ b/src/main/java/refinedstorage/block/BlockDiskManipulator.java @@ -14,7 +14,6 @@ import refinedstorage.tile.TileDiskManipulator; import javax.annotation.Nullable; -// @TODO: Connectivity public class BlockDiskManipulator extends BlockNode { public BlockDiskManipulator() { super("disk_manipulator"); diff --git a/src/main/java/refinedstorage/block/BlockGrid.java b/src/main/java/refinedstorage/block/BlockGrid.java index 81f7dd289..923502a41 100755 --- a/src/main/java/refinedstorage/block/BlockGrid.java +++ b/src/main/java/refinedstorage/block/BlockGrid.java @@ -19,7 +19,6 @@ import refinedstorage.tile.grid.TileGrid; import java.util.List; -// @TODO: Better colors public class BlockGrid extends BlockNode { public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumGridType.class); diff --git a/src/main/java/refinedstorage/item/ItemSilicon.java b/src/main/java/refinedstorage/item/ItemSilicon.java index 8832c88f7..8217d0b25 100755 --- a/src/main/java/refinedstorage/item/ItemSilicon.java +++ b/src/main/java/refinedstorage/item/ItemSilicon.java @@ -1,6 +1,5 @@ package refinedstorage.item; -// @TODO: Better texture public class ItemSilicon extends ItemBase { public ItemSilicon() { super("silicon"); diff --git a/src/main/resources/assets/refinedstorage/models/block/detector.json b/src/main/resources/assets/refinedstorage/models/block/detector.json index 920834e59..20ee0a1b1 100755 --- a/src/main/resources/assets/refinedstorage/models/block/detector.json +++ b/src/main/resources/assets/refinedstorage/models/block/detector.json @@ -1,105 +1,147 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "textures": { - "0": "refinedstorage:blocks/side" + "0": "refinedstorage:blocks/detector_side", + "1": "refinedstorage:blocks/detector_side", + "2": "refinedstorage:blocks/detector_top", + "3": "refinedstorage:blocks/detector_bottom" }, "elements": [ { + "name": "Element", "from": [ - 7, - 0, - 7 + 7.0, + 5.0, + 7.0 ], "to": [ - 9, - 10, - 9 - ], - "shade": false, - "faces": { - "down": { - "uv": [ - 7, - 13, - 9, - 15 - ], - "texture": "#torch" - }, - "up": { - "uv": [ - 7, - 6, - 9, - 8 - ], - "texture": "#torch" - } - } - }, - { - "from": [ - 7, - 0, - 0 - ], - "to": [ - 9, - 16, - 16 - ], - "shade": false, - "faces": { - "west": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#torch" - }, - "east": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#torch" - } - } - }, - { - "from": [ - 0, - 0, - 7 - ], - "to": [ - 16, - 16, - 9 + 9.0, + 15.0, + 9.0 ], "shade": false, "faces": { "north": { + "texture": "#0", "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#torch" + 10.0, + 1.0, + 12.0, + 11.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 10.0, + 1.0, + 12.0, + 11.0 + ] }, "south": { + "texture": "#0", "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#torch" + 10.0, + 1.0, + 12.0, + 11.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 10.0, + 1.0, + 12.0, + 11.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 10.0, + 1.0, + 12.0, + 3.0 + ] + }, + "down": { + "texture": "#0", + "uv": [ + 10.0, + 5.0, + 12.0, + 7.0 + ] + } + } + }, + { + "name": "Element", + "from": [ + 7.0, + 5.0, + 6.0 + ], + "to": [ + 9.0, + 16.0, + 10.0 + ], + "shade": false, + "faces": { + "east": { + "texture": "#0", + "uv": [ + 9.0, + 0.0, + 13.0, + 11.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 9.0, + 0.0, + 13.0, + 11.0 + ] + } + } + }, + { + "name": "Element", + "from": [ + 6.0, + 5.0, + 7.0 + ], + "to": [ + 10.0, + 16.0, + 9.0 + ], + "shade": false, + "faces": { + "north": { + "texture": "#0", + "uv": [ + 9.0, + 0.0, + 13.0, + 11.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 9.0, + 0.0, + 13.0, + 11.0 + ] } } }, @@ -112,48 +154,48 @@ ], "to": [ 16.0, - 4.0, + 5.0, 16.0 ], "faces": { "north": { - "texture": "#0", + "texture": "#1", "uv": [ 0.0, - 12.0, + 11.0, 16.0, 16.0 ] }, "east": { - "texture": "#0", + "texture": "#1", "uv": [ 0.0, - 12.0, + 11.0, 16.0, 16.0 ] }, "south": { - "texture": "#0", + "texture": "#1", "uv": [ 0.0, - 12.0, + 11.0, 16.0, 16.0 ] }, "west": { - "texture": "#0", + "texture": "#1", "uv": [ 0.0, - 12.0, + 11.0, 16.0, 16.0 ] }, "up": { - "texture": "#0", + "texture": "#2", "uv": [ 0.0, 0.0, @@ -162,7 +204,7 @@ ] }, "down": { - "texture": "#0", + "texture": "#3", "uv": [ 0.0, 0.0, diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected_front.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected_front.png index e82d4a9b7..ba281c9c5 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected_front.png and b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected_front.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_bottom.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_bottom.png new file mode 100755 index 000000000..ca8479ad2 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/detector_bottom.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_side.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_side.png new file mode 100755 index 000000000..8795b0173 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/detector_side.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_top.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_top.png new file mode 100755 index 000000000..1b1a60831 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/detector_top.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator.png index 029c880a3..c79ebe9e6 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator.png and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front_connected.png index 69accdf48..2b4747a55 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front_connected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_front_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_front_connected.png index 648e41fef..95cc176fe 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_front_connected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_front_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_front_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_front_connected.png index 167baea72..ed6370597 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/grid_front_connected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_front_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front_connected.png index f00385697..19ec43120 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front_connected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/silicon.png b/src/main/resources/assets/refinedstorage/textures/items/silicon.png index a8995b0d1..85fd28ff0 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/silicon.png and b/src/main/resources/assets/refinedstorage/textures/items/silicon.png differ