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

Major Refactoring of Bootstrap Code (#75)

Browse Source 
- 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
2016-08-22 14:25:10 +02:00
committed by Sebastian Hartte
parent 66df324ef0
commit 6f2bbfab4c
172 changed files with 2289 additions and 2863 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/assets/appliedenergistics2/blockstates/creative_energy_cell.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"variants": {
"normal": {
"model": "appliedenergistics2:EnergyCell/creative_energy_cell"
"model": "appliedenergistics2:energy_cell/creative_energy_cell"
}
}
}
src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json
+8 -8
View File
@@ -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"
}
}
}
src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json
+8 -8
View File
@@ -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"
}
}
}
src/main/resources/assets/appliedenergistics2/blockstates/quartz_lamp.json
+29 -5
View File
@@ -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 }
}
}
}
]
}