From e28524864d722b4d9fd971356e92cd75b515cbcd Mon Sep 17 00:00:00 2001
From: Robert Sosnitzka <robert.sosnitzka@gmail.com>
Date: Sun, 24 Jul 2016 22:42:25 +0200
Subject: [PATCH] Corrected rest of generated material textures.

---
 src/main/java/com/sosnitzka/taiga/Blocks.java |   1 +
 .../com/sosnitzka/taiga/items/ItemNugget.java |  11 -----------
 .../sosnitzka/taiga/proxy/ClientProxy.java    |   9 +++++++--
 .../sosnitzka/taiga/traits/TraitGarishly.java |   2 +-
 .../taiga/textures/blocks/bysmuid_block.png   | Bin 16294 -> 16309 bytes
 .../textures/blocks/materials/solarium.png    | Bin 16482 -> 16354 bytes
 .../textures/items/tic/bysmuid_ingot.png      | Bin 15535 -> 15999 bytes
 7 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 src/main/java/com/sosnitzka/taiga/items/ItemNugget.java

diff --git a/src/main/java/com/sosnitzka/taiga/Blocks.java b/src/main/java/com/sosnitzka/taiga/Blocks.java
index 1e1bf18..46f4c67 100644
--- a/src/main/java/com/sosnitzka/taiga/Blocks.java
+++ b/src/main/java/com/sosnitzka/taiga/Blocks.java
@@ -26,6 +26,7 @@ public class Blocks {
     public static Block basalt = new BasicBlock("basalt", Material.ROCK, 45.0f, 35.0f, OBSIDIAN);
     public static Block rottenGround = new BasicBlockGround("rotten_ground", Material.GROUND, 2.0f, 2.0f, STONE);
     public static Block ligniteOre = new BlockLignite();
+    // will be optional / config
     public static Block slagironOre = new BasicBlock("slagiron_ore", Material.ROCK, 3.0f, 5.0f, IRON);
     public static Block slaggoldOre = new BasicBlock("slaggold_ore", Material.ROCK, 3.0f, 5.0f, IRON);
 
diff --git a/src/main/java/com/sosnitzka/taiga/items/ItemNugget.java b/src/main/java/com/sosnitzka/taiga/items/ItemNugget.java
deleted file mode 100644
index f054d9a..0000000
--- a/src/main/java/com/sosnitzka/taiga/items/ItemNugget.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.sosnitzka.taiga.items;
-
-import com.sosnitzka.taiga.generic.BasicItem;
-
-public class ItemNugget extends BasicItem {
-
-    public ItemNugget(String name) {
-        super(name);
-    }
-
-}
diff --git a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java
index 6350a30..e22db4e 100644
--- a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java
+++ b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java
@@ -66,12 +66,17 @@ public class ClientProxy extends ServerProxy {
     public void setRenderInfo(final Material material) {
 
         if (material == adamantite) specialRender(material, 0xd55cdf, 0.5f, 2.0f, 0.2f);
-        else if (material == solarium) specialRender(material, 0xffff00, 0.3f, 1.0f, 0.0f);
+        else if (material == solarium) specialRender(material, 0xFFDD11, 0.4f, 0.3f, 0.1f);
         else if (material == proxideum) specialRender(material, 0x2d8f8b, 0.4f, 0.3f, 0.1f);
+        else if (material == prometheum) specialRender(material, 0x555555, 1.2f, 0.6f, 0.1f);
         else if (material == tiberium) specialRender(material, 0x33ff33, 0.5f, 0.2f, 0.1f);
         else if (material == bismuth) specialRender(material, 0xffffff, 0.3f, 0.0f, 0.0f);
+        else if (material == bysmuid) specialRender(material, 0xccccee, 0.6f, 0.2f, 0.0f);
+        else if (material == imperomite) specialRender(material, 0x8decaf, 1.2f, 0.5f, -0.1f);
+        else if (material == noctunyx) specialRender(material, 0xce70e8, 0.5f, 0.2f, 0.3f);
+        else if (material == nucleum) specialRender(material, 0xd9f446, 1.6f, 0.4f, 0.3f);
         else if (material == dyonite) specialRender(material, 0xffe240, 0.6f, 1.8f, 0.2f);
-        else if (material == arcanite) specialRender(material, 0xBBBBBB, 0.6f, 1.8f, 0.2f); // TODO: Fix Textures
+        else if (material == arcanite) specialRender(material, 0x5e5499, 0.6f, 0.8f, 0.2f);
         else {
             material.setRenderInfo(new MaterialRenderInfo.BlockTexture("taiga:blocks/" + material.getIdentifier() + "_block"));
         }
diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java b/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java
index e074bd4..90fe19d 100644
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java
@@ -67,7 +67,7 @@ public class TraitGarishly extends AbstractTrait {
         float r = random.nextFloat();
         if (r > 0.5f) event.getDrops().clear();
         else if (r < 0.1 && event.getWorld().getBlockState(event.getPos()).getMaterial() == Material.ROCK) {
-            ItemStack stack = new ItemStack(Item.getItemFromBlock(event.getWorld().getBlockState(event.getPos()).getBlock()), random.nextInt(5));
+            ItemStack stack = new ItemStack(Item.getItemFromBlock(event.getWorld().getBlockState(event.getPos()).getBlock()), random.nextInt(3));
             event.getDrops().add(0, stack);
             ToolHelper.damageTool(tool, random.nextInt(6) + 1, event.getHarvester());
         }
diff --git a/src/main/resources/assets/taiga/textures/blocks/bysmuid_block.png b/src/main/resources/assets/taiga/textures/blocks/bysmuid_block.png
index 46e98319b92c47c721f69b131f1498f60e7726cc..97f51ac6fe9f485ac3a447634538706b41bb48cb 100644
GIT binary patch
delta 816
zcmZ2hzqNkD7G_>^T_ckaBO@y#11n>b$p@J&QAIYhvm9hpF*P(WF;6oz&^0$QN!GP6
zH8Iz<FitVjHLx&DF-$TrPc}+5-28_19t%+_C%@ye;6b)`@<;aO$!oc|Ht*-QHe_Ko
zW&1z*pN)Qfv8Rh;NX0FdgVEi>=@JYN-hZfDZkaOa?h&)>E9<%<UQB)9|8;uB!(I<f
z-7TyO!>4W2iN4jLcC%1z=9!1q`|S8@zrHJuy?*O0)5%+o=}|RZ6K)^uG&%j{^n0^a
z%sel*^UL?m`O<Xx`uqIrtxGkFoT{E*_^GMtX}G}Y!SoNkq8;@n9}Cmx{(P#>`M~g~
zR`cZV(+=P14`foCQKD3MCYq<nbHb#IckVWpodrKa)}GpZa9UT<OHtE3*8T<)6@JZ|
zX1jKiCeIxEl>O@Ff3}~Vd9sydS>TMUb44d^=A;!xt}r~^BvJb1@d1kqcD8|=A7z%E
ztoyse*7~`}<#*yQ)Vj^R{OcoUd`>iG-E}?0PuTX|tipCpoB9IA^G`0#KgRgl>hEWP
zkS=a9^;20zD&nb29{V0o*M23Vx$nx`+4JjDwwrH1D6G5j!*b0C?VZ<E4Hxa%QuiuS
zYE4c@u+ptowb`LfjG5BRwvm1J<#+E*E9|)`!p(g3o~*^|=lhBcC11%J`|jeezxdvL
z()kT%9~*u;(x1L+(d5@DvR998t8@9d;lPGz|NH*jE8W`q>0{bToh7|2@7aX9SksO&
z-<DkyC26#~>AY?HyoramTcxIdWeW37x2STfe%P_$RIaKM*T2A}*2j7Dr=@Pp-ZWwH
z^vvyF*W}GUVG?x8)^(jnM{voJ8Q(&_RNVbszqNOD_iCA!bA;~QdAm^PQh<|0X9b&T
zL+Zp74VU?cW<0Wb<k5M$Gt8-aeyHk{GV8uB?L(ekiY`qGLHA818zuisckEf!Q2bFf
z)a=w&uMfuyKmW_EK7ZtAlHQ8wC(9PUx*}5d$tSKL?Hu>_!(VU7)&2U<_wUZ8^~?+x
Zb4$yM8s_uLGB7YOc)I$ztaD0e0svJOcozTw

delta 797
zcmdm5zpQ@47G_>kT|<iyLrW_IGb;nr$p@J&QAIYhvm9hpF-cBJHAphB&`nE9HqkXo
zHL=jOFfumKO-@WQF|;%>Of*SN+Wdy~9t%+_C%@yeK(%FZCFkkQ|G57cu!JqIo-+BL
zjedQKr;B4q#VwYDr?X_j1sE=@+EtprzuM|jM#~467K!$pri0S;nfsJq=lFckN|9`0
zX5>~E+NM)_e)aPB@1d6L^>yEGl*SgYG+Z`#zVe^YjtIBa$#a*lkKeap+R@YR<^ORp
zG8^4rw`{w9h)9USUelzzex7aJn^ZINKTQ<yc+|hOUNYw2YxQLki>Kbw_~fLwbJM1E
zOAP{6PqE%*_l;4Nslj{u5(&;9_qXlToPU0uo6=LRGp`OyuquT2D_j-UG(GCMGWwVD
zt&cw!E-<=2tFz;Dl=sXTAv3*JpZZ~<of2Mkzbd51xn|~-r)8y{^>tMeV$YZUT_69@
z=v-Mw#i~Tkbyl7AUtFr<oc`~azmF}l?#H(#y;-H(MebJaus(CGyT2ml2S?V7M_z%J
zwJ!x7l@I=Ut+?m+Tie<_yEij(@!mRq@ukPi#5@M`sc&Kg6FB#LE>nGB&Y5%Vx{Qq9
z=J;ink3UqNyT(=g{JdhC&)+95s=c!pZ`o;eCgkmf4L8&|Qzd^zN*t`e?Z_&t`+5V<
zQoi}Sw@i23yyVZr$i14<&(6O6c4~)$ec>ec*V(=^W_xG9*W9hO!lUc=MRR4&{g;+(
zYRSB9arn^;w`r|c16ht0%sX7#nm#vhQGDzZ^;<t&u6x$M^S>hdjfqn+^R>f4Psi?*
z)kkF67z%t8m)y_K5t3rrnm<2c)7sj=B~L=UzW2s$7Gm@?`1U5zq|{Hi>DmhExmMHH
zYw_vX-CFh}naw%Ry+3tTrQAFtL*BoO*WQ~JrMb6zwd#!7Dn+;7)&H!hpZWV)(o%yk
z(fJ$Rd_QVb?I*=-nfmT)x%uhOzkg5rU$@{tJA=)Y*y*N=9al0iFfe$!`njxgN@xNA
DXh&-5

diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/solarium.png b/src/main/resources/assets/taiga/textures/blocks/materials/solarium.png
index 0fd85f4f4f67ec4de91677cbc469915e6637e9a2..585911fc56ca4c0dc68e8027e9e7a881ae56a6e7 100644
GIT binary patch
delta 827
zcmaFV!1$<s!%k)nBO@zA11m$L$p@M3;GE6uEC(4?%uUjgEzM2Mbd4;N&2&>NOpJ6B
zQ_PKY6H^n-lP!}|O%09AH@{(h!$OqG$$z+P5f(UdA2(zP2sqL-na5VIo@tV&i(^Q|
zEt4~e`HRvR*bD4_?Ty^DTPJc_>^s-u>E74hURt*I%Nn!L*ItUc0gfU8E-c+jf`Kmc
zrzt%-_<wK2x8Dr*Y#+NO$$m_`yzi~#;)!d%S|q+@Uoa&t^4`h?Kjj`x|CqeDw&vHa
zu9=^{^{agF5a?}PxA?`y5;^^88eB5<MFsP{9=<=3qrRE*-|+?2jj!Xq9zS!~v{qhn
zla=&th7W&S)Q-LAboN}_`G1y*WF_N)2LX>_pKkqV$UXnRwa?D>Jsj+tE?>Wt%f!%L
z^tRe%-J|>bJOv)+uQzH{EDIB}WH?_|6S}?XRKWFH{QV}?(WiXx{OLL>U_9|=)wgIF
z-Rk=9h07hU2{s%On7cZEn$nx5=SMDbJ>JIi?8ux&OJ2kpG^&X(i|sWosDJmhP45o-
zW5$nXVxL#ts$Fth_0pkS%@onorProQ@oaQq_+Wk^$He7{Cd2ORjL^ELtn(6Y%I?)Z
zsc|}YON5ltXDg9UypbK#*7vqeim|s|U-z%7zDjV{y82^xwZE>?-sEX<d|}OJo}LIc
zw{ANN@6){1F;^@;-7Id+)%x0HZjvFCTU);N^NBbHg;@@E$pI<%CJRc`&i?zbX!^Wg
z2Iacmdrp^0i>R#M+y0q>!CmZ<xJJDp!?OGDCcN7?Ct#BiYoWqN*=>m{CoT1AED3%k
zHOZFYP4E|g$tkV%>%V+{!pfd?<%eSY^yu)~ZDxV2vz8j2&s=n8P2A)PW`;+G&D$l?
zSd?9!h+VzU_GYTur@kvidh(33O7hcJiRw>dc#+ro&Hl{7)lYI|mHR{Lw&(esxy`-2
zY@VB9mr^17?R^_&{_qr7cJR)#S=Q$hS15=+Qh2!j>*>imkF-yHyk)(vcwh9a<~Og3
r*Jwxjv;LO7s(j1pw*Q;?%nZJ(rU#_l;u2<HU|{fc^>bP0l+XkK2{U){

delta 956
zcmaD<|EPg+!%k)nLrW`T11l5r$p@M3;GE6uEC(4?5=~5vO%n}MbuA4I(sYwdO;U9&
z%~F$fEsYFJj7-eal8r1aH@{(h!$OqG$$z+P5f(UdA2(zv*}(N+GLNlZJ+qLfi(^Q|
zEtZ3?{cmwFFnstY`2FLgr_)Z?MsD)f`@QAqw9~24Wv7MAjr9v(6}&1qC*6_365ZHj
z<K-B~x+*A6^vT0ht5<MLi8{6Tz*>b}JKy}NsJjur@jm~H;LLRq3z!!!;8hOjch5G|
zyuzNi>15&ZsYZ+Ei#*StxAy<T*y_dgl@>))mNoo3^j1c4!O1D%xnB-@Xh|$h>P+hu
zl|FOxlWg4I@FMTY+_~RdzXgaKjpG;SO%6A<|8(spTkJXaNnvXhpB(+adyhz&`3u=A
zn->aH=xr6YJM~QK=wW^F=Lep<)qXg9Wa5|YMK#|q-<)~lt<{!gdWVm_jhcTp=+yIl
zvGLsXy#Jh40<P@+_2vBeh6_0|>3n<GN)IGH%sx{YuVPSNAzU~+K|Sf(nstR!C%5F)
zSyV5UEar25?J)0v--?t&TU=f){o+`3A@k~*1@*61N{5M_xVz?jjI;QwlqvVPxNOV~
z_A+>McWpgwH+x=pSN!S@kwD#van`aov|gk)9ou@jW>I};(nr@Be!;gaD<vi|ZQ<VY
zg5$5pvqL?dK^xA>@Vg2cFG}k)@}0o)>e!bK!AsjJ?dJEW1_)Rbt(wUr%N#4X`8a3h
z^Lf2q@BZ&JF%mmoxH*Y)-sA@hbj16)c>k#+ysdcRARPN7td>(;&Rlo-lJdiw0wcbO
z&6~|*aq)7Dk^DjXdIjyXryg$5k5es=+Li9muPZDaCbTv2)ASulb8f`+KFTxyu`lRE
z%qG{gU(2WEfBjTbQG32N)annHJ=3qfc^_W>?he{I^Txv$U#4+warWBl^Xgtp3|j{O
zthLH%iqWzrt$tsB)ZgZ~u=cvrhTfBMWzsTMYfIMcxwv=srjyIJn}^2K?_3fcY1Vve
z`}(vDt<UQfYFOkMo~wu4p7?6v@3$i7yy`ZdUas@n%YMrX`FQCqJJ%E{rW6EjJaRnm
z`<4msGUhSxDxb-iFt1(1?_SY)yE2`gpUd3)gMTwcpMLmlkMG=@eCgl6c~=MKRPJ;5
z!QjWb@%6VgpG=MZS#W7S7UuUdYx%18c+cUudB5g5J?J`lVbcG*6Yo3~n;*V?<9lWX
Zu^p$s#LvmLV_;xl@O1TaS?83{1OO-m!Hoa_

diff --git a/src/main/resources/assets/taiga/textures/items/tic/bysmuid_ingot.png b/src/main/resources/assets/taiga/textures/items/tic/bysmuid_ingot.png
index 821a46087a9dc1c3bbf446b63bae796c9a6dd57d..f884b0ca79baa7f611b5fce504a572e6cc04935b 100644
GIT binary patch
delta 811
zcmZ2q`M+j@1(WrRjaF66yym(_CLu;fRz?O^MwXKgGFzgFu(QlnF;7f0Ff=nr(oIZG
zvCuU%GD+4=GBvc&H8eJ~v@o|cFiA@_+kAp0f@ShuR@cd^*&T_}F<F4a0?o2>Y)zBT
zvvX~J$YE{BGGWSpyU7Yx`t^yPE{-7;x0Xyk?H!URajgFS$DY3QIo-<lf>v(vkvJ)$
zdel2rb0_CTGr^Dvt5rDuu-^*pE_&*A%C-AW$zliHmW-*AlBthdWz?T9TJ|`$_}I+i
zePWXY9XafFi{E>GocsM}4o%hSiHGD=i%$E!$-0<V?y>r;SLxkK#tV0^@-_Ubw-1in
zrlzdKswm3U7pIaPul0BRyOZ}P)a$*-EzrK+e!3*qN<c#7dfdVv6^1Vp`4v@plaKjc
zPiR@OeEO+hZWr%f-N);(byjLwnA%d+rBCEfDNA)Hwp_osH7Dnzpidh6!>0=OU2Vmt
zNl5(gO4u{^x_@=cima@Oy~|H~Y@5+(tXiMA*=nQu$|Fm78&hhoxVyET`{Kp)cz%_J
z*2;%(JJ>rN3yMTk9leh{)p8MS%D8gm!V#|X_kKu9a|`uto;)e-nDm_Vlkbm}?hxue
zdFp1esmb-LMz-4<Uj-!VoIAJC{yE2CVaFbMfjH@dpM#T=RXr9Rb=ze+cWI^U!WkQ_
z&Zr!DUB6>_&5f-ZU5cz;E<#)@Eqpd?`#1C0E$%BJa}!NBd9J$LlXOXQ&FUn@gAbxJ
zSo`mLpKE;c)_k4r8mB6~=!F~)H?-MWN_Jm%GuYr#=O`Fhvd5V5*S;@_Ik}$-Gdh+W
zu`qf0IIuN*#nY?Lt=`?+dG}V?;@&%Jnpx6ne>BH2?b8gY+TB)v?tJ^f?<<Ua7V&)e
zG$s7c)FaEDWHaboXM6H=wfW1+KXWFBJ}oJ`cW9kwQem{siWwpd{KoH#Gnb_vzjNXB
zFJ^`rnxDKEa_}ftUjOg(M(xq7$w&L<F1&eDivLB!#@9w~x1QV2#!%e-_NkJ)N;U%n
O1B0ilpUXO@geCxX_-f+-

delta 665
zcmexgv%YeI1(W5yjaF66lRY>@C!b_C1k?O1QzyS+SKEAwC5&bBEv`QXEFA^~YbW2b
z*01;Wba4!+xOHT*zsKZ4nPc|vU+=cOpPP5C#PYh7)-;!-7S2qa?lU@z+*l)z?{SY6
z(wDXJaItn1+1+|U(dMf^f1vvGnG^mCnUzN0E=k+^$2k7$-%<hPg-RbT6#w~Dv(M(k
z2M;HXZAvqBy|h+;{X6+$+Gg(TeN&x}pYvphJ;=aNf9n2%qU~DKmO7~@Zr=S%Xz4no
zs`xvi(*AX`7u;FP)vLt7XR>Y6`gLsSW@pyK^vsh{lZZ-F{nPVnnQ>6K!G?JU(l&EX
zKYjLIl)R|u)F&B|J>8roS9>b+I*!^{pL)Zw_uOQe98ZIr!45A{9a@~%tE{|tU#(9r
z-)*Z%l99xQXS3@yO?5YFL<b(>N?vTZ$2Hr<SnU}5yv?iEO)PI-%u!<J>Ne4LRp%;O
z(<fe1yUfnt_`%X2?{DzQ(Cb*n;lMRUQ!aI=F0NSZH(~nYBjK+P-!Ex7a)znvsKP`)
z|HmKSCDhckw4OJ*x&E-rv=F12l00JSx8K~3^qIc!L?+i8E4F04iS-^Vvv)Nu>JGiO
zB~<O%LYA5R_t`D)T<S{9Z8UE#TxBbk61#Yz=6rr<!$p^^y5=2y`*qFr89zVqwjVy_
zq~`1uq`Bdy=7z{lzq1?nUt(M%=)dg6Yk7z3(_Y9|^skcI_)2irU)f2QF4XM%eD3Wz
z>G1Wj%QvN{uRJ1h@`uXD7b<C+y;8I!pXaXNcTG7dT&TCD%wzwxbqsHp{}sP2Z@WiT
zZ~I*p8_~sA9xqz{+pa8>`N5QW<1Gu<B`~af9QXbF;mhj$EjnwfXP=Mzsk|kV`+se(
cJsZQ@HxJo*J)C|qFfcH9y85}Sb4q9e0Jv^DBme*a