Texture Update Credits

Also added an _ to all variants for readability

README.md

@@ -25,9 +25,9 @@ A Mod about Matter, Energy and using them to conquer the world..
 ## Contacts
 
 * [Website](http://ae-mod.info/)
-* [IRC #appliedenergistics on esper.net](http://webchat.esper.net/?channels=appliedenergistics&prompt=1)
-* [GitHub](https://github.com/AppliedEnergistics/Applied-Energistics-2)
 * [Discord](https://discord.gg/GygKjjm)
+* [GitHub](https://github.com/AppliedEnergistics/Applied-Energistics-2)
+* [IRC #appliedenergistics on esper.net](http://webchat.esper.net/?channels=appliedenergistics&prompt=1)
 
 ## License
 
@@ -38,7 +38,7 @@ A Mod about Matter, Energy and using them to conquer the world..
   - (c) 2013 - 2020 AlgorithmX2 et al
   - [![License](https://img.shields.io/badge/License-LGPLv3-blue.svg?style=flat-square)](https://raw.githubusercontent.com/AppliedEnergistics/Applied-Energistics-2/rv2/LICENSE)
 * Textures and Models
-  - (c) 2013 - 2020 AlgorithmX2 et al
+  - (c) 2020, [Ridanisaurus Rid](https://github.com/Ridanisaurus/), (c) 2013 - 2020 AlgorithmX2 et al
   - [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%203.0-yellow.svg?style=flat-square)](https://creativecommons.org/licenses/by-nc-sa/3.0/)
 * Text and Translations
   - [![License](https://img.shields.io/badge/License-No%20Restriction-green.svg?style=flat-square)](https://creativecommons.org/publicdomain/zero/1.0/)
@@ -185,4 +185,5 @@ Thanks to
 * Notch et al for Minecraft
 * Lex et al for MinecraftForge
 * AlgorithmX2 for AppliedEnergistics2
+* [Ridanisaurus Rid](https://github.com/Ridanisaurus/) for the new 2020 textures
 * all [contributors](https://github.com/AppliedEnergistics/Applied-Energistics-2/graphs/contributors)

build.gradle

@@ -20,6 +20,7 @@ buildscript {
     repositories {
         maven { url = 'https://files.minecraftforge.net/maven' }
         maven { url = 'https://repo.spongepowered.org/maven' }
+        jcenter()
         mavenCentral()
     }
     dependencies {
@@ -39,15 +40,9 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'org.spongepowered.mixin'
 apply plugin: "eclipse"
 
-// All jar files from this folder will be added automatically as runtime mod dependencies
-def extraModsDir = "extra-mods-${minecraft_version}"
-
 repositories {
-    flatDir {
-        name "extra-mods"
-        dir file(extraModsDir)
-    }
     mavenLocal()
+    jcenter()
     mavenCentral()
     maven { // modmaven, maven proxy
         name 'modmaven'
@@ -66,16 +61,6 @@ dependencies {
     runtimeOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}:${jei_version}")
     runtimeOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-${minecraft_release}:${minecraft_release}-${top_version}")
 
-    // Locally sourced extra mods for runtime (i.e. testing)
-    for (extraModJar in fileTree(dir: extraModsDir, include: '*.jar')) {
-        def basename = extraModJar.name.substring(0, extraModJar.name.length() - ".jar".length())
-        def versionSep = basename.lastIndexOf('-')
-        assert versionSep != -1
-        def artifactId = basename.substring(0, versionSep)
-        def version = basename.substring(versionSep + 1)
-        runtimeOnly fg.deobf("extra-mods:$artifactId:$version")
-    }
-
     // unit test dependencies
     testCompile "junit:junit:4.13"
     

gradle.properties

@@ -11,7 +11,7 @@ artifact_basename=appliedenergistics2
 minecraft_release=1.16
 minecraft_version=1.16.3
 mcp_mappings=20200916-1.16.2
-forge_version=34.1.15
+forge_version=34.0.8
 
 #########################################################
 # Provided APIs                                         #

src/main/java/appeng/block/networking/EnergyCellBlock.java

@@ -35,7 +35,9 @@ import appeng.tile.networking.EnergyCellTileEntity;
 
 public class EnergyCellBlock extends AEBaseTileBlock<EnergyCellTileEntity> {
 
-    public static final IntegerProperty ENERGY_STORAGE = IntegerProperty.create("fullness", 0, 7);
+    public static final int MAX_FULLNESS = 4;
+
+    public static final IntegerProperty ENERGY_STORAGE = IntegerProperty.create("fullness", 0, MAX_FULLNESS);
 
     public EnergyCellBlock() {
         super(defaultProps(AEMaterials.GLASS));

src/main/java/appeng/parts/misc/ItemHandlerAdapter.java

@@ -122,15 +122,6 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
             do {
                 extracted = this.itemHandler.extractItem(i, remainingCurrentSlot, simulate);
                 if (!extracted.isEmpty()) {
-                    // In order to guard against broken IItemHandler implementations, we'll
-                    // try to guess if the returned stack (especially in simulate mode) is
-                    // the same that was returned by getStackInSlot. This is obviously not a
-                    // precise science, but it would catch the previous Forge bug:
-                    // https://github.com/MinecraftForge/MinecraftForge/pull/6580
-                    if (extracted == stackInInventorySlot) {
-                        extracted = extracted.copy();
-                    }
-
                     if (extracted.getCount() > remainingCurrentSlot) {
                         // Something broke. It should never return more than we requested...
                         // We're going to silently eat the remainder
@@ -140,28 +131,19 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
                         extracted.setCount(remainingCurrentSlot);
                     }
 
-                    // Heuristic for simulation: looping in case of simulations is pointless, since
-                    // the
-                    // state of the underlying inventory does not change after a simulated
-                    // extraction
-                    // To still support inventories that report stacks that are larger than
-                    // maxStackSize,
-                    // we use this heuristic
-                    if (simulate && extracted.getCount() == extracted.getMaxStackSize()
-                            && remainingCurrentSlot > extracted.getMaxStackSize()) {
-                        extracted.setCount(remainingCurrentSlot);
-                    }
-
                     // We're just gonna use the first stack we get our hands on as the template for
                     // the rest.
+                    // In case some stupid itemhandler (aka forge) returns an internal state we have
+                    // to do a second
+                    // expensive copy again.
                     if (gathered.isEmpty()) {
-                        gathered = extracted;
+                        gathered = extracted.copy();
                     } else {
                         gathered.grow(extracted.getCount());
                     }
                     remainingCurrentSlot -= extracted.getCount();
                 }
-            } while (!simulate && !extracted.isEmpty() && remainingCurrentSlot > 0);
+            } while (!extracted.isEmpty() && remainingCurrentSlot > 0);
 
             remainingSize -= stackSizeCurrentSlot - remainingCurrentSlot;
 

src/main/java/appeng/tile/networking/EnergyCellTileEntity.java

@@ -21,6 +21,7 @@ package appeng.tile.networking;
 import net.minecraft.block.BlockState;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.tileentity.TileEntityType;
+import net.minecraft.util.math.MathHelper;
 
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
@@ -67,15 +68,9 @@ public class EnergyCellTileEntity extends AENetworkTileEntity implements IAEPowe
      * block. This is also used for determining the item model.
      */
     public static int getStorageLevelFromFillFactor(double fillFactor) {
-        byte boundMetadata = (byte) (8.0 * (fillFactor));
+        byte factor = (byte) (8.0 * (fillFactor));
 
-        if (boundMetadata > 7) {
+        return MathHelper.clamp(factor, 0, EnergyCellBlock.MAX_FULLNESS);
-            boundMetadata = 7;
-        }
-        if (boundMetadata < 0) {
-            boundMetadata = 0;
-        }
-        return boundMetadata;
     }
 
     private void changePowerLevel() {

src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json

@@ -1,7 +1,15 @@
 {
   "variants": {
-    "": {
+    "": [
-      "model": "appliedenergistics2:block/charged_quartz_ore"
+      {
-    }
+        "model": "appliedenergistics2:block/charged_quartz_ore_0",
+        "weight": 1
+      },
+      {
+        "model": "appliedenergistics2:block/charged_quartz_ore_1",
+        "weight": 1
+      },
+      { "model": "appliedenergistics2:block/charged_quartz_ore_2", "weight": 1 }
+    ]
   }
 }

src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json

@@ -1,28 +1,19 @@
 {
   "variants": {
     "fullness=0": {
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell0"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_0"
     },
     "fullness=1": {
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell1"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_1"
     },
     "fullness=2": {
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell2"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_2"
     },
     "fullness=3": {
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell3"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_3"
     },
     "fullness=4": {
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell4"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_4"
-    },
-    "fullness=5": {
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell5"
-    },
-    "fullness=6": {
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell6"
-    },
-    "fullness=7": {
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell7"
     }
   }
 }

src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json

@@ -1,28 +1,19 @@
 {
   "variants": {
     "fullness=0": {
-      "model": "appliedenergistics2:block/energy_cell/energy_cell0"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell_0"
     },
     "fullness=1": {
-      "model": "appliedenergistics2:block/energy_cell/energy_cell1"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell_1"
     },
     "fullness=2": {
-      "model": "appliedenergistics2:block/energy_cell/energy_cell2"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell_2"
     },
     "fullness=3": {
-      "model": "appliedenergistics2:block/energy_cell/energy_cell3"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell_3"
     },
     "fullness=4": {
-      "model": "appliedenergistics2:block/energy_cell/energy_cell4"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell_4"
-    },
-    "fullness=5": {
-      "model": "appliedenergistics2:block/energy_cell/energy_cell5"
-    },
-    "fullness=6": {
-      "model": "appliedenergistics2:block/energy_cell/energy_cell6"
-    },
-    "fullness=7": {
-      "model": "appliedenergistics2:block/energy_cell/energy_cell7"
     }
   }
 }

src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json

@@ -1,7 +1,10 @@
 {
   "variants": {
-    "": {
+    "": [
-      "model": "appliedenergistics2:block/quartz_ore"
+      { "model": "appliedenergistics2:block/quartz_ore_0", "weight": 1 },
-    }
+      { "model": "appliedenergistics2:block/quartz_ore_1", "weight": 1 },
+      { "model": "appliedenergistics2:block/quartz_ore_2", "weight": 1 },
+      { "model": "appliedenergistics2:block/quartz_ore_3", "weight": 1 }
+    ]
   }
 }

src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_0.json

@@ -2,7 +2,7 @@
   "parent": "block/block",
   "textures": {
     "block": "block/stone",
-    "quartz": "appliedenergistics2:block/charged_quartz_ore_light",
+    "quartz": "appliedenergistics2:block/charged_quartz_ore_light_0",
     "particle": "appliedenergistics2:block/charged_quartz_ore"
   },
   "elements": [

src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_1.json

@@ -0,0 +1,77 @@
+{
+  "parent": "block/block",
+  "textures": {
+    "block": "block/stone",
+    "quartz": "appliedenergistics2:block/charged_quartz_ore_light_1",
+    "particle": "appliedenergistics2:block/charged_quartz_ore"
+  },
+  "elements": [
+    {
+      "faces": {
+        "down": {
+          "texture": "#block",
+          "cullface": "down"
+        },
+        "east": {
+          "texture": "#block",
+          "cullface": "east"
+        },
+        "north": {
+          "texture": "#block",
+          "cullface": "north"
+        },
+        "south": {
+          "texture": "#block",
+          "cullface": "south"
+        },
+        "up": {
+          "texture": "#block",
+          "cullface": "up"
+        },
+        "west": {
+          "texture": "#block",
+          "cullface": "west"
+        }
+      },
+      "from": [0, 0, 0],
+      "to": [16, 16, 16]
+    },
+    {
+      "faces": {
+        "down": {
+          "texture": "#quartz",
+          "cullface": "down",
+          "unlit": true
+        },
+        "east": {
+          "texture": "#quartz",
+          "cullface": "east",
+          "unlit": true
+        },
+        "north": {
+          "texture": "#quartz",
+          "cullface": "north",
+          "unlit": true
+        },
+        "south": {
+          "texture": "#quartz",
+          "cullface": "south",
+          "unlit": true
+        },
+        "up": {
+          "texture": "#quartz",
+          "cullface": "up",
+          "unlit": true
+        },
+        "west": {
+          "texture": "#quartz",
+          "cullface": "west",
+          "unlit": true
+        }
+      },
+      "from": [0, 0, 0],
+      "shade": true,
+      "to": [16, 16, 16]
+    }
+  ]
+}

src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_2.json

@@ -0,0 +1,77 @@
+{
+  "parent": "block/block",
+  "textures": {
+    "block": "block/stone",
+    "quartz": "appliedenergistics2:block/charged_quartz_ore_light_2",
+    "particle": "appliedenergistics2:block/charged_quartz_ore"
+  },
+  "elements": [
+    {
+      "faces": {
+        "down": {
+          "texture": "#block",
+          "cullface": "down"
+        },
+        "east": {
+          "texture": "#block",
+          "cullface": "east"
+        },
+        "north": {
+          "texture": "#block",
+          "cullface": "north"
+        },
+        "south": {
+          "texture": "#block",
+          "cullface": "south"
+        },
+        "up": {
+          "texture": "#block",
+          "cullface": "up"
+        },
+        "west": {
+          "texture": "#block",
+          "cullface": "west"
+        }
+      },
+      "from": [0, 0, 0],
+      "to": [16, 16, 16]
+    },
+    {
+      "faces": {
+        "down": {
+          "texture": "#quartz",
+          "cullface": "down",
+          "unlit": true
+        },
+        "east": {
+          "texture": "#quartz",
+          "cullface": "east",
+          "unlit": true
+        },
+        "north": {
+          "texture": "#quartz",
+          "cullface": "north",
+          "unlit": true
+        },
+        "south": {
+          "texture": "#quartz",
+          "cullface": "south",
+          "unlit": true
+        },
+        "up": {
+          "texture": "#quartz",
+          "cullface": "up",
+          "unlit": true
+        },
+        "west": {
+          "texture": "#quartz",
+          "cullface": "west",
+          "unlit": true
+        }
+      },
+      "from": [0, 0, 0],
+      "shade": true,
+      "to": [16, 16, 16]
+    }
+  ]
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell0.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell0"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell1.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell1"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell2.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell2"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell3.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell3"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell4.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell4"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell5.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell5"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell6.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell6"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell7.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell7"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_0.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell_0"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_1.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell_1"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_2.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell_2"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_3.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell_3"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_4.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell_4"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_5.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell_5"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell4.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/energy_cell4"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell5.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/energy_cell5"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell6.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/energy_cell6"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell7.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/energy_cell7"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_0.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/energy_cell_0"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_1.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/energy_cell_1"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_2.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/energy_cell_2"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_3.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/energy_cell_3"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_4.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/energy_cell_4"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_5.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/energy_cell_5"
+  }
+}

src/main/resources/assets/appliedenergistics2/models/block/inscriber.json

@@ -1,9 +1,10 @@
 {
+  "credit": "Made with Blockbench",
   "parent": "block/orientable",
   "textures": {
+    "inside": "appliedenergistics2:block/inscriber_internal",
     "particle": "appliedenergistics2:block/inscriber",
-    "side": "appliedenergistics2:block/inscriber",
+    "side": "appliedenergistics2:block/inscriber"
-    "inside": "appliedenergistics2:block/inscriber_inside"
   },
   "elements": [
     {
@@ -11,26 +12,11 @@
       "from": [1, 0, 1],
       "to": [15, 1, 15],
       "faces": {
-        "down": {
+        "north": { "uv": [1, 15, 15, 16], "texture": "#side" },
-          "texture": "#side",
+        "east": { "uv": [1, 0, 15, 1], "texture": "#side" },
-          "uv": [1, 1, 15, 15]
+        "south": { "uv": [1, 0, 15, 1], "texture": "#side" },
-        },
+        "west": { "uv": [1, 0, 15, 1], "texture": "#side" },
-        "east": {
+        "down": { "uv": [1, 1, 15, 15], "texture": "#side" }
-          "texture": "#side",
-          "uv": [1, 0, 15, 1]
-        },
-        "north": {
-          "texture": "#side",
-          "uv": [1, 15, 15, 16]
-        },
-        "south": {
-          "texture": "#side",
-          "uv": [1, 0, 15, 1]
-        },
-        "west": {
-          "texture": "#side",
-          "uv": [1, 0, 15, 1]
-        }
       }
     },
     {
@@ -38,26 +24,11 @@
       "from": [1, 15, 1],
       "to": [15, 16, 15],
       "faces": {
-        "east": {
+        "north": { "uv": [1, 15, 15, 16], "texture": "#side" },
-          "texture": "#side",
+        "east": { "uv": [1, 0, 15, 1], "texture": "#side" },
-          "uv": [1, 0, 15, 1]
+        "south": { "uv": [1, 0, 15, 1], "texture": "#side" },
-        },
+        "west": { "uv": [1, 15, 15, 16], "texture": "#side" },
-        "north": {
+        "up": { "uv": [1, 1, 15, 15], "texture": "#side" }
-          "texture": "#side",
-          "uv": [1, 15, 15, 16]
-        },
-        "south": {
-          "texture": "#side",
-          "uv": [1, 0, 15, 1]
-        },
-        "up": {
-          "texture": "#side",
-          "uv": [1, 1, 15, 15]
-        },
-        "west": {
-          "texture": "#side",
-          "uv": [1, 15, 15, 16]
-        }
       }
     },
     {
@@ -65,30 +36,12 @@
       "from": [0, 1, 0],
       "to": [3, 15, 16],
       "faces": {
-        "down": {
+        "north": { "uv": [13, 1, 16, 15], "texture": "#side" },
-          "texture": "#side",
+        "east": { "uv": [0, 1, 16, 15], "texture": "#inside" },
-          "uv": [0, 1, 3, 15]
+        "south": { "uv": [0, 1, 3, 15], "texture": "#side" },
-        },
+        "west": { "uv": [0, 1, 16, 15], "texture": "#side" },
-        "east": {
+        "up": { "uv": [0, 0, 3, 16], "texture": "#side" },
-          "texture": "#side",
+        "down": { "uv": [0, 0, 3, 16], "texture": "#side" }
-          "uv": [0, 1, 16, 15]
-        },
-        "north": {
-          "texture": "#side",
-          "uv": [13, 1, 16, 15]
-        },
-        "south": {
-          "texture": "#side",
-          "uv": [0, 1, 3, 15]
-        },
-        "up": {
-          "texture": "#side",
-          "uv": [0, 0, 3, 6]
-        },
-        "west": {
-          "texture": "#side",
-          "uv": [0, 1, 16, 15]
-        }
       }
     },
     {
@@ -96,30 +49,12 @@
       "from": [13, 1, 0],
       "to": [16, 15, 16],
       "faces": {
-        "down": {
+        "north": { "uv": [0, 1, 3, 15], "texture": "#side" },
-          "texture": "#side",
+        "east": { "uv": [0, 1, 16, 15], "texture": "#side" },
-          "uv": [0, 1, 3, 15]
+        "south": { "uv": [13, 1, 16, 15], "texture": "#side" },
-        },
+        "west": { "uv": [0, 1, 16, 15], "texture": "#inside" },
-        "east": {
+        "up": { "uv": [13, 0, 16, 16], "texture": "#side" },
-          "texture": "#side",
+        "down": { "uv": [0, 0, 3, 16], "rotation": 180, "texture": "#side" }
-          "uv": [0, 1, 16, 15]
-        },
-        "north": {
-          "texture": "#side",
-          "uv": [0, 1, 3, 15]
-        },
-        "south": {
-          "texture": "#side",
-          "uv": [13, 1, 16, 15]
-        },
-        "up": {
-          "texture": "#side",
-          "uv": [13, 1, 16, 15]
-        },
-        "west": {
-          "texture": "#side",
-          "uv": [0, 1, 16, 15]
-        }
       }
     },
     {
@@ -127,22 +62,10 @@
       "from": [3, 1, 13],
       "to": [13, 15, 16],
       "faces": {
-        "down": {
+        "north": { "uv": [3, 1, 13, 15], "texture": "#inside" },
-          "texture": "#side",
+        "south": { "uv": [3, 1, 13, 15], "texture": "#side" },
-          "uv": [3, 0, 13, 3]
+        "up": { "uv": [3, 0, 13, 3], "rotation": 180, "texture": "#side" },
-        },
+        "down": { "uv": [3, 13, 13, 16], "rotation": 180, "texture": "#side" }
-        "north": {
-          "texture": "#side",
-          "uv": [3, 1, 13, 15]
-        },
-        "south": {
-          "texture": "#side",
-          "uv": [3, 1, 13, 15]
-        },
-        "up": {
-          "texture": "#side",
-          "uv": [3, 0, 13, 3]
-        }
       }
     },
     {
@@ -150,14 +73,8 @@
       "from": [3, 1, 1],
       "to": [13, 4, 13],
       "faces": {
-        "north": {
+        "north": { "uv": [3, 13, 13, 16], "texture": "#side" },
-          "texture": "#side",
+        "up": { "uv": [3, 2, 13, 14], "texture": "#inside" }
-          "uv": [3, 12, 13, 15]
-        },
-        "up": {
-          "texture": "#side",
-          "uv": [3, 1, 13, 13]
-        }
       }
     },
     {
@@ -165,14 +82,8 @@
       "from": [3, 12, 1],
       "to": [13, 15, 11],
       "faces": {
-        "down": {
+        "north": { "uv": [3, 0, 13, 3], "texture": "#side" },
-          "texture": "#side",
+        "down": { "uv": [3, 3, 13, 13], "texture": "#inside" }
-          "uv": [3, 1, 13, 11]
-        },
-        "north": {
-          "texture": "#side",
-          "uv": [3, 1, 13, 4]
-        }
       }
     }
   ]

src/main/resources/assets/appliedenergistics2/models/block/quartz_ore.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/quartz_ore"
-  }
-}

src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_0.json

@@ -1,6 +1,6 @@
 {
   "parent": "block/cube_all",
   "textures": {
-    "all": "appliedenergistics2:block/energy_cell0"
+    "all": "appliedenergistics2:block/quartz_ore_0"
   }
 }

src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_1.json

@@ -1,6 +1,6 @@
 {
   "parent": "block/cube_all",
   "textures": {
-    "all": "appliedenergistics2:block/energy_cell1"
+    "all": "appliedenergistics2:block/quartz_ore_1"
   }
 }

src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_2.json

@@ -1,6 +1,6 @@
 {
   "parent": "block/cube_all",
   "textures": {
-    "all": "appliedenergistics2:block/energy_cell2"
+    "all": "appliedenergistics2:block/quartz_ore_2"
   }
 }

src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_3.json

@@ -1,6 +1,6 @@
 {
   "parent": "block/cube_all",
   "textures": {
-    "all": "appliedenergistics2:block/energy_cell3"
+    "all": "appliedenergistics2:block/quartz_ore_3"
   }
 }

src/main/resources/assets/appliedenergistics2/models/item/dense_energy_cell.json

@@ -1,47 +1,29 @@
 {
-  "parent": "appliedenergistics2:block/energy_cell/dense_energy_cell0",
+  "parent": "appliedenergistics2:block/energy_cell/dense_energy_cell_0",
   "overrides": [
     {
       "predicate": {
-        "appliedenergistics2:fill_level": 0.125
+        "appliedenergistics2:fill_level": 0
       },
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell1"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_1"
     },
     {
       "predicate": {
         "appliedenergistics2:fill_level": 0.25
       },
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell2"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_2"
-    },
-    {
-      "predicate": {
-        "appliedenergistics2:fill_level": 0.375
-      },
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell3"
     },
     {
       "predicate": {
         "appliedenergistics2:fill_level": 0.5
       },
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell4"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_3"
-    },
-    {
-      "predicate": {
-        "appliedenergistics2:fill_level": 0.625
-      },
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell5"
     },
     {
       "predicate": {
         "appliedenergistics2:fill_level": 0.75
       },
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell6"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_4"
-    },
-    {
-      "predicate": {
-        "appliedenergistics2:fill_level": 0.875
-      },
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell7"
     }
   ]
 }

src/main/resources/assets/appliedenergistics2/models/item/energy_cell.json

@@ -1,47 +1,29 @@
 {
-  "parent": "appliedenergistics2:block/energy_cell/energy_cell0",
+  "parent": "appliedenergistics2:block/energy_cell/energy_cell_0",
   "overrides": [
     {
       "predicate": {
-        "appliedenergistics2:fill_level": 0.125
+        "appliedenergistics2:fill_level": 0
       },
-      "model": "appliedenergistics2:block/energy_cell/energy_cell1"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell_1"
     },
     {
       "predicate": {
         "appliedenergistics2:fill_level": 0.25
       },
-      "model": "appliedenergistics2:block/energy_cell/energy_cell2"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell_2"
-    },
-    {
-      "predicate": {
-        "appliedenergistics2:fill_level": 0.375
-      },
-      "model": "appliedenergistics2:block/energy_cell/energy_cell3"
     },
     {
       "predicate": {
         "appliedenergistics2:fill_level": 0.5
       },
-      "model": "appliedenergistics2:block/energy_cell/energy_cell4"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell_3"
-    },
-    {
-      "predicate": {
-        "appliedenergistics2:fill_level": 0.625
-      },
-      "model": "appliedenergistics2:block/energy_cell/energy_cell5"
     },
     {
       "predicate": {
         "appliedenergistics2:fill_level": 0.75
       },
-      "model": "appliedenergistics2:block/energy_cell/energy_cell6"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell_4"
-    },
-    {
-      "predicate": {
-        "appliedenergistics2:fill_level": 0.875
-      },
-      "model": "appliedenergistics2:block/energy_cell/energy_cell7"
     }
   ]
 }

src/main/resources/assets/appliedenergistics2/models/item/fluid_p2p_tunnel.json

@@ -1,6 +1,6 @@
 {
   "parent": "appliedenergistics2:item/p2p_tunnel_base",
   "textures": {
-    "type": "block/lapis_block"
+    "type": "appliedenergistics2:block/fluid_interface"
   }
 }

src/main/resources/assets/appliedenergistics2/models/item/quartz_ore.json

@@ -1,3 +1,6 @@
 {
-  "parent": "appliedenergistics2:block/quartz_ore"
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/quartz_ore_0"
+  }
 }

src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_fluids.json

@@ -1,6 +1,6 @@
 {
   "parent": "appliedenergistics2:part/p2p/p2p_tunnel_base",
   "textures": {
-    "type": "block/lapis_block"
+    "type": "appliedenergistics2:block/fluid_interface"
   }
 }

src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_0.png.mcmeta

@@ -0,0 +1,49 @@
+ {
+  "animation": {
+  "interpolate": true,
+  	"frames": [
+  		{
+  			"index": 0,
+  			"time": 25
+  		},
+  		{
+  			"index": 1,
+  			"time": 2
+  		},
+  		{
+  			"index": 2,
+  			"time": 2
+  		},
+  		{
+  			"index": 3,
+  			"time": 2
+  		}
+  		,
+  		{
+  			"index": 4,
+  			"time": 2
+  		},
+  		{
+  			"index": 5,
+  			"time": 2
+  		},
+  		{
+  			"index": 6,
+  			"time": 2
+  		},
+  		{
+  			"index": 7,
+  			"time": 2
+  		}
+  		,
+  		{
+  			"index": 8,
+  			"time": 2
+  		},
+  		{
+  			"index": 9,
+  			"time": 2
+  		}
+  	]
+  }  
+}

src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_1.png.mcmeta

@@ -0,0 +1,49 @@
+ {
+  "animation": {
+  "interpolate": true,
+  	"frames": [
+  		{
+  			"index": 0,
+  			"time": 2
+  		},
+  		{
+  			"index": 1,
+  			"time": 2
+  		},
+  		{
+  			"index": 2,
+  			"time": 2
+  		},
+  		{
+  			"index": 3,
+  			"time": 2
+  		}
+  		,
+  		{
+  			"index": 4,
+  			"time": 2
+  		},
+  		{
+  			"index": 5,
+  			"time": 2
+  		},
+  		{
+  			"index": 6,
+  			"time": 2
+  		},
+  		{
+  			"index": 7,
+  			"time": 2
+  		}
+  		,
+  		{
+  			"index": 8,
+  			"time": 25
+  		},
+  		{
+  			"index": 9,
+  			"time": 2
+  		}
+  	]
+  }  
+}

src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_2.png.mcmeta

@@ -0,0 +1,49 @@
+ {
+  "animation": {
+  "interpolate": true,
+  	"frames": [
+  		{
+  			"index": 0,
+  			"time": 2
+  		},
+  		{
+  			"index": 1,
+  			"time": 2
+  		},
+  		{
+  			"index": 2,
+  			"time": 25
+  		},
+  		{
+  			"index": 3,
+  			"time": 2
+  		}
+  		,
+  		{
+  			"index": 4,
+  			"time": 2
+  		},
+  		{
+  			"index": 5,
+  			"time": 2
+  		},
+  		{
+  			"index": 6,
+  			"time": 2
+  		},
+  		{
+  			"index": 7,
+  			"time": 2
+  		}
+  		,
+  		{
+  			"index": 8,
+  			"time": 2
+  		},
+  		{
+  			"index": 9,
+  			"time": 2
+  		}
+  	]
+  }  
+}

src/main/resources/assets/appliedenergistics2/textures/block/controller_column_lights.png.mcmeta

@@ -1,6 +1,6 @@
 {
   "animation": {
-    "frametime": 3,
+    "frametime": 2,
     "frames": [
       1,
       2,

src/main/resources/assets/appliedenergistics2/textures/block/controller_lights.png.mcmeta

@@ -1,6 +1,6 @@
 {
   "animation": {
-    "frametime": 3,
+    "frametime": 2,
     "frames": [
       0,
       1,

src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage_light.png.mcmeta

@@ -0,0 +1,39 @@
+{
+  "animation": {
+  "interpolate": true,
+  	"frames": [
+  		{
+  			"index": 0,
+  			"time": 90
+  		},
+  		{
+  			"index": 1,
+  			"time": 2
+  		},
+  		{
+  			"index": 2,
+  			"time": 2
+  		},
+  		{
+  			"index": 3,
+  			"time": 2
+  		},
+  		{
+  			"index": 4,
+  			"time": 2
+  		},
+  		{
+  			"index": 5,
+  			"time": 2
+  		},
+  		{
+  			"index": 6,
+  			"time": 2
+  		},
+  		{
+  			"index": 7,
+  			"time": 2
+  		}
+  	]
+  }  
+}

src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage_light.png.mcmeta

@@ -0,0 +1,39 @@
+{
+  "animation": {
+  "interpolate": true,
+  	"frames": [
+  		{
+  			"index": 0,
+  			"time": 70
+  		},
+  		{
+  			"index": 1,
+  			"time": 2
+  		},
+  		{
+  			"index": 2,
+  			"time": 2
+  		},
+  		{
+  			"index": 3,
+  			"time": 2
+  		},
+  		{
+  			"index": 4,
+  			"time": 2
+  		},
+  		{
+  			"index": 5,
+  			"time": 2
+  		},
+  		{
+  			"index": 6,
+  			"time": 2
+  		},
+  		{
+  			"index": 7,
+  			"time": 2
+  		}
+  	]
+  }  
+}

src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage_light.png.mcmeta

@@ -0,0 +1,39 @@
+{
+  "animation": {
+  "interpolate": true,
+  	"frames": [
+  		{
+  			"index": 0,
+  			"time": 80
+  		},
+  		{
+  			"index": 1,
+  			"time": 2
+  		},
+  		{
+  			"index": 2,
+  			"time": 2
+  		},
+  		{
+  			"index": 3,
+  			"time": 2
+  		},
+  		{
+  			"index": 4,
+  			"time": 2
+  		},
+  		{
+  			"index": 5,
+  			"time": 2
+  		},
+  		{
+  			"index": 6,
+  			"time": 2
+  		},
+  		{
+  			"index": 7,
+  			"time": 2
+  		}
+  	]
+  }  
+}