From 3067e37ebe4bfb1f045547a2a133adc0245ed981 Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Wed, 29 Jul 2015 18:58:23 +0200
Subject: [PATCH] Water Ring Textures & Quartz Paxels

---
 .../actuallyadditions/crafting/ToolCrafting.java  |   6 ++++++
 .../actuallyadditions/creative/CreativeTab.java   |   2 ++
 .../actuallyadditions/items/InitItems.java        |   4 +++-
 .../textures/items/itemWaterRemovalRing.png       | Bin 0 -> 561 bytes
 .../textures/items/quartzPaxel.png                | Bin 0 -> 420 bytes
 5 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemWaterRemovalRing.png
 create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/quartzPaxel.png

diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/ToolCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ToolCrafting.java
index 7b7f57040..0d478d317 100644
--- a/src/main/java/ellpeck/actuallyadditions/crafting/ToolCrafting.java
+++ b/src/main/java/ellpeck/actuallyadditions/crafting/ToolCrafting.java
@@ -161,6 +161,12 @@ public class ToolCrafting{
                     new ItemStack(InitItems.itemSwordObsidian),
                     new ItemStack(InitItems.itemShovelObsidian),
                     new ItemStack(InitItems.itemHoeObsidian)));
+            GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.quartzPaxel),
+                    new ItemStack(InitItems.itemAxeQuartz),
+                    new ItemStack(InitItems.itemPickaxeQuartz),
+                    new ItemStack(InitItems.itemSwordQuartz),
+                    new ItemStack(InitItems.itemShovelQuartz),
+                    new ItemStack(InitItems.itemHoeQuartz)));
         }
     }
 
diff --git a/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java
index 3550d7b85..db470dec2 100644
--- a/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java
+++ b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java
@@ -95,6 +95,7 @@ public class CreativeTab extends CreativeTabs{
 
         add(InitItems.itemGrowthRing);
         add(InitItems.itemMagnetRing);
+        add(InitItems.itemWaterRemovalRing);
         
         add(InitItems.itemPhantomConnector);
         add(InitItems.itemBucketCanolaOil);
@@ -128,6 +129,7 @@ public class CreativeTab extends CreativeTabs{
         add(InitItems.diamondPaxel);
         add(InitItems.emeraldPaxel);
         add(InitItems.obsidianPaxel);
+        add(InitItems.quartzPaxel);
         InitForeignPaxels.addToCreativeTab();
 
         add(InitItems.itemPickaxeQuartz);
diff --git a/src/main/java/ellpeck/actuallyadditions/items/InitItems.java b/src/main/java/ellpeck/actuallyadditions/items/InitItems.java
index 1368f2ffd..c912fc913 100644
--- a/src/main/java/ellpeck/actuallyadditions/items/InitItems.java
+++ b/src/main/java/ellpeck/actuallyadditions/items/InitItems.java
@@ -87,6 +87,7 @@ public class InitItems{
     public static Item goldPaxel;
     public static Item emeraldPaxel;
     public static Item obsidianPaxel;
+    public static Item quartzPaxel;
 
     public static Item itemDrill;
     public static Item itemDrillUpgradeSpeed;
@@ -272,6 +273,7 @@ public class InitItems{
         diamondPaxel = new ItemAllToolAA(Item.ToolMaterial.EMERALD, "gemDiamond", "diamondPaxel", EnumRarity.epic);
         emeraldPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialEmerald, "gemEmerald", "emeraldPaxel", EnumRarity.epic);
         obsidianPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialObsidian, "obsidian", "obsidianPaxel", EnumRarity.epic);
-        ItemUtil.registerItems(new Item[]{woodenPaxel, stonePaxel, ironPaxel, goldPaxel, diamondPaxel, emeraldPaxel, obsidianPaxel});
+        quartzPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialQuartz, "gemQuartzBlack", "quartzPaxel", EnumRarity.rare);
+        ItemUtil.registerItems(new Item[]{woodenPaxel, stonePaxel, ironPaxel, goldPaxel, diamondPaxel, emeraldPaxel, obsidianPaxel, quartzPaxel});
     }
 }
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemWaterRemovalRing.png b/src/main/resources/assets/actuallyadditions/textures/items/itemWaterRemovalRing.png
new file mode 100644
index 0000000000000000000000000000000000000000..be56c7ce34e80b727ec0b154e26680bc261d428d
GIT binary patch
literal 561
zcmV-10?z%3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-v=5J1Oq_-j1d3;03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00EUrL_t(I%dL{ZYEw}V
zhQFD)_a+sBu^SbnC3GPK6v4F5BedEFa1j)jLaEpX5F+|Kl7c7|M6@dEvawQZntRR}
z7ikmPG`66#JTvpnf8c|EEIIkGc=w5Wilh(_5yWiN^BCED`ADV$mR2{sKG(!k#NF`}
zvAlw(NF3~=d6nMwTQ*-jlnFp<dClu{P2!->uOA=LEW_Q0Ln5Sdz@^3wEU(b}vc;=s
z_hkfVEw6d)>H=yRyWif^ef~gB`)_My-Dev&0od7oL$}iwJ!)o^3+#UXFm)NA+iA<r
zr`Lr39v&kALx3nUX8pBN2*Y`mF+fBxGeqr7faV33SK#oV0=PQ|`+ImS&y}JmiZSpg
zfvBNbake;Wlw~*$NFiW(g%rcN62!89B7q8~%EfEfX|1gLw8h1HPrY_|9xG<>P#za)
zX?4SER~m>Kz0X@ig*_o^q;dej?7}VFou6Od(e1QlLgm|c9(#Shi4`-1gWsrShdNhD
zvBXoH5KT^t=_w*2c#0s3hY~HSc#5OT|E>N2&tj+|KrmMj00000NkvXXu0mjfI#236

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/actuallyadditions/textures/items/quartzPaxel.png b/src/main/resources/assets/actuallyadditions/textures/items/quartzPaxel.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e5e35defcbf78fee77fe115bc82d438ff393051
GIT binary patch
literal 420
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmP~yQHw0(x-{M&w)a+nIRD+&iT2ysd*(pE(3#eQEFmI
zYKlU6W=V#EyQgnJie4%^0|O(6r;B5V#p$_$hJHs31m=8|at+fG(urLn{DD<tMW#kZ
z1-tzt*^)ht;R;$yyrnIVT6s4L#n$Y5vSXso+Bb9OO6ou4iO4Qp^HXNicRAO<1@EhG
zn6?TkIbDld`&vqg>6v}*Y~`@fRtaSn76t<zW+x7-YsVzE<Z=rtdaYgg%B9bci6KPP
zg(cLLBe95uVN04U!<^#HjLMP>KC_H%{l8D2tR=Wm$J=0Y8vBxpx(`*G3va~5E_iJv
zaM7_pQpx^a=#L+F9==w;aB-`i=Kj6)=T97)QOfRp>dc&8L*@PZVqU*JCY#ed^J?|_
z-|`m41zu^{#+@@GXZ~DKbZhqBoLO$0`_&u1bsD<;dfyO#By!^2h{$=dpuqBU^>bP0
Hl+XkKuWp)1

literal 0
HcmV?d00001