From 6f723f64bd7023e0bd042b4bfd8e1323ebd3bec1 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Tue, 21 Jan 2014 11:28:43 -0500 Subject: [PATCH] Crystals! Currently useless. --- common/mekanism/common/Mekanism.java | 15 ++++- common/mekanism/common/item/ItemCrystal.java | 55 ++++++++++++++++++ resources/assets/mekanism/lang/en_US.lang | 10 ++++ .../mekanism/textures/items/CopperCrystal.png | Bin 1649 -> 1649 bytes .../mekanism/textures/items/GoldCrystal.png | Bin 1621 -> 1621 bytes .../mekanism/textures/items/IronCrystal.png | Bin 1611 -> 1611 bytes .../mekanism/textures/items/LeadCrystal.png | Bin 1639 -> 1639 bytes .../textures/items/ObsidianCrystal.png | Bin 1590 -> 1592 bytes .../mekanism/textures/items/OsmiumCrystal.png | Bin 1646 -> 1646 bytes .../mekanism/textures/items/SilverCrystal.png | Bin 1691 -> 1691 bytes .../mekanism/textures/items/TinCrystal.png | Bin 1639 -> 1639 bytes 11 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 common/mekanism/common/item/ItemCrystal.java diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index e0195fdef..08f89feea 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -58,6 +58,7 @@ import mekanism.common.item.ItemBlockMachine; import mekanism.common.item.ItemBlockOre; import mekanism.common.item.ItemClump; import mekanism.common.item.ItemConfigurator; +import mekanism.common.item.ItemCrystal; import mekanism.common.item.ItemDictionary; import mekanism.common.item.ItemDirtyDust; import mekanism.common.item.ItemDust; @@ -246,7 +247,6 @@ public class Mekanism public static ItemGasMask GasMask; public static Item Dictionary; public static Item Balloon; - public static Item Shard; public static Item ElectrolyticCore; public static Item CompressedRedstone; public static Item Sawdust; @@ -270,6 +270,8 @@ public class Mekanism public static Item Ingot; public static Item Clump; public static Item DirtyDust; + public static Item Shard; + public static Item Crystal; //General Configuration public static boolean osmiumGenerationEnabled = true; @@ -754,6 +756,7 @@ public class Mekanism Sawdust = new ItemMekanism(configuration.getItem("Sawdust", 11230).getInt()).setUnlocalizedName("Sawdust"); Salt = new ItemMekanism(configuration.getItem("Salt", 11231).getInt()).setUnlocalizedName("Salt"); BrineBucket = new ItemMekanism(configuration.getItem("BrineBucket", 11232).getInt()).setMaxStackSize(1).setUnlocalizedName("BrineBucket"); + Crystal = new ItemCrystal(configuration.getItem("Crystal", 11233).getInt()); configuration.save(); @@ -793,6 +796,7 @@ public class Mekanism GameRegistry.registerItem(Sawdust, "Sawdust"); GameRegistry.registerItem(Salt, "Salt"); GameRegistry.registerItem(BrineBucket, "BrineBucket"); + GameRegistry.registerItem(Crystal, "Crystal"); } /** @@ -898,6 +902,15 @@ public class Mekanism OreDictionary.registerOre("shardObsidian", new ItemStack(Shard, 1, 6)); OreDictionary.registerOre("shardLead", new ItemStack(Shard, 1, 7)); + OreDictionary.registerOre("crystalIron", new ItemStack(Crystal, 1, 0)); + OreDictionary.registerOre("crystalGold", new ItemStack(Crystal, 1, 1)); + OreDictionary.registerOre("crystalOsmium", new ItemStack(Crystal, 1, 2)); + OreDictionary.registerOre("crystalCopper", new ItemStack(Crystal, 1, 3)); + OreDictionary.registerOre("crystalTin", new ItemStack(Crystal, 1, 4)); + OreDictionary.registerOre("crystalSilver", new ItemStack(Crystal, 1, 5)); + OreDictionary.registerOre("crystalObsidian", new ItemStack(Crystal, 1, 6)); + OreDictionary.registerOre("crystalLead", new ItemStack(Crystal, 1, 7)); + OreDictionary.registerOre("oreOsmium", new ItemStack(OreBlock, 1, 0)); OreDictionary.registerOre("oreCopper", new ItemStack(OreBlock, 1, 1)); OreDictionary.registerOre("oreTin", new ItemStack(OreBlock, 1, 2)); diff --git a/common/mekanism/common/item/ItemCrystal.java b/common/mekanism/common/item/ItemCrystal.java new file mode 100644 index 000000000..98eca40e2 --- /dev/null +++ b/common/mekanism/common/item/ItemCrystal.java @@ -0,0 +1,55 @@ +package mekanism.common.item; + +import java.util.List; + +import mekanism.common.Mekanism; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; + +public class ItemCrystal extends ItemMekanism +{ + public Icon[] icons = new Icon[256]; + + public static String[] en_USNames = {"Iron", "Gold", "Osmium", + "Copper", "Tin", "Silver", + "Obsidian", "Lead"}; + + public ItemCrystal(int id) + { + super(id); + setHasSubtypes(true); + setCreativeTab(Mekanism.tabMekanism); + } + + @Override + public void registerIcons(IconRegister register) + { + for(int i = 0; i <= 7; i++) + { + icons[i] = register.registerIcon("mekanism:" + en_USNames[i] + "Crystal"); + } + } + + @Override + public Icon getIconFromDamage(int meta) + { + return icons[meta]; + } + + @Override + public void getSubItems(int id, CreativeTabs tabs, List itemList) + { + for(int counter = 0; counter <= 7; ++counter) + { + itemList.add(new ItemStack(this, 1, counter)); + } + } + + @Override + public String getUnlocalizedName(ItemStack item) + { + return "item." + en_USNames[item.getItemDamage()].toLowerCase() + "Crystal"; + } +} diff --git a/resources/assets/mekanism/lang/en_US.lang b/resources/assets/mekanism/lang/en_US.lang index a5986c49c..df2f3c8c4 100644 --- a/resources/assets/mekanism/lang/en_US.lang +++ b/resources/assets/mekanism/lang/en_US.lang @@ -147,6 +147,16 @@ item.silverShard.name=Silver Shard item.obsidianShard.name=Obsidian Shard item.leadShard.name=Lead Shard +//Crystals +item.ironCrystal.name=Iron Crystal +item.goldCrystal.name=Gold Crystal +item.osmiumCrystal.name=Osmium Crystal +item.copperCrystal.name=Copper Crystal +item.tinCrystal.name=Tin Crystal +item.silverCrystal.name=Silver Crystal +item.obsidianCrystal.name=Obsidian Crystal +item.leadCrystal.name=Lead Crystal + //Dirty Dust item.dirtyIronDust.name=Dirty Iron Dust item.dirtyGoldDust.name=Dirty Gold Dust diff --git a/resources/assets/mekanism/textures/items/CopperCrystal.png b/resources/assets/mekanism/textures/items/CopperCrystal.png index ab65f9a094d41516c64b671098fefd64688e388b..e67b3c7bc31f3a87241f6090e97d7ea3e0b818b3 100644 GIT binary patch delta 473 zcmV;~0Ve+O4Dk%GqXd8d<2N%Wkx@VJ?8kWnvn(N(^XnAh><%6#E<1fs|$f`v7z>CSuEF08u!;lT-6&f}Vse zMhXBR(DV5bZCNvu)A{l3J^RS8r*s6DHxG;z%()E-#+tp)U~hj)2^dH@!iMT}u=>-3 zZCxJTp4`SA3jj^XvAMcTF_>el1x^vg1)vq>G@%#UvgP?;%?0q2ikK+I7VVq^0QlOS zT{mbePWIMEG6e6MDO>Q-BZEF}1OTkF4Q}nwEnAZwSrUK-fO#}<(Upw6kv$W+Ql zW2qbkz@X|Jla+rd`gr|9o6b=H8gv?JktF9TmH>D+L8;Zs_+)EEkO?^FDwY7)U{+^v zyAGY#Rsnl{x;7So?FAd$+BJBNTzU=dChY}lgPyYM3kqNFw=T*+sxtP0el?N64jdPK zW3OWg0H0W`jAzRPULSaXd0YTNAc)U6m;(SX9&Xi&tGiKG^(n~=tOfy(uZ1u^>7 z<{|)iqt*QgmK!hK!t-tSLcd_sK)G*qgI*W`fFnWJO|#U!Mx15*zZdHZ=~S`~Vloi) P00000NkvXXu0mjfU&Yzt delta 473 zcmV;~0Ve+O4Dk%GqXd7ydDPdc{dwbCj3q$w-CCuXH;APe0Ib(nV6H&yH`|>B2(un8 z1E~7qcxRXkAaa?QhOH65u{F$I9VT+Lh z00{JaeneZ=%;a=_e0$G6GVCcG!R5^ZV+C_=LxQnp?=#q&QUZSlQjV~pIvuS3^k7?; zhqouUamNBc6LM^>E>jHV7;Ax3L~#LVMLA9A#kOpDK3H=B{G=i#im^pI=Kuh{c4yZO z+KQ9C^^pw0yJpH3eDuhmj~f91>uiHtJ9Nv|q(_znpuux0%ki;ABmt;%sxmT_^3hl- zM*%RXI>%&Xiavi{ztE<06o3YuhFT=axr!wK-c3+ywK6{0S`lOd&bf*u05+J_8QiWz z=e1S9o}aFb1z>x@2Df$%o+FoDL%T_P!P=mw?D~Sj*ZZxDGLWi_eV|`WB(MX=Mc>%# zSOUN&Rx9J#GJ)3z9$+39KoAJxGY;ke0E~xQwc_gTRee!PG6SnY0qZ(tWkW%Xezmy> z0N!YIKZ51POSkZR+r7{)*fdb?Tiu`+MgZVQ5O&inb*~X;8UH`l-(%nlWcsoWTt9^| P00000NkvXXu0mjfJ*?Yn diff --git a/resources/assets/mekanism/textures/items/GoldCrystal.png b/resources/assets/mekanism/textures/items/GoldCrystal.png index 736d7d7974b87dbf41cc27e141018e3018611385..3e5e2a1ee99fde480e8be93c5a6021cd00a286dd 100644 GIT binary patch delta 451 zcmV;!0X+WI4Al&IeusrvQh zq7kQt#1OS20(`hIm_2+IDIxoYs1*@t%BG*m`3`w$6Qpa@0+J!%f$AC`hXe3={8`mE zhJXjT1eTdgt1D5AffEFH+1gSa53T-=!$m!V4ZQ@U2{BFLUa9UJ#bT?2K#BZ-Ql$_{_X}2a?jWF`L!^}>N*=|C zKhqZkng!9pM4VO)GXwoEvc$FTwewijY>yUySxcJAd)d$kuR zNM?S$xh^+yQ@3os@p8Siu`xRo$XA9w;J0Q7EWTV9a&!NdA_Dq})yiA0|AVEnO-%%rl#Q t9NEXc&=QbDkO()e)91t2iTii4z5%LgvGXX4uL1x7002ovPDHLkV1m;&&yWBB delta 451 zcmV;!0X+WI4Al&e3Rd>(&R^^GCm zK`w!1=F;j)6l3570baJYRL4WBzvFOG&tO9@0ck>vlf^E~U`~Il79=Iz3<0gER#Kc2 zs)cwsX9x_h2nXcVLWZ9Wfw#HaIyky-Gft1sT3d{CBdS`G!&fGL-!KH?WD6dzOT?;G zdu2TY6uhLelAN%J9s-))U71&^J4dnD>L5@eKcG}8MAH3&Rh>HsDCiJr<%p6;F(Qz9 z5?ETU44-VR$6J3OT=FPJ1VXUT2Y474ACD~)PUUf|fPn3V7~HNic!`~Rxzk?l1qzax zUvI9vmDk@W3bmG$BV- zRWzeHrCJn}ShxhVqN$QHk5!BNc6JH;q#`CrsYO5Mhyb3>ZnvW^tX8YuhT%1$s)ZQ6 zGOWi&M8F1HaO=m~sx|e>vIG>oq_UD2TSS(C2InfHQn?t#Qaee2pcVcn;#YAA{RyNx@WAmEMb^%`wI?lpL^HZD5! tSm2!YLQepJBw-J|a;?cbef^CgBo5)%*SaDb5rU zbJQ9T(BxonI2?+Uz_~eUEuLj&{%kgzjQ86`(p}d*H%_P1{c^c{j2?UhL<#`td_I?) z>tmRl8@JnSQr|=b0CGGYi51PIy-=c<0uKnN)7q#`2diJN*SddQ)H6IVN&rpBQB@Vq zXiljX1tk_P0j+4Nq|9U0;=Y|-0zavU2~uj&&p9H1r?cDb=nJdWs<&Zyji_oNMz0L( zu@Mol!4};5v9@YWy|OF;1uvMzPdR5+JAsr)*V#5Pj6d005o{7Jd5Qx97R;^*Zuha~vsJ=gobHVhu)ScxtzW@Q z?9uN5?FA1o=f`zn;QIix_l=NLAXgdtK>uqZfgQLm#-_fO1_byMtCjI?nZWAk;iWBpwPz5o{G#0lmYsQCZ@002ovPDHLkV1kX#)S&fH5zxiKU^Kd2DbYj%c}+1X<%(N?gns`jmFJC-^nCutar2gW z3IOQ*;*KCD%f%TynLL`e3^|bk^Y>R`dDeO$q1bFT@^VX^h(LcS7}ZtPZXLqvTl|Z^F1))jFtsIH^ZT)k2JJ8Tw7lBM=6M;Nd*_p<3VFvLXQmw^U|{35zHa(BM*KRH_uC zSn6lr0f4FkniPNfsW|IfkX1lI*O3+^Emtujkh%#ft=S*QshkR-ySP4;#1P2&DttWPmf#VW6GOPl}z002ov JPDHLkV1mE>+vflP delta 467 zcmV;^0WALK4Cf56p9Fuuxg8x}F1O9E$}ND!JDn4^Z4!Gq0vK<%`_Bl~|s&9!MxQn~l8OQYRu%3Pyi*Rkd4(u=>{ip;O{k zvHiUc&cR2h{j#VD5g z*>?b-s(>bieky;?`W9prP|$Ux1xd?Qj0mJ|f=a75fuHP95fZjs#fU%%7WN4qj-$_O ztAtZ=I@U;l2aHJ}csS2EtIZxl0_a)bnA+039z^7%e(SOdlq%yn&{tDQ(Z_Z%Hutv_ z5#T3QE92fOFn!t-VQv>lkO=UZ1M3mMWUqJT#^VQ#iF``}>x2^4ar&x;lBj>RIS2x& zwpe_4!_(=LOT~t9UeZ?wd3qLV0th6DFlm#0U3`5{>Lw`z%V!8c_qMbBWqR93Q+@)i}0Bn zq69E3^5_L=ZG$vcEX6ngNE%1b?97PS-^zWq-P4Lm06l~lm$HPI&84bkMumk7 zz!~+H6mgttL6yxez)v!Q_foZ>$7}%>TX}*`zU4Z}DtNu+YN-vkOxIJx0%Z2qd8Ql} zwpzU{s{*j|mdt-zY-|!$05+~=hDz0J*cZ!1061milFXHYjdxz4Bp(;L>tt_{-*uR0eR%RrCO?zibWX+2**wwPj$>j`t=3>{+nRt)88?$ddqk7CeVF zJ+~`7>%J`&0cx4SG5>0MaM~`|mfkHrfcO{7nW47`;+I+$;uxHO z9bK?s0TLr1j^;-{u9HbhM*@i~8YlMH&vw!okzYQBx%o~j0fv=qR6Q$14M5IhDRV=V z0EV^P#^Q8BbXUs*NWqohRi0WaaZt-VfS5Uc&gB|nZH~~L)rx=qEWogl`&uARmsRXt zc3tPj0?4y$y&$b^kj9Fo7<&Lo;|Q9a88Q1yxy!bDS}_TrhY({aYlzugs#<1LShxV3 zQEy2R$Eg-n+3W)RBqMk)RSSB|7GSZH2k7KWE|RQ**ITZZ+HlKsJvA&qW^bKm%5h<< z)!VWv06TBVti^xECQ$`o<635@RLzEcv0MazQ#LNiTq)Ri=LI^RivaBOkkV?9maFIi z?A-(|EoX*THfN+VfLpGj2VnhWYdFs~#|5q}1ABJ7Hwj?Rf^}~7?7T&u1mLsaIjrfq zUEx{xYpDoO%M6bBU(wTelDn27;^ezCDu{Pc0anb{~&d*(Jl7000!TZ|9gQBexfF7*l`e6#%+vWn`y=*?%qU zs5+}>cpwP?O~^67yg@OTW2^;6k%bFDGa8ms#<6TsZ)X?4PcmYF7+c)u900)E?zDZ# zy<&Z3ZXiSO8d2GTjg}1S)Cd4rW9!`RV{O?Qwq&&c)Ok*3IW{(lS^#QXml>I=vr%6v zM*+~O8pmX1iZ*{C=6YdW`j ztohg~V9!o;rvkdf-ql+Qx26 z6#)FiYG$l0gLr-50cN=XfsItJB4R!?Sez)0_U_B1^{445cbeG*BX4Be*dnoZ@j9$t~VEjCjbBd07*qo IM6N<$g5-|ZasU7T delta 466 zcmV;@0WJRS4DJlDrv!g~^H^#$dy~dD9SeZqt6QyN(jaDH0H9xNtd;+*^4IA-KXs>| z8~1P-K-LFGC;eCek;}v=Y*hega3JVjob{PVfxx+xjmKVX32>mfz3-h1bOe3#@LB4I zD_Ot*9PJ(72hLLq2B+P}<5hOaa3%l%#q8TTrpn0eg&fAzc?ExfZdw`H>0tI>3p=XL z>KPtL0zeaT%r9?H4CWYXfl*}P0?>?xrIc|jTh!ax1@M!M7$C+L_c;du@U}Z`A9Al) zUzr=o5WGfIwqTV%2osL2+g5*4k6#(9opwwz+{A6oJkO?^FQLF&4&g`1btsZMW zwhGv@Q(Y2(?FH-H?yK`0Ie8z@Uho{&?W0`0AK{-B zf9VG5yUR}D*;>2cP`SW4?S%mV7!rg%G|sgKAE)1cUw@Z@Z}LRGu2bfw-~a#s07*qo IM6N<$g6z=Ua{vGU diff --git a/resources/assets/mekanism/textures/items/SilverCrystal.png b/resources/assets/mekanism/textures/items/SilverCrystal.png index 672776b893ad7f22e1870f1cb62e784ee705663f..993aa0ab5ef5e1c65abe4c801868156ed80a5aaf 100644 GIT binary patch delta 512 zcmV+b0{{J+4Vw+HrUZZg_{|FBrzbv|&9Bw90X84aji_dmh+G7)J~TYU@W=5%v4xYL zv{nVs^~TP6bsvxjRiY8K5(MPtV6eTpTUDYK3FOtn*p%}g0TPy$7i@Xj8cE+?m$@E% zWSRmfw6%B4B0-j$6I?tx4L&mDBougmJ7X=)hF(Z0R=O%_xxRl%f`AWO5-#@I~-INP6^Z9D1yQfR_ z_YK6bY&NT+D5cuc=>mVU8GL=IR9z6xjg6{~OuKq|d{(GQjA@+;m_W{bYVfnI=PuMF zzzaqKW^pr4T&Q(kLKcvBfoszG;_@OQ$M(0*serFDzKD48)s&>@9;7_dV zjAttg)2Fo&=5c`piJ(4nU^M~=&dyD#!~GM9N%$-*1Cp>@r!UozB;vo?Tm%8zs8qf_ zF~%;=FO>~z;)th3p1cb&0RTvX;AU94c{A$&y_%nOAK4)t>Mx4`0000A04d{AuRmwzk4}S+3^@q}-rvqxOS7RD5{i|sN?NXOk|2NJ1Eaf4XJ-sy_o--1 zN#dboQAj(2xUz6?2{|Sv$LVTTZmtCaCRPIIh$G|@5-Tm#3K>=c-|2{(y3}HvRwIDd zZe?+mG1WKN8~boQ&_H{<3 zd>C0v`p$O%MWufNGRgF9xX`!2semlnh_oOX@+qdwZp!x$Yj-#0!pwZW8tU%pQvH1c zF)W+SswhgSwsg9{pKJzSUn*4>gmYt~sw2~`o*thSY7%2wrvfIBbDtXgZ0orTH3{&7 zk$_p;j1w1XotKaWx?g=d^LC_Df&1rVqO215(M}YD?8)a z%EI(%ZG?GTAVDIi&m35d0D`k~Q|fU4L}C&?3(J5cEZ6BvH6)4nuQnG!z&0wCuTPAz zi}Oom!0WbdN4Cf56q6B|GezO9Nt=-|G`7Ngoz~QZS$1R$~N{Rsdt8447)vhvzgO|sp zTyEW1Q~^|desNi0j!Bd$QAe$SfF2G8cemYdCGsS&ug;YP1gw;M`$yIltVwznwFu%7 z0MONSpRuBuhckKb`ZVgByjsk~>=A(DZSagK7^T&fD5l^60S$jz8`bGx^&5?Cbr=D4P-P!30W3IW= znbXQw#{iz66z4E8}0bRs@@bOFqSbfCaN_f?Ge<{A`tQ zEKhw?3D{n+;5M${C3f~n1_14a7+@|wzOHIl^|*~a>yirODq|n$uV#!Ku8X;;H$p&w zf3aE_@0N$e`XEM_*98(J0(|0N_6Q(&aCq$cy&KI5YywDYKnbg#wyL2dCQofTK_E6h zKi)le@8RCXa&4ZsX|%vT?S%;eB$9;PG|#mjK2O}gi}eL%y}ilQ+cXIP00000WbdN4Cf56q6B}NM`LSuxM+UMsRM9$tKD&nCb5zt0RQURx@)zojN#zraVeKu zHx^X@Ri9s6R+wWFWlGdhDmZo<%K!cmx1+ zb=_yIXy)Ne9=tw{`X;Xyb1{1a;CLH6V+uxTbtQ@^ctAjd)<%DII#~TiV_V%tJ;M!C z37`o%8kU?3&=#k2ODAB^=9B z-&6v&7c97qD|m^WeUbq{dm#pxi;u6X+EqPnW6!#z0=dfA2l}fSBZuo^Zt9H?5a3^| zR>r&KA+bJ)5$1J)1c?BjIG8;G2p$|ByMFIRa{`;d8c;~W>Zh%0D2d5an@$jjjn9vF z&)s{tcd=ZX=WQA-uupqoLI8;*VK>clt%uJO_aE!;D)0rge!a