fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge fixes

Browse Source
This commit is contained in:
Sebastian Hartte
2020-08-11 00:09:08 +02:00
parent 89058448cf d591a1492c
commit ff0d38d56a
121 changed files with 1684 additions and 1995 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/resources/assets/uvlightmapjsontest/blockstates/uvlblock.json
-5
View File
@@ -1,5 +0,0 @@
{
"variants": {
"normal": { "model": "uvlightmapjsontest:uvlblock_vanilla" }
}
}
src/test/resources/assets/uvlightmapjsontest/models/block/uvlblock.json
-159
View File
@@ -1,159 +0,0 @@
{
"loader": "appliedenergistics2:uvlightmap",
"textures": {
"0": "block/obsidian",
"1": "uvlightmapjsontest:blocks/BlockControllerLights"
},
"elements": [
{
"name": "LL",
"from": [4.0, 0.0, 7.0],
"to": [6.0, 16.0, 9.0],
"faces": {
"north": { "texture": "#0", "uv": [1.0, 0.0, 15.0, 16.0] },
"east": { "texture": "#0", "uv": [1.0, 0.0, 15.0, 16.0] },
"south": { "texture": "#0", "uv": [1.0, 0.0, 15.0, 16.0] },
"west": { "texture": "#0", "uv": [1.0, 0.0, 15.0, 16.0] },
"up": { "texture": "#0", "uv": [0.0, 0.0, 2.0, 2.0] },
"down": { "texture": "#0", "uv": [0.0, 0.0, 2.0, 2.0] }
}
},
{
"name": "RL",
"from": [10.0, 0.0, 7.0],
"to": [12.0, 16.0, 9.0],
"faces": {
"north": { "texture": "#0", "uv": [1.0, 0.0, 15.0, 16.0] },
"east": { "texture": "#0", "uv": [1.0, 0.0, 15.0, 16.0] },
"south": { "texture": "#0", "uv": [1.0, 0.0, 15.0, 16.0] },
"west": { "texture": "#0", "uv": [1.0, 0.0, 15.0, 16.0] },
"up": { "texture": "#0", "uv": [0.0, 0.0, 2.0, 2.0] },
"down": { "texture": "#0", "uv": [0.0, 0.0, 2.0, 2.0] }
}
},
{
"name": "B",
"from": [6.0, 7.0, 7.0],
"to": [10.0, 9.0, 9.0],
"faces": {
"north": { "texture": "#0", "uv": [0.0, 1.0, 16.0, 3.0] },
"east": { "texture": "#0", "uv": [1.0, 1.0, 3.0, 3.0] },
"south": { "texture": "#0", "uv": [0.0, 1.0, 16.0, 3.0] },
"west": { "texture": "#0", "uv": [1.0, 1.0, 3.0, 3.0] },
"up": { "texture": "#0", "uv": [0.0, 1.0, 16.0, 3.0] },
"down": { "texture": "#0", "uv": [0.0, 1.0, 16.0, 3.0] }
}
},
{
"name": "LLO",
"from": [4.0, 0.0, 7.0],
"to": [6.0, 16.0, 9.0],
"faces": {
"north": {
"texture": "#1",
"uv": [2.0, 0.0, 4.0, 16.0],
"uvlightmap": { "sky": 0.007, "block": 0.007 }
},
"east": {
"texture": "#1",
"uv": [5.0, 0.0, 7.0, 16.0],
"uvlightmap": { "sky": 0.007, "block": 0.007 }
},
"south": {
"texture": "#1",
"uv": [8.0, 0.0, 10.0, 16.0],
"uvlightmap": { "sky": 0.007, "block": 0.007 }
},
"west": {
"texture": "#1",
"uv": [11.0, 0.0, 13.0, 16.0],
"uvlightmap": { "sky": 0.007, "block": 0.007 }
},
"up": {
"texture": "#1",
"uv": [6.0, 6.0, 8.0, 8.0],
"uvlightmap": { "sky": 0.007, "block": 0.007 }
},
"down": {
"texture": "#1",
"uv": [8.0, 8.0, 10.0, 10.0],
"uvlightmap": { "sky": 0.007, "block": 0.007 }
}
}
},
{
"name": "RLO",
"from": [10.0, 0.0, 7.0],
"to": [12.0, 16.0, 9.0],
"faces": {
"north": {
"texture": "#1",
"uv": [3.0, 0.0, 5.0, 16.0],
"uvlightmap": { "sky": 0.007, "block": 0.007 }
},
"east": {
"texture": "#1",
"uv": [5.0, 0.0, 7.0, 16.0],
"uvlightmap": { "sky": 0.007, "block": 0.007 }
},
"south": {
"texture": "#1",
"uv": [7.0, 0.0, 9.0, 16.0],
"uvlightmap": { "sky": 0.007, "block": 0.007 }
},
"west": {
"texture": "#1",
"uv": [10.0, 0.0, 12.0, 16.0],
"uvlightmap": { "sky": 0.007, "block": 0.007 }
},
"up": {
"texture": "#1",
"uv": [6.0, 6.0, 8.0, 8.0],
"uvlightmap": { "sky": 0.007, "block": 0.007 }
},
"down": {
"texture": "#1",
"uv": [7.0, 8.0, 9.0, 10.0],
"uvlightmap": { "sky": 0.007, "block": 0.007 }
}
}
},
{
"name": "BO",
"from": [6.0, 7.0, 7.0],
"to": [10.0, 9.0, 9.0],
"faces": {
"north": {
"texture": "#1",
"uv": [5.0, 6.0, 9.0, 8.0],
"uvlightmap": { "sky": 0.007, "block": 0.007 }
},
"east": {
"texture": "#1",
"uv": [0.0, 0.0, 2.0, 2.0],
"uvlightmap": { "sky": 0.007, "block": 0.007 }
},
"south": {
"texture": "#1",
"uv": [5.0, 7.0, 9.0, 9.0],
"uvlightmap": { "sky": 0.007, "block": 0.007 }
},
"west": {
"texture": "#1",
"uv": [5.0, 3.0, 7.0, 5.0],
"uvlightmap": { "sky": 0.007, "block": 0.007 }
},
"up": {
"texture": "#1",
"uv": [4.0, 10.0, 8.0, 12.0],
"uvlightmap": { "sky": 0.007, "block": 0.007 }
},
"down": {
"texture": "#1",
"uv": [8.0, 8.0, 12.0, 10.0],
"uvlightmap": { "sky": 0.007, "block": 0.007 }
}
}
}
]
}
src/test/resources/assets/uvlightmapjsontest/models/block/uvlblock.model
BIN
View File
Binary file not shown.
src/test/resources/assets/uvlightmapjsontest/models/block/uvlblock_vanilla.json
-6
View File
@@ -1,6 +0,0 @@
{
"parent": "uvlightmapjsontest:block/uvlblock",
"textures": {
"0": "block/diamond_block"
}
}
src/test/resources/assets/uvlightmapjsontest/models/item/uvlblock.json
-3
View File
@@ -1,3 +0,0 @@
{
"parent": "uvlightmapjsontest:block/uvlblock"
}
src/test/resources/assets/uvlightmapjsontest/textures/blocks/BlockControllerLights.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

src/test/resources/assets/uvlightmapjsontest/textures/blocks/BlockControllerLights.png.mcmeta
-19
View File
@@ -1,19 +0,0 @@
{
"animation": {
"frametime": 3,
"frames": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11
]
}
}