Fixes from Cyanide

This commit is contained in:
Raoul Van den Berge
2016-09-28 00:30:27 +02:00
parent 679d29ef44
commit 78337ac17a
19 changed files with 141 additions and 110 deletions

View File

@@ -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();
}

View File

@@ -356,7 +356,6 @@ public class BlockCable extends BlockCoverable {
@Override
public BlockRenderLayer getBlockLayer() {
// @TODO: Remove config
return BlockRenderLayer.CUTOUT;
}
}

View File

@@ -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);

View File

@@ -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);

View File

@@ -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);

View File

@@ -14,7 +14,6 @@ import refinedstorage.tile.TileDiskManipulator;
import javax.annotation.Nullable;
// @TODO: Connectivity
public class BlockDiskManipulator extends BlockNode {
public BlockDiskManipulator() {
super("disk_manipulator");

View File

@@ -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);

View File

@@ -1,6 +1,5 @@
package refinedstorage.item;
// @TODO: Better texture
public class ItemSilicon extends ItemBase {
public ItemSilicon() {
super("silicon");

View File

@@ -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
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
],
"texture": "#torch"
"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,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 16 KiB