Started work on forge block models.

Could still take a while though.

src/main/resources/assets/actuallyadditions/blockstates/blockAtomicReconstructor.json

@@ -1,10 +0,0 @@
-{
-  "variants": {
-    "meta=0": { "model": "actuallyadditions:blockAtomicReconstructor", "x": 90 },
-    "meta=1": { "model": "actuallyadditions:blockAtomicReconstructor", "x": -90 },
-    "meta=2": { "model": "actuallyadditions:blockAtomicReconstructor", "y": 0 },
-    "meta=3": { "model": "actuallyadditions:blockAtomicReconstructor", "y": 180 },
-    "meta=4": { "model": "actuallyadditions:blockAtomicReconstructor", "y": 270 },
-    "meta=5": { "model": "actuallyadditions:blockAtomicReconstructor", "y": 90 }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockBlackLotus.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "normal": { "model": "actuallyadditions:blockBlackLotus" }
-    }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockBreaker.json

@@ -1,10 +0,0 @@
-{
-  "variants": {
-    "meta=0": { "model": "actuallyadditions:blockBreaker", "x": 90 },
-    "meta=1": { "model": "actuallyadditions:blockBreaker", "x": -90 },
-    "meta=2": { "model": "actuallyadditions:blockBreaker", "y": 0 },
-    "meta=3": { "model": "actuallyadditions:blockBreaker", "y": 180 },
-    "meta=4": { "model": "actuallyadditions:blockBreaker", "y": 270 },
-    "meta=5": { "model": "actuallyadditions:blockBreaker", "y": 90 }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockCanola.json

@@ -1,12 +0,0 @@
-{
-  "variants": {
-    "age=0": { "model": "actuallyadditions:blockCanolaStage1" },
-    "age=1": { "model": "actuallyadditions:blockCanolaStage1" },
-    "age=2": { "model": "actuallyadditions:blockCanolaStage2" },
-    "age=3": { "model": "actuallyadditions:blockCanolaStage2" },
-    "age=4": { "model": "actuallyadditions:blockCanolaStage2" },
-    "age=5": { "model": "actuallyadditions:blockCanolaStage3" },
-    "age=6": { "model": "actuallyadditions:blockCanolaStage3" },
-    "age=7": { "model": "actuallyadditions:blockCanolaStage4" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockCanolaPress.json

@@ -1,5 +0,0 @@
-{
-  "variants": {
-    "normal": { "model": "actuallyadditions:blockCanolaPress" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockChiseledQuartzSlab.json

@@ -1,6 +0,0 @@
-{
-    "variants": {
-        "meta=0": { "model": "actuallyadditions:blockChiseledQuartzSlabBottom" },
-        "meta=1": { "model": "actuallyadditions:blockChiseledQuartzSlabTop" }
-    }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockChiseledQuartzStair.json

@@ -1,44 +0,0 @@
-{
-    "variants": {
-        "facing=east,half=bottom,shape=straight":  { "model": "actuallyadditions:blockChiseledQuartzStairs" },
-        "facing=west,half=bottom,shape=straight":  { "model": "actuallyadditions:blockChiseledQuartzStairs", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=straight": { "model": "actuallyadditions:blockChiseledQuartzStairs", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=straight": { "model": "actuallyadditions:blockChiseledQuartzStairs", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=outer_right":  { "model": "actuallyadditions:blockChiseledQuartzStairsOuter" },
-        "facing=west,half=bottom,shape=outer_right":  { "model": "actuallyadditions:blockChiseledQuartzStairsOuter", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockChiseledQuartzStairsOuter", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockChiseledQuartzStairsOuter", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=outer_left":  { "model": "actuallyadditions:blockChiseledQuartzStairsOuter", "y": 270, "uvlock": true },
-        "facing=west,half=bottom,shape=outer_left":  { "model": "actuallyadditions:blockChiseledQuartzStairsOuter", "y": 90, "uvlock": true },
-        "facing=south,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockChiseledQuartzStairsOuter" },
-        "facing=north,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockChiseledQuartzStairsOuter", "y": 180, "uvlock": true },
-        "facing=east,half=bottom,shape=inner_right":  { "model": "actuallyadditions:blockChiseledQuartzStairsInner" },
-        "facing=west,half=bottom,shape=inner_right":  { "model": "actuallyadditions:blockChiseledQuartzStairsInner", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockChiseledQuartzStairsInner", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockChiseledQuartzStairsInner", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=inner_left":  { "model": "actuallyadditions:blockChiseledQuartzStairsInner", "y": 270, "uvlock": true },
-        "facing=west,half=bottom,shape=inner_left":  { "model": "actuallyadditions:blockChiseledQuartzStairsInner", "y": 90, "uvlock": true },
-        "facing=south,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockChiseledQuartzStairsInner" },
-        "facing=north,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockChiseledQuartzStairsInner", "y": 180, "uvlock": true },
-        "facing=east,half=top,shape=straight":  { "model": "actuallyadditions:blockChiseledQuartzStairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=straight":  { "model": "actuallyadditions:blockChiseledQuartzStairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=straight": { "model": "actuallyadditions:blockChiseledQuartzStairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=straight": { "model": "actuallyadditions:blockChiseledQuartzStairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "actuallyadditions:blockChiseledQuartzStairsOuter", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "actuallyadditions:blockChiseledQuartzStairsOuter", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "actuallyadditions:blockChiseledQuartzStairsOuter", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "actuallyadditions:blockChiseledQuartzStairsOuter", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "actuallyadditions:blockChiseledQuartzStairsOuter", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "actuallyadditions:blockChiseledQuartzStairsOuter", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "actuallyadditions:blockChiseledQuartzStairsOuter", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "actuallyadditions:blockChiseledQuartzStairsOuter", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "actuallyadditions:blockChiseledQuartzStairsInner", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "actuallyadditions:blockChiseledQuartzStairsInner", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "actuallyadditions:blockChiseledQuartzStairsInner", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "actuallyadditions:blockChiseledQuartzStairsInner", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "actuallyadditions:blockChiseledQuartzStairsInner", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "actuallyadditions:blockChiseledQuartzStairsInner", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "actuallyadditions:blockChiseledQuartzStairsInner", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "actuallyadditions:blockChiseledQuartzStairsInner", "x": 180, "uvlock": true }
-    }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockChiseledQuartzWall.json

@@ -1,36 +0,0 @@
-{
-    "variants": {
-        "east=false,north=false,south=false,up=false,west=false": { "model": "actuallyadditions:blockChiseledQuartzWallPost" },
-        "east=false,north=true,south=false,up=false,west=false":  { "model": "actuallyadditions:blockChiseledQuartzWallNorth" },
-        "east=true,north=false,south=false,up=false,west=false":  { "model": "actuallyadditions:blockChiseledQuartzWallNorth", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=false,west=false":  { "model": "actuallyadditions:blockChiseledQuartzWallNorth", "y": 180, "uvlock": true },
-        "east=false,north=false,south=false,up=false,west=true":  { "model": "actuallyadditions:blockChiseledQuartzWallNorth", "y": 270, "uvlock": true },
-        "east=true,north=true,south=false,up=false,west=false":   { "model": "actuallyadditions:blockChiseledQuartzWallNorthEast" },
-        "east=true,north=false,south=true,up=false,west=false":   { "model": "actuallyadditions:blockChiseledQuartzWallNorthEast", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=false,west=true":   { "model": "actuallyadditions:blockChiseledQuartzWallNorthEast", "y": 180, "uvlock": true },
-        "east=false,north=true,south=false,up=false,west=true":   { "model": "actuallyadditions:blockChiseledQuartzWallNorthEast", "y": 270, "uvlock": true },
-        "east=false,north=true,south=true,up=false,west=false":   { "model": "actuallyadditions:blockChiseledQuartzWallNorthSouth" },
-        "east=true,north=false,south=false,up=false,west=true":   { "model": "actuallyadditions:blockChiseledQuartzWallNorthSouth", "y": 90, "uvlock": true },
-        "east=true,north=true,south=true,up=false,west=false":    { "model": "actuallyadditions:blockChiseledQuartzWallNorthSouthEast" },
-        "east=true,north=false,south=true,up=false,west=true":    { "model": "actuallyadditions:blockChiseledQuartzWallNorthSouthEast", "y": 90, "uvlock": true },
-        "east=false,north=true,south=true,up=false,west=true":    { "model": "actuallyadditions:blockChiseledQuartzWallNorthSouthEast", "y": 180, "uvlock": true },
-        "east=true,north=true,south=false,up=false,west=true":    { "model": "actuallyadditions:blockChiseledQuartzWallNorthSouthEast", "y": 270, "uvlock": true },
-        "east=true,north=true,south=true,up=false,west=true":     { "model": "actuallyadditions:blockChiseledQuartzWallNorthSouthEastWest" },
-        "east=false,north=false,south=false,up=true,west=false":  { "model": "actuallyadditions:blockChiseledQuartzWallPost" },
-        "east=false,north=true,south=false,up=true,west=false":   { "model": "actuallyadditions:blockChiseledQuartzWallNorth" },
-        "east=true,north=false,south=false,up=true,west=false":   { "model": "actuallyadditions:blockChiseledQuartzWallNorth", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=true,west=false":   { "model": "actuallyadditions:blockChiseledQuartzWallNorth", "y": 180, "uvlock": true },
-        "east=false,north=false,south=false,up=true,west=true":   { "model": "actuallyadditions:blockChiseledQuartzWallNorth", "y": 270, "uvlock": true },
-        "east=true,north=true,south=false,up=true,west=false":    { "model": "actuallyadditions:blockChiseledQuartzWallNorthEast" },
-        "east=true,north=false,south=true,up=true,west=false":    { "model": "actuallyadditions:blockChiseledQuartzWallNorthEast", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=true,west=true":    { "model": "actuallyadditions:blockChiseledQuartzWallNorthEast", "y": 180, "uvlock": true },
-        "east=false,north=true,south=false,up=true,west=true":    { "model": "actuallyadditions:blockChiseledQuartzWallNorthEast", "y": 270, "uvlock": true },
-        "east=false,north=true,south=true,up=true,west=false":    { "model": "actuallyadditions:blockChiseledQuartzWallNorthSouthAbove" },
-        "east=true,north=false,south=false,up=true,west=true":    { "model": "actuallyadditions:blockChiseledQuartzWallNorthSouthAbove", "y": 90, "uvlock": true },
-        "east=true,north=true,south=true,up=true,west=false":     { "model": "actuallyadditions:blockChiseledQuartzWallNorthSouthEast" },
-        "east=true,north=false,south=true,up=true,west=true":     { "model": "actuallyadditions:blockChiseledQuartzWallNorthSouthEast", "y": 90, "uvlock": true },
-        "east=false,north=true,south=true,up=true,west=true":     { "model": "actuallyadditions:blockChiseledQuartzWallNorthSouthEast", "y": 180, "uvlock": true },
-        "east=true,north=true,south=false,up=true,west=true":     { "model": "actuallyadditions:blockChiseledQuartzWallNorthSouthEast", "y": 270, "uvlock": true },
-        "east=true,north=true,south=true,up=true,west=true":      { "model": "actuallyadditions:blockChiseledQuartzWallNorthSouthEastWest" }
-    }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockCoalGenerator.json

@@ -1,6 +1,20 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_bottom_top",
+    "textures": {
+      "side": "actuallyadditions:blocks/blockCoalGenerator",
+      "bottom": "actuallyadditions:blocks/blockCoalGeneratorBottom",
+      "top": "actuallyadditions:blocks/blockCoalGeneratorTop"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "meta=0": { "model": "actuallyadditions:blockCoalGenerator" },
+    "normal": [{}],
-    "meta=1": { "model": "actuallyadditions:blockCoalGenerator" }
+    "inventory": [{}],
+    "meta": {
+      "0": {},
+      "1": {}
+    }
   }
 }

src/main/resources/assets/actuallyadditions/blockstates/blockCoffee.json

@@ -1,12 +0,0 @@
-{
-  "variants": {
-    "age=0": { "model": "actuallyadditions:blockCoffeeStage1" },
-    "age=1": { "model": "actuallyadditions:blockCoffeeStage2" },
-    "age=2": { "model": "actuallyadditions:blockCoffeeStage2" },
-    "age=3": { "model": "actuallyadditions:blockCoffeeStage3" },
-    "age=4": { "model": "actuallyadditions:blockCoffeeStage4" },
-    "age=5": { "model": "actuallyadditions:blockCoffeeStage4" },
-    "age=6": { "model": "actuallyadditions:blockCoffeeStage5" },
-    "age=7": { "model": "actuallyadditions:blockCoffeeStage6" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockCoffeeMachine.json

@@ -1,8 +0,0 @@
-{
-  "variants": {
-    "meta=1": { "model": "actuallyadditions:blockCoffeeMachine", "y": 0 },
-    "meta=0": { "model": "actuallyadditions:blockCoffeeMachine", "y": 180 },
-    "meta=3": { "model": "actuallyadditions:blockCoffeeMachine", "y": 270 },
-    "meta=2": { "model": "actuallyadditions:blockCoffeeMachine", "y": 90 }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockColoredLamp.json

@@ -1,20 +0,0 @@
-{
-  "variants": {
-    "meta=0": { "model": "actuallyadditions:blockColoredLampWhite" },
-    "meta=1": { "model": "actuallyadditions:blockColoredLampOrange" },
-    "meta=2": { "model": "actuallyadditions:blockColoredLampMagenta" },
-    "meta=3": { "model": "actuallyadditions:blockColoredLampLightBlue" },
-    "meta=4": { "model": "actuallyadditions:blockColoredLampYellow" },
-    "meta=5": { "model": "actuallyadditions:blockColoredLampLime" },
-    "meta=6": { "model": "actuallyadditions:blockColoredLampPink" },
-    "meta=7": { "model": "actuallyadditions:blockColoredLampGray" },
-    "meta=8": { "model": "actuallyadditions:blockColoredLampLightGray" },
-    "meta=9": { "model": "actuallyadditions:blockColoredLampCyan" },
-    "meta=10": { "model": "actuallyadditions:blockColoredLampPurple" },
-    "meta=11": { "model": "actuallyadditions:blockColoredLampBlue" },
-    "meta=12": { "model": "actuallyadditions:blockColoredLampBrown" },
-    "meta=13": { "model": "actuallyadditions:blockColoredLampGreen" },
-    "meta=14": { "model": "actuallyadditions:blockColoredLampRed" },
-    "meta=15": { "model": "actuallyadditions:blockColoredLampBlack" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockColoredLampOn.json

@@ -1,20 +0,0 @@
-{
-  "variants": {
-    "meta=0": { "model": "actuallyadditions:blockColoredLampWhiteOn" },
-    "meta=1": { "model": "actuallyadditions:blockColoredLampOrangeOn" },
-    "meta=2": { "model": "actuallyadditions:blockColoredLampMagentaOn" },
-    "meta=3": { "model": "actuallyadditions:blockColoredLampLightBlueOn" },
-    "meta=4": { "model": "actuallyadditions:blockColoredLampYellowOn" },
-    "meta=5": { "model": "actuallyadditions:blockColoredLampLimeOn" },
-    "meta=6": { "model": "actuallyadditions:blockColoredLampPinkOn" },
-    "meta=7": { "model": "actuallyadditions:blockColoredLampGrayOn" },
-    "meta=8": { "model": "actuallyadditions:blockColoredLampLightGrayOn" },
-    "meta=9": { "model": "actuallyadditions:blockColoredLampCyanOn" },
-    "meta=10": { "model": "actuallyadditions:blockColoredLampPurpleOn" },
-    "meta=11": { "model": "actuallyadditions:blockColoredLampBlueOn" },
-    "meta=12": { "model": "actuallyadditions:blockColoredLampBrownOn" },
-    "meta=13": { "model": "actuallyadditions:blockColoredLampGreenOn" },
-    "meta=14": { "model": "actuallyadditions:blockColoredLampRedOn" },
-    "meta=15": { "model": "actuallyadditions:blockColoredLampBlackOn" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockCompost.json

@@ -1,5 +0,0 @@
-{
-  "variants": {
-    "normal": { "model": "actuallyadditions:blockCompost"}
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockCrystal.json

@@ -1,10 +0,0 @@
-{
-  "variants": {
-    "meta=0": { "model": "actuallyadditions:blockCrystalRed" },
-    "meta=1": { "model": "actuallyadditions:blockCrystalBlue" },
-    "meta=2": { "model": "actuallyadditions:blockCrystalLightBlue" },
-    "meta=3": { "model": "actuallyadditions:blockCrystalBlack" },
-    "meta=4": { "model": "actuallyadditions:blockCrystalGreen" },
-    "meta=5": { "model": "actuallyadditions:blockCrystalWhite" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockDirectionalBreaker.json

@@ -1,10 +0,0 @@
-{
-  "variants": {
-    "meta=0": { "model": "actuallyadditions:blockDirectionalBreaker", "x": 90 },
-    "meta=1": { "model": "actuallyadditions:blockDirectionalBreaker", "x": -90 },
-    "meta=2": { "model": "actuallyadditions:blockDirectionalBreaker", "y": 0 },
-    "meta=3": { "model": "actuallyadditions:blockDirectionalBreaker", "y": 180 },
-    "meta=4": { "model": "actuallyadditions:blockDirectionalBreaker", "y": 270 },
-    "meta=5": { "model": "actuallyadditions:blockDirectionalBreaker", "y": 90 }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockDropper.json

@@ -1,10 +0,0 @@
-{
-  "variants": {
-    "meta=0": { "model": "actuallyadditions:blockDropper", "x": 90 },
-    "meta=1": { "model": "actuallyadditions:blockDropper", "x": -90 },
-    "meta=2": { "model": "actuallyadditions:blockDropper", "y": 0 },
-    "meta=3": { "model": "actuallyadditions:blockDropper", "y": 180 },
-    "meta=4": { "model": "actuallyadditions:blockDropper", "y": 270 },
-    "meta=5": { "model": "actuallyadditions:blockDropper", "y": 90 }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockEnergizer.json

@@ -1,5 +1,16 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_bottom_top",
+    "textures": {
+      "side": "actuallyadditions:blocks/blockEnergizerSide",
+      "bottom": "actuallyadditions:blocks/blockEnergizer",
+      "top": "actuallyadditions:blocks/blockEnergizerTop"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": { "model": "actuallyadditions:blockEnergizer" }
+    "normal": [{}],
+    "inventory": [{}]
   }
 }

src/main/resources/assets/actuallyadditions/blockstates/blockEnervator.json

@@ -1,5 +1,16 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_bottom_top",
+    "textures": {
+      "side": "actuallyadditions:blocks/blockEnervatorSide",
+      "bottom": "actuallyadditions:blocks/blockEnervator",
+      "top": "actuallyadditions:blocks/blockEnervatorTop"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": { "model": "actuallyadditions:blockEnervator" }
+    "normal": [{}],
+    "inventory": [{}]
   }
 }

src/main/resources/assets/actuallyadditions/blockstates/blockFeeder.json

@@ -1,5 +0,0 @@
-{
-  "variants": {
-    "normal": { "model": "actuallyadditions:blockFeeder" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockFermentingBarrel.json

@@ -1,5 +0,0 @@
-{
-  "variants": {
-    "normal": { "model": "actuallyadditions:blockFermentingBarrel" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockFireworkBox.json

@@ -1,5 +0,0 @@
-{
-  "variants": {
-    "normal": { "model": "actuallyadditions:blockFireworkBox" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockFishingNet.json

@@ -1,5 +0,0 @@
-{
-  "variants": {
-    "normal": { "model": "actuallyadditions:blockFishingNet"}
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockFlax.json

@@ -1,12 +0,0 @@
-{
-  "variants": {
-    "age=0": { "model": "actuallyadditions:blockFlaxStage1" },
-    "age=1": { "model": "actuallyadditions:blockFlaxStage2" },
-    "age=2": { "model": "actuallyadditions:blockFlaxStage2" },
-    "age=3": { "model": "actuallyadditions:blockFlaxStage3" },
-    "age=4": { "model": "actuallyadditions:blockFlaxStage4" },
-    "age=5": { "model": "actuallyadditions:blockFlaxStage4" },
-    "age=6": { "model": "actuallyadditions:blockFlaxStage5" },
-    "age=7": { "model": "actuallyadditions:blockFlaxStage6" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockFluidCollector.json

@@ -1,10 +0,0 @@
-{
-  "variants": {
-    "meta=0": { "model": "actuallyadditions:blockFluidCollector", "x": 90 },
-    "meta=1": { "model": "actuallyadditions:blockFluidCollector", "x": -90 },
-    "meta=2": { "model": "actuallyadditions:blockFluidCollector", "y": 0 },
-    "meta=3": { "model": "actuallyadditions:blockFluidCollector", "y": 180 },
-    "meta=4": { "model": "actuallyadditions:blockFluidCollector", "y": 270 },
-    "meta=5": { "model": "actuallyadditions:blockFluidCollector", "y": 90 }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockFluidPlacer.json

@@ -1,10 +0,0 @@
-{
-  "variants": {
-    "meta=0": { "model": "actuallyadditions:blockFluidPlacer", "x": 90 },
-    "meta=1": { "model": "actuallyadditions:blockFluidPlacer", "x": -90 },
-    "meta=2": { "model": "actuallyadditions:blockFluidPlacer", "y": 0 },
-    "meta=3": { "model": "actuallyadditions:blockFluidPlacer", "y": 180 },
-    "meta=4": { "model": "actuallyadditions:blockFluidPlacer", "y": 270 },
-    "meta=5": { "model": "actuallyadditions:blockFluidPlacer", "y": 90 }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockFurnaceDouble.json

@@ -1,12 +1,30 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube",
+    "textures": {
+      "particle": "actuallyadditions:blocks/blockFurnaceDouble",
+      "down": "#particle",
+      "up": "actuallyadditions:blocks/blockFurnaceDoubleTop",
+      "south": "#particle",
+      "north": "actuallyadditions:blocks/blockFurnaceDoubleFront",
+      "east": "#particle",
+      "west": "#particle"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "meta=0": { "model": "actuallyadditions:blockFurnaceDouble", "y": 0 },
+    "normal": [{}],
-    "meta=1": { "model": "actuallyadditions:blockFurnaceDouble", "y": 180 },
+    "inventory": [{}],
-    "meta=2": { "model": "actuallyadditions:blockFurnaceDouble", "y": -90 },
+    "meta": {
-    "meta=3": { "model": "actuallyadditions:blockFurnaceDouble", "y": 90 },
+      "0": { "y" : 0 },
-    "meta=4": { "model": "actuallyadditions:blockFurnaceDoubleOn", "y": 0 },
+      "1": { "y" : 180 },
-    "meta=5": { "model": "actuallyadditions:blockFurnaceDoubleOn", "y": 180 },
+      "2": { "y" : 270 },
-    "meta=6": { "model": "actuallyadditions:blockFurnaceDoubleOn", "y": -90 },
+      "3": { "y" : 90 },
-    "meta=7": { "model": "actuallyadditions:blockFurnaceDoubleOn", "y": 90 }
+      "4": { "y" : 0, "textures": { "north": "actuallyadditions:blocks/blockFurnaceDoubleOn" } },
+      "5": { "y" : 180, "textures": { "north": "actuallyadditions:blocks/blockFurnaceDoubleOn" } },
+      "6": { "y" : 270, "textures": { "north": "actuallyadditions:blocks/blockFurnaceDoubleOn" } },
+      "7": { "y" : 90, "textures": { "north": "actuallyadditions:blocks/blockFurnaceDoubleOn" } }
+    }
   }
 }

src/main/resources/assets/actuallyadditions/blockstates/blockFurnaceSolar.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "normal": { "model": "actuallyadditions:blockFurnaceSolar" }
-    }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockGiantChest.json

@@ -1,5 +0,0 @@
-{
-  "variants": {
-    "normal": { "model": "actuallyadditions:blockGiantChest" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockGreenhouseGlass.json

@@ -1,5 +1,14 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "actuallyadditions:blocks/blockGreenhouseGlass"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": { "model": "actuallyadditions:blockGreenhouseGlass" }
+    "normal": [{}],
+    "inventory": [{}]
   }
 }

src/main/resources/assets/actuallyadditions/blockstates/blockGrinder.json

@@ -1,6 +1,20 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_bottom_top",
+    "textures": {
+      "side": "actuallyadditions:blocks/blockGrinder",
+      "bottom": "actuallyadditions:blocks/blockGrinderBottom",
+      "top": "actuallyadditions:blocks/blockGrinderTop"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "meta=0": { "model": "actuallyadditions:blockGrinder" },
+    "normal": [{}],
-    "meta=1": { "model": "actuallyadditions:blockGrinderOn" }
+    "inventory": [{}],
+    "meta": {
+      "0": {},
+      "1": { "textures": { "top": "actuallyadditions:blocks/blockGrinderOn" } }
+    }
   }
 }

src/main/resources/assets/actuallyadditions/blockstates/blockGrinderDouble.json

@@ -1,6 +1,20 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_bottom_top",
+    "textures": {
+      "side": "actuallyadditions:blocks/blockGrinderDouble",
+      "bottom": "actuallyadditions:blocks/blockGrinderBottom",
+      "top": "actuallyadditions:blocks/blockGrinderTop"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "meta=0": { "model": "actuallyadditions:blockGrinderDouble" },
+    "normal": [{}],
-    "meta=1": { "model": "actuallyadditions:blockGrinderDoubleOn" }
+    "inventory": [{}],
+    "meta": {
+      "0": {},
+      "1": { "textures": { "top": "actuallyadditions:blocks/blockGrinderOn" } }
+    }
   }
 }

src/main/resources/assets/actuallyadditions/blockstates/blockHeatCollector.json

@@ -1,5 +1,16 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_bottom_top",
+    "textures": {
+      "side": "actuallyadditions:blocks/blockHeatCollectorSide",
+      "bottom": "actuallyadditions:blocks/blockHeatCollector",
+      "top": "actuallyadditions:blocks/blockHeatCollectorTop"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": { "model": "actuallyadditions:blockHeatCollector" }
+    "normal": [{}],
+    "inventory": [{}]
   }
 }

src/main/resources/assets/actuallyadditions/blockstates/blockInputter.json

@@ -1,5 +1,14 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "actuallyadditions:blocks/blockInputter"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": { "model": "actuallyadditions:blockInputter" }
+    "normal": [{}],
+    "inventory": [{}]
   }
 }

src/main/resources/assets/actuallyadditions/blockstates/blockInputterAdvanced.json

@@ -1,5 +1,14 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "actuallyadditions:blocks/blockInputterAdvanced"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": { "model": "actuallyadditions:blockInputterAdvanced" }
+    "normal": [{}],
+    "inventory": [{}]
   }
 }

src/main/resources/assets/actuallyadditions/blockstates/blockItemRepairer.json

@@ -1,5 +1,16 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_bottom_top",
+    "textures": {
+      "side": "actuallyadditions:blocks/blockItemRepairer",
+      "bottom": "actuallyadditions:blocks/blockItemRepairerBottom",
+      "top": "actuallyadditions:blocks/blockItemRepairerTop"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": { "model": "actuallyadditions:blockItemRepairer" }
+    "normal": [{}],
+    "inventory": [{}]
   }
 }

src/main/resources/assets/actuallyadditions/blockstates/blockLampPowerer.json

@@ -1,10 +0,0 @@
-{
-  "variants": {
-    "meta=0": { "model": "actuallyadditions:blockLampPowerer", "x": 90 },
-    "meta=1": { "model": "actuallyadditions:blockLampPowerer", "x": -90 },
-    "meta=2": { "model": "actuallyadditions:blockLampPowerer", "y": 0 },
-    "meta=3": { "model": "actuallyadditions:blockLampPowerer", "y": 180 },
-    "meta=4": { "model": "actuallyadditions:blockLampPowerer", "y": 270 },
-    "meta=5": { "model": "actuallyadditions:blockLampPowerer", "y": 90 }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelay.json

@@ -1,10 +0,0 @@
-{
-  "variants": {
-    "meta=0": { "model": "actuallyadditions:blockLaserRelay", "x": 180 },
-    "meta=1": { "model": "actuallyadditions:blockLaserRelay"},
-    "meta=2": { "model": "actuallyadditions:blockLaserRelay", "x": 90 },
-    "meta=3": { "model": "actuallyadditions:blockLaserRelay", "x": 270 },
-    "meta=4": { "model": "actuallyadditions:blockLaserRelay", "x": 90, "y": 270 },
-    "meta=5": { "model": "actuallyadditions:blockLaserRelay", "x": 90, "y": 90 }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockLavaFactoryController.json

@@ -1,5 +1,16 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_bottom_top",
+    "textures": {
+      "side": "actuallyadditions:blocks/blockLavaFactoryController",
+      "bottom": "#side",
+      "top": "actuallyadditions:blocks/blockLavaFactoryControllerTop"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": { "model": "actuallyadditions:blockLavaFactoryController" }
+    "normal": [{}],
+    "inventory": [{}]
   }
 }

src/main/resources/assets/actuallyadditions/blockstates/blockLeafGenerator.json

@@ -1,5 +1,14 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "actuallyadditions:blocks/blockLeafGenerator"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": { "model": "actuallyadditions:blockLeafGenerator" }
+    "normal": [{}],
+    "inventory": [{}]
   }
 }

src/main/resources/assets/actuallyadditions/blockstates/blockMiner.json

@@ -1,5 +1,16 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_bottom_top",
+    "textures": {
+      "side": "actuallyadditions:blocks/blockMiner",
+      "bottom": "actuallyadditions:blocks/blockMinerFront",
+      "top": "actuallyadditions:blocks/blockMinerTop"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": { "model": "actuallyadditions:blockMiner" }
+    "normal": [{}],
+    "inventory": [{}]
   }
 }

src/main/resources/assets/actuallyadditions/blockstates/blockMisc.json

@@ -1,14 +0,0 @@
-{
-  "variants": {
-    "meta=0": { "model": "actuallyadditions:blockMiscBlackQuartzPillar" },
-    "meta=1": { "model": "actuallyadditions:blockMiscBlackQuartzChiseled" },
-    "meta=2": { "model": "actuallyadditions:blockMiscBlackQuartz" },
-    "meta=3": { "model": "actuallyadditions:blockMiscOreBlackQuartz" },
-    "meta=4": { "model": "actuallyadditions:blockMiscWoodCasing" },
-    "meta=5": { "model": "actuallyadditions:blockMiscCharcoal" },
-    "meta=6": { "model": "actuallyadditions:blockMiscEnderpearl" },
-    "meta=7": { "model": "actuallyadditions:blockMiscLavaFactoryCase" },
-    "meta=8": { "model": "actuallyadditions:blockMiscEnderCasing" },
-    "meta=9": { "model": "actuallyadditions:blockMiscIronCasing" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockOilGenerator.json

@@ -1,6 +1,20 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_bottom_top",
+    "textures": {
+      "side": "actuallyadditions:blocks/blockOilGenerator",
+      "bottom": "actuallyadditions:blocks/blockOilGeneratorBottom",
+      "top": "actuallyadditions:blocks/blockOilGeneratorTop"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "meta=0": { "model": "actuallyadditions:blockOilGenerator" },
+    "normal": [{}],
-    "meta=1": { "model": "actuallyadditions:blockOilGenerator" }
+    "inventory": [{}],
+    "meta": {
+      "0": {},
+      "1": {}
+    }
   }
 }

src/main/resources/assets/actuallyadditions/blockstates/blockPhantomBooster.json

@@ -1,5 +0,0 @@
-{
-  "variants": {
-    "normal": { "model": "actuallyadditions:blockPhantomBooster"}
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockPhantomBreaker.json

@@ -1,5 +0,0 @@
-{
-  "variants": {
-    "normal": { "model": "actuallyadditions:blockPhantomBreaker" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockPhantomEnergyface.json

@@ -1,5 +0,0 @@
-{
-  "variants": {
-    "normal": { "model": "actuallyadditions:blockPhantomEnergyface" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockPhantomLiquiface.json

@@ -1,5 +0,0 @@
-{
-  "variants": {
-    "normal": { "model": "actuallyadditions:blockPhantomLiquiface" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockPhantomPlacer.json

@@ -1,5 +0,0 @@
-{
-  "variants": {
-    "normal": { "model": "actuallyadditions:blockPhantomPlacer" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockPhantomface.json

@@ -1,5 +0,0 @@
-{
-  "variants": {
-    "normal": { "model": "actuallyadditions:blockPhantomface" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockPillarQuartzSlab.json

@@ -1,6 +0,0 @@
-{
-    "variants": {
-        "meta=0": { "model": "actuallyadditions:blockPillarQuartzSlabBottom" },
-        "meta=1": { "model": "actuallyadditions:blockPillarQuartzSlabTop" }
-    }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockPillarQuartzStair.json

@@ -1,44 +0,0 @@
-{
-    "variants": {
-        "facing=east,half=bottom,shape=straight":  { "model": "actuallyadditions:blockPillarQuartzStairs" },
-        "facing=west,half=bottom,shape=straight":  { "model": "actuallyadditions:blockPillarQuartzStairs", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=straight": { "model": "actuallyadditions:blockPillarQuartzStairs", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=straight": { "model": "actuallyadditions:blockPillarQuartzStairs", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=outer_right":  { "model": "actuallyadditions:blockPillarQuartzStairsOuter" },
-        "facing=west,half=bottom,shape=outer_right":  { "model": "actuallyadditions:blockPillarQuartzStairsOuter", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockPillarQuartzStairsOuter", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockPillarQuartzStairsOuter", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=outer_left":  { "model": "actuallyadditions:blockPillarQuartzStairsOuter", "y": 270, "uvlock": true },
-        "facing=west,half=bottom,shape=outer_left":  { "model": "actuallyadditions:blockPillarQuartzStairsOuter", "y": 90, "uvlock": true },
-        "facing=south,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockPillarQuartzStairsOuter" },
-        "facing=north,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockPillarQuartzStairsOuter", "y": 180, "uvlock": true },
-        "facing=east,half=bottom,shape=inner_right":  { "model": "actuallyadditions:blockPillarQuartzStairsInner" },
-        "facing=west,half=bottom,shape=inner_right":  { "model": "actuallyadditions:blockPillarQuartzStairsInner", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockPillarQuartzStairsInner", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockPillarQuartzStairsInner", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=inner_left":  { "model": "actuallyadditions:blockPillarQuartzStairsInner", "y": 270, "uvlock": true },
-        "facing=west,half=bottom,shape=inner_left":  { "model": "actuallyadditions:blockPillarQuartzStairsInner", "y": 90, "uvlock": true },
-        "facing=south,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockPillarQuartzStairsInner" },
-        "facing=north,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockPillarQuartzStairsInner", "y": 180, "uvlock": true },
-        "facing=east,half=top,shape=straight":  { "model": "actuallyadditions:blockPillarQuartzStairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=straight":  { "model": "actuallyadditions:blockPillarQuartzStairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=straight": { "model": "actuallyadditions:blockPillarQuartzStairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=straight": { "model": "actuallyadditions:blockPillarQuartzStairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "actuallyadditions:blockPillarQuartzStairsOuter", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "actuallyadditions:blockPillarQuartzStairsOuter", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "actuallyadditions:blockPillarQuartzStairsOuter", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "actuallyadditions:blockPillarQuartzStairsOuter", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "actuallyadditions:blockPillarQuartzStairsOuter", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "actuallyadditions:blockPillarQuartzStairsOuter", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "actuallyadditions:blockPillarQuartzStairsOuter", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "actuallyadditions:blockPillarQuartzStairsOuter", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "actuallyadditions:blockPillarQuartzStairsInner", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "actuallyadditions:blockPillarQuartzStairsInner", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "actuallyadditions:blockPillarQuartzStairsInner", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "actuallyadditions:blockPillarQuartzStairsInner", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "actuallyadditions:blockPillarQuartzStairsInner", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "actuallyadditions:blockPillarQuartzStairsInner", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "actuallyadditions:blockPillarQuartzStairsInner", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "actuallyadditions:blockPillarQuartzStairsInner", "x": 180, "uvlock": true }
-    }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockPillarQuartzWall.json

@@ -1,36 +0,0 @@
-{
-    "variants": {
-        "east=false,north=false,south=false,up=false,west=false": { "model": "actuallyadditions:blockPillarQuartzWallPost" },
-        "east=false,north=true,south=false,up=false,west=false":  { "model": "actuallyadditions:blockPillarQuartzWallNorth" },
-        "east=true,north=false,south=false,up=false,west=false":  { "model": "actuallyadditions:blockPillarQuartzWallNorth", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=false,west=false":  { "model": "actuallyadditions:blockPillarQuartzWallNorth", "y": 180, "uvlock": true },
-        "east=false,north=false,south=false,up=false,west=true":  { "model": "actuallyadditions:blockPillarQuartzWallNorth", "y": 270, "uvlock": true },
-        "east=true,north=true,south=false,up=false,west=false":   { "model": "actuallyadditions:blockPillarQuartzWallNorthEast" },
-        "east=true,north=false,south=true,up=false,west=false":   { "model": "actuallyadditions:blockPillarQuartzWallNorthEast", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=false,west=true":   { "model": "actuallyadditions:blockPillarQuartzWallNorthEast", "y": 180, "uvlock": true },
-        "east=false,north=true,south=false,up=false,west=true":   { "model": "actuallyadditions:blockPillarQuartzWallNorthEast", "y": 270, "uvlock": true },
-        "east=false,north=true,south=true,up=false,west=false":   { "model": "actuallyadditions:blockPillarQuartzWallNorthSouth" },
-        "east=true,north=false,south=false,up=false,west=true":   { "model": "actuallyadditions:blockPillarQuartzWallNorthSouth", "y": 90, "uvlock": true },
-        "east=true,north=true,south=true,up=false,west=false":    { "model": "actuallyadditions:blockPillarQuartzWallNorthSouthEast" },
-        "east=true,north=false,south=true,up=false,west=true":    { "model": "actuallyadditions:blockPillarQuartzWallNorthSouthEast", "y": 90, "uvlock": true },
-        "east=false,north=true,south=true,up=false,west=true":    { "model": "actuallyadditions:blockPillarQuartzWallNorthSouthEast", "y": 180, "uvlock": true },
-        "east=true,north=true,south=false,up=false,west=true":    { "model": "actuallyadditions:blockPillarQuartzWallNorthSouthEast", "y": 270, "uvlock": true },
-        "east=true,north=true,south=true,up=false,west=true":     { "model": "actuallyadditions:blockPillarQuartzWallNorthSouthEastWest" },
-        "east=false,north=false,south=false,up=true,west=false":  { "model": "actuallyadditions:blockPillarQuartzWallPost" },
-        "east=false,north=true,south=false,up=true,west=false":   { "model": "actuallyadditions:blockPillarQuartzWallNorth" },
-        "east=true,north=false,south=false,up=true,west=false":   { "model": "actuallyadditions:blockPillarQuartzWallNorth", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=true,west=false":   { "model": "actuallyadditions:blockPillarQuartzWallNorth", "y": 180, "uvlock": true },
-        "east=false,north=false,south=false,up=true,west=true":   { "model": "actuallyadditions:blockPillarQuartzWallNorth", "y": 270, "uvlock": true },
-        "east=true,north=true,south=false,up=true,west=false":    { "model": "actuallyadditions:blockPillarQuartzWallNorthEast" },
-        "east=true,north=false,south=true,up=true,west=false":    { "model": "actuallyadditions:blockPillarQuartzWallNorthEast", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=true,west=true":    { "model": "actuallyadditions:blockPillarQuartzWallNorthEast", "y": 180, "uvlock": true },
-        "east=false,north=true,south=false,up=true,west=true":    { "model": "actuallyadditions:blockPillarQuartzWallNorthEast", "y": 270, "uvlock": true },
-        "east=false,north=true,south=true,up=true,west=false":    { "model": "actuallyadditions:blockPillarQuartzWallNorthSouthAbove" },
-        "east=true,north=false,south=false,up=true,west=true":    { "model": "actuallyadditions:blockPillarQuartzWallNorthSouthAbove", "y": 90, "uvlock": true },
-        "east=true,north=true,south=true,up=true,west=false":     { "model": "actuallyadditions:blockPillarQuartzWallNorthSouthEast" },
-        "east=true,north=false,south=true,up=true,west=true":     { "model": "actuallyadditions:blockPillarQuartzWallNorthSouthEast", "y": 90, "uvlock": true },
-        "east=false,north=true,south=true,up=true,west=true":     { "model": "actuallyadditions:blockPillarQuartzWallNorthSouthEast", "y": 180, "uvlock": true },
-        "east=true,north=true,south=false,up=true,west=true":     { "model": "actuallyadditions:blockPillarQuartzWallNorthSouthEast", "y": 270, "uvlock": true },
-        "east=true,north=true,south=true,up=true,west=true":      { "model": "actuallyadditions:blockPillarQuartzWallNorthSouthEastWest" }
-    }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockPlacer.json

@@ -1,10 +0,0 @@
-{
-  "variants": {
-    "meta=0": { "model": "actuallyadditions:blockPlacer", "x": 90 },
-    "meta=1": { "model": "actuallyadditions:blockPlacer", "x": -90 },
-    "meta=2": { "model": "actuallyadditions:blockPlacer", "y": 0 },
-    "meta=3": { "model": "actuallyadditions:blockPlacer", "y": 180 },
-    "meta=4": { "model": "actuallyadditions:blockPlacer", "y": 270 },
-    "meta=5": { "model": "actuallyadditions:blockPlacer", "y": 90 }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockQuartzSlab.json

@@ -1,6 +0,0 @@
-{
-    "variants": {
-        "meta=0": { "model": "actuallyadditions:blockQuartzSlabBottom" },
-        "meta=1": { "model": "actuallyadditions:blockQuartzSlabTop" }
-    }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockQuartzStair.json

@@ -1,44 +0,0 @@
-{
-    "variants": {
-        "facing=east,half=bottom,shape=straight":  { "model": "actuallyadditions:blockQuartzStairs" },
-        "facing=west,half=bottom,shape=straight":  { "model": "actuallyadditions:blockQuartzStairs", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=straight": { "model": "actuallyadditions:blockQuartzStairs", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=straight": { "model": "actuallyadditions:blockQuartzStairs", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=outer_right":  { "model": "actuallyadditions:blockQuartzStairsOuter" },
-        "facing=west,half=bottom,shape=outer_right":  { "model": "actuallyadditions:blockQuartzStairsOuter", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockQuartzStairsOuter", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockQuartzStairsOuter", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=outer_left":  { "model": "actuallyadditions:blockQuartzStairsOuter", "y": 270, "uvlock": true },
-        "facing=west,half=bottom,shape=outer_left":  { "model": "actuallyadditions:blockQuartzStairsOuter", "y": 90, "uvlock": true },
-        "facing=south,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockQuartzStairsOuter" },
-        "facing=north,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockQuartzStairsOuter", "y": 180, "uvlock": true },
-        "facing=east,half=bottom,shape=inner_right":  { "model": "actuallyadditions:blockQuartzStairsInner" },
-        "facing=west,half=bottom,shape=inner_right":  { "model": "actuallyadditions:blockQuartzStairsInner", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockQuartzStairsInner", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockQuartzStairsInner", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=inner_left":  { "model": "actuallyadditions:blockQuartzStairsInner", "y": 270, "uvlock": true },
-        "facing=west,half=bottom,shape=inner_left":  { "model": "actuallyadditions:blockQuartzStairsInner", "y": 90, "uvlock": true },
-        "facing=south,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockQuartzStairsInner" },
-        "facing=north,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockQuartzStairsInner", "y": 180, "uvlock": true },
-        "facing=east,half=top,shape=straight":  { "model": "actuallyadditions:blockQuartzStairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=straight":  { "model": "actuallyadditions:blockQuartzStairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=straight": { "model": "actuallyadditions:blockQuartzStairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=straight": { "model": "actuallyadditions:blockQuartzStairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "actuallyadditions:blockQuartzStairsOuter", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "actuallyadditions:blockQuartzStairsOuter", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "actuallyadditions:blockQuartzStairsOuter", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "actuallyadditions:blockQuartzStairsOuter", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "actuallyadditions:blockQuartzStairsOuter", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "actuallyadditions:blockQuartzStairsOuter", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "actuallyadditions:blockQuartzStairsOuter", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "actuallyadditions:blockQuartzStairsOuter", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "actuallyadditions:blockQuartzStairsInner", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "actuallyadditions:blockQuartzStairsInner", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "actuallyadditions:blockQuartzStairsInner", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "actuallyadditions:blockQuartzStairsInner", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "actuallyadditions:blockQuartzStairsInner", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "actuallyadditions:blockQuartzStairsInner", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "actuallyadditions:blockQuartzStairsInner", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "actuallyadditions:blockQuartzStairsInner", "x": 180, "uvlock": true }
-    }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockQuartzWall.json

@@ -1,36 +0,0 @@
-{
-    "variants": {
-        "east=false,north=false,south=false,up=false,west=false": { "model": "actuallyadditions:blockQuartzWallPost" },
-        "east=false,north=true,south=false,up=false,west=false":  { "model": "actuallyadditions:blockQuartzWallNorth" },
-        "east=true,north=false,south=false,up=false,west=false":  { "model": "actuallyadditions:blockQuartzWallNorth", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=false,west=false":  { "model": "actuallyadditions:blockQuartzWallNorth", "y": 180, "uvlock": true },
-        "east=false,north=false,south=false,up=false,west=true":  { "model": "actuallyadditions:blockQuartzWallNorth", "y": 270, "uvlock": true },
-        "east=true,north=true,south=false,up=false,west=false":   { "model": "actuallyadditions:blockQuartzWallNorthEast" },
-        "east=true,north=false,south=true,up=false,west=false":   { "model": "actuallyadditions:blockQuartzWallNorthEast", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=false,west=true":   { "model": "actuallyadditions:blockQuartzWallNorthEast", "y": 180, "uvlock": true },
-        "east=false,north=true,south=false,up=false,west=true":   { "model": "actuallyadditions:blockQuartzWallNorthEast", "y": 270, "uvlock": true },
-        "east=false,north=true,south=true,up=false,west=false":   { "model": "actuallyadditions:blockQuartzWallNorthSouth" },
-        "east=true,north=false,south=false,up=false,west=true":   { "model": "actuallyadditions:blockQuartzWallNorthSouth", "y": 90, "uvlock": true },
-        "east=true,north=true,south=true,up=false,west=false":    { "model": "actuallyadditions:blockQuartzWallNorthSouthEast" },
-        "east=true,north=false,south=true,up=false,west=true":    { "model": "actuallyadditions:blockQuartzWallNorthSouthEast", "y": 90, "uvlock": true },
-        "east=false,north=true,south=true,up=false,west=true":    { "model": "actuallyadditions:blockQuartzWallNorthSouthEast", "y": 180, "uvlock": true },
-        "east=true,north=true,south=false,up=false,west=true":    { "model": "actuallyadditions:blockQuartzWallNorthSouthEast", "y": 270, "uvlock": true },
-        "east=true,north=true,south=true,up=false,west=true":     { "model": "actuallyadditions:blockQuartzWallNorthSouthEastWest" },
-        "east=false,north=false,south=false,up=true,west=false":  { "model": "actuallyadditions:blockQuartzWallPost" },
-        "east=false,north=true,south=false,up=true,west=false":   { "model": "actuallyadditions:blockQuartzWallNorth" },
-        "east=true,north=false,south=false,up=true,west=false":   { "model": "actuallyadditions:blockQuartzWallNorth", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=true,west=false":   { "model": "actuallyadditions:blockQuartzWallNorth", "y": 180, "uvlock": true },
-        "east=false,north=false,south=false,up=true,west=true":   { "model": "actuallyadditions:blockQuartzWallNorth", "y": 270, "uvlock": true },
-        "east=true,north=true,south=false,up=true,west=false":    { "model": "actuallyadditions:blockQuartzWallNorthEast" },
-        "east=true,north=false,south=true,up=true,west=false":    { "model": "actuallyadditions:blockQuartzWallNorthEast", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=true,west=true":    { "model": "actuallyadditions:blockQuartzWallNorthEast", "y": 180, "uvlock": true },
-        "east=false,north=true,south=false,up=true,west=true":    { "model": "actuallyadditions:blockQuartzWallNorthEast", "y": 270, "uvlock": true },
-        "east=false,north=true,south=true,up=true,west=false":    { "model": "actuallyadditions:blockQuartzWallNorthSouthAbove" },
-        "east=true,north=false,south=false,up=true,west=true":    { "model": "actuallyadditions:blockQuartzWallNorthSouthAbove", "y": 90, "uvlock": true },
-        "east=true,north=true,south=true,up=true,west=false":     { "model": "actuallyadditions:blockQuartzWallNorthSouthEast" },
-        "east=true,north=false,south=true,up=true,west=true":     { "model": "actuallyadditions:blockQuartzWallNorthSouthEast", "y": 90, "uvlock": true },
-        "east=false,north=true,south=true,up=true,west=true":     { "model": "actuallyadditions:blockQuartzWallNorthSouthEast", "y": 180, "uvlock": true },
-        "east=true,north=true,south=false,up=true,west=true":     { "model": "actuallyadditions:blockQuartzWallNorthSouthEast", "y": 270, "uvlock": true },
-        "east=true,north=true,south=true,up=true,west=true":      { "model": "actuallyadditions:blockQuartzWallNorthSouthEastWest" }
-    }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockRangedCollector.json

@@ -1,5 +0,0 @@
-{
-  "variants": {
-    "normal": { "model": "actuallyadditions:blockRangedCollector" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockRice.json

@@ -1,12 +0,0 @@
-{
-  "variants": {
-    "age=0": { "model": "actuallyadditions:blockRiceStage1" },
-    "age=1": { "model": "actuallyadditions:blockRiceStage2" },
-    "age=2": { "model": "actuallyadditions:blockRiceStage2" },
-    "age=3": { "model": "actuallyadditions:blockRiceStage3" },
-    "age=4": { "model": "actuallyadditions:blockRiceStage4" },
-    "age=5": { "model": "actuallyadditions:blockRiceStage4" },
-    "age=6": { "model": "actuallyadditions:blockRiceStage5" },
-    "age=7": { "model": "actuallyadditions:blockRiceStage6" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockSmileyCloud.json

@@ -1,12 +0,0 @@
-{
-  "variants": {
-    "meta=0": { "model": "actuallyadditions:blockSmileyCloud", "y": 0 },
-    "meta=1": { "model": "actuallyadditions:blockSmileyCloud", "y": 180 },
-    "meta=2": { "model": "actuallyadditions:blockSmileyCloud", "y": -90 },
-    "meta=3": { "model": "actuallyadditions:blockSmileyCloud", "y": 90 },
-    "meta=4": { "model": "actuallyadditions:blockSmileyCloudFluffy", "y": 0 },
-    "meta=5": { "model": "actuallyadditions:blockSmileyCloudFluffy", "y": 180 },
-    "meta=6": { "model": "actuallyadditions:blockSmileyCloudFluffy", "y": -90 },
-    "meta=7": { "model": "actuallyadditions:blockSmileyCloudFluffy", "y": 90 }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenFence.json

@@ -1,36 +0,0 @@
-{
-    "variants": {
-        "east=false,north=false,south=false,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFencePost" },
-        "east=false,north=true,south=false,up=false,west=false":  { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth" },
-        "east=true,north=false,south=false,up=false,west=false":  { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=false,west=false":  { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth", "y": 180, "uvlock": true },
-        "east=false,north=false,south=false,up=false,west=true":  { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth", "y": 270, "uvlock": true },
-        "east=true,north=true,south=false,up=false,west=false":   { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast" },
-        "east=true,north=false,south=true,up=false,west=false":   { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=false,west=true":   { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast", "y": 180, "uvlock": true },
-        "east=false,north=true,south=false,up=false,west=true":   { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast", "y": 270, "uvlock": true },
-        "east=false,north=true,south=true,up=false,west=false":   { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouth" },
-        "east=true,north=false,south=false,up=false,west=true":   { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouth", "y": 90, "uvlock": true },
-        "east=true,north=true,south=true,up=false,west=false":    { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast" },
-        "east=true,north=false,south=true,up=false,west=true":    { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast", "y": 90, "uvlock": true },
-        "east=false,north=true,south=true,up=false,west=true":    { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast", "y": 180, "uvlock": true },
-        "east=true,north=true,south=false,up=false,west=true":    { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast", "y": 270, "uvlock": true },
-        "east=true,north=true,south=true,up=false,west=true":     { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEastWest" },
-        "east=false,north=false,south=false,up=true,west=false":  { "model": "actuallyadditions:blockTestifiBucksGreenFencePost" },
-        "east=false,north=true,south=false,up=true,west=false":   { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth" },
-        "east=true,north=false,south=false,up=true,west=false":   { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=true,west=false":   { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth", "y": 180, "uvlock": true },
-        "east=false,north=false,south=false,up=true,west=true":   { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth", "y": 270, "uvlock": true },
-        "east=true,north=true,south=false,up=true,west=false":    { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast" },
-        "east=true,north=false,south=true,up=true,west=false":    { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=true,west=true":    { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast", "y": 180, "uvlock": true },
-        "east=false,north=true,south=false,up=true,west=true":    { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast", "y": 270, "uvlock": true },
-        "east=false,north=true,south=true,up=true,west=false":    { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthAbove" },
-        "east=true,north=false,south=false,up=true,west=true":    { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthAbove", "y": 90, "uvlock": true },
-        "east=true,north=true,south=true,up=true,west=false":     { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast" },
-        "east=true,north=false,south=true,up=true,west=true":     { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast", "y": 90, "uvlock": true },
-        "east=false,north=true,south=true,up=true,west=true":     { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast", "y": 180, "uvlock": true },
-        "east=true,north=true,south=false,up=true,west=true":     { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast", "y": 270, "uvlock": true },
-        "east=true,north=true,south=true,up=true,west=true":      { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEastWest" }
-    }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenSlab.json

@@ -1,6 +0,0 @@
-{
-    "variants": {
-        "meta=0": { "model": "actuallyadditions:blockTestifiBucksGreenSlabBottom" },
-        "meta=1": { "model": "actuallyadditions:blockTestifiBucksGreenSlabTop" }
-    }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenStairs.json

@@ -1,44 +0,0 @@
-{
-    "variants": {
-        "facing=east,half=bottom,shape=straight":  { "model": "actuallyadditions:blockTestifiBucksGreenStairs" },
-        "facing=west,half=bottom,shape=straight":  { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=outer_right":  { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter" },
-        "facing=west,half=bottom,shape=outer_right":  { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=outer_left":  { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "y": 270, "uvlock": true },
-        "facing=west,half=bottom,shape=outer_left":  { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "y": 90, "uvlock": true },
-        "facing=south,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter" },
-        "facing=north,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "y": 180, "uvlock": true },
-        "facing=east,half=bottom,shape=inner_right":  { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner" },
-        "facing=west,half=bottom,shape=inner_right":  { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=inner_left":  { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "y": 270, "uvlock": true },
-        "facing=west,half=bottom,shape=inner_left":  { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "y": 90, "uvlock": true },
-        "facing=south,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner" },
-        "facing=north,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "y": 180, "uvlock": true },
-        "facing=east,half=top,shape=straight":  { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=straight":  { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "uvlock": true }
-    }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenWall.json

@@ -1,5 +0,0 @@
-{
-  "variants": {
-    "normal": { "model": "actuallyadditions:blockTestifiBucksGreenWall" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteFence.json

@@ -1,36 +0,0 @@
-{
-    "variants": {
-        "east=false,north=false,south=false,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFencePost" },
-        "east=false,north=true,south=false,up=false,west=false":  { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth" },
-        "east=true,north=false,south=false,up=false,west=false":  { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=false,west=false":  { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth", "y": 180, "uvlock": true },
-        "east=false,north=false,south=false,up=false,west=true":  { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth", "y": 270, "uvlock": true },
-        "east=true,north=true,south=false,up=false,west=false":   { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast" },
-        "east=true,north=false,south=true,up=false,west=false":   { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=false,west=true":   { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast", "y": 180, "uvlock": true },
-        "east=false,north=true,south=false,up=false,west=true":   { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast", "y": 270, "uvlock": true },
-        "east=false,north=true,south=true,up=false,west=false":   { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouth" },
-        "east=true,north=false,south=false,up=false,west=true":   { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouth", "y": 90, "uvlock": true },
-        "east=true,north=true,south=true,up=false,west=false":    { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast" },
-        "east=true,north=false,south=true,up=false,west=true":    { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast", "y": 90, "uvlock": true },
-        "east=false,north=true,south=true,up=false,west=true":    { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast", "y": 180, "uvlock": true },
-        "east=true,north=true,south=false,up=false,west=true":    { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast", "y": 270, "uvlock": true },
-        "east=true,north=true,south=true,up=false,west=true":     { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEastWest" },
-        "east=false,north=false,south=false,up=true,west=false":  { "model": "actuallyadditions:blockTestifiBucksWhiteFencePost" },
-        "east=false,north=true,south=false,up=true,west=false":   { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth" },
-        "east=true,north=false,south=false,up=true,west=false":   { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=true,west=false":   { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth", "y": 180, "uvlock": true },
-        "east=false,north=false,south=false,up=true,west=true":   { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth", "y": 270, "uvlock": true },
-        "east=true,north=true,south=false,up=true,west=false":    { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast" },
-        "east=true,north=false,south=true,up=true,west=false":    { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast", "y": 90, "uvlock": true },
-        "east=false,north=false,south=true,up=true,west=true":    { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast", "y": 180, "uvlock": true },
-        "east=false,north=true,south=false,up=true,west=true":    { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast", "y": 270, "uvlock": true },
-        "east=false,north=true,south=true,up=true,west=false":    { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthAbove" },
-        "east=true,north=false,south=false,up=true,west=true":    { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthAbove", "y": 90, "uvlock": true },
-        "east=true,north=true,south=true,up=true,west=false":     { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast" },
-        "east=true,north=false,south=true,up=true,west=true":     { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast", "y": 90, "uvlock": true },
-        "east=false,north=true,south=true,up=true,west=true":     { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast", "y": 180, "uvlock": true },
-        "east=true,north=true,south=false,up=true,west=true":     { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast", "y": 270, "uvlock": true },
-        "east=true,north=true,south=true,up=true,west=true":      { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEastWest" }
-    }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteSlab.json

@@ -1,6 +0,0 @@
-{
-    "variants": {
-        "meta=0": { "model": "actuallyadditions:blockTestifiBucksWhiteSlabBottom" },
-        "meta=1": { "model": "actuallyadditions:blockTestifiBucksWhiteSlabTop" }
-    }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteStairs.json

@@ -1,44 +0,0 @@
-{
-    "variants": {
-        "facing=east,half=bottom,shape=straight":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairs" },
-        "facing=west,half=bottom,shape=straight":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=outer_right":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter" },
-        "facing=west,half=bottom,shape=outer_right":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=outer_left":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "y": 270, "uvlock": true },
-        "facing=west,half=bottom,shape=outer_left":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "y": 90, "uvlock": true },
-        "facing=south,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter" },
-        "facing=north,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "y": 180, "uvlock": true },
-        "facing=east,half=bottom,shape=inner_right":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner" },
-        "facing=west,half=bottom,shape=inner_right":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=inner_left":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "y": 270, "uvlock": true },
-        "facing=west,half=bottom,shape=inner_left":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "y": 90, "uvlock": true },
-        "facing=south,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner" },
-        "facing=north,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "y": 180, "uvlock": true },
-        "facing=east,half=top,shape=straight":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=straight":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "uvlock": true }
-    }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteWall.json

@@ -1,5 +0,0 @@
-{
-  "variants": {
-    "normal": { "model": "actuallyadditions:blockTestifiBucksWhiteWall" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockTreasureChest.json

@@ -1,8 +0,0 @@
-{
-  "variants": {
-    "meta=0": { "model": "actuallyadditions:blockTreasureChest", "y": 0 },
-    "meta=1": { "model": "actuallyadditions:blockTreasureChest", "y": 180 },
-    "meta=2": { "model": "actuallyadditions:blockTreasureChest", "y": -90 },
-    "meta=3": { "model": "actuallyadditions:blockTreasureChest", "y": 90 }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockWild.json

@@ -1,8 +0,0 @@
-{
-  "variants": {
-    "meta=0": { "model": "actuallyadditions:blockCanolaStage4" },
-    "meta=1": { "model": "actuallyadditions:blockFlaxStage6" },
-    "meta=2": { "model": "actuallyadditions:blockRiceStage6" },
-    "meta=3": { "model": "actuallyadditions:blockCoffeeStage6" }
-  }
-}

src/main/resources/assets/actuallyadditions/blockstates/blockXPSolidifier.json

@@ -1,8 +1,26 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube",
+    "textures": {
+      "particle": "actuallyadditions:blocks/blockXPSolidifier",
+      "down": "#particle",
+      "up": "actuallyadditions:blocks/blockXPSolidifierTop",
+      "south": "#particle",
+      "north": "actuallyadditions:blocks/blockXPSolidifierFront",
+      "east": "#particle",
+      "west": "#particle"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "meta=0": { "model": "actuallyadditions:blockXPSolidifier", "y": 0 },
+    "normal": [{}],
-    "meta=1": { "model": "actuallyadditions:blockXPSolidifier", "y": 180 },
+    "inventory": [{}],
-    "meta=2": { "model": "actuallyadditions:blockXPSolidifier", "y": -90 },
+    "meta": {
-    "meta=3": { "model": "actuallyadditions:blockXPSolidifier", "y": 90 }
+      "0": { "y" : 0 },
+      "1": { "y" : 180 },
+      "2": { "y" : 270 },
+      "3": { "y" : 90 }
+    }
   }
 }

src/main/resources/assets/actuallyadditions/models/block/blockAtomicReconstructor.json

@@ -1,12 +0,0 @@
-{
-  "parent": "block/cube",
-  "textures": {
-    "particle": "actuallyadditions:blocks/blockAtomicReconstructor",
-    "down": "actuallyadditions:blocks/blockAtomicReconstructorTop",
-    "up": "actuallyadditions:blocks/blockAtomicReconstructorTop",
-    "north": "actuallyadditions:blocks/blockAtomicReconstructorFront",
-    "east": "actuallyadditions:blocks/blockAtomicReconstructor",
-    "south": "actuallyadditions:blocks/blockAtomicReconstructor",
-    "west": "actuallyadditions:blocks/blockAtomicReconstructor"
-  }
-}

src/main/resources/assets/actuallyadditions/models/block/blockBlackLotus.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/cross",
-    "textures": {
-        "cross": "actuallyadditions:blocks/blockBlackLotus"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockBreaker.json

@@ -1,12 +0,0 @@
-{
-  "parent": "block/cube",
-  "textures": {
-    "particle": "actuallyadditions:blocks/blockBreaker",
-    "down": "actuallyadditions:blocks/blockBreakerTop",
-    "up": "actuallyadditions:blocks/blockBreakerTop",
-    "north": "actuallyadditions:blocks/blockBreakerFront",
-    "east": "actuallyadditions:blocks/blockBreaker",
-    "south": "actuallyadditions:blocks/blockBreaker",
-    "west": "actuallyadditions:blocks/blockBreaker"
-  }
-}

src/main/resources/assets/actuallyadditions/models/block/blockCanolaPress.json

@@ -1,12 +0,0 @@
-{
-  "parent": "block/cube",
-  "textures": {
-    "particle": "actuallyadditions:blocks/blockCanolaPress",
-    "down": "actuallyadditions:blocks/blockCanolaPressTop",
-    "up": "actuallyadditions:blocks/blockCanolaPressTop",
-    "north": "actuallyadditions:blocks/blockCanolaPress",
-    "east": "actuallyadditions:blocks/blockCanolaPress",
-    "south": "actuallyadditions:blocks/blockCanolaPress",
-    "west": "actuallyadditions:blocks/blockCanolaPress"
-  }
-}

src/main/resources/assets/actuallyadditions/models/block/blockCanolaStage1.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/cross",
-    "textures": {
-        "cross": "actuallyadditions:blocks/blockCanolaStage1"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockCanolaStage2.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/cross",
-    "textures": {
-        "cross": "actuallyadditions:blocks/blockCanolaStage2"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockCanolaStage3.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/cross",
-    "textures": {
-        "cross": "actuallyadditions:blocks/blockCanolaStage3"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockCanolaStage4.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/cross",
-    "textures": {
-        "cross": "actuallyadditions:blocks/blockCanolaStage4"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzSlabBottom.json

@@ -1,8 +0,0 @@
-{
-    "parent": "block/half_slab",
-    "textures": {
-        "bottom": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled",
-        "top": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled",
-        "side": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzSlabTop.json

@@ -1,8 +0,0 @@
-{
-    "parent": "block/upper_slab",
-    "textures": {
-        "bottom": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled",
-        "top": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled",
-        "side": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzStairs.json

@@ -1,8 +0,0 @@
-{
-    "parent": "block/stairs",
-    "textures": {
-        "bottom": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled",
-        "top": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled",
-        "side": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzStairsInner.json

@@ -1,8 +0,0 @@
-{
-    "parent": "block/inner_stairs",
-    "textures": {
-        "bottom": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled",
-        "top": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled",
-        "side": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzStairsOuter.json

@@ -1,8 +0,0 @@
-{
-    "parent": "block/outer_stairs",
-    "textures": {
-        "bottom": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled",
-        "top": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled",
-        "side": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallInventory.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/wall_inventory",
-    "textures": {
-        "wall": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallNorth.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/wall_n",
-    "textures": {
-        "wall": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallNorthEast.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/wall_ne",
-    "textures": {
-        "wall": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallNorthEastSouthWest.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/wall_nsew",
-    "textures": {
-        "wall": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallNorthSouth.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/wall_ns",
-    "textures": {
-        "wall": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallNorthSouthAbove.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/wall_ns_above",
-    "textures": {
-        "wall": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallNorthSouthEast.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/wall_nse",
-    "textures": {
-        "wall": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallNorthSouthEastWest.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/wall_nsew",
-    "textures": {
-        "wall": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallPost.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/wall_post",
-    "textures": {
-        "wall": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockCoalGenerator.json

@@ -1,12 +0,0 @@
-{
-  "parent": "block/cube",
-  "textures": {
-    "particle": "actuallyadditions:blocks/blockCoalGenerator",
-    "down": "actuallyadditions:blocks/blockCoalGeneratorBottom",
-    "up": "actuallyadditions:blocks/blockCoalGeneratorTop",
-    "north": "actuallyadditions:blocks/blockCoalGenerator",
-    "east": "actuallyadditions:blocks/blockCoalGenerator",
-    "south": "actuallyadditions:blocks/blockCoalGenerator",
-    "west": "actuallyadditions:blocks/blockCoalGenerator"
-  }
-}

src/main/resources/assets/actuallyadditions/models/block/blockCoffeeStage1.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/cross",
-    "textures": {
-        "cross": "actuallyadditions:blocks/blockCoffeeStage1"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockCoffeeStage2.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/cross",
-    "textures": {
-        "cross": "actuallyadditions:blocks/blockCoffeeStage2"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockCoffeeStage3.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/cross",
-    "textures": {
-        "cross": "actuallyadditions:blocks/blockCoffeeStage3"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockCoffeeStage4.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/cross",
-    "textures": {
-        "cross": "actuallyadditions:blocks/blockCoffeeStage4"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockCoffeeStage5.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/cross",
-    "textures": {
-        "cross": "actuallyadditions:blocks/blockCoffeeStage5"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockCoffeeStage6.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/cross",
-    "textures": {
-        "cross": "actuallyadditions:blocks/blockCoffeeStage6"
-    }
-}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlack.json

@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "actuallyadditions:blocks/blockColoredLampBlack"
-  }
-}