tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Make UVLLoader a bit more robust (#3102)

Browse source 
Catch all parsing exceptions instead of propagating them upwards as
these are meaningless for the actual test.
Renamed uvlMarker to ae2_uvl_marker just in case some other mod uses the
same key.
This commit is contained in:
yueh 2017-09-21 20:42:23 +02:00 committed by GitHub
parent d3a5be7ed6
commit 829c18e2bb
49 changed files with 54 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/appeng/client/render/model/UVLModelLoader.java
View file

@ -191,17 +191,19 @@ public enum UVLModelLoader implements ICustomModelLoader
{
modelPath = modelPath.substring( "models/".length() );
}
try( InputStreamReader io = new InputStreamReader( Minecraft.getMinecraft()
.getResourceManager()
.getResource( new ResourceLocation( modelLocation.getResourceDomain(), "models/" + modelPath + ".json" ) )
.getInputStream() ) )
{
return gson.fromJson( io, UVLMarker.class ).uvlMarker;
return gson.fromJson( io, UVLMarker.class ).ae2_uvl_marker;
}
catch( IOException e )
catch( Exception e )
{
// Catch-all in case of any JSON parser issues.
}
return false;
}
@ -387,7 +389,7 @@ public enum UVLModelLoader implements ICustomModelLoader
class UVLMarker
{
boolean uvlMarker = false;
boolean ae2_uvl_marker = false;
}
}

2
src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"parent": "block/block",
"textures": {
"block": "blocks/stone",

2
src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
"state": "appliedenergistics2:blocks/chest/cell_state_full"

2
src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
"state": "appliedenergistics2:blocks/chest/cell_state_online"

2
src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
"state": "appliedenergistics2:blocks/chest/cell_state_types_full"

2
src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"lights_bright": "appliedenergistics2:blocks/chest/lights_on_bright",
"lights_medium": "appliedenergistics2:blocks/chest/lights_on_medium",

2
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"parent": "block/block",
"textures": {
"block": "appliedenergistics2:blocks/controller_powered",

2
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"parent": "block/block",
"textures": {
"block": "appliedenergistics2:blocks/controller_powered",

2
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"parent": "block/block",
"textures": {
"block": "appliedenergistics2:blocks/controller_column_powered",

2
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"parent": "block/block",
"textures": {
"block": "appliedenergistics2:blocks/controller_column_powered",

2
src/main/resources/assets/appliedenergistics2/models/block/drive_cell_empty.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"front": "appliedenergistics2:blocks/drive_cell_states"
},

2
src/main/resources/assets/appliedenergistics2/models/block/drive_cell_full.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"front": "appliedenergistics2:blocks/drive_cell_states"
},

2
src/main/resources/assets/appliedenergistics2/models/block/drive_cell_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"front": "appliedenergistics2:blocks/drive_cell_states"
},

2
src/main/resources/assets/appliedenergistics2/models/block/drive_cell_types_full.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"front": "appliedenergistics2:blocks/drive_cell_states"
},

2
src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"parent": "block/block",
"textures": {
"all": "appliedenergistics2:blocks/molecular_assembler_lights"

2
src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"parent": "block/block",
"textures": {
"particle": "appliedenergistics2:blocks/security_station_side",

2
src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"ambientocclusion": false,
"textures": {
"torch": "appliedenergistics2:blocks/wireless_access_point_on"

2
src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"lightsBright": "appliedenergistics2:parts/conversion_monitor_bright",
"lightsMedium": "appliedenergistics2:parts/conversion_monitor_medium_locked",

2
src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"lightsBright": "appliedenergistics2:parts/conversion_monitor_bright",
"lightsMedium": "appliedenergistics2:parts/conversion_monitor_medium",

2
src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"lightsBright": "appliedenergistics2:parts/crafting_terminal_bright",
"lightsMedium": "appliedenergistics2:parts/crafting_terminal_medium",

2
src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel"
},

2
src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_on"
},

2
src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel"
},

2
src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_on"
},

2
src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel"
},

2
src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_on"
},

2
src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel"
},

2
src/main/resources/assets/appliedenergistics2/models/part/interface_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_on"
},

2
src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"lightsBright": "appliedenergistics2:parts/interface_terminal_bright",
"lightsMedium": "appliedenergistics2:parts/interface_terminal_medium",

2
src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"ambientocclusion": false,
"textures": {
"emitter": "appliedenergistics2:parts/level_emitter_on",

2
src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel"
},

2
src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_on"
},

2
src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"sides": "appliedenergistics2:parts/monitor_sides",
"back": "appliedenergistics2:parts/monitor_back",

2
src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"ambientocclusion": false,
"textures": {
"lights": "appliedenergistics2:parts/monitor_light"

2
src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"lights": "appliedenergistics2:parts/monitor_light"
},

2
src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"lights": "appliedenergistics2:parts/monitor_light"
},

2
src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel"
},

2
src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_on"
},

2
src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"lightsBright": "appliedenergistics2:parts/pattern_terminal_bright",
"lightsMedium": "appliedenergistics2:parts/pattern_terminal_medium",

2
src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel"
},

2
src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_on"
},

2
src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"lightsBright": "appliedenergistics2:parts/storage_monitor_bright",
"lightsMedium": "appliedenergistics2:parts/storage_monitor_medium",

2
src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"lightsBright": "appliedenergistics2:parts/storage_monitor_bright",
"lightsMedium": "appliedenergistics2:parts/storage_monitor_medium",

2
src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"lightsBright": "appliedenergistics2:parts/terminal_bright",
"lightsMedium": "appliedenergistics2:parts/terminal_medium",

2
src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_on"
},

2
src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"indicator": "appliedenergistics2:parts/monitor_sides_status_on"
},

2
src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"sides": "appliedenergistics2:parts/monitor_sides_status",
"back": "appliedenergistics2:parts/transition_plane_back",

2
src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"sides": "appliedenergistics2:parts/monitor_sides_status",
"back": "appliedenergistics2:parts/transition_plane_back",

2
src/test/resources/assets/uvlightmapjsontest/models/block/uvlblock.json
View file

@ -1,5 +1,5 @@
{
"uvlMarker": true,
"ae2_uvl_marker": true,
"textures": {
"0": "blocks/obsidian",
"1": "uvlightmapjsontest:blocks/BlockControllerLights"