From 12d09e1cae8d659d51d8c3ecf18ae475e3ea49d3 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sun, 26 Jul 2015 02:36:42 +0200 Subject: [PATCH] Added Ring of Lava/Water Removal Added Textures for Quartz Tools --- .../ellpeck/actuallyadditions/PLANNED.txt | 1 - .../actuallyadditions/items/InitItems.java | 4 + .../items/ItemWaterRemovalRing.java | 85 ++++++++++++++++++ .../textures/armor/armorQuartz1.png | Bin 0 -> 767 bytes .../textures/armor/armorQuartz2.png | Bin 0 -> 428 bytes .../textures/items/itemAxeQuartz.png | Bin 0 -> 314 bytes .../textures/items/itemBootsQuartz.png | Bin 0 -> 255 bytes .../textures/items/itemChestQuartz.png | Bin 0 -> 295 bytes .../textures/items/itemGrowthRing.png | Bin 0 -> 571 bytes .../textures/items/itemHelmQuartz.png | Bin 0 -> 241 bytes .../textures/items/itemHoeQuartz.png | Bin 0 -> 305 bytes .../textures/items/itemPantsQuartz.png | Bin 0 -> 236 bytes .../textures/items/itemPickaxeQuartz.png | Bin 0 -> 332 bytes .../textures/items/itemShovelQuartz.png | Bin 0 -> 307 bytes .../textures/items/itemSuctionRing.png | Bin 0 -> 579 bytes .../textures/items/itemSwordQuartz.png | Bin 0 -> 309 bytes 16 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 src/main/java/ellpeck/actuallyadditions/items/ItemWaterRemovalRing.java create mode 100644 src/main/resources/assets/actuallyadditions/textures/armor/armorQuartz1.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/armor/armorQuartz2.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemAxeQuartz.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemBootsQuartz.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemChestQuartz.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemGrowthRing.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemHelmQuartz.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemHoeQuartz.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemPantsQuartz.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemPickaxeQuartz.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemShovelQuartz.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemSuctionRing.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemSwordQuartz.png diff --git a/src/main/java/ellpeck/actuallyadditions/PLANNED.txt b/src/main/java/ellpeck/actuallyadditions/PLANNED.txt index f50d7c29d..c48dce756 100644 --- a/src/main/java/ellpeck/actuallyadditions/PLANNED.txt +++ b/src/main/java/ellpeck/actuallyadditions/PLANNED.txt @@ -73,7 +73,6 @@ -Ring of Thorns: Hurts Attackers when they hit you with a Projectile -Ring of Water Walking -Ring of Aquadive: Fast underwater movement - -Ring of Water Absorption: Removes Water around -Ring of Unarmoring: Attacker lose parts of their Armor -Food Cannon diff --git a/src/main/java/ellpeck/actuallyadditions/items/InitItems.java b/src/main/java/ellpeck/actuallyadditions/items/InitItems.java index 3520a14a4..1368f2ffd 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/InitItems.java +++ b/src/main/java/ellpeck/actuallyadditions/items/InitItems.java @@ -110,6 +110,7 @@ public class InitItems{ public static Item itemGrowthRing; public static Item itemMagnetRing; + public static Item itemWaterRemovalRing; public static void init(){ ModUtil.LOGGER.info("Initializing Items..."); @@ -120,6 +121,9 @@ public class InitItems{ itemMagnetRing = new ItemMagnetRing(); ItemUtil.register(itemMagnetRing); + itemWaterRemovalRing = new ItemWaterRemovalRing(); + ItemUtil.register(itemWaterRemovalRing); + itemHelmEmerald = new ItemArmorAA("itemHelmEmerald", InitArmorMaterials.armorMaterialEmerald, 0, "gemEmerald", "armorEmerald"); itemChestEmerald = new ItemArmorAA("itemChestEmerald", InitArmorMaterials.armorMaterialEmerald, 1, "gemEmerald", "armorEmerald"); itemPantsEmerald = new ItemArmorAA("itemPantsEmerald", InitArmorMaterials.armorMaterialEmerald, 2, "gemEmerald", "armorEmerald"); diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemWaterRemovalRing.java b/src/main/java/ellpeck/actuallyadditions/items/ItemWaterRemovalRing.java new file mode 100644 index 000000000..eb3d9d1ba --- /dev/null +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemWaterRemovalRing.java @@ -0,0 +1,85 @@ +package ellpeck.actuallyadditions.items; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ellpeck.actuallyadditions.util.INameableItem; +import ellpeck.actuallyadditions.util.ModUtil; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +public class ItemWaterRemovalRing extends ItemEnergy implements INameableItem{ + + private static final int RANGE = 2; + private static final int ENERGY_USED_PER_BLOCK = 30; + + public ItemWaterRemovalRing(){ + super(1000000, 5000, 2); + } + + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5){ + if(!(entity instanceof EntityPlayer) || world.isRemote) return; + + EntityPlayer player = (EntityPlayer)entity; + ItemStack equipped = player.getCurrentEquippedItem(); + + if(equipped != null && equipped == stack && this.getEnergyStored(stack) >= ENERGY_USED_PER_BLOCK){ + + //Setting everything to air + for(int x = -RANGE; x < RANGE+1; x++){ + for(int z = -RANGE; z < RANGE+1; z++){ + for(int y = -RANGE; y < RANGE+1; y++){ + int theX = (int)player.posX+x; + int theY = (int)player.posY+y; + int theZ = (int)player.posZ+z; + if(this.getEnergyStored(stack) >= ENERGY_USED_PER_BLOCK){ + //Remove Water + if(world.getBlock(theX, theY, theZ) == Blocks.water || world.getBlock(theX, theY, theZ) == Blocks.flowing_water){ + world.setBlockToAir(theX, theY, theZ); + + if(!player.capabilities.isCreativeMode){ + this.extractEnergy(stack, ENERGY_USED_PER_BLOCK, false); + } + } + //Remove Lava + else if(world.getBlock(theX, theY, theZ) == Blocks.lava || world.getBlock(theX, theY, theZ) == Blocks.flowing_lava){ + world.setBlockToAir(theX, theY, theZ); + + if(!player.capabilities.isCreativeMode){ + this.extractEnergy(stack, ENERGY_USED_PER_BLOCK*2, false); + } + } + } + } + } + } + } + } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } + + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + } + + @Override + public String getName(){ + return "itemWaterRemovalRing"; + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/armor/armorQuartz1.png b/src/main/resources/assets/actuallyadditions/textures/armor/armorQuartz1.png new file mode 100644 index 0000000000000000000000000000000000000000..77f6a1976328be69699415d44077ca586902ae04 GIT binary patch literal 767 zcmVO9010qNS#tmY4#5Bb4#5Gqk!$S$000McNliru-v=2J95#m_6|w*T0*pyS zK~!ko-B>|;gCGn|5ba&O^#A|8w)YkxJM4RWkwJBxoz`4dFgg;FmzOZjh;vRvgqS() zF*At>5fNRlSEdgZJEy?R)OB52kK>s3V~q6aVwWn05Ynv^(d73hi&?6e8?V#g&<+rh z6!xX`IJ^Ux`G=vUy+fx!Db(}Ia99u&kz)QIMY!*Ksnz(>UhQ|j&i8AwHIJ~m&ZE@f zz^L(fMIF9LE{k(1435S5}fk)V!;FRR?czgqfF~zjV2@;-bo&5WyZ*1m( zaU9dlmu>}NdOn}Ud!N?MInfT%;jY78e}8Y4#OhFtG1BdJ<7bhe4_(S%IAyMi?1e|X z{RD7`P9ObuYY_amf9{-1)kZ`x(fa z-mwOcn5DwTm|eBM%$x|<8dbzD@%Y~Q{xumSuaT3bdY@xO&JPe-HEcoEfKE=LO8f#* zp&c}bS@y3E5E1ISF0noI27TWPNR@L=V6g5jw0=H(?Yb@zFXX)Uo%>lJO;&eI@I?dccC4J}+5m{>~gfO|~{GHM|r{Aj$L|%1@F=k>|PJe3$&U*(u zn{x*ALkNpO(yoEZwF&{mo|`1qZVTT;PHRli>l_pjJ*!lKS4L(_!*9uS>D|Q3YNn^r zReQOFytPRXa(Iao@ZOePp#ds4O*27tV@x_AP*tOL(=^p`v}OdneIB6a{HkRH!~ xOEW)aern8?9i}aDYwvxPcjpu1JsR~J`2qq6K>#btEcyTd002ovPDHLkV1ncAVWrnk)`W0tR;{Jll7pqPldlNO&o-tUGt&5@2K|z3ng$Y94WBbw;)TK~2dwJ%ed7KMu zA6xV_bSNm@)lP6`P;$!V6%bq_RCRPidP*8YL%0S*@wx2tx4Y)6uHWcCU$CXa!NtKv zK}kVr!8X&57tJ!Y?;I6NBDLn8Ykqj*XPcyf%*mVKf8YF^sC(edbgi|Y9rHWlqMCA) zzP-EN^7lcoz47`Kn>w~1OWtl>Vdmd4DbPz${`X|7J?H0dHLrhGxi2)Uxx*p*?c;># zNEep0dlQl-1~o;!o)zGg`Sog)dG3;rReinJ%fH;YE&3t4t@zv~ozu&j%nJFxMk@6` z`u|31&o23hpUeyzis`eL>P6fATx|BMoFzi3WcHQ*@Aje9Dj9oJFXSyOf6VRrgTe~DWM4fR&1>- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemAxeQuartz.png b/src/main/resources/assets/actuallyadditions/textures/items/itemAxeQuartz.png new file mode 100644 index 0000000000000000000000000000000000000000..ade0458ad66ac8851f5da0c7c0b42530e87f976d GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(~=H>axxTY*?&Yp zko93xQfV%W?%F%-8#aA3{SsQE9c}H+?YKecpoqAxO-st{*gxG|R&QtaOP)KRp0c+0 z+O3MW%Yq*0oMtFEr>OK_Vlq=VN7U=pa&wuOTLdJ&z4kd?>66E>V5?e7!}obdrOb9a zM==Wqp0n&)^k8}LA&KVi^Zsr;bHDvn^-HBiZGWxahP9@>?J<0|^QT+0+Z^9r8>fdq zUTb;PcE{aS2Jvzcx&G$0uVgJ&ep6n#UNt_$>Rf#L{fqjuyW@0xZy5Igy~N<@>gTe~ HDWM4fjGlN5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemBootsQuartz.png b/src/main/resources/assets/actuallyadditions/textures/items/itemBootsQuartz.png new file mode 100644 index 0000000000000000000000000000000000000000..febe1beabf7e74ade58e7d3b3f10de1a1b4ef591 GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(~=H>(8et|7v}^=d78U$@=!2D@#FXGh!HyR)WOZkOKiGOmq%{Sq7FYegKLKzA{Cy85}Sb4q9e094>uH2?qr literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemChestQuartz.png b/src/main/resources/assets/actuallyadditions/textures/items/itemChestQuartz.png new file mode 100644 index 0000000000000000000000000000000000000000..b1d3c68291ac42e5b68a817514c9e583347a647a GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(~=H>4bz*YiSo=K6MlLt;)h=3Tp6$e^&ar6a&=;nrtW`b$|3 z>{_=%Yt^rJbJ?vzu9n@)* zL-yIJLEnJQc literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemGrowthRing.png b/src/main/resources/assets/actuallyadditions/textures/items/itemGrowthRing.png new file mode 100644 index 0000000000000000000000000000000000000000..d0d465e1eff64a1745808f5eed4cabea4fb4e8c5 GIT binary patch literal 571 zcmV-B0>u4^P)O9010qNS#tmY3ljhU3ljkVnw%H_000McNliru-v=2J4HWFU8GbZ8()Nlj2>E@cM*00Ey#L_t(I%dL|^Yg0iK zg}-}e^72AVd<0EIkYd^{0zurkZ-r8SvJ2DdA8_MJM3T@|(xR=DguXX3*F~^R)sTgr z-3<4B+;e6w{G;Uei|0o@3o)VFFKh7Vzx#BP;e=ls|6x_T`$)dx9B)pkjo|=)P#td-V{lW8=3ghzIB& z_N=*|V<~X;b;;T3h5XI0b7I|>1-)T`1#I$eE*>DNkvAG#e7a;Zn#rcX#-o`8i}qx% zgGB>C0YtzwuEN@;0LevAxev%(4Rzc5y?00sze*K=1k39sF>Iee6zcUlm8@Ba4xD;4 z+dhJ-QkEs&)&N>To;xhWt$;`(-3Uqa4qzfACv*mFc8HBl}V;6P~x>gLEJjiP-7Lm+*${1;6 zo)97_!0huSXD8>fahdwZU9+H=v(=lcVIfk>JQj`dXfFIu{RCuit$r)w%=-WU002ov JPDHLkV1l^u@YMhS literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemHelmQuartz.png b/src/main/resources/assets/actuallyadditions/textures/items/itemHelmQuartz.png new file mode 100644 index 0000000000000000000000000000000000000000..57ab7f798a8f7f9fdbe6b5cff0f03b3efdb1e01a GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(~=H>bp*l|&#}JFtZzr7OI^w|LqOCNq z<L}8zShBV3=Dw!zRAcMs9Sy6dHGN_-K0N1h%}mbn`uGo=OBIy%nHv?` i{WoC{2%Pz!kxzNE`A@C<4NHM8VeoYIb6Mw<&;$VSzEgPs literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemHoeQuartz.png b/src/main/resources/assets/actuallyadditions/textures/items/itemHoeQuartz.png new file mode 100644 index 0000000000000000000000000000000000000000..7dce10d41e292ae96a4b1bee6c99788c5e1f658e GIT binary patch literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(~=H>j978Nl?+vu(I^-ZwyZflq z1lNKHkEv6lvXXTpZdUN_?K1x$Gf%X<3%Zz;NwW+{8f6E!QRl9g6CHT-IshTTmau#E|0AFq74o`?<`m zZLQa&+V66?MjoGDdP_RL=cCJ${ktb7pRAnKFv)yQadRu*r2Oey@27Cf|2=kYr$)BT x>ggT(ET72u7<3osH$~2^FR)GjKY95B<^=iJjfZ>GEr32@@O1TaS?83{1OQj{Z|wj8 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemPantsQuartz.png b/src/main/resources/assets/actuallyadditions/textures/items/itemPantsQuartz.png new file mode 100644 index 0000000000000000000000000000000000000000..8ea4efa6cfe5e37a45d7db036c0d010e0ae2c68d GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(~=H>zopr092+=vj6}9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemPickaxeQuartz.png b/src/main/resources/assets/actuallyadditions/textures/items/itemPickaxeQuartz.png new file mode 100644 index 0000000000000000000000000000000000000000..e059307b61b5fd541126c632ea76f835ac8988ff GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(~=H>FAdXEwW2K?X9QPmT zCwH3+)8f*jvXfK~NEiosnfNwu%VlJk5;P^X^J|a-SB#9mB_l(+heNjSl%TyVbBYVj zO*|rZsrcj1wX>(@*W5P`^7>pOw^h}>k^AL61_q~&b;?=Jeo6e(S36C+zGT&^b<;f? z+l#C8COrL`@bJpDo$iZDViHc>ES&T4M*H16I)`R%{F#z+qEchq)nH%C{-pi9`_=z9 ZSqB$IOC<(PyA1RsgQu&X%Q~loCIJ27ev1GA literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemShovelQuartz.png b/src/main/resources/assets/actuallyadditions/textures/items/itemShovelQuartz.png new file mode 100644 index 0000000000000000000000000000000000000000..55a0bf62efcce8f786ce2e1f35bf6ab935a8586c GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(~=H>Sjv*GOk51mmb;v-V?f;a5 z1vjI(V%J#Qyr?&K_czZPvH6FNzj*cL$qSvlNh>*urpyagzO}HoIgRVd|9{r+_A~sq zJLT@bWA_ZJe1KBDtOvx=EH(b7V+=m3i-9FbtmPgs-Fl_ zUY*is#J_R<`pLJ;G;5fd8*U%@RT0eaO9010qNS#tmY3ljhU3ljkVnw%H_000McNliru-v=2J3lqtwMPmQ}03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00E~-L_t(I%dL{lYE(fG zg}>_RzPTelLda;Mf`VCu#DF5AD;0m1E(9OVg%QkNbT1e*xV>f>=quF{obrUCtdsWXbCZp;g z#U5>J=@za~*A;DBh#G0vzWc|WP5BLQr>cE5IMvA52E@NnaQ448U_wynpS{WXbGLC% zK4>=N2=GAFFGU~;@3QbRXTc81?>CMd7RUQ%ZZN;FMiBSCo#zq(EDF(_-CPciPtfl6 zGr`>Fm#!i>00AJ_ffXw@Gj&ymoC(S?Km>{k=Cj|{b&g1lAI28|%mZUU|K{%s=40H- zF`!5xnBqZZ6FiWj5@aHSDjP{14PkZ$L2(Cjn{c2BQR6bs{ZyTp#LD_(?=P+sq5#!& zmG8#r*JGeFqw#6%002ovPDHLkV1l}n@hAWQ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemSwordQuartz.png b/src/main/resources/assets/actuallyadditions/textures/items/itemSwordQuartz.png new file mode 100644 index 0000000000000000000000000000000000000000..4ae95a4179e803828daa89fa0bd2ecc7a47944ba GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(~=H>L`yw3o&)2&PL^78GLXSonqh_3(o+nNRHvo>%;CJ~dA>RV^7U8R+rHv4#_a@K|N-n)A2Edmer_Lpsv1oGzkSKG{E4w>r2 zAu#dngq^Sc-nzB%>$lf-na}3T_w+9O*%4I9*rd{E;C|$H2hcYRp00i_>zopr0K8pt AkpKVy literal 0 HcmV?d00001