Merge remote-tracking branch 'origin/master' into fabric-1.16

# Conflicts: # gradle.properties # src/main/java/appeng/block/AEBaseBlock.java # src/main/java/appeng/block/misc/QuartzFixtureBlock.java # src/main/java/appeng/block/misc/TinyTNTBlock.java # src/main/java/appeng/block/networking/CableBusBlock.java # src/main/java/appeng/helpers/AEMaterials.java # src/unported/java/appeng/block/misc/ChargerBlock.java # src/unported/java/appeng/block/networking/CreativeEnergyCellBlock.java # src/unported/java/appeng/block/networking/EnergyCellBlock.java # src/unported/java/appeng/block/networking/WirelessBlock.java # src/unported/java/appeng/block/paint/PaintSplotchesBlock.java # src/unported/java/appeng/block/qnb/QuantumLinkChamberBlock.java # src/unported/java/appeng/block/spatial/SpatialPylonBlock.java # src/unported/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java # src/unported/java/appeng/tile/storage/ChestBlockEntity.java
2020-07-02 12:25:39 +02:00
parent 295e720d37 1a7bac1fcc
commit fee1c18afe
27 changed files with 121 additions and 94 deletions
@@ -15,7 +15,7 @@
    },
    {
      "when": {
-        "slot_state": "online|types_full|full"
+        "slot_state": "online|not_empty|types_full|full"
      },
      "apply": {
        "model": "appliedenergistics2:block/chest/lights_on"
@@ -45,6 +45,14 @@
        "model": "appliedenergistics2:block/chest/cell_state_online"
      }
    },
+    {
+      "when": {
+        "slot_state": "not_empty"
+      },
+      "apply": {
+        "model": "appliedenergistics2:block/chest/cell_state_not_empty"
+      }
+    },
    {
      "when": {
        "slot_state": "types_full"
@@ -0,0 +1,31 @@
+{
+  "loader": "appliedenergistics2:uvlightmap",
+  "textures": {
+    "backdrop": "appliedenergistics2:block/chest/cell_state_backdrop",
+    "state": "appliedenergistics2:block/chest/cell_state_not_empty"
+  },
+  "elements": [
+    {
+      "from": [0, 0, 0],
+      "to": [16, 16, 16],
+      "faces": {
+        "north": {
+          "texture": "#backdrop"
+        }
+      }
+    },
+    {
+      "from": [0, 0, 0],
+      "to": [16, 16, 16],
+      "faces": {
+        "north": {
+          "texture": "#state",
+          "uvlightmap": {
+            "block": 0.007,
+            "sky": 0.007
+          }
+        }
+      }
+    }
+  ]
+}