dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename "generic_grey.png" to "cable_part_border.png"

Browse Source
This commit is contained in:
raoulvdberge
2018-07-12 04:56:10 +02:00
parent 2a2655a7e1
commit e97923ff19
18 changed files with 126 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -11,6 +11,7 @@ NOTE: Worlds that used Refined Storage 1.5.x are fully compatible with Refined S
- Removed "void excess items or fluids" functionality on storages (raoulvdberge)
- Removed the Solderer (raoulvdberge)
- Removed "compare oredict" buttons on Exporter, Importer, etc. (raoulvdberge)
- Removed ConnectedTexturesMod integration for fullbright textures, RS now has fullbright textures natively (raoulvdberge)
- Added the Cutting Tool (raoulvdberge)
- Renamed "Printed Processors" to "Cut Processors" (raoulvdberge)
- Added covers (raoulvdberge)

8
src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelCableCover.java
View File

@@ -24,7 +24,7 @@ import java.util.ArrayList;
import java.util.List;
public class BakedModelCableCover extends BakedModelDelegate {
private static TextureAtlasSprite GREY_SPRITE;
private static TextureAtlasSprite BORDER_SPRITE;
public BakedModelCableCover(IBakedModel base) {
super(base);
@@ -137,8 +137,8 @@ public class BakedModelCableCover extends BakedModelDelegate {
quads.addAll(new CubeBuilder().from(from.getX(), from.getY(), from.getZ()).to(to.getX(), to.getY(), to.getZ()).addFaces(face -> new CubeBuilder.Face(face, sprite)).bake());
if (handle) {
if (GREY_SPRITE == null) {
GREY_SPRITE = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(RS.ID + ":blocks/generic_grey");
if (BORDER_SPRITE == null) {
BORDER_SPRITE = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(RS.ID + ":blocks/cable_part_border");
}
bounds = ConstantsCable.getHolderBounds(coverSide);
@@ -146,7 +146,7 @@ public class BakedModelCableCover extends BakedModelDelegate {
from = new Vector3f((float) bounds.minX * 16, (float) bounds.minY * 16, (float) bounds.minZ * 16);
to = new Vector3f((float) bounds.maxX * 16, (float) bounds.maxY * 16, (float) bounds.maxZ * 16);
quads.addAll(new CubeBuilder().from(from.getX(), from.getY(), from.getZ()).to(to.getX(), to.getY(), to.getZ()).addFaces(face -> new CubeBuilder.Face(face, GREY_SPRITE)).bake());
quads.addAll(new CubeBuilder().from(from.getX(), from.getY(), from.getZ()).to(to.getX(), to.getY(), to.getZ()).addFaces(face -> new CubeBuilder.Face(face, BORDER_SPRITE)).bake());
}
}

2
src/main/resources/assets/refinedstorage/blockstates/constructor.json
View File

@@ -6,7 +6,7 @@
"particle": "refinedstorage:blocks/cable",
"front": "refinedstorage:blocks/constructor/constructor",
"cutout": "refinedstorage:blocks/constructor/cutouts/disconnected",
"line": "refinedstorage:blocks/generic_grey"
"border": "refinedstorage:blocks/cable_part_border"
},
"model": "refinedstorage:cable_core",
"uvlock": true

2
src/main/resources/assets/refinedstorage/blockstates/destructor.json
View File

@@ -6,7 +6,7 @@
"particle": "refinedstorage:blocks/cable",
"front": "refinedstorage:blocks/destructor/destructor",
"cutout": "refinedstorage:blocks/destructor/cutouts/disconnected",
"line": "refinedstorage:blocks/generic_grey"
"border": "refinedstorage:blocks/cable_part_border"
},
"model": "refinedstorage:cable_core",
"uvlock": true

2
src/main/resources/assets/refinedstorage/blockstates/exporter.json
View File

@@ -4,7 +4,7 @@
"textures": {
"cable": "refinedstorage:blocks/cable",
"particle": "refinedstorage:blocks/cable",
"line": "refinedstorage:blocks/generic_grey"
"border": "refinedstorage:blocks/cable_part_border"
},
"model": "refinedstorage:cable_core",
"uvlock": false

2
src/main/resources/assets/refinedstorage/blockstates/external_storage.json
View File

@@ -4,7 +4,7 @@
"textures": {
"cable": "refinedstorage:blocks/cable",
"particle": "refinedstorage:blocks/cable",
"line": "refinedstorage:blocks/generic_grey"
"border": "refinedstorage:blocks/cable_part_border"
},
"model": "refinedstorage:cable_core",
"uvlock": false

2
src/main/resources/assets/refinedstorage/blockstates/importer.json
View File

@@ -4,7 +4,7 @@
"textures": {
"cable": "refinedstorage:blocks/cable",
"particle": "refinedstorage:blocks/cable",
"line": "refinedstorage:blocks/generic_grey"
"border": "refinedstorage:blocks/cable_part_border"
},
"model": "refinedstorage:cable_core",
"uvlock": false

2
src/main/resources/assets/refinedstorage/blockstates/reader.json
View File

@@ -6,7 +6,7 @@
"particle": "refinedstorage:blocks/cable",
"front": "refinedstorage:blocks/reader/reader",
"cutout": "refinedstorage:blocks/reader/cutouts/disconnected",
"line": "refinedstorage:blocks/generic_grey"
"border": "refinedstorage:blocks/cable_part_border"
},
"model": "refinedstorage:cable_core",
"uvlock": true

2
src/main/resources/assets/refinedstorage/blockstates/writer.json
View File

@@ -6,7 +6,7 @@
"particle": "refinedstorage:blocks/cable",
"front": "refinedstorage:blocks/writer/writer",
"cutout": "refinedstorage:blocks/writer/cutouts/disconnected",
"line": "refinedstorage:blocks/generic_grey"
"border": "refinedstorage:blocks/cable_part_border"
},
"model": "refinedstorage:cable_core",
"uvlock": true

20
src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json
View File

@@ -15,7 +15,7 @@
],
"faces": {
"east": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -24,7 +24,7 @@
]
},
"south": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -33,7 +33,7 @@
]
},
"west": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -42,7 +42,7 @@
]
},
"up": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -51,7 +51,7 @@
]
},
"down": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -84,7 +84,7 @@
]
},
"east": {
"texture": "#line",
"texture": "#border",
"uv": [
14.0,
0.0,
@@ -93,7 +93,7 @@
]
},
"south": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -102,7 +102,7 @@
]
},
"west": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -111,7 +111,7 @@
]
},
"up": {
"texture": "#line",
"texture": "#border",
"uv": [
2.0,
0.0,
@@ -120,7 +120,7 @@
]
},
"down": {
"texture": "#line",
"texture": "#border",
"uv": [
2.0,
14.0,

20
src/main/resources/assets/refinedstorage/models/block/constructor_destructor_item.json
View File

@@ -15,7 +15,7 @@
],
"faces": {
"east": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -24,7 +24,7 @@
]
},
"south": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -33,7 +33,7 @@
]
},
"west": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -42,7 +42,7 @@
]
},
"up": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -51,7 +51,7 @@
]
},
"down": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -84,7 +84,7 @@
]
},
"east": {
"texture": "#line",
"texture": "#border",
"uv": [
14.0,
0.0,
@@ -93,7 +93,7 @@
]
},
"south": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -102,7 +102,7 @@
]
},
"west": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -111,7 +111,7 @@
]
},
"up": {
"texture": "#line",
"texture": "#border",
"uv": [
2.0,
0.0,
@@ -120,7 +120,7 @@
]
},
"down": {
"texture": "#line",
"texture": "#border",
"uv": [
2.0,
14.0,

36
src/main/resources/assets/refinedstorage/models/block/exporter.json
View File

@@ -20,7 +20,7 @@
4,
4
],
"texture": "#line"
"texture": "#border"
},
"east": {
"uv": [
@@ -29,7 +29,7 @@
2,
4
],
"texture": "#line"
"texture": "#border"
},
"south": {
"uv": [
@@ -38,7 +38,7 @@
4,
4
],
"texture": "#line"
"texture": "#border"
},
"west": {
"uv": [
@@ -47,7 +47,7 @@
2,
4
],
"texture": "#line"
"texture": "#border"
},
"up": {
"uv": [
@@ -56,7 +56,7 @@
4,
2
],
"texture": "#line"
"texture": "#border"
},
"down": {
"uv": [
@@ -65,7 +65,7 @@
4,
2
],
"texture": "#line"
"texture": "#border"
}
}
},
@@ -89,7 +89,7 @@
6,
6
],
"texture": "#line"
"texture": "#border"
},
"east": {
"uv": [
@@ -98,7 +98,7 @@
2,
6
],
"texture": "#line"
"texture": "#border"
},
"south": {
"uv": [
@@ -107,7 +107,7 @@
6,
6
],
"texture": "#line"
"texture": "#border"
},
"west": {
"uv": [
@@ -116,7 +116,7 @@
2,
6
],
"texture": "#line"
"texture": "#border"
},
"up": {
"uv": [
@@ -125,7 +125,7 @@
6,
2
],
"texture": "#line"
"texture": "#border"
},
"down": {
"uv": [
@@ -134,7 +134,7 @@
6,
2
],
"texture": "#line"
"texture": "#border"
}
}
},
@@ -158,7 +158,7 @@
10,
10
],
"texture": "#line"
"texture": "#border"
},
"east": {
"uv": [
@@ -167,7 +167,7 @@
2,
10
],
"texture": "#line"
"texture": "#border"
},
"south": {
"uv": [
@@ -176,7 +176,7 @@
10,
10
],
"texture": "#line"
"texture": "#border"
},
"west": {
"uv": [
@@ -185,7 +185,7 @@
2,
10
],
"texture": "#line"
"texture": "#border"
},
"up": {
"uv": [
@@ -194,7 +194,7 @@
10,
2
],
"texture": "#line"
"texture": "#border"
},
"down": {
"uv": [
@@ -203,7 +203,7 @@
10,
2
],
"texture": "#line"
"texture": "#border"
}
}
}

36
src/main/resources/assets/refinedstorage/models/block/exporter_item.json
View File

@@ -21,7 +21,7 @@
4,
4
],
"texture": "#line"
"texture": "#border"
},
"east": {
"uv": [
@@ -30,7 +30,7 @@
2,
4
],
"texture": "#line"
"texture": "#border"
},
"south": {
"uv": [
@@ -39,7 +39,7 @@
4,
4
],
"texture": "#line"
"texture": "#border"
},
"west": {
"uv": [
@@ -48,7 +48,7 @@
2,
4
],
"texture": "#line"
"texture": "#border"
},
"up": {
"uv": [
@@ -57,7 +57,7 @@
4,
2
],
"texture": "#line"
"texture": "#border"
},
"down": {
"uv": [
@@ -66,7 +66,7 @@
4,
2
],
"texture": "#line"
"texture": "#border"
}
}
},
@@ -90,7 +90,7 @@
6,
6
],
"texture": "#line"
"texture": "#border"
},
"east": {
"uv": [
@@ -99,7 +99,7 @@
2,
6
],
"texture": "#line"
"texture": "#border"
},
"south": {
"uv": [
@@ -108,7 +108,7 @@
6,
6
],
"texture": "#line"
"texture": "#border"
},
"west": {
"uv": [
@@ -117,7 +117,7 @@
2,
6
],
"texture": "#line"
"texture": "#border"
},
"up": {
"uv": [
@@ -126,7 +126,7 @@
6,
2
],
"texture": "#line"
"texture": "#border"
},
"down": {
"uv": [
@@ -135,7 +135,7 @@
6,
2
],
"texture": "#line"
"texture": "#border"
}
}
},
@@ -159,7 +159,7 @@
10,
10
],
"texture": "#line"
"texture": "#border"
},
"east": {
"uv": [
@@ -168,7 +168,7 @@
2,
10
],
"texture": "#line"
"texture": "#border"
},
"south": {
"uv": [
@@ -177,7 +177,7 @@
10,
10
],
"texture": "#line"
"texture": "#border"
},
"west": {
"uv": [
@@ -186,7 +186,7 @@
2,
10
],
"texture": "#line"
"texture": "#border"
},
"up": {
"uv": [
@@ -195,7 +195,7 @@
10,
2
],
"texture": "#line"
"texture": "#border"
},
"down": {
"uv": [
@@ -204,7 +204,7 @@
10,
2
],
"texture": "#line"
"texture": "#border"
}
}
},

22
src/main/resources/assets/refinedstorage/models/block/external_storage.json
View File

@@ -15,7 +15,7 @@
],
"faces": {
"east": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -24,7 +24,7 @@
]
},
"south": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -33,7 +33,7 @@
]
},
"west": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -42,7 +42,7 @@
]
},
"up": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -51,7 +51,7 @@
]
},
"down": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -75,7 +75,7 @@
],
"faces": {
"north": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -84,7 +84,7 @@
]
},
"east": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -93,7 +93,7 @@
]
},
"south": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -102,7 +102,7 @@
]
},
"west": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -111,7 +111,7 @@
]
},
"up": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -120,7 +120,7 @@
]
},
"down": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,

22
src/main/resources/assets/refinedstorage/models/block/external_storage_item.json
View File

@@ -15,7 +15,7 @@
],
"faces": {
"east": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -24,7 +24,7 @@
]
},
"south": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -33,7 +33,7 @@
]
},
"west": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -42,7 +42,7 @@
]
},
"up": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -51,7 +51,7 @@
]
},
"down": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -75,7 +75,7 @@
],
"faces": {
"north": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -84,7 +84,7 @@
]
},
"east": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -93,7 +93,7 @@
]
},
"south": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -102,7 +102,7 @@
]
},
"west": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -111,7 +111,7 @@
]
},
"up": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -120,7 +120,7 @@
]
},
"down": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,

36
src/main/resources/assets/refinedstorage/models/block/importer.json
View File

@@ -15,7 +15,7 @@
],
"faces": {
"north": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -24,7 +24,7 @@
]
},
"east": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -33,7 +33,7 @@
]
},
"south": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -42,7 +42,7 @@
]
},
"west": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -51,7 +51,7 @@
]
},
"up": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -60,7 +60,7 @@
]
},
"down": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -84,7 +84,7 @@
],
"faces": {
"north": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -93,7 +93,7 @@
]
},
"east": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -102,7 +102,7 @@
]
},
"south": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -111,7 +111,7 @@
]
},
"west": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -120,7 +120,7 @@
]
},
"up": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -129,7 +129,7 @@
]
},
"down": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -153,7 +153,7 @@
],
"faces": {
"north": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -162,7 +162,7 @@
]
},
"east": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -171,7 +171,7 @@
]
},
"south": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -180,7 +180,7 @@
]
},
"west": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -189,7 +189,7 @@
]
},
"up": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -198,7 +198,7 @@
]
},
"down": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,

36
src/main/resources/assets/refinedstorage/models/block/importer_item.json
View File

@@ -15,7 +15,7 @@
],
"faces": {
"north": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -24,7 +24,7 @@
]
},
"east": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -33,7 +33,7 @@
]
},
"south": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -42,7 +42,7 @@
]
},
"west": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -51,7 +51,7 @@
]
},
"up": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -60,7 +60,7 @@
]
},
"down": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -84,7 +84,7 @@
],
"faces": {
"north": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -93,7 +93,7 @@
]
},
"east": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -102,7 +102,7 @@
]
},
"south": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -111,7 +111,7 @@
]
},
"west": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -120,7 +120,7 @@
]
},
"up": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -129,7 +129,7 @@
]
},
"down": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -153,7 +153,7 @@
],
"faces": {
"north": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -162,7 +162,7 @@
]
},
"east": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -171,7 +171,7 @@
]
},
"south": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -180,7 +180,7 @@
]
},
"west": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -189,7 +189,7 @@
]
},
"up": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,
@@ -198,7 +198,7 @@
]
},
"down": {
"texture": "#line",
"texture": "#border",
"uv": [
0.0,
0.0,

0
src/main/resources/assets/refinedstorage/textures/blocks/generic_grey.png → src/main/resources/assets/refinedstorage/textures/blocks/cable_part_border.png Executable file → Normal file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB