From 098ee2f00092b76b65e90440991e9806135108e1 Mon Sep 17 00:00:00 2001
From: fscan <flo@chilicode.com>
Date: Thu, 17 Aug 2017 11:01:31 +0200
Subject: [PATCH] Making charged certus ore glow again (#3035)

---
 .../core/api/definitions/ApiBlocks.java       |   1 +
 .../blockstates/charged_quartz_ore.json       |  15 ++-
 .../models/block/charged_quartz_ore.json      |  99 +++++++++++++++++-
 .../blocks/charged_quartz_ore_light.png       | Bin 0 -> 826 bytes
 4 files changed, 109 insertions(+), 6 deletions(-)
 create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/charged_quartz_ore_light.png

diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java
index 317020223..0d8b3473f 100644
--- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java
+++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java
@@ -246,6 +246,7 @@ public final class ApiBlocks implements IBlocks
 				.build();
 		this.quartzOreCharged = registry.block( "charged_quartz_ore", BlockChargedQuartzOre::new )
 				.features( AEFeature.CERTUS_ORE, AEFeature.CHARGED_CERTUS_ORE )
+				.useCustomItemModel()
 				.bootstrap( ( block, item ) -> (IOreDictComponent) side -> OreDictionary.registerOre( "oreCertusQuartz", new ItemStack( block ) ) )
 				.build();
 		this.matrixFrame = registry.block( "matrix_frame", BlockMatrixFrame::new ).features( AEFeature.SPATIAL_IO ).build();
diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json b/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json
index fda7badac..dc965c20f 100644
--- a/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json
+++ b/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json
@@ -1,7 +1,16 @@
 {
-    "variants": {
-        "normal": {
-            "model": "appliedenergistics2:charged_quartz_ore"
+    "forge_marker": 1,
+    "defaults": {
+        "textures": {
+            "all": "appliedenergistics2:blocks/charged_quartz_ore"
         }
+    },
+    "variants": {
+        "normal": [{
+            "model": "appliedenergistics2:charged_quartz_ore"
+        }],
+        "inventory": [{
+            "model": "cube_all"
+        }]
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json
index ab02b96a0..31dca99c8 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json
@@ -1,6 +1,99 @@
 {
-    "parent": "block/cube_all",
+    "uvlMarker": true,
+    "parent": "block/block",
     "textures": {
-        "all": "appliedenergistics2:blocks/charged_quartz_ore"
-    }
+        "block": "blocks/stone",
+        "quartz": "appliedenergistics2:blocks/charged_quartz_ore_light"
+    },    
+    "elements": [
+        {
+           "faces": {
+                "down": {
+                    "texture": "#block"
+                },
+                "east": {
+                    "texture": "#block"
+                },
+                "north": {
+                    "texture": "#block"
+                },
+                "south": {
+                    "texture": "#block"
+                },
+                "up": {
+                    "texture": "#block"
+                },
+                "west": {
+                    "texture": "#block"
+                }
+            },
+            "from": [
+                0,
+                0,
+                0
+            ],
+            "to": [
+                16,
+                16,
+                16
+            ]
+        },
+        {
+           "faces": {
+                "down": {
+                    "texture": "#quartz",
+                    "uvlightmap": {
+                        "block": 0.007,
+                        "sky": 0.007
+                    }
+                },
+                "east": {
+                    "texture": "#quartz",
+                    "uvlightmap": {
+                        "block": 0.007,
+                        "sky": 0.007
+                    }
+                },
+                "north": {
+                    "texture": "#quartz",
+                    "uvlightmap": {
+                        "block": 0.007,
+                        "sky": 0.007
+                    }
+                },
+                "south": {
+                    "texture": "#quartz",
+                    "uvlightmap": {
+                        "block": 0.007,
+                        "sky": 0.007
+                    }
+                },
+                "up": {
+                    "texture": "#quartz",
+                    "uvlightmap": {
+                        "block": 0.007,
+                        "sky": 0.007
+                    }
+                },
+                "west": {
+                    "texture": "#quartz",
+                    "uvlightmap": {
+                        "block": 0.007,
+                        "sky": 0.007
+                    }
+                }
+            },
+            "from": [
+                0,
+                0,
+                0
+            ],
+            "shade": false,
+            "to": [
+                16,
+                16,
+                16
+            ]
+        }
+    ]
 }
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/charged_quartz_ore_light.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/charged_quartz_ore_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..0aab6f20ce85471f07dd1e5c5060936fe3410c59
GIT binary patch
literal 826
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^Rm@;DWu&Co?cG
za29w(7BevL9R^{><M}I67#JAXOFVsD*&lKUh;Ztq&pZ5?fr06`r;B5Vg}?9Q^Vuq;
z0!QudUN%1I^VM%3+n3!ByQMe%d(r)XU*Ox5qq7%O#PTbx5D>KCnCJe%UO<fBQ9xf#
zbZ^H7g?UXJoNpYfV`Goj_}+T4Y*UG^k@3q+e&eQ6omKZ9hwh!;<F<I-%+v!s84V#W
zRp)lHY}llu*|li#s#xRfM(zYY1*H@Rcb8}9cG_LgbL=owb5KA3nJr^Zac^<oCY_J>
zm{ro;*nC#6x>fV@SM~40d+X(+SDKgE{YntFV7n#YB$S-v%EIv8_MByisNl<G4q+m!
z-*>-VYX9Hz_779rr$4vfzbQKLtbo&^RckvE(qxUj&**d-E=!xnbeYGaQMh6C-Q58P
z&#cdlseb!aKL6g24}}lX8w8jf*w!!!H*C_GeddhbnKuh}l+QlhtmwaX{^hlPFZqia
zIy;txhAv#i+c0x3^Oe%QulB0*DhfFLh|R10`Q+k{e-Hod4VA0=z~z0dG~sUbd<MP~
z&K!pY4n+luM23cDE?Z?R_LY10eB0`hx4#a)%kOsU`6ywr^0n2;&wnP0-<SH!VBqI}
z<L{Hl>U+MI8!Hr_Tg&7d8hZSw{QcOSTctx?=5&M{uxa^l$5?;w$G2}P8f|2rSUl%z
z@Z>5<?wKo*JnwnswiMafHw6vWugZG;|MXwSx*tE6n{R8_xawQ*10R=H0*6?3@Yo1A
zMQ|&AIith)W%b_MZ|+AgwLkIm-!pOj4v&zl+z)JS-n$p~@t%L<>h*hmy_=i=PwLb6
z>+ka!*&U8snzQPyd?nRAUEb<>+5xY~Y2q`#*CnL!UU>87?!&Xo<x`KpnUJbCr&u;2
zD@~MpwR+k$=AiervwGYXHx~Ofw6wMaKky0lpVl0#u=e$?v!C~fPGrlNo+zDmz$etd
zao^0pN0f5^TjuE~>0W3Nh++smdM3))+x3Y~w44?r&x<RicQw0|ShGS~Ti>~aN*gCf
g+6um8oLtYyJSEUixxk`|fq{X+)78&qol`;+09`tF1poj5

literal 0
HcmV?d00001