Major Refactoring of Bootstrap Code (#75)
- Refactored boostrap code: * Completely reworked item/block/tile registration. * Fixed server side startup. * Fixed server side startup. * More documentation. * More heavy cleanup * More cleanups. * Major refactoring of state mapping and fixes a lot of other issue related to item rendering. * Fixes sky chest item models (no item TESR). * Only use CachingRotatingBakedModel for tile entities automatically. Fix default rotation of quartz pillar for item model. * Used method reference instead of lambda for ItemMeshDefinition for multiparts. * Removed unnecessary IHasSpecialItemModel * Removed unused IconReg class. * Updated resource pack version.
This commit is contained in:
shartte
committed by
Sebastian Hartte
Sebastian Hartte
parent
66df324ef0
commit
6f2bbfab4c
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"variants": {
|
||||
"normal": {
|
||||
"model": "appliedenergistics2:EnergyCell/creative_energy_cell"
|
||||
"model": "appliedenergistics2:energy_cell/creative_energy_cell"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,28 +1,28 @@
|
||||
{
|
||||
"variants": {
|
||||
"fullness=0": {
|
||||
"model": "appliedenergistics2:EnergyCell/dense_energy_cell0"
|
||||
"model": "appliedenergistics2:energy_cell/dense_energy_cell0"
|
||||
},
|
||||
"fullness=1": {
|
||||
"model": "appliedenergistics2:EnergyCell/dense_energy_cell1"
|
||||
"model": "appliedenergistics2:energy_cell/dense_energy_cell1"
|
||||
},
|
||||
"fullness=2": {
|
||||
"model": "appliedenergistics2:EnergyCell/dense_energy_cell2"
|
||||
"model": "appliedenergistics2:energy_cell/dense_energy_cell2"
|
||||
},
|
||||
"fullness=3": {
|
||||
"model": "appliedenergistics2:EnergyCell/dense_energy_cell3"
|
||||
"model": "appliedenergistics2:energy_cell/dense_energy_cell3"
|
||||
},
|
||||
"fullness=4": {
|
||||
"model": "appliedenergistics2:EnergyCell/dense_energy_cell4"
|
||||
"model": "appliedenergistics2:energy_cell/dense_energy_cell4"
|
||||
},
|
||||
"fullness=5": {
|
||||
"model": "appliedenergistics2:EnergyCell/dense_energy_cell5"
|
||||
"model": "appliedenergistics2:energy_cell/dense_energy_cell5"
|
||||
},
|
||||
"fullness=6": {
|
||||
"model": "appliedenergistics2:EnergyCell/dense_energy_cell6"
|
||||
"model": "appliedenergistics2:energy_cell/dense_energy_cell6"
|
||||
},
|
||||
"fullness=7": {
|
||||
"model": "appliedenergistics2:EnergyCell/dense_energy_cell7"
|
||||
"model": "appliedenergistics2:energy_cell/dense_energy_cell7"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,28 +1,28 @@
|
||||
{
|
||||
"variants": {
|
||||
"fullness=0": {
|
||||
"model": "appliedenergistics2:EnergyCell/energy_cell0"
|
||||
"model": "appliedenergistics2:energy_cell/energy_cell0"
|
||||
},
|
||||
"fullness=1": {
|
||||
"model": "appliedenergistics2:EnergyCell/energy_cell1"
|
||||
"model": "appliedenergistics2:energy_cell/energy_cell1"
|
||||
},
|
||||
"fullness=2": {
|
||||
"model": "appliedenergistics2:EnergyCell/energy_cell2"
|
||||
"model": "appliedenergistics2:energy_cell/energy_cell2"
|
||||
},
|
||||
"fullness=3": {
|
||||
"model": "appliedenergistics2:EnergyCell/energy_cell3"
|
||||
"model": "appliedenergistics2:energy_cell/energy_cell3"
|
||||
},
|
||||
"fullness=4": {
|
||||
"model": "appliedenergistics2:EnergyCell/energy_cell4"
|
||||
"model": "appliedenergistics2:energy_cell/energy_cell4"
|
||||
},
|
||||
"fullness=5": {
|
||||
"model": "appliedenergistics2:EnergyCell/energy_cell5"
|
||||
"model": "appliedenergistics2:energy_cell/energy_cell5"
|
||||
},
|
||||
"fullness=6": {
|
||||
"model": "appliedenergistics2:EnergyCell/energy_cell6"
|
||||
"model": "appliedenergistics2:energy_cell/energy_cell6"
|
||||
},
|
||||
"fullness=7": {
|
||||
"model": "appliedenergistics2:EnergyCell/energy_cell7"
|
||||
"model": "appliedenergistics2:energy_cell/energy_cell7"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,31 @@
|
||||
{
|
||||
"variants": {
|
||||
"normal": {
|
||||
"model": "appliedenergistics2:builtin/connected_glass"
|
||||
"multipart": [
|
||||
{
|
||||
"apply": [{ "model": "appliedenergistics2:quartz_glass_1" }, { "model": "appliedenergistics2:quartz_glass_2" }, { "model": "appliedenergistics2:quartz_glass_3" }, { "model": "appliedenergistics2:quartz_glass_4" }]
|
||||
},
|
||||
{
|
||||
"when": { "down": "false" },
|
||||
"apply": { "model": "appliedenergistics2:quartz_glass_frame", "x": 90 }
|
||||
},
|
||||
{
|
||||
"when": { "up": "false" },
|
||||
"apply": { "model": "appliedenergistics2:quartz_glass_frame", "x": -90 }
|
||||
},
|
||||
{
|
||||
"when": { "north": "false" },
|
||||
"apply": { "model": "appliedenergistics2:quartz_glass_frame"}
|
||||
},
|
||||
{
|
||||
"when": { "south": "false" },
|
||||
"apply": { "model": "appliedenergistics2:quartz_glass_frame", "y": 180 }
|
||||
},
|
||||
{
|
||||
"when": { "west": "false" },
|
||||
"apply": { "model": "appliedenergistics2:quartz_glass_frame", "y": -90 }
|
||||
},
|
||||
{
|
||||
"when": { "east": "false" },
|
||||
"apply": { "model": "appliedenergistics2:quartz_glass_frame", "y": 90 }
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
{
|
||||
"parent": "appliedenergistics2:block/EnergyCell/creative_energy_cell"
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
{
|
||||
"display": {
|
||||
"thirdperson": {
|
||||
"rotation": [
|
||||
10,
|
||||
-45,
|
||||
170
|
||||
],
|
||||
"scale": [
|
||||
0.375,
|
||||
0.375,
|
||||
0.375
|
||||
],
|
||||
"translation": [
|
||||
0,
|
||||
1.5,
|
||||
-2.75
|
||||
]
|
||||
}
|
||||
},
|
||||
"parent": "appliedenergistics2:fluix/block"
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"parent": "block/cube_all",
|
||||
"textures": {
|
||||
"all": "appliedenergistics2:items/quartz_glass"
|
||||
"all": "appliedenergistics2:blocks/quartz_glass"
|
||||
}
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
{
|
||||
"parent": "appliedenergistics2:block/quartz_pillar"
|
||||
}
|
||||
@@ -1,107 +1,7 @@
|
||||
{
|
||||
"display": {
|
||||
"firstperson_righthand": {
|
||||
"rotation": [
|
||||
0,
|
||||
315,
|
||||
0
|
||||
],
|
||||
"scale": [
|
||||
0.4,
|
||||
0.4,
|
||||
0.4
|
||||
],
|
||||
"translation": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
"fixed": {
|
||||
"rotation": [
|
||||
0,
|
||||
180,
|
||||
0
|
||||
],
|
||||
"scale": [
|
||||
0.5,
|
||||
0.5,
|
||||
0.5
|
||||
],
|
||||
"translation": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
"ground": {
|
||||
"rotation": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
],
|
||||
"scale": [
|
||||
0.25,
|
||||
0.25,
|
||||
0.25
|
||||
],
|
||||
"translation": [
|
||||
0,
|
||||
3,
|
||||
0
|
||||
]
|
||||
},
|
||||
"gui": {
|
||||
"rotation": [
|
||||
30,
|
||||
45,
|
||||
0
|
||||
],
|
||||
"scale": [
|
||||
0.625,
|
||||
0.625,
|
||||
0.625
|
||||
],
|
||||
"translation": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
"head": {
|
||||
"rotation": [
|
||||
0,
|
||||
180,
|
||||
0
|
||||
],
|
||||
"scale": [
|
||||
1,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"translation": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
"thirdperson_righthand": {
|
||||
"rotation": [
|
||||
75,
|
||||
315,
|
||||
0
|
||||
],
|
||||
"scale": [
|
||||
0.375,
|
||||
0.375,
|
||||
0.375
|
||||
],
|
||||
"translation": [
|
||||
0,
|
||||
2.5,
|
||||
0
|
||||
]
|
||||
}
|
||||
},
|
||||
"parent": "builtin/entity"
|
||||
"parent": "appliedenergistics2:item/sky_chest_stone",
|
||||
"textures": {
|
||||
"particle": "appliedenergistics2:models/skyblockchest",
|
||||
"0": "appliedenergistics2:models/skyblockchest"
|
||||
}
|
||||
}
|
||||
@@ -1,107 +1,50 @@
|
||||
{
|
||||
"display": {
|
||||
"firstperson_righthand": {
|
||||
"rotation": [
|
||||
0,
|
||||
315,
|
||||
0
|
||||
],
|
||||
"scale": [
|
||||
0.4,
|
||||
0.4,
|
||||
0.4
|
||||
],
|
||||
"translation": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
"fixed": {
|
||||
"rotation": [
|
||||
0,
|
||||
180,
|
||||
0
|
||||
],
|
||||
"scale": [
|
||||
0.5,
|
||||
0.5,
|
||||
0.5
|
||||
],
|
||||
"translation": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
"ground": {
|
||||
"rotation": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
],
|
||||
"scale": [
|
||||
0.25,
|
||||
0.25,
|
||||
0.25
|
||||
],
|
||||
"translation": [
|
||||
0,
|
||||
3,
|
||||
0
|
||||
]
|
||||
},
|
||||
"gui": {
|
||||
"rotation": [
|
||||
30,
|
||||
45,
|
||||
0
|
||||
],
|
||||
"scale": [
|
||||
0.625,
|
||||
0.625,
|
||||
0.625
|
||||
],
|
||||
"translation": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
"head": {
|
||||
"rotation": [
|
||||
0,
|
||||
180,
|
||||
0
|
||||
],
|
||||
"scale": [
|
||||
1,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"translation": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
"thirdperson_righthand": {
|
||||
"rotation": [
|
||||
75,
|
||||
315,
|
||||
0
|
||||
],
|
||||
"scale": [
|
||||
0.375,
|
||||
0.375,
|
||||
0.375
|
||||
],
|
||||
"translation": [
|
||||
0,
|
||||
2.5,
|
||||
0
|
||||
]
|
||||
}
|
||||
"parent": "block/orientable",
|
||||
"textures": {
|
||||
"particle": "appliedenergistics2:models/skychest",
|
||||
"0": "appliedenergistics2:models/skychest"
|
||||
},
|
||||
"parent": "builtin/entity"
|
||||
"elements": [
|
||||
{
|
||||
"name": "Base",
|
||||
"from": [ 1.0, 0.0, 1.0 ],
|
||||
"to": [ 15.0, 10.0, 15.0 ],
|
||||
"shade": false,
|
||||
"faces": {
|
||||
"north": { "texture": "#0", "uv": [ 3.5, 8.25, 7, 10.75 ] },
|
||||
"east": { "texture": "#0", "uv": [ 0.0, 8.25, 3.5, 10.75 ] },
|
||||
"south": { "texture": "#0", "uv": [ 10.5, 8.25, 14, 10.75 ] },
|
||||
"west": { "texture": "#0", "uv": [ 7, 8.25, 10.5, 10.75 ] },
|
||||
"up": { "texture": "#0", "uv": [ 3.5, 0.0, 7, 3.5 ] },
|
||||
"down": { "texture": "#0", "uv": [ 7, 0.0, 10.5, 3.5 ] }
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Lid",
|
||||
"from": [ 1.0, 10.0, 1.0 ],
|
||||
"to": [ 15.0, 15.0, 15.0 ],
|
||||
"shade": false,
|
||||
"faces": {
|
||||
"north": { "texture": "#0", "uv": [ 3.5, 3.5, 7, 4.75 ] },
|
||||
"east": { "texture": "#0", "uv": [ 0.0, 3.5, 3.5, 4.75 ] },
|
||||
"south": { "texture": "#0", "uv": [ 10.5, 3.5, 14, 4.75 ] },
|
||||
"west": { "texture": "#0", "uv": [ 7, 3.5, 10.5, 4.75 ] },
|
||||
"up": { "texture": "#0", "uv": [ 3.5, 0.0, 7, 3.5 ] },
|
||||
"down": { "texture": "#0", "uv": [ 7, 0.0, 10.5, 3.5 ] }
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Knob",
|
||||
"from": [ 7.0, 6.0, 0.0 ],
|
||||
"to": [ 9.0, 10.0, 1.0 ],
|
||||
"shade": false,
|
||||
"faces": {
|
||||
"north": { "texture": "#0", "uv": [ 0.25, 0.25, 0.75, 1.25 ] },
|
||||
"east": { "texture": "#0", "uv": [ 0, 0.25, 0.25, 1.25 ] },
|
||||
"west": { "texture": "#0", "uv": [ 0.75, 0.25, 1.5, 1.25 ] },
|
||||
"up": { "texture": "#0", "uv": [ 0.25, 0.0, 0.75, 0.25 ] },
|
||||
"down": { "texture": "#0", "uv": [ 0.75, 0.0, 1.5, 0.25 ] }
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
{
|
||||
"parent": "appliedenergistics2:tiny_tnt"
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"pack": {
|
||||
"pack_format": 1,
|
||||
"pack_format": 2,
|
||||
"description": "Resources used for Applied Energistics 2"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user