More texture optimizations

SleepyTrousers · Nov 6, 2016 · dffdc4b · dffdc4b
1 parent 7e959f5
commit dffdc4b
Show file tree

Hide file tree

Showing 20 changed files with 13 additions and 13 deletions.
diff --git a/...tures/blocks/conduitConnectorExternal.png → doc/textures/conduitConnectorExternal.png b/...tures/blocks/conduitConnectorExternal.png → doc/textures/conduitConnectorExternal.png
diff --git a/...textures/blocks/blockSoulMachineBlank.png → ...textures/blocks/blockSoulMachineBlank.png b/...textures/blocks/blockSoulMachineBlank.png → ...textures/blocks/blockSoulMachineBlank.png
diff --git a/...textures/items/itemCoordSelector_alt1.png → doc/textures/itemCoordSelector_alt1.png b/...textures/items/itemCoordSelector_alt1.png → doc/textures/itemCoordSelector_alt1.png
diff --git a/...textures/items/itemCoordSelector_alt2.png → doc/textures/itemCoordSelector_alt2.png b/...textures/items/itemCoordSelector_alt2.png → doc/textures/itemCoordSelector_alt2.png
diff --git a/.../enderio/textures/blocks/reservoirMbB.png → doc/textures/old/reservoirMbB.png b/.../enderio/textures/blocks/reservoirMbB.png → doc/textures/old/reservoirMbB.png
diff --git a/...enderio/textures/blocks/reservoirMbBl.png → doc/textures/old/reservoirMbBl.png b/...enderio/textures/blocks/reservoirMbBl.png → doc/textures/old/reservoirMbBl.png
diff --git a/...enderio/textures/blocks/reservoirMbBr.png → doc/textures/old/reservoirMbBr.png b/...enderio/textures/blocks/reservoirMbBr.png → doc/textures/old/reservoirMbBr.png
diff --git a/.../enderio/textures/blocks/reservoirMbL.png → doc/textures/old/reservoirMbL.png b/.../enderio/textures/blocks/reservoirMbL.png → doc/textures/old/reservoirMbL.png
diff --git a/.../enderio/textures/blocks/reservoirMbR.png → doc/textures/old/reservoirMbR.png b/.../enderio/textures/blocks/reservoirMbR.png → doc/textures/old/reservoirMbR.png
diff --git a/.../enderio/textures/blocks/reservoirMbT.png → doc/textures/old/reservoirMbT.png b/.../enderio/textures/blocks/reservoirMbT.png → doc/textures/old/reservoirMbT.png
diff --git a/...enderio/textures/blocks/reservoirMbTl.png → doc/textures/old/reservoirMbTl.png b/...enderio/textures/blocks/reservoirMbTl.png → doc/textures/old/reservoirMbTl.png
diff --git a/...enderio/textures/blocks/reservoirMbTr.png → doc/textures/old/reservoirMbTr.png b/...enderio/textures/blocks/reservoirMbTr.png → doc/textures/old/reservoirMbTr.png
diff --git a/resources/assets/enderio/blockstates/blockDecoration1.json b/resources/assets/enderio/blockstates/blockDecoration1.json
@@ -30,19 +30,19 @@
         "top":      "enderio:blocks/machineTop",
         "side":     "enderio:blocks/machineBack"
       }, "model":   "enderio:sidedCube" },
-      "type07":             { "textures": { "all": "enderio:blocks/blockSoulMachineBlank" } },
+      "type07":             { "textures": { "all": "enderio:blocks/blockSoulMachineBottom" } },
       "type08":             { "textures": { "all": "enderio:blocks/blockSoulMachineTop" } },
       "type09":             { "textures": { "all": "enderio:blocks/blockSoulMachineSide" } },
       "type10":             { "textures": { "all": "enderio:blocks/blockSoulMachineBack" } },
       "type11":             { "textures": {
-        "particle": "enderio:blocks/blockSoulMachineBlank",
-        "bottom":   "enderio:blocks/blockSoulMachineBlank",
+        "particle": "enderio:blocks/blockSoulMachineBottom",
+        "bottom":   "enderio:blocks/blockSoulMachineBottom",
         "top":      "enderio:blocks/blockSoulMachineTop",
         "side":     "enderio:blocks/blockSoulMachineSide"
       }, "model":   "enderio:sidedCube" },
       "type12":             { "textures": {
-        "particle": "enderio:blocks/blockSoulMachineBlank",
-        "bottom":   "enderio:blocks/blockSoulMachineBlank",
+        "particle": "enderio:blocks/blockSoulMachineBottom",
+        "bottom":   "enderio:blocks/blockSoulMachineBottom",
         "top":      "enderio:blocks/blockSoulMachineTop",
         "side":     "enderio:blocks/blockSoulMachineBack"
       }, "model":   "enderio:sidedCube" },

diff --git a/resources/assets/enderio/blockstates/blockSoulBinder.json b/resources/assets/enderio/blockstates/blockSoulBinder.json
@@ -2,8 +2,8 @@
     "forge_marker":1,
     "defaults":{
 			"textures": {
-			    "particle": "enderio:blocks/blockSoulMachineBlank",
-			    "0": "enderio:blocks/blockSoulMachineBlank",
+			    "particle": "enderio:blocks/blockSoulMachineBottom",
+			    "0": "enderio:blocks/blockSoulMachineBottom",
 			    "1": "enderio:blocks/blockSoulMachineTop",
 			    "2": "enderio:blocks/endermanSkullFront",
 			    "3": "enderio:blocks/skullSkeleton",

diff --git a/resources/assets/enderio/blockstates/machineBase.json b/resources/assets/enderio/blockstates/machineBase.json
@@ -62,10 +62,10 @@
                 },
                 "model":"enderio:paint_overlay"
             },
-            "soul_frame":{          "submodel":{ "frame":{ "model":"enderio:blockSoulBinder_frame", "y":180 } }, "textures":{  "0": "enderio:blocks/blockSoulMachineBlank", "1": "enderio:blocks/blockSoulMachineTop" } },
-            "soul_frame_east":{     "submodel":{ "frame":{ "model":"enderio:blockSoulBinder_frame", "y":270 } }, "textures":{  "0": "enderio:blocks/blockSoulMachineBlank", "1": "enderio:blocks/blockSoulMachineTop" } },
-            "soul_frame_south":{    "submodel":{ "frame":{ "model":"enderio:blockSoulBinder_frame", "y":0   } }, "textures":{  "0": "enderio:blocks/blockSoulMachineBlank", "1": "enderio:blocks/blockSoulMachineTop" } },
-            "soul_frame_west":{     "submodel":{ "frame":{ "model":"enderio:blockSoulBinder_frame", "y":90  } }, "textures":{  "0": "enderio:blocks/blockSoulMachineBlank", "1": "enderio:blocks/blockSoulMachineTop" } }
+            "soul_frame":{          "submodel":{ "frame":{ "model":"enderio:blockSoulBinder_frame", "y":180 } }, "textures":{  "0": "enderio:blocks/blockSoulMachineBottom", "1": "enderio:blocks/blockSoulMachineTop" } },
+            "soul_frame_east":{     "submodel":{ "frame":{ "model":"enderio:blockSoulBinder_frame", "y":270 } }, "textures":{  "0": "enderio:blocks/blockSoulMachineBottom", "1": "enderio:blocks/blockSoulMachineTop" } },
+            "soul_frame_south":{    "submodel":{ "frame":{ "model":"enderio:blockSoulBinder_frame", "y":0   } }, "textures":{  "0": "enderio:blocks/blockSoulMachineBottom", "1": "enderio:blocks/blockSoulMachineTop" } },
+            "soul_frame_west":{     "submodel":{ "frame":{ "model":"enderio:blockSoulBinder_frame", "y":90  } }, "textures":{  "0": "enderio:blocks/blockSoulMachineBottom", "1": "enderio:blocks/blockSoulMachineTop" } }
         }
     }
 }
diff --git a/resources/assets/enderio/models/block/blockEndermanSkull_tormented.json b/resources/assets/enderio/models/block/blockEndermanSkull_tormented.json
@@ -5,7 +5,7 @@
         "side": "enderio:blocks/endermanSkullSide",
         "front": "enderio:blocks/endermanSkullFront",
         "top": "enderio:blocks/endermanSkullTop",
-        "bolt": "enderio:blocks/blockSoulMachineBlank"
+        "bolt": "enderio:blocks/blockSoulMachineBottom"
     },
     "elements": [
         {

diff --git a/resources/assets/enderio/textures/blocks/overlays/reservoir.png b/resources/assets/enderio/textures/blocks/overlays/reservoir.png
diff --git a/resources/assets/enderio/textures/blocks/solarPanelVibrantSide.png b/resources/assets/enderio/textures/blocks/solarPanelVibrantSide.png
diff --git a/resources/assets/enderio/textures/items/inventoryPanelUpgrade.png b/resources/assets/enderio/textures/items/inventoryPanelUpgrade.png
diff --git a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderManager.java b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderManager.java
@@ -32,7 +32,7 @@ public class ConduitBundleRenderManager {
 
   public static final TextureSupplier connectorIconExternal = TextureRegistry.registerTexture("blocks/conduitConnector");
 
-  public static final TextureSupplier connectorIcon = TextureRegistry.registerTexture("blocks/conduitConnectorExternal");
+  public static final TextureSupplier connectorIcon = TextureRegistry.registerTexture("blocks/conduitConnector"); // TODO: is this even used?
 
   public static final TextureSupplier wireFrameIcon = TextureRegistry.registerTexture("blocks/wireFrame");