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

fix ME Chest rendering (#246)

Browse Source 
* Update dependencies.gradle

* fix ME Chest rendering
This commit is contained in:
Xikaro
2023-03-20 23:58:40 +05:00
committed by GitHub
parent 75be2ff039
commit af5921f9e8
9 changed files with 206 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle/scripts/dependencies.gradle
+3 -3
View File
@@ -81,11 +81,11 @@ configurations {
dependencies { dependencies {
// deobfCompile "gregtechce:gregtech:1.12.2:1.15.1.735" // deobfCompile "gregtechce:gregtech:1.12.2:1.15.1.735"
// installable runtime dependencies // installable runtime dependencies
deobfCompile "curse.maven:gregtechceu-557242:3949406" deobfCompile "curse.maven:gregtechceu-557242:4429261"
compileOnly "curse.maven:chisel-235279:2915375" compileOnly "curse.maven:chisel-235279:2915375"
deobfCompile "baubles:Baubles:1.12:1.5.2" deobfCompile "curse.maven:baubles-227083:2518667"
//mods "mcp.mobius.waila:Hwyla:${hwyla_version}" //mods "mcp.mobius.waila:Hwyla:${hwyla_version}"
mods "curse.maven:hwyla-253449:2568751" mods "curse.maven:hwyla-253449:2568751"
mods "net.industrial-craft:industrialcraft-2:${ic2_version}:dev" mods "net.industrial-craft:industrialcraft-2:${ic2_version}:dev"
@@ -107,7 +107,7 @@ dependencies {
compileOnly "cofh:CoFHCore:${cofhcore_version}:deobf" compileOnly "cofh:CoFHCore:${cofhcore_version}:deobf"
compileOnly "CraftTweaker2:CraftTweaker2-API:${crafttweaker_version}" compileOnly "CraftTweaker2:CraftTweaker2-API:${crafttweaker_version}"
compileOnly "curse.maven:inventory-tweaks-223094:2482482" compileOnly "curse.maven:inventory-tweaks-223094:2482482"
compileOnly "curse.maven:inventory-bogo-sorter-632327:4329854" compileOnly "curse.maven:inventory-bogo-sorter-632327:4399738"
compileOnly "team.chisel.ctm:CTM:${ctm_version}" compileOnly "team.chisel.ctm:CTM:${ctm_version}"
compileOnly "de.ellpeck.actuallyadditions:ActuallyAdditions:1.12.2-r152.16:api" compileOnly "de.ellpeck.actuallyadditions:ActuallyAdditions:1.12.2-r152.16:api"
deobfCompile "net.sengir.forestry:forestry_${minecraft_version}:$forestry_version" deobfCompile "net.sengir.forestry:forestry_${minecraft_version}:$forestry_version"
src/main/resources/assets/appliedenergistics2/blockstates/chest.json
+56 -56
View File
@@ -1,60 +1,60 @@
{ {
"forge_marker": 1, "forge_marker": 1,
"defaults": { "defaults": {
"model": "appliedenergistics2:chest/base" "model": "appliedenergistics2:chest/base"
}, },
"variants": { "variants": {
"slot_state": { "slot_state": {
"empty": { "empty": {
"submodel": { "submodel": {
"lights": { "lights": {
"model": "appliedenergistics2:chest/lights_off" "model": "appliedenergistics2:chest/lights_off"
}, },
"state": { "state": {
"model": "appliedenergistics2:chest/cell_state_empty" "model": "appliedenergistics2:chest/cell_state_empty"
} }
}
},
"offline": {
"submodel": {
"lights": {
"model": "appliedenergistics2:chest/lights_off"
},
"state": {
"model": "appliedenergistics2:chest/cell_state_offline"
}
}
},
"online": {
"submodel": {
"lights": {
"model": "appliedenergistics2:chest/lights_on"
},
"state": {
"model": "appliedenergistics2:chest/cell_state_online"
}
}
},
"types_full": {
"submodel": {
"lights": {
"model": "appliedenergistics2:chest/lights_on"
},
"state": {
"model": "appliedenergistics2:chest/cell_state_types_full"
}
}
},
"full": {
"submodel": {
"lights": {
"model": "appliedenergistics2:chest/lights_on"
},
"state": {
"model": "appliedenergistics2:chest/cell_state_full"
}
}
}
} }
},
"offline": {
"submodel": {
"lights": {
"model": "appliedenergistics2:chest/lights_off"
},
"state": {
"model": "appliedenergistics2:chest/cell_state_offline"
}
}
},
"online": {
"submodel": {
"lights": {
"model": "appliedenergistics2:chest/lights_on"
},
"state": {
"model": "appliedenergistics2:chest/cell_state_online"
}
}
},
"types_full": {
"submodel": {
"lights": {
"model": "appliedenergistics2:chest/lights_on"
},
"state": {
"model": "appliedenergistics2:chest/cell_state_types_full"
}
}
},
"full": {
"submodel": {
"lights": {
"model": "appliedenergistics2:chest/lights_on"
},
"state": {
"model": "appliedenergistics2:chest/cell_state_full"
}
}
}
} }
}
} }
src/main/resources/assets/appliedenergistics2/models/block/chest/base.json
-1
View File
@@ -1,5 +1,4 @@
{ {
"credit": "Made with Blockbench",
"textures": { "textures": {
"4": "appliedenergistics2:blocks/drive_inside", "4": "appliedenergistics2:blocks/drive_inside",
"up": "appliedenergistics2:blocks/chest/top", "up": "appliedenergistics2:blocks/chest/top",
src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json
+22 -23
View File
@@ -1,24 +1,23 @@
{ {
"credit": "Made with Blockbench", "textures": {
"textures": { "backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
"backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop", "state": "appliedenergistics2:blocks/chest/cell_state_full"
"state": "appliedenergistics2:blocks/chest/cell_state_full" },
}, "elements": [
"elements": [ {
{ "from": [5, 4, 0],
"from": [5, 4, 0], "to": [11, 6, 1],
"to": [11, 6, 1], "faces": {
"faces": { "north": { "uv": [5, 10, 11, 12], "texture": "#backdrop" },
"north": {"uv": [5, 10, 11, 12], "texture": "#backdrop"}, "up": { "uv": [5, 9, 11, 10], "texture": "#backdrop" }
"up": {"uv": [5, 9, 11, 10], "texture": "#backdrop"} }
} },
}, {
{ "from": [0, 0, 0],
"from": [0, 0, 0], "to": [16, 16, 16],
"to": [16, 16, 16], "faces": {
"faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#state" }
"north": {"uv": [0, 0, 16, 16], "texture": "#state"} }
} }
} ]
] }
}
src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_offline.json
+14 -15
View File
@@ -1,16 +1,15 @@
{ {
"credit": "Made with Blockbench", "textures": {
"textures": { "state": "appliedenergistics2:blocks/chest/cell_state_offline"
"state": "appliedenergistics2:blocks/chest/cell_state_offline" },
}, "elements": [
"elements": [ {
{ "from": [5, 4, 0],
"from": [5, 4, 0], "to": [11, 6, 1],
"to": [11, 6, 1], "faces": {
"faces": { "north": { "uv": [5, 10, 11, 12], "texture": "#state" },
"north": {"uv": [5, 10, 11, 12], "texture": "#state"}, "up": { "uv": [5, 9, 11, 10], "texture": "#state" }
"up": {"uv": [5, 9, 11, 10], "texture": "#state"} }
} }
} ]
] }
}
src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json
+22 -23
View File
@@ -1,24 +1,23 @@
{ {
"credit": "Made with Blockbench", "textures": {
"textures": { "backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
"backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop", "state": "appliedenergistics2:blocks/chest/cell_state_online"
"state": "appliedenergistics2:blocks/chest/cell_state_online" },
}, "elements": [
"elements": [ {
{ "from": [5, 4, 0],
"from": [5, 4, 0], "to": [11, 6, 1],
"to": [11, 6, 1], "faces": {
"faces": { "north": { "uv": [5, 10, 11, 12], "texture": "#backdrop" },
"north": {"uv": [5, 10, 11, 12], "texture": "#backdrop"}, "up": { "uv": [5, 9, 11, 10], "texture": "#backdrop" }
"up": {"uv": [5, 9, 11, 10], "texture": "#backdrop"} }
} },
}, {
{ "from": [0, 0, 0],
"from": [0, 0, 0], "to": [16, 16, 16],
"to": [16, 16, 16], "faces": {
"faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#state" }
"north": {"uv": [0, 0, 16, 16], "texture": "#state"} }
} }
} ]
] }
}
src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json
+22 -23
View File
@@ -1,24 +1,23 @@
{ {
"credit": "Made with Blockbench", "textures": {
"textures": { "backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
"backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop", "state": "appliedenergistics2:blocks/chest/cell_state_types_full"
"state": "appliedenergistics2:blocks/chest/cell_state_types_full" },
}, "elements": [
"elements": [ {
{ "from": [5, 4, 0],
"from": [5, 4, 0], "to": [11, 6, 1],
"to": [11, 6, 1], "faces": {
"faces": { "north": { "uv": [5, 10, 11, 12], "texture": "#backdrop" },
"north": {"uv": [5, 10, 11, 12], "texture": "#backdrop"}, "up": { "uv": [5, 9, 11, 10], "texture": "#backdrop" }
"up": {"uv": [5, 9, 11, 10], "texture": "#backdrop"} }
} },
}, {
{ "from": [0, 0, 0],
"from": [0, 0, 0], "to": [16, 16, 16],
"to": [16, 16, 16], "faces": {
"faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#state" }
"north": {"uv": [0, 0, 16, 16], "texture": "#state"} }
} }
} ]
] }
}
src/main/resources/assets/appliedenergistics2/models/block/chest/lights_off.json
+15 -23
View File
@@ -1,25 +1,17 @@
{ {
"textures": { "textures": {
"lights": "appliedenergistics2:blocks/chest/lights_off" "lights": "appliedenergistics2:blocks/chest/lights_off"
}, },
"elements": [ "elements": [
{ {
"from": [ "from": [0, 0, 0],
0, "to": [16, 16, 16],
0, "faces": {
0 "up": {
], "texture": "#lights",
"to": [ "tintindex": 3
16,
16,
16
],
"faces": {
"up": {
"texture": "#lights",
"tintindex": 3
}
}
} }
] }
} }
]
}
src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json
+52 -77
View File
@@ -1,79 +1,54 @@
{ {
"ae2_uvl_marker": true, "textures": {
"textures": { "lights_bright": "appliedenergistics2:blocks/chest/lights_on_bright",
"lights_bright": "appliedenergistics2:blocks/chest/lights_on_bright", "lights_medium": "appliedenergistics2:blocks/chest/lights_on_medium",
"lights_medium": "appliedenergistics2:blocks/chest/lights_on_medium", "lights_dark": "appliedenergistics2:blocks/chest/lights_on_dark"
"lights_dark": "appliedenergistics2:blocks/chest/lights_on_dark" },
}, "elements": [
"elements": [ {
{ "from": [0, 0, 0],
"from": [ "to": [16, 16, 16],
0, "faces": {
0, "up": {
0 "texture": "#lights_bright",
], "tintindex": 3,
"to": [ "unlit": true,
16, "uvlightmap": {
16, "block": 15,
16 "sky": 15
], }
"faces": {
"up": {
"texture": "#lights_bright",
"tintindex": 3,
"unlit": true,
"uvlightmap": {
"block": 15,
"sky": 15
}
}
}
},
{
"from": [
0,
0,
0
],
"to": [
16,
16,
16
],
"faces": {
"up": {
"texture": "#lights_medium",
"tintindex": 2,
"unlit": true,
"uvlightmap": {
"block": 15,
"sky": 15
}
}
}
},
{
"from": [
0,
0,
0
],
"to": [
16,
16,
16
],
"faces": {
"up": {
"texture": "#lights_dark",
"tintindex": 1,
"unlit": true,
"uvlightmap": {
"block": 15,
"sky": 15
}
}
}
} }
] }
} },
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"up": {
"texture": "#lights_medium",
"tintindex": 2,
"unlit": true,
"uvlightmap": {
"block": 15,
"sky": 15
}
}
}
},
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"up": {
"texture": "#lights_dark",
"tintindex": 1,
"unlit": true,
"uvlightmap": {
"block": 15,
"sky": 15
}
}
}
}
]
}