From 8efe5482f8d35c90eae810991dc186091613db69 Mon Sep 17 00:00:00 2001
From: canitzp <canitzp@googlemail.com>
Date: Sat, 9 Jan 2016 18:07:18 +0100
Subject: [PATCH] -Coffee Machine JSON \o/

---
 .../blockstates/blockCoffeeMachine.json       |   8 +
 .../models/block/blockCoffeeMachine.json      | 459 ++++++++++++++++++
 .../models/item/blockCoffeeMachine.json       |  10 +
 .../blocks/models/modelCoffeeMachine.png      | Bin 552 -> 475 bytes
 4 files changed, 477 insertions(+)
 create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockCoffeeMachine.json
 create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockCoffeeMachine.json
 create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockCoffeeMachine.json

diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockCoffeeMachine.json b/src/main/resources/assets/actuallyadditions/blockstates/blockCoffeeMachine.json
new file mode 100644
index 000000000..a511e2211
--- /dev/null
+++ b/src/main/resources/assets/actuallyadditions/blockstates/blockCoffeeMachine.json
@@ -0,0 +1,8 @@
+{
+  "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 }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockCoffeeMachine.json b/src/main/resources/assets/actuallyadditions/models/block/blockCoffeeMachine.json
new file mode 100644
index 000000000..1788a503b
--- /dev/null
+++ b/src/main/resources/assets/actuallyadditions/models/block/blockCoffeeMachine.json
@@ -0,0 +1,459 @@
+{
+    "__createdwith": "opl's Model Creator",
+    "ambientocclusion": false,
+    "textures": {
+        "coffeeMachine": "actuallyadditions:blocks/models/modelCoffeeMachine"
+    },
+    "elements": [
+        {
+            "from": [3,0,1],
+            "to": [13,1,15],
+            "faces": {
+                "up": {
+                    "uv": [2.1052632,0.26315784,2.7368422,1.5263159],
+                    "texture": "#coffeeMachine"
+                },
+                "down": {
+                    "uv": [2.999999,0.6842098,5.631579,2.68421],
+                    "texture": "#coffeeMachine"
+                },
+                "west": {
+                    "uv": [4.105262,1.3684217,5.052636,2.6315799],
+                    "texture": "#coffeeMachine"
+                },
+                "east": {
+                    "uv": [2.9473686,0.68421054,6.4210534,1.5263159],
+                    "texture": "#coffeeMachine"
+                },
+                "north": {
+                    "uv": [0,1.3400855,6.8,2.6],
+                    "texture": "#coffeeMachine"
+                },
+                "south": {
+                    "uv": [4.2105265,0.84210527,4.5263147,1.5263158],
+                    "texture": "#coffeeMachine"
+                }
+            }
+        },
+        {
+            "from": [3,1,1],
+            "to": [13,10,7],
+            "faces": {
+                "up": {
+                    "uv": [0.0,0.0,10.0,6.0],
+                    "texture": "missingtexture"
+                },
+                "down": {
+                    "uv": [0.0,0.0,10.0,6.0],
+                    "texture": "missingtexture"
+                },
+                "west": {
+                    "uv": [1.3684201,0.47368407,4.105262,1.5263153],
+                    "texture": "#coffeeMachine"
+                },
+                "east": {
+                    "uv": [1.5789478,0.31578958,5.157894,2.8421037],
+                    "texture": "#coffeeMachine"
+                },
+                "north": {
+                    "uv": [2,0,6,3],
+                    "texture": "#coffeeMachine"
+                },
+                "south": {
+                    "uv": [2,0,4,2],
+                    "texture": "#coffeeMachine"
+                }
+            }
+        },
+        {
+            "from": [3,9,1],
+            "to": [13,11,12],
+            "faces": {
+                "up": {
+                    "uv": [9.094739,1.0421052,10.568425,2.094737],
+                    "texture": "#coffeeMachine"
+                },
+                "down": {
+                    "uv": [2.3157897,0.21052635,6.000002,2.9999995],
+                    "texture": "#coffeeMachine"
+                },
+                "west": {
+                    "uv": [8.2,2.6,11.2,3],
+                    "texture": "#coffeeMachine"
+                },
+                "east": {
+                    "uv": [7.6,2.6,9,3],
+                    "texture": "#coffeeMachine"
+                },
+                "north": {
+                    "uv": [7.2,2.6,9,3],
+                    "texture": "#coffeeMachine"
+                },
+                "south": {
+                    "uv": [8.6,2.6,10,3],
+                    "texture": "#coffeeMachine"
+                }
+            }
+        },
+        {
+            "from": [4,11,1],
+            "to": [12,14,9],
+            "faces": {
+                "up": {
+                    "uv": [1.6,3,3.2,4.6],
+                    "texture": "#coffeeMachine"
+                },
+                "down": {
+                    "uv": [0.0,0.0,8.0,8.0],
+                    "texture": "missingtexture"
+                },
+                "west": {
+                    "uv": [10.315789,1,10.4,1.6842105],
+                    "texture": "#coffeeMachine"
+                },
+                "east": {
+                    "uv": [9.684211,1.4736842,10.736842,1.8947369],
+                    "texture": "#coffeeMachine"
+                },
+                "north": {
+                    "uv": [9.326308,1.1271291,10.957892,1.4631579],
+                    "texture": "#coffeeMachine"
+                },
+                "south": {
+                    "uv": [10.2,0.6,10.8,1.2],
+                    "texture": "#coffeeMachine"
+                }
+            }
+        },
+        {
+            "from": [7,8,9.5],
+            "to": [9,9,11.5],
+            "faces": {
+                "up": {
+                    "uv": [0.0,0.0,2.0,2.0],
+                    "texture": "missingtexture"
+                },
+                "down": {
+                    "uv": [9.684211,1.2631578,10.526316,1.8947369],
+                    "texture": "#coffeeMachine"
+                },
+                "west": {
+                    "uv": [9.7263155,1.2736838,10.357892,1.4842103],
+                    "texture": "#coffeeMachine"
+                },
+                "east": {
+                    "uv": [9.7263155,1.0526314,10.357892,2.1052628],
+                    "texture": "#coffeeMachine"
+                },
+                "north": {
+                    "uv": [10.105263,0.84210527,10.526316,1.8947369],
+                    "texture": "#coffeeMachine"
+                },
+                "south": {
+                    "uv": [10.105263,1.0526316,10.526316,1.6842105],
+                    "texture": "#coffeeMachine"
+                }
+            }
+        },
+        {
+            "from": [6,1,9],
+            "to": [10,2,13],
+            "faces": {
+                "up": {
+                    "uv": [7.368421,3.5789473,8,4.2],
+                    "texture": "#coffeeMachine"
+                },
+                "down": {
+                    "uv": [0.0,0.0,4.0,4.0],
+                    "texture": "missingtexture"
+                },
+                "west": {
+                    "uv": [6.947369,3.3684208,7.7894735,4.157895],
+                    "texture": "#coffeeMachine"
+                },
+                "east": {
+                    "uv": [7.3684196,3.2105274,7.999996,4],
+                    "texture": "#coffeeMachine"
+                },
+                "north": {
+                    "uv": [7.578948,3.5789473,8.210525,4.2105265],
+                    "texture": "#coffeeMachine"
+                },
+                "south": {
+                    "uv": [6.968419,3.210528,8.021048,4],
+                    "texture": "#coffeeMachine"
+                }
+            }
+        },
+        {
+            "from": [6,2,8],
+            "to": [10,7,9],
+            "faces": {
+                "up": {
+                    "uv": [7.105263,3.6315806,8.15789,4.2105265],
+                    "texture": "#coffeeMachine"
+                },
+                "down": {
+                    "uv": [7.38947,3.3789477,7.810521,4.1684194],
+                    "texture": "#coffeeMachine"
+                },
+                "west": {
+                    "uv": [7.368421,3.6315784,8,4],
+                    "texture": "#coffeeMachine"
+                },
+                "east": {
+                    "uv": [7.2105265,3.4210534,7.8,4],
+                    "texture": "#coffeeMachine"
+                },
+                "north": {
+                    "uv": [6.915793,3.221051,7.8,4],
+                    "texture": "#coffeeMachine"
+                },
+                "south": {
+                    "uv": [7.526315,3.421054,8,4],
+                    "texture": "#coffeeMachine"
+                }
+            }
+        },
+        {
+            "from": [6,2,13],
+            "to": [10,7,14],
+            "faces": {
+                "up": {
+                    "uv": [7.5789475,3.7894738,8,4],
+                    "texture": "#coffeeMachine"
+                },
+                "down": {
+                    "uv": [6.999999,3.6,7.631578,3.9684215],
+                    "texture": "#coffeeMachine"
+                },
+                "west": {
+                    "uv": [7.368421,3.5789473,8,4],
+                    "texture": "#coffeeMachine"
+                },
+                "east": {
+                    "uv": [7.7894735,3.368421,8,3.7894738],
+                    "texture": "#coffeeMachine"
+                },
+                "north": {
+                    "uv": [7.157894,3.4210515,7.8,4],
+                    "texture": "#coffeeMachine"
+                },
+                "south": {
+                    "uv": [7.2,3.8,8,4],
+                    "texture": "#coffeeMachine"
+                }
+            }
+        },
+        {
+            "from": [5,2,9],
+            "to": [6,7,13],
+            "faces": {
+                "up": {
+                    "uv": [7.2105265,3.157895,7.999999,3.9999993],
+                    "texture": "#coffeeMachine"
+                },
+                "down": {
+                    "uv": [6.7894745,3.578949,7.842106,4],
+                    "texture": "#coffeeMachine"
+                },
+                "west": {
+                    "uv": [6.7684236,3.789474,8.242098,4.000001],
+                    "texture": "#coffeeMachine"
+                },
+                "east": {
+                    "uv": [7.7368455,3.578947,8,4.2],
+                    "texture": "#coffeeMachine"
+                },
+                "north": {
+                    "uv": [7.526315,3.368423,8,4],
+                    "texture": "#coffeeMachine"
+                },
+                "south": {
+                    "uv": [7.5789504,3.3684218,8,4],
+                    "texture": "#coffeeMachine"
+                }
+            }
+        },
+        {
+            "from": [10,2,9],
+            "to": [11,7,13],
+            "faces": {
+                "up": {
+                    "uv": [7.1578946,3.5789473,7.7894735,4],
+                    "texture": "#coffeeMachine"
+                },
+                "down": {
+                    "uv": [7.368421,3.7894738,7.5789475,4],
+                    "texture": "#coffeeMachine"
+                },
+                "west": {
+                    "uv": [7.1578946,3.4210515,7.6,3.8],
+                    "texture": "#coffeeMachine"
+                },
+                "east": {
+                    "uv": [6.9789453,3.2210534,8.031565,4.0105267],
+                    "texture": "#coffeeMachine"
+                },
+                "north": {
+                    "uv": [7.3684235,3.421053,8.210532,3.9999993],
+                    "texture": "#coffeeMachine"
+                },
+                "south": {
+                    "uv": [7.421055,3.210527,7.999999,4],
+                    "texture": "#coffeeMachine"
+                }
+            }
+        },
+        {
+            "from": [4,2,10],
+            "to": [5,3,12],
+            "faces": {
+                "up": {
+                    "uv": [6.778949,3.1894736,7.4105287,3.821053],
+                    "texture": "#coffeeMachine"
+                },
+                "down": {
+                    "uv": [7.2105265,3.210527,7.7894735,4.1578965],
+                    "texture": "#coffeeMachine"
+                },
+                "west": {
+                    "uv": [6.9473686,3.5789473,7.5789475,4],
+                    "texture": "#coffeeMachine"
+                },
+                "east": {
+                    "uv": [0.0,0.0,2.0,1.0],
+                    "texture": "missingtexture"
+                },
+                "north": {
+                    "uv": [7.0000014,3.4210515,7.8,4],
+                    "texture": "#coffeeMachine"
+                },
+                "south": {
+                    "uv": [7.3684244,3.3684216,7.8,4],
+                    "texture": "#coffeeMachine"
+                }
+            }
+        },
+        {
+            "from": [4,5,10],
+            "to": [5,6,12],
+            "faces": {
+                "up": {
+                    "uv": [7.5789456,3.7894752,8.210522,4.2105274],
+                    "texture": "#coffeeMachine"
+                },
+                "down": {
+                    "uv": [7.5789475,3.7894738,8,4],
+                    "texture": "#coffeeMachine"
+                },
+                "west": {
+                    "uv": [6.8947353,3.5789483,7.5263157,3.9999993],
+                    "texture": "#coffeeMachine"
+                },
+                "east": {
+                    "uv": [0.0,0.0,2.0,1.0],
+                    "texture": "missingtexture"
+                },
+                "north": {
+                    "uv": [7.2105207,3.2105284,8.210525,4.2105293],
+                    "texture": "#coffeeMachine"
+                },
+                "south": {
+                    "uv": [7.5789475,3.7894752,8.210524,4.2105284],
+                    "texture": "#coffeeMachine"
+                }
+            }
+        },
+        {
+            "from": [3,3,10],
+            "to": [4,5,12],
+            "faces": {
+                "up": {
+                    "uv": [7.421055,3.4736857,8.000004,4.000002],
+                    "texture": "#coffeeMachine"
+                },
+                "down": {
+                    "uv": [7.368421,3.5789473,8,3.7894738],
+                    "texture": "#coffeeMachine"
+                },
+                "west": {
+                    "uv": [7.5789475,3.5789473,8,3.7894738],
+                    "texture": "#coffeeMachine"
+                },
+                "east": {
+                    "uv": [7.4736843,3.4736855,8.2105255,4.2105255],
+                    "texture": "#coffeeMachine"
+                },
+                "north": {
+                    "uv": [6.9684157,3.178948,7.3894744,4.021053],
+                    "texture": "#coffeeMachine"
+                },
+                "south": {
+                    "uv": [6.978949,3.5999997,7.610526,4.0210524],
+                    "texture": "#coffeeMachine"
+                }
+            }
+        },
+        {
+            "from": [6,10.2,10.8],
+            "to": [7,11.2,11.8],
+            "faces": {
+                "up": {
+                    "uv": [10.315789,2.4,10.4,2.6],
+                    "texture": "#coffeeMachine"
+                },
+                "down": {
+                    "uv": [0.0,0.0,1.0,1.0],
+                    "texture": "missingtexture"
+                },
+                "west": {
+                    "uv": [9.4,2.2,9.8,2.6],
+                    "texture": "#coffeeMachine"
+                },
+                "east": {
+                    "uv": [9.4,2.4,9.6,2.6],
+                    "texture": "#coffeeMachine"
+                },
+                "north": {
+                    "uv": [9.4,2.2,9.8,2.6],
+                    "texture": "#coffeeMachine"
+                },
+                "south": {
+                    "uv": [9.4,2.2,9.8,2.6],
+                    "texture": "#coffeeMachine"
+                }
+            }
+        },
+        {
+            "from": [9,10.2,10.8],
+            "to": [10,11.2,11.8],
+            "faces": {
+                "up": {
+                    "uv": [9.4,2.2,9.8,2.6],
+                    "texture": "#coffeeMachine"
+                },
+                "down": {
+                    "uv": [0.0,0.0,1.0,1.0],
+                    "texture": "missingtexture"
+                },
+                "west": {
+                    "uv": [9.4,2.2,9.8,2.6],
+                    "texture": "#coffeeMachine"
+                },
+                "east": {
+                    "uv": [9.4,2.2,9.8,2.6],
+                    "texture": "#coffeeMachine"
+                },
+                "north": {
+                    "uv": [9.4,2.2,9.8,2.6],
+                    "texture": "#coffeeMachine"
+                },
+                "south": {
+                    "uv": [9.4,2.2,9.8,2.6],
+                    "texture": "#coffeeMachine"
+                }
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockCoffeeMachine.json b/src/main/resources/assets/actuallyadditions/models/item/blockCoffeeMachine.json
new file mode 100644
index 000000000..7afa59601
--- /dev/null
+++ b/src/main/resources/assets/actuallyadditions/models/item/blockCoffeeMachine.json
@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockCoffeeMachine",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelCoffeeMachine.png b/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelCoffeeMachine.png
index 99aac9c1904b465985155970547ef36edc675b9c..c8dcd6915400c3e9190ad8050da91855878b9f0b 100644
GIT binary patch
delta 418
zcmV;T0bTy61lt24iBL{Q4GJ0x0000DNk~Le0000`0000`2nGNE0FDvzt&t%xf8YTL
z5H}DDZp1hM00C%8L_t(|+U?gpZi6rw#_@-$3`VMg7!X4{xKmb+;LG%UJwq?Rnki9~
zp;1*uOc|0&?GjLjLS6Aui2lDNiXe)4cx}H9)WBN%sS#~9n?N&kBXn{*$3f?L?ln8g
zvK+knsX(SM0nU339DBE=0zrTTe@K7?I0?=<Ip-R`6W|O4Q)y%3IG#mdMNtHkJPZ4t
zTPIh6eI49=-&n(8zV$z>wLzc1>-8k!bJNrEL#y>pl9WWD4#%^SDAaR#-+2JPg;3oy
zMi_%_BCGXI%f|;LQK-AcLXzrF+89r7`@Igwvy3s4r0wfF>G@9KBnp*gT$$2KkaZ<)
z#~rNCbZ@(Vh-JWg7p~U8N}8F`-}V&OL9YO-O`}@-j4_u$?Nx@-dw?$|E1jx_t$y@D
zrsq$Awq5)80K4{iUHeF%K5_OHIOfLiz1rHY5#W`qfs^q885jQQ3xXhZuUKE7EdT%j
M07*qoM6N<$f)b3pH~;_u

delta 502
zcmcc3yn;osGr-TCmrII^fq{Y7)59eQNH>5m2OE$)Y?pX?qM||leKu|$3C(?e{i_%l
z7`J-5IEGZ*dV9mrkI7Ml;lh5mE>%M{krt=!t(%^5R7;+JF1d$c?NsUHg@$bbkt;aO
z)@@`AbQ3GTmwjRrv*e8Z_5bE8)va8$Dplo*iLYSi+p0d_%R2jK`cM2+tSQ5?vMG6H
z(wTLf4QGHz_80fJ;@uJT=60#R3Jg{srn}zt7mfbYvG*lY(D_t(D+$vB_I~eI2mRSq
z&BWlEFrRDpw_U4NCEc}UT(Ciyp~;!IfnmYq;)ZqAFXmJiys%^blk%a&>aIq#j##(f
zynDXSx1Y)}JFPeS%R25I7WLh)XYcOlkl<xEtgq|6SRgRHTe!cP&-KCAv-Poa=FdHr
zVbQVp@#Bt;^WjD>ndIc<lK%aXN{w`LIr8@J<f-RUxj{PT`6T@j<d{G6!L_7xL58<x
zAFfseMZJt+TA=&u*53U(r~4aLtSRGTEchDax@XJZjNj{yzISEFx&1u<_upC@^&g?)
z0oO~fl<xf`m8<aI<>U2C)2TB3ndKru%sEwg{9g*WBSIOycXm05G#W8Z-pD9C`2Zse
eE-b$H17A<xq{OhK9lwE5$>8bg=d#Wzp$P!2Zr8>D