From 6647ca46d6e1050a751eba6d6643e9d24420f7e1 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Mon, 25 May 2020 22:26:01 +0200 Subject: [PATCH] fixed a crash, bonk, missing textures, centrifuge on a stick --- assets/hbm/lang/de_DE.lang | 1 + assets/hbm/lang/en_US.lang | 1 + assets/hbm/sounds.json | 1 + assets/hbm/sounds/weapon/bonk.ogg | Bin 0 -> 7206 bytes assets/hbm/textures/items/centri_stick.png | Bin 0 -> 354 bytes assets/hbm/textures/models/tank_BALEFIRE.png | Bin 0 -> 3693 bytes assets/hbm/textures/models/tank_HYDROGEN.png | Bin 0 -> 5522 bytes assets/hbm/textures/models/tank_MERCURY.png | Bin 0 -> 5512 bytes assets/hbm/textures/models/tank_OXYGEN.png | Bin 0 -> 5604 bytes assets/hbm/textures/models/tank_XENON.png | Bin 0 -> 4440 bytes com/hbm/entity/missile/EntityBobmazon.java | 5 +- .../entity/missile/EntityMissileCustom.java | 1 - com/hbm/entity/missile/EntitySoyuz.java | 6 +- com/hbm/handler/ToolAbility.java | 2 +- com/hbm/items/ModItems.java | 114 +++++++++--------- com/hbm/items/special/ItemRadioactive.java | 2 +- com/hbm/items/tool/ItemToolAbility.java | 10 +- com/hbm/items/tool/WeaponSpecial.java | 2 +- com/hbm/lib/RefStrings.java | 2 +- com/hbm/main/CraftingManager.java | 2 +- com/hbm/main/MainRegistry.java | 36 +++--- com/hbm/main/ModEventHandler.java | 4 +- .../tileentity/machine/TileEntityBarrel.java | 2 - .../TileEntityMachineReactorSmallOld.java | 2 - 24 files changed, 98 insertions(+), 95 deletions(-) create mode 100644 assets/hbm/sounds/weapon/bonk.ogg create mode 100644 assets/hbm/textures/items/centri_stick.png create mode 100644 assets/hbm/textures/models/tank_BALEFIRE.png create mode 100644 assets/hbm/textures/models/tank_HYDROGEN.png create mode 100644 assets/hbm/textures/models/tank_MERCURY.png create mode 100644 assets/hbm/textures/models/tank_OXYGEN.png create mode 100644 assets/hbm/textures/models/tank_XENON.png diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 08d39073a..5f8dfbcf4 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -2126,6 +2126,7 @@ item.cobalt_pickaxe.name=Kobaltspitzhacke item.cobalt_axe.name=Kobaltaxt item.cobalt_shovel.name=Kobaltschaufel item.cobalt_hoe.name=Kobaltfeldhacke +item.centri_stick.name=Zentrifuge am Spieß tile.red_cable.name=Rotes Kupferkabel diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index c4e02f670..dbf9efe29 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -2126,6 +2126,7 @@ item.cobalt_pickaxe.name=Cobalt Pickaxe item.cobalt_axe.name=Cobalt Axe item.cobalt_shovel.name=Cobalt Shovel item.cobalt_hoe.name=Cobalt Hoe +item.centri_stick.name=Centrifuge on a Stick tile.red_cable.name=Red Copper Cable diff --git a/assets/hbm/sounds.json b/assets/hbm/sounds.json index f23f29ce0..41e5888a3 100644 --- a/assets/hbm/sounds.json +++ b/assets/hbm/sounds.json @@ -123,6 +123,7 @@ "weapon.teslaShoot": {"category": "player", "sounds": [{"name": "weapon/teslaShoot", "stream": false}]}, "weapon.flamerReload": {"category": "player", "sounds": [{"name": "weapon/flamerReload", "stream": false}]}, "weapon.stop": {"category": "player", "sounds": ["weapon/stop1", "weapon/stop2"]}, + "weapon.bonk": {"category": "player", "sounds": [{"name": "weapon/bonk", "stream": false}]}, "weapon.reloadTurret": {"category": "player", "sounds": [{"name": "weapon/reloadTurret", "stream": false}]}, "weapon.switchmode1": {"category": "player", "sounds": [{"name": "weapon/switchmode1", "stream": false}]}, diff --git a/assets/hbm/sounds/weapon/bonk.ogg b/assets/hbm/sounds/weapon/bonk.ogg new file mode 100644 index 0000000000000000000000000000000000000000..fdcbc63d910f0128ca93ae7808d32b21e4a6f28f GIT binary patch literal 7206 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 JQH((5zW@kL51Ie~ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/centri_stick.png b/assets/hbm/textures/items/centri_stick.png new file mode 100644 index 0000000000000000000000000000000000000000..6e95053375c0390f65d754c0f765cb7cfd93a365 GIT binary patch literal 354 zcmV-o0iFJdP)LbJkn@8%jGU{wIRd4Q_@0 z5AEbsTwEPGbS&*4EjSij~o zA_xKnFdJfPEr2+V!x*mXnn=gp)q4SwBvA+PQw*CwvsJ=xkWn1R@z$G-cHtw9cm=f9 zdojT2aAUn%h`qTWdU@mP`;4Y(IxHE&2GsM8?yXk~xxdx2)N_#xkq5et4A-Oh@$Ood zdfrFv+<{e#uP)C?-apBTX43x{%{*zeHUA3(KY+%g?EnKH82|tP07*qoM6N<$f_j#h A>Hq)$ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/tank_BALEFIRE.png b/assets/hbm/textures/models/tank_BALEFIRE.png new file mode 100644 index 0000000000000000000000000000000000000000..85e10a90817bfd141230584fb99cc40c3a64e603 GIT binary patch literal 3693 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 LNkvXXu0mjfM&K#2 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/tank_HYDROGEN.png b/assets/hbm/textures/models/tank_HYDROGEN.png new file mode 100644 index 0000000000000000000000000000000000000000..11db8b7faa3a64acbac8992ecc17deebcb59234b GIT binary patch literal 5522 zcmV;D6>aK?P)_Bv1+w-RjXC2wYJqy@l!vw z%MRL-r;hn}mdnd%r(oFa!dqfGP6)e(~qM_c`Z% z&pq!w^EnE1;Hd`D1~w?6@3i&y&aOU{3A;|0N=mNd&7YtRTDpB7c;Ur8v< zjNQpFY|aA;X=dMV!A_xo6ct|n`g6Hl9j$x9>GbTIu0DZbiu^-KlBDEi0MLM~`}W;@ zbm>^NT&*Zc$SF%Ze^9BYIS+ts!S`Ykpj+PrL0Sec871!4&96WaB{LoXMtB5m?L6*C zlyAu3{&ncg-4CyA7&uW{DL1~$-JGo2!N&~-ioP!e9{gy0n%c?*6q5=SLB|`&A)Nu7*5pU#-#xrwPjb|Uzn0xAz6X#HPdzu^#>Q+~OWS(VFzo;!cy?YR zr%V6<$%)~IE^VD4PC78H@3~d}LlgiAGK6$+wVK${W=n6ZJ(qXw`YF{>6`^SB-EXy!j2GRNz!m2g*O|`4a2TZ*`V;POM);S;uf&+lyx=nb? z!^dtgEG(@6fKjPx8c12Eq8_{AC>|HkP7Be_rh=v&0F1m!JLj^3rJY5HypUhjd)}V) z0zHbNvPz=;8>^|2$)vEfu(Wh>=v7>txl4PW;D}s&!~md?6<0w!jeD4K69Tus0RW&X zPc35s^<$RGq|l~a0MFXjiNm)XOxO8|1_5ZeA7`Wm`6;Q%0N@*OX@g^zE|b!Z?>wka zVZj9e63|pjV*b7e0Pa)HN4WV9-6FL2d&4Pw(*a*U-|hgA9}{y3&G>?Kesaw0hg&~2ryQoe z5cCwIq5j)gpMLf|5z!RK7&=;jryNbT07BnspEV@YqU}Oocl94UPId2ewj?QgmrMUy z%W24nyi4D#P^p+$9gpJ_zQDyVWH?h9Q<58Vc9EIy)aA{TUDcCl0Sq+Ng;f<9XD(D0 z=IsU`H!M%n(y<1(Ji<(tcll0P)}37p%jWBG8t~x(SXF^C_u`%<8U}eOT7X#Fq!VbV2*CIi5joQrmSzK`dy z#bXrNOm@MY&p#x+X7mtyioL8vDHgGRoE{E9147{9J7@m}J3gPEzNhPFEFf>b?5Z(| z7N%9*T0A@E*Bygv7k3(!jt!V7tyCPUz1J{zGOLbVer0X=NV!~f=03489{^;a;PT#; z8U_VA9vk+|$n&e7i&isi`u#j8hoK*gbG9(IkSFXo-P{0ZE3`-#z_J>7?r*QXr3PR# zU{g4sOZEl;p7-2^c6>fxBaM`1-_83>Kh49)uHRKW3F{M%eEg#dfO)_d zL9Sx^rMhx7Djj<>YCla8UdFfuH;=_I00=se4qmwBAW6W%&a6?;qH8=-@SRr>@NMnf%^D07(65 z@j8Y@Apnk!ua#XT&IEwmOPeg*XUE?3?9xT-_3Y@S*M9!(XZ^g(6TgosPENeP4{!>V zjDsfhg*h{wg9nYxO^;j+f@iBQ9ZNWO`6U3VyHVo7{g%f?^XX8^!NqD~eoonXLz!7E z_gIhT`@erBifcK|(#~P&i$#T1TlIa=_qPFX^e^nge;jFXRXnz`vL+G$+b#lt7P?rG zbo%|KkN{6)Z(EnaDkVo|E%o&O=ZtOG&S70Ne{Hun69`l#J4*7iOSaa}Q6E~_m1ma^ zmuO{IzwuZ=X@pGi?Zj>Xz$j%30BlpzF;5S750Rs7H{_HVm6Wzu(lmFAZuHeP-f z|E#qhS5c)ts?RIBvF6t@%K#hSpol&mep^4vh|hXUqihE)Kr^8(IW_k!MgPRBd;m4M zpXC-8R{hYdl#R%)IQGNrx(pjOM*m)3)bqa<7fHXre`!=Y2C&*|f+QQ{5`3Zi^Q$L` z^b$!_$Cah|C0{hlZvzmdl$IQx^hW2P^w=&hA6l5dqTf&Lq6;X93jQVWQsPwIH9uhW zw*D_Io@>ZsmASFmY3Zpxo?@@uKX?4d8Z?nc(TMCyp0+hL<@{dsI zv#ed*?f+X#Fp!Qt$dzkt>*nST0E!B!q(LsLDlWOXcTV2bZ~t4RP-ry-Y!sIx z)H`*m+2?U zIXr%EwOn&fd(}8MJ96Ca2i(T}ZAi{W^SHIc308XR`0bMij`Vu=#c@r%jwc3_*b8_l z*_BEX7k}c{NC4>c!oHbY4jBM6EFF_&AI^&X+IvyTwHvQN?@*^Pnc0o6Jm;sz#J+*Y zH~>oXx%%TtP5Jrx3riFV#iQoe+Az6;4k7*A7l_8hZz@wm5&QZ4u59@a*}7+gCJp$3 z6Lj*Gv?3&AeH{=ew$JV6u`nhM=+aDgfY+pu{14|Km8|qs6psn3ozrK}yQ0 z^y8ntsgdlvt)G@dg7ymS7vV5))e_38pL;`Gv9lo1W5MN{fERAZS4H02*K-osVg>-h zriA@W`yZQP=z}?*wDKA;bB%T2|6T^))3Pyt0ifS7zg2>v*FH=y#@)=Xdig_>tONja z8vNiTYwp5oQRkSeMc-5&5zo`5sbl*~QTN8)w@I`B4Z)fQ-(mFnO(2~p-95HO*}NG= z1K^UNf+vjG={okz7TPw<3()p|Zrer9{Q&^Hx|>fRo#y*DS|$N$6CAPbs&(ks5r&ojq+qfE002IIqH!FbPe$pk8D-r7 z$S+Z*-Pk@e?8c6fLv+7eJ4Oy+(w9XW=H=;O9>(vr`BeZY$dkn+9a%N6IC|+?AO|7> zgxiEAyFmN#bX;E0<{1DWktpL553ibA9KEC-SIvS=J^lBGP)FAY062_XupXo{WoTOm z-|&FNCjzikDR7KCsBh+mkz{q7gL{h&Bk&M0eS`p*?Awpx*S zBlp03^iAB8!hteG6({p`ARwCn4A^zG9mXb9Y_0YF|LxuvW8ra({>2LK2H6kxP*d1RPu3!ngy z8M$k=N5t@}z5~6N#@t-Amr?Gi7XU%N7Gtev0sw-dxd6aupaQF8bZHq4TaU}9!0k3}$~FilTLXZjExa-Kzwa2@B>(~>j|Ko% zqc*nDRR@+_i1>jsrvreqExfXwUkTLYF1u#P>(kd^F8WIAt;#kBCK~`W4PI7(I@ak@ z#3o_?(+fLIShkb7^7pn!&95k{=pu)X;_4bbnFF1OR1{vN%oowJZV}*t*&GgD}|6zzuEwB-yM_*{hewOjyqD1OR*hj-%#& zn!jt?Ghnh??0~At1^`8ary+Pm(wVC(1O4|-5xdUlQ{(^nONP9}H0fFD%U<1e%_9XM z=(*sHl+U(0JC_A1xhKfNZ*D7;Y;|?cjVoZQ7y#fni2?ut7y!`7wOhj~WiR;{$-A zLYAYe{Dz=ZqXw1nc>v((*J(U>eJvU*zjtWY2$)T^Em1+9bm+Y~OzH=JasjwL_sT|4 z-dugIyjoczE4tZe`HjJ(TL6Gd06A z!zIixzsx&12YQY;{0Wyo-m?G98BtYvVKEk>GAF_^uoD2}#8*Z__E#|gFRf~iitc+|`VK|Om}&nzVWq%;**@<=eCUES*p0_6aX9-PdjiJ8|BGOSfc-6ZAkbWt1lcM54Zr&-g_uagf z4|8{R3(W7j;yEPGIMEXC*|YQ`IY7G{)O79iJfP8o*>Ddw56+iAHW>|kda+|srb-~b9AeCxh1Mp;m^}2xlW5ZND)4S zWhZg%4x=GA;X>lZ-oER{a$MdC>J%6{9SAk*L&B}ReL-&1`wBz%&o>v6_U8U0>vd@q z0IxxTZ-V=rs8kJw^z!OW0Fa$u{f}$%MBdte8m#D`lh#O-1pY69+-Na~sM_R;)}0E3F;H zr>2#hDc&%|-J#E<*LjX%JrpW_bzw@}smj~C_k$^}GqAcFpMR)mLw|RN;3;o#9R~U- zlw4^;+{zlZ>hiZA4{+&q@l~P6_<;n^!Cb#*)%QWkKy&@~lM5Vg`~7CsefmU>rLP+( z0jDccXDJ7@b%3t#VpoW1a?T^SM*3S%D!G$%;SciJtON#p)R>wN4 z^9o}0eZQA=?-GX_C6pDblbd?qP0pPfJB{+F&ziE?fwqImE(CR;ZP4s4psh}-bf9g~ z(E>c>=m>zP9327Bfet(>xE4Ye5N7}CSn_7CqQNu$O~HaknD?IZ!8yYDoj~0^J_iDEK=3rHZjoc+Hvg|TS-LaT zrBAOn2)ZxdI}k4;aM#N^u1-2;?X~^ZjUC;>)S1gKv_P?14ec%f^kr9R7cOk9PTqQw z)RZcFJ`=Qp6t5l9RQhfqp8wHRepX`UQAN_$-yNNKK~|wlB5Zip=60jkep$5V$e8O< z=NAQQo~;oKJgGaPj*L6m2hB^irPvLQcvnQY5pENf?8?~mi$Bx}_0BoumnhRpx6cd% zVOBd1qX0D5&z3^F3V_FzU2zEzqV9cO0D#m&#Aojt_aZcDsyqM#aS7beGZFUgf&oPw zUo*Axo|Hfxg&LfCbe?#9vu*EQ)niHxrDKM+9!AdAnrK%6@TjsY9Vh}6xVGj1AS+X( z>-WEk{G1zH030qvAcYhF&?0ju04S_Lj!?4mc4CJ3Z*{?^H>Et7i%<>ux=BB&? z)~*8JQDj%fz_JGasyNHmt4D&Sc>qu;M|u3-uf~DNPy+y?F{>vXGgY+5b%2MGT|J&9 zZBP&d$fl%YriykI0JX9!G*5Q**!EP)YM^Q9SZn+7IA~V^@UXJ0$F_IxUbCcQt?9$# zqFs#v9!7T663D-kdC+@A%o;w?hiptb*3x!c678x50JO3z*_G*A00!nl*gN@;e919r z+AFXa(&GQGKu(D&C2!x$FM>^GDFBw8#38!MHG05nf_rITpYkxsEvMgyQI zCFKNJek@a&Sy5+>URowkS0+XNURlGJLQ_!NuiuT&YnF7((3Ua(o6GA!2U-OG2P&KX Ufp~N9;s5{u07*qoM6N<$f^l)9CjbBd literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/tank_MERCURY.png b/assets/hbm/textures/models/tank_MERCURY.png new file mode 100644 index 0000000000000000000000000000000000000000..a375f4abd8b0c789a9ef43586c116d2e8c3e683a GIT binary patch literal 5512 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 KMNUMnLSTZA=BJ1N literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/tank_OXYGEN.png b/assets/hbm/textures/models/tank_OXYGEN.png new file mode 100644 index 0000000000000000000000000000000000000000..58b43dc4510d0ced028f1f8b2af4677f98edae2a GIT binary patch literal 5604 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 e7%=dEh5rUZENF(luMJ560000> 4, targetZ >> 4); - if(worldObj.spawnEntityInWorld(capsule)) - System.out.println("Success!"); - else - System.out.println("Crap."); + worldObj.spawnEntityInWorld(capsule); } this.setDead(); diff --git a/com/hbm/handler/ToolAbility.java b/com/hbm/handler/ToolAbility.java index b5591b212..65cc604f9 100644 --- a/com/hbm/handler/ToolAbility.java +++ b/com/hbm/handler/ToolAbility.java @@ -1,5 +1,6 @@ package com.hbm.handler; +import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -17,7 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import scala.actors.threadpool.Arrays; public abstract class ToolAbility { diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 46b9bb283..97236085e 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -1559,6 +1559,7 @@ public class ModItems { public static Item cobalt_axe; public static Item cobalt_shovel; public static Item cobalt_hoe; + public static Item centri_stick; public static Item matchstick; @@ -1625,7 +1626,6 @@ public class ModItems { public static Item wand; public static Item wand_s; public static Item wand_d; - public static Item analyzer; public static Item cape_test; public static Item cape_radiation; @@ -3021,7 +3021,7 @@ public class ModItems { grenade_black_hole = new ItemGrenade(7).setUnlocalizedName("grenade_black_hole").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_black_hole"); grenade_cloud = new ItemGrenade(-1).setUnlocalizedName("grenade_cloud").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_cloud"); grenade_pink_cloud = new ItemGrenade(-1).setUnlocalizedName("grenade_pink_cloud").setCreativeTab(null).setTextureName(RefStrings.MODID + ":grenade_pink_cloud"); - ullapool_caber = new WeaponSpecial(MainRegistry.enumToolMaterialSteel).setUnlocalizedName("ullapool_caber").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ullapool_caber"); + ullapool_caber = new WeaponSpecial(MainRegistry.tMatSteel).setUnlocalizedName("ullapool_caber").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ullapool_caber"); grenade_if_generic = new ItemGrenade(4).setUnlocalizedName("grenade_if_generic").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_if_generic"); grenade_if_he = new ItemGrenade(5).setUnlocalizedName("grenade_if_he").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_if_he"); @@ -3202,7 +3202,6 @@ public class ModItems { wand = new ItemWand().setUnlocalizedName("wand_k").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setFull3D().setTextureName(RefStrings.MODID + ":wand"); wand_s = new ItemWandS().setUnlocalizedName("wand_s").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setFull3D().setTextureName(RefStrings.MODID + ":wand_s"); wand_d = new ItemWandD().setUnlocalizedName("wand_d").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setFull3D().setTextureName(RefStrings.MODID + ":wand_d"); - analyzer = new ItemAnalyzer().setUnlocalizedName("analyzer").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setFull3D().setTextureName(RefStrings.MODID + ":analyzer"); nuke_starter_kit = new ItemStarterKit().setUnlocalizedName("nuke_starter_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":nuke_starter_kit"); nuke_advanced_kit = new ItemStarterKit().setUnlocalizedName("nuke_advanced_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":nuke_advanced_kit"); @@ -3348,7 +3347,8 @@ public class ModItems { .addEffect(new PotionEffect(Potion.damageBoost.id, 20, 2)) .addEffect(new PotionEffect(Potion.jump.id, 20, 1)) .addEffect(new PotionEffect(Potion.moveSpeed.id, 20, 2)) - .addEffect(new PotionEffect(Potion.field_76443_y.id, 20, 0)).setUnlocalizedName("schrabidium_helmet").setTextureName(RefStrings.MODID + ":schrabidium_helmet"); + .addEffect(new PotionEffect(Potion.field_76443_y.id, 20, 0)) + .setFireproof(true).setUnlocalizedName("schrabidium_helmet").setTextureName(RefStrings.MODID + ":schrabidium_helmet"); schrabidium_plate = new ArmorFSB(MainRegistry.aMatSchrab, 7, 1, RefStrings.MODID + ":textures/armor/schrabidium_1.png").cloneStats((ArmorFSB) schrabidium_helmet).setUnlocalizedName("schrabidium_plate").setTextureName(RefStrings.MODID + ":schrabidium_plate"); schrabidium_legs = new ArmorFSB(MainRegistry.aMatSchrab, 7, 2, RefStrings.MODID + ":textures/armor/schrabidium_2.png").cloneStats((ArmorFSB) schrabidium_helmet).setCap(4F).setMod(0.1F).setUnlocalizedName("schrabidium_legs").setTextureName(RefStrings.MODID + ":schrabidium_legs"); schrabidium_boots = new ArmorFSB(MainRegistry.aMatSchrab, 7, 3, RefStrings.MODID + ":textures/armor/schrabidium_1.png").cloneStats((ArmorFSB) schrabidium_helmet).setCap(4F).setMod(0.1F).setUnlocalizedName("schrabidium_boots").setTextureName(RefStrings.MODID + ":schrabidium_boots"); @@ -3366,7 +3366,8 @@ public class ModItems { alloy_boots = new ArmorFSB(MainRegistry.aMatAlloy, 7, 3, RefStrings.MODID + ":textures/armor/alloy_1.png").cloneStats((ArmorFSB) alloy_helmet).setUnlocalizedName("alloy_boots").setTextureName(RefStrings.MODID + ":alloy_boots"); cmb_helmet = new ArmorFSB(MainRegistry.aMatCMB, 7, 0, RefStrings.MODID + ":textures/armor/cmb_1.png").setCap(10F).setMod(0.5F) .addEffect(new PotionEffect(Potion.moveSpeed.id, 20, 2)) - .addEffect(new PotionEffect(Potion.digSpeed.id, 20, 0)).setUnlocalizedName("cmb_helmet").setTextureName(RefStrings.MODID + ":cmb_helmet"); + .addEffect(new PotionEffect(Potion.digSpeed.id, 20, 0)) + .setFireproof(true).setUnlocalizedName("cmb_helmet").setTextureName(RefStrings.MODID + ":cmb_helmet"); cmb_plate = new ArmorFSB(MainRegistry.aMatCMB, 7, 1, RefStrings.MODID + ":textures/armor/cmb_1.png").cloneStats((ArmorFSB) cmb_helmet).setUnlocalizedName("cmb_plate").setTextureName(RefStrings.MODID + ":cmb_plate"); cmb_legs = new ArmorFSB(MainRegistry.aMatCMB, 7, 2, RefStrings.MODID + ":textures/armor/cmb_2.png").cloneStats((ArmorFSB) cmb_helmet).setUnlocalizedName("cmb_legs").setTextureName(RefStrings.MODID + ":cmb_legs"); cmb_boots = new ArmorFSB(MainRegistry.aMatCMB, 7, 3, RefStrings.MODID + ":textures/armor/cmb_1.png").cloneStats((ArmorFSB) cmb_helmet).setUnlocalizedName("cmb_boots").setTextureName(RefStrings.MODID + ":cmb_boots"); @@ -3386,7 +3387,8 @@ public class ModItems { cobalt_plate = new ArmorFSB(MainRegistry.aMatCobalt, 7, 1, RefStrings.MODID + ":textures/armor/cobalt_1.png").cloneStats((ArmorFSB) cobalt_helmet).setUnlocalizedName("cobalt_plate").setTextureName(RefStrings.MODID + ":cobalt_plate"); cobalt_legs = new ArmorFSB(MainRegistry.aMatCobalt, 7, 2, RefStrings.MODID + ":textures/armor/cobalt_2.png").cloneStats((ArmorFSB) cobalt_helmet).setUnlocalizedName("cobalt_legs").setTextureName(RefStrings.MODID + ":cobalt_legs"); cobalt_boots = new ArmorFSB(MainRegistry.aMatCobalt, 7, 3, RefStrings.MODID + ":textures/armor/cobalt_1.png").cloneStats((ArmorFSB) cobalt_helmet).setUnlocalizedName("cobalt_boots").setTextureName(RefStrings.MODID + ":cobalt_boots"); - starmetal_helmet = new ArmorFSB(MainRegistry.aMatStarmetal, 7, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png").setMod(0.5F).setCap(15F).setUnlocalizedName("starmetal_helmet").setTextureName(RefStrings.MODID + ":starmetal_helmet"); + starmetal_helmet = new ArmorFSB(MainRegistry.aMatStarmetal, 7, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png").setMod(0.5F).setCap(15F) + .setFireproof(true).setUnlocalizedName("starmetal_helmet").setTextureName(RefStrings.MODID + ":starmetal_helmet"); starmetal_plate = new ArmorFSB(MainRegistry.aMatStarmetal, 7, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png").cloneStats((ArmorFSB) starmetal_helmet).setUnlocalizedName("starmetal_plate").setTextureName(RefStrings.MODID + ":starmetal_plate"); starmetal_legs = new ArmorFSB(MainRegistry.aMatStarmetal, 7, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png").cloneStats((ArmorFSB) starmetal_helmet).setUnlocalizedName("starmetal_legs").setTextureName(RefStrings.MODID + ":starmetal_legs"); starmetal_boots = new ArmorFSB(MainRegistry.aMatStarmetal, 7, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png").cloneStats((ArmorFSB) starmetal_helmet).setUnlocalizedName("starmetal_boots").setTextureName(RefStrings.MODID + ":starmetal_boots"); @@ -3394,123 +3396,126 @@ public class ModItems { jackt = new ModArmor(MainRegistry.aMatSteel, 7, 1).setUnlocalizedName("jackt").setTextureName(RefStrings.MODID + ":jackt"); jackt2 = new ModArmor(MainRegistry.aMatSteel, 7, 1).setUnlocalizedName("jackt2").setTextureName(RefStrings.MODID + ":jackt2"); - chainsaw = new ItemToolAbility(25, -0.05, MainRegistry.enumToolMaterialChainsaw, EnumToolType.AXE) + chainsaw = new ItemToolAbility(25, -0.05, MainRegistry.tMatChainsaw, EnumToolType.AXE) .addBreakAbility(new ToolAbility.RecursionAbility(5)).setUnlocalizedName("chainsaw").setTextureName(RefStrings.MODID + ":chainsaw"); - schrabidium_sword = new ItemToolAbility(150, 0, MainRegistry.enumToolMaterialSchrabidium, EnumToolType.SWORD) + schrabidium_sword = new ItemToolAbility(150, 0, MainRegistry.tMatSchrab, EnumToolType.SWORD) .addHitAbility(new WeaponAbility.RadiationAbility(50F)) .addHitAbility(new WeaponAbility.VampireAbility(2F)).setUnlocalizedName("schrabidium_sword").setTextureName(RefStrings.MODID + ":schrabidium_sword"); - schrabidium_pickaxe = new ItemToolAbility(20, 0, MainRegistry.enumToolMaterialSchrabidium, EnumToolType.PICKAXE) + schrabidium_pickaxe = new ItemToolAbility(20, 0, MainRegistry.tMatSchrab, EnumToolType.PICKAXE) .addHitAbility(new WeaponAbility.RadiationAbility(15F)) .addBreakAbility(new ToolAbility.HammerAbility(2)) .addBreakAbility(new ToolAbility.RecursionAbility(10)) .addBreakAbility(new ToolAbility.SmelterAbility()) .addBreakAbility(new ToolAbility.ShredderAbility()).setUnlocalizedName("schrabidium_pickaxe").setTextureName(RefStrings.MODID + ":schrabidium_pickaxe"); - schrabidium_axe = new ItemToolAbility(25, 0, MainRegistry.enumToolMaterialSchrabidium, EnumToolType.AXE) + schrabidium_axe = new ItemToolAbility(25, 0, MainRegistry.tMatSchrab, EnumToolType.AXE) .addHitAbility(new WeaponAbility.RadiationAbility(15F)) .addBreakAbility(new ToolAbility.HammerAbility(2)) .addBreakAbility(new ToolAbility.RecursionAbility(10)) .addBreakAbility(new ToolAbility.SmelterAbility()) .addBreakAbility(new ToolAbility.ShredderAbility()).setUnlocalizedName("schrabidium_axe").setTextureName(RefStrings.MODID + ":schrabidium_axe"); - schrabidium_shovel = new ItemToolAbility(15, 0, MainRegistry.enumToolMaterialSchrabidium, EnumToolType.SHOVEL) + schrabidium_shovel = new ItemToolAbility(15, 0, MainRegistry.tMatSchrab, EnumToolType.SHOVEL) .addHitAbility(new WeaponAbility.RadiationAbility(15F)) .addBreakAbility(new ToolAbility.HammerAbility(2)) .addBreakAbility(new ToolAbility.RecursionAbility(10)) .addBreakAbility(new ToolAbility.SmelterAbility()) .addBreakAbility(new ToolAbility.ShredderAbility()).setUnlocalizedName("schrabidium_shovel").setTextureName(RefStrings.MODID + ":schrabidium_shovel"); - schrabidium_hoe = new HoeSchrabidium(MainRegistry.enumToolMaterialSchrabidium).setUnlocalizedName("schrabidium_hoe").setTextureName(RefStrings.MODID + ":schrabidium_hoe"); + schrabidium_hoe = new HoeSchrabidium(MainRegistry.tMatSchrab).setUnlocalizedName("schrabidium_hoe").setTextureName(RefStrings.MODID + ":schrabidium_hoe"); - titanium_sword = new ItemToolAbility(6.5F, 0, MainRegistry.enumToolMaterialTitanium, EnumToolType.SWORD).setUnlocalizedName("titanium_sword").setTextureName(RefStrings.MODID + ":titanium_sword"); - titanium_pickaxe = new ItemToolAbility(4.5F, 0, MainRegistry.enumToolMaterialTitanium, EnumToolType.PICKAXE).setUnlocalizedName("titanium_pickaxe").setTextureName(RefStrings.MODID + ":titanium_pickaxe"); - titanium_axe = new ItemToolAbility(5.5F, 0, MainRegistry.enumToolMaterialTitanium, EnumToolType.AXE).setUnlocalizedName("titanium_axe").setTextureName(RefStrings.MODID + ":titanium_axe"); - titanium_shovel = new ItemToolAbility(3.5F, 0, MainRegistry.enumToolMaterialTitanium, EnumToolType.SHOVEL).setUnlocalizedName("titanium_shovel").setTextureName(RefStrings.MODID + ":titanium_shovel"); - titanium_hoe = new ModHoe(MainRegistry.enumToolMaterialTitanium).setUnlocalizedName("titanium_hoe").setTextureName(RefStrings.MODID + ":titanium_hoe"); - steel_sword = new ItemToolAbility(6F, 0, MainRegistry.enumToolMaterialSteel, EnumToolType.SWORD).setUnlocalizedName("steel_sword").setTextureName(RefStrings.MODID + ":steel_sword"); - steel_pickaxe = new ItemToolAbility(4F, 0, MainRegistry.enumToolMaterialSteel, EnumToolType.PICKAXE).setUnlocalizedName("steel_pickaxe").setTextureName(RefStrings.MODID + ":steel_pickaxe"); - steel_axe = new ItemToolAbility(5F, 0, MainRegistry.enumToolMaterialSteel, EnumToolType.AXE).setUnlocalizedName("steel_axe").setTextureName(RefStrings.MODID + ":steel_axe"); - steel_shovel = new ItemToolAbility(3F, 0, MainRegistry.enumToolMaterialSteel, EnumToolType.SHOVEL).setUnlocalizedName("steel_shovel").setTextureName(RefStrings.MODID + ":steel_shovel"); - steel_hoe = new ModHoe(MainRegistry.enumToolMaterialSteel).setUnlocalizedName("steel_hoe").setTextureName(RefStrings.MODID + ":steel_hoe"); + titanium_sword = new ItemToolAbility(6.5F, 0, MainRegistry.tMatTitan, EnumToolType.SWORD).setUnlocalizedName("titanium_sword").setTextureName(RefStrings.MODID + ":titanium_sword"); + titanium_pickaxe = new ItemToolAbility(4.5F, 0, MainRegistry.tMatTitan, EnumToolType.PICKAXE).setUnlocalizedName("titanium_pickaxe").setTextureName(RefStrings.MODID + ":titanium_pickaxe"); + titanium_axe = new ItemToolAbility(5.5F, 0, MainRegistry.tMatTitan, EnumToolType.AXE).setUnlocalizedName("titanium_axe").setTextureName(RefStrings.MODID + ":titanium_axe"); + titanium_shovel = new ItemToolAbility(3.5F, 0, MainRegistry.tMatTitan, EnumToolType.SHOVEL).setUnlocalizedName("titanium_shovel").setTextureName(RefStrings.MODID + ":titanium_shovel"); + titanium_hoe = new ModHoe(MainRegistry.tMatTitan).setUnlocalizedName("titanium_hoe").setTextureName(RefStrings.MODID + ":titanium_hoe"); + steel_sword = new ItemToolAbility(6F, 0, MainRegistry.tMatSteel, EnumToolType.SWORD).setUnlocalizedName("steel_sword").setTextureName(RefStrings.MODID + ":steel_sword"); + steel_pickaxe = new ItemToolAbility(4F, 0, MainRegistry.tMatSteel, EnumToolType.PICKAXE).setUnlocalizedName("steel_pickaxe").setTextureName(RefStrings.MODID + ":steel_pickaxe"); + steel_axe = new ItemToolAbility(5F, 0, MainRegistry.tMatSteel, EnumToolType.AXE).setUnlocalizedName("steel_axe").setTextureName(RefStrings.MODID + ":steel_axe"); + steel_shovel = new ItemToolAbility(3F, 0, MainRegistry.tMatSteel, EnumToolType.SHOVEL).setUnlocalizedName("steel_shovel").setTextureName(RefStrings.MODID + ":steel_shovel"); + steel_hoe = new ModHoe(MainRegistry.tMatSteel).setUnlocalizedName("steel_hoe").setTextureName(RefStrings.MODID + ":steel_hoe"); - alloy_sword = new ItemToolAbility(9F, 0, MainRegistry.enumToolMaterialAlloy, EnumToolType.SWORD) + alloy_sword = new ItemToolAbility(9F, 0, MainRegistry.tMatAlloy, EnumToolType.SWORD) .addHitAbility(new WeaponAbility.StunAbility(2)).setUnlocalizedName("alloy_sword").setTextureName(RefStrings.MODID + ":alloy_sword"); - alloy_pickaxe = new ItemToolAbility(6F, 0, MainRegistry.enumToolMaterialAlloy, EnumToolType.PICKAXE) + alloy_pickaxe = new ItemToolAbility(6F, 0, MainRegistry.tMatAlloy, EnumToolType.PICKAXE) .addBreakAbility(new ToolAbility.RecursionAbility(3)).setUnlocalizedName("alloy_pickaxe").setTextureName(RefStrings.MODID + ":alloy_pickaxe"); - alloy_axe = new ItemToolAbility(7F, 0, MainRegistry.enumToolMaterialAlloy, EnumToolType.AXE) + alloy_axe = new ItemToolAbility(7F, 0, MainRegistry.tMatAlloy, EnumToolType.AXE) .addBreakAbility(new ToolAbility.RecursionAbility(3)).setUnlocalizedName("alloy_axe").setTextureName(RefStrings.MODID + ":alloy_axe"); - alloy_shovel = new ItemToolAbility(5F, 0, MainRegistry.enumToolMaterialAlloy, EnumToolType.SHOVEL) + alloy_shovel = new ItemToolAbility(5F, 0, MainRegistry.tMatAlloy, EnumToolType.SHOVEL) .addBreakAbility(new ToolAbility.RecursionAbility(3)).setUnlocalizedName("alloy_shovel").setTextureName(RefStrings.MODID + ":alloy_shovel"); - alloy_hoe = new ModHoe(MainRegistry.enumToolMaterialAlloy).setUnlocalizedName("alloy_hoe").setTextureName(RefStrings.MODID + ":alloy_hoe"); + alloy_hoe = new ModHoe(MainRegistry.tMatAlloy).setUnlocalizedName("alloy_hoe").setTextureName(RefStrings.MODID + ":alloy_hoe"); - cmb_sword = new ItemToolAbility(50F, 0, MainRegistry.enumToolMaterialCmb, EnumToolType.SWORD) + cmb_sword = new ItemToolAbility(50F, 0, MainRegistry.tMatCMB, EnumToolType.SWORD) .addHitAbility(new WeaponAbility.StunAbility(2)) .addHitAbility(new WeaponAbility.VampireAbility(2F)).setUnlocalizedName("cmb_sword").setTextureName(RefStrings.MODID + ":cmb_sword"); - cmb_pickaxe = new ItemToolAbility(10F, 0, MainRegistry.enumToolMaterialCmb, EnumToolType.PICKAXE) + cmb_pickaxe = new ItemToolAbility(10F, 0, MainRegistry.tMatCMB, EnumToolType.PICKAXE) .addBreakAbility(new ToolAbility.RecursionAbility(5)) .addBreakAbility(new ToolAbility.SmelterAbility()).setUnlocalizedName("cmb_pickaxe").setTextureName(RefStrings.MODID + ":cmb_pickaxe"); - cmb_axe = new ItemToolAbility(12.5F, 0, MainRegistry.enumToolMaterialCmb, EnumToolType.AXE) + cmb_axe = new ItemToolAbility(12.5F, 0, MainRegistry.tMatCMB, EnumToolType.AXE) .addBreakAbility(new ToolAbility.RecursionAbility(5)) .addBreakAbility(new ToolAbility.SmelterAbility()).setUnlocalizedName("cmb_axe").setTextureName(RefStrings.MODID + ":cmb_axe"); - cmb_shovel = new ItemToolAbility(8F, 0, MainRegistry.enumToolMaterialCmb, EnumToolType.SHOVEL) + cmb_shovel = new ItemToolAbility(8F, 0, MainRegistry.tMatCMB, EnumToolType.SHOVEL) .addBreakAbility(new ToolAbility.RecursionAbility(5)) .addBreakAbility(new ToolAbility.SmelterAbility()).setUnlocalizedName("cmb_shovel").setTextureName(RefStrings.MODID + ":cmb_shovel"); - cmb_hoe = new ModHoe(MainRegistry.enumToolMaterialCmb).setUnlocalizedName("cmb_hoe").setTextureName(RefStrings.MODID + ":cmb_hoe"); + cmb_hoe = new ModHoe(MainRegistry.tMatCMB).setUnlocalizedName("cmb_hoe").setTextureName(RefStrings.MODID + ":cmb_hoe"); - elec_sword = new ItemToolAbilityPower(15F, 0, MainRegistry.enumToolMaterialElec, EnumToolType.SWORD, 500000, 1000, 100) + elec_sword = new ItemToolAbilityPower(15F, 0, MainRegistry.tMatElec, EnumToolType.SWORD, 500000, 1000, 100) .addHitAbility(new WeaponAbility.StunAbility(5)).setUnlocalizedName("elec_sword").setTextureName(RefStrings.MODID + ":elec_sword_anim"); - elec_pickaxe = new ItemToolAbilityPower(10F, 0, MainRegistry.enumToolMaterialElec, EnumToolType.PICKAXE, 500000, 1000, 100) + elec_pickaxe = new ItemToolAbilityPower(10F, 0, MainRegistry.tMatElec, EnumToolType.PICKAXE, 500000, 1000, 100) .addBreakAbility(new ToolAbility.HammerAbility(2)) .addBreakAbility(new ToolAbility.RecursionAbility(5)).setUnlocalizedName("elec_pickaxe").setTextureName(RefStrings.MODID + ":elec_drill_anim"); - elec_axe = new ItemToolAbilityPower(12.5F, 0, MainRegistry.enumToolMaterialElec, EnumToolType.AXE, 500000, 1000, 100) + elec_axe = new ItemToolAbilityPower(12.5F, 0, MainRegistry.tMatElec, EnumToolType.AXE, 500000, 1000, 100) .addBreakAbility(new ToolAbility.HammerAbility(2)) .addBreakAbility(new ToolAbility.RecursionAbility(5)).setUnlocalizedName("elec_axe").setTextureName(RefStrings.MODID + ":elec_chainsaw_anim"); - elec_shovel = new ItemToolAbilityPower(7.5F, 0, MainRegistry.enumToolMaterialElec, EnumToolType.SHOVEL, 500000, 1000, 100) + elec_shovel = new ItemToolAbilityPower(7.5F, 0, MainRegistry.tMatElec, EnumToolType.SHOVEL, 500000, 1000, 100) .addBreakAbility(new ToolAbility.HammerAbility(2)) .addBreakAbility(new ToolAbility.RecursionAbility(5)).setUnlocalizedName("elec_shovel").setTextureName(RefStrings.MODID + ":elec_shovel_anim"); - desh_sword = new ItemToolAbility(15F, 0, MainRegistry.enumToolMaterialDesh, EnumToolType.SWORD) + desh_sword = new ItemToolAbility(15F, 0, MainRegistry.tMatDesh, EnumToolType.SWORD) .addHitAbility(new WeaponAbility.StunAbility(2)).setUnlocalizedName("desh_sword").setTextureName(RefStrings.MODID + ":desh_sword"); - desh_pickaxe = new ItemToolAbility(5F, 0, MainRegistry.enumToolMaterialDesh, EnumToolType.PICKAXE) + desh_pickaxe = new ItemToolAbility(5F, 0, MainRegistry.tMatDesh, EnumToolType.PICKAXE) .addBreakAbility(new ToolAbility.HammerAbility(1)) .addBreakAbility(new ToolAbility.RecursionAbility(3)).setUnlocalizedName("desh_pickaxe").setTextureName(RefStrings.MODID + ":desh_pickaxe"); - desh_axe = new ItemToolAbility(6.5F, 0, MainRegistry.enumToolMaterialDesh, EnumToolType.AXE) + desh_axe = new ItemToolAbility(6.5F, 0, MainRegistry.tMatDesh, EnumToolType.AXE) .addBreakAbility(new ToolAbility.HammerAbility(1)) .addBreakAbility(new ToolAbility.RecursionAbility(3)).setUnlocalizedName("desh_axe").setTextureName(RefStrings.MODID + ":desh_axe"); - desh_shovel = new ItemToolAbility(4F, 0, MainRegistry.enumToolMaterialDesh, EnumToolType.SHOVEL) + desh_shovel = new ItemToolAbility(4F, 0, MainRegistry.tMatDesh, EnumToolType.SHOVEL) .addBreakAbility(new ToolAbility.HammerAbility(1)) .addBreakAbility(new ToolAbility.RecursionAbility(3)).setUnlocalizedName("desh_shovel").setTextureName(RefStrings.MODID + ":desh_shovel"); - desh_hoe = new ModHoe(MainRegistry.enumToolMaterialDesh).setUnlocalizedName("desh_hoe").setTextureName(RefStrings.MODID + ":desh_hoe"); + desh_hoe = new ModHoe(MainRegistry.tMatDesh).setUnlocalizedName("desh_hoe").setTextureName(RefStrings.MODID + ":desh_hoe"); - cobalt_sword = new ItemToolAbility(12F, 0, MainRegistry.enumToolMaterialCobalt, EnumToolType.SWORD).setUnlocalizedName("cobalt_sword").setTextureName(RefStrings.MODID + ":cobalt_sword"); + cobalt_sword = new ItemToolAbility(12F, 0, MainRegistry.tMatCobalt, EnumToolType.SWORD).setUnlocalizedName("cobalt_sword").setTextureName(RefStrings.MODID + ":cobalt_sword"); - cobalt_pickaxe = new ItemToolAbility(4F, 0, MainRegistry.enumToolMaterialCobalt, EnumToolType.PICKAXE) + cobalt_pickaxe = new ItemToolAbility(4F, 0, MainRegistry.tMatCobalt, EnumToolType.PICKAXE) .addBreakAbility(new ToolAbility.RecursionAbility(4)).setUnlocalizedName("cobalt_pickaxe").setTextureName(RefStrings.MODID + ":cobalt_pickaxe"); - cobalt_axe = new ItemToolAbility(6F, 0, MainRegistry.enumToolMaterialCobalt, EnumToolType.AXE) + cobalt_axe = new ItemToolAbility(6F, 0, MainRegistry.tMatCobalt, EnumToolType.AXE) .addBreakAbility(new ToolAbility.RecursionAbility(4)).setUnlocalizedName("cobalt_axe").setTextureName(RefStrings.MODID + ":cobalt_axe"); - cobalt_shovel = new ItemToolAbility(3.5F, 0, MainRegistry.enumToolMaterialCobalt, EnumToolType.SHOVEL) + cobalt_shovel = new ItemToolAbility(3.5F, 0, MainRegistry.tMatCobalt, EnumToolType.SHOVEL) .addBreakAbility(new ToolAbility.RecursionAbility(4)).setUnlocalizedName("cobalt_shovel").setTextureName(RefStrings.MODID + ":cobalt_shovel"); - cobalt_hoe = new ModHoe(MainRegistry.enumToolMaterialCobalt).setUnlocalizedName("cobalt_hoe").setTextureName(RefStrings.MODID + ":cobalt_hoe"); + cobalt_hoe = new ModHoe(MainRegistry.tMatCobalt).setUnlocalizedName("cobalt_hoe").setTextureName(RefStrings.MODID + ":cobalt_hoe"); + + centri_stick = new ItemToolAbility(3F, 0, MainRegistry.tMatElec, EnumToolType.MINER) + .addBreakAbility(new ToolAbility.CentrifugeAbility()).setMaxDamage(50).setUnlocalizedName("centri_stick").setTextureName(RefStrings.MODID + ":centri_stick"); mask_of_infamy = new MaskOfInfamy(ArmorMaterial.IRON, 8, 0).setUnlocalizedName("mask_of_infamy").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mask_of_infamy"); @@ -3543,16 +3548,16 @@ public class ModItems { cape_gasmask = new ArmorModel(ArmorMaterial.CHAIN, 9, 1).setUnlocalizedName("cape_gasmask").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_gasmask"); cape_schrabidium = new ArmorModel(MainRegistry.aMatSchrab, 9, 1).setUnlocalizedName("cape_schrabidium").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_schrabidium"); - schrabidium_hammer = new WeaponSpecial(MainRegistry.enumToolMaterialHammer).setUnlocalizedName("schrabidium_hammer").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_hammer"); + schrabidium_hammer = new WeaponSpecial(MainRegistry.tMatHammmer).setUnlocalizedName("schrabidium_hammer").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_hammer"); shimmer_sledge = new WeaponSpecial(MainRegistry.enumToolMaterialSledge).setUnlocalizedName("shimmer_sledge").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":shimmer_sledge_original"); shimmer_axe = new WeaponSpecial(MainRegistry.enumToolMaterialSledge).setUnlocalizedName("shimmer_axe").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":shimmer_axe"); bottle_opener = new WeaponSpecial(MainRegistry.enumToolMaterialBottleOpener).setUnlocalizedName("bottle_opener").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":bottle_opener"); euphemium_stopper = new ItemSyringe().setUnlocalizedName("euphemium_stopper").setMaxStackSize(1).setFull3D().setTextureName(RefStrings.MODID + ":euphemium_stopper"); matchstick = new ItemMatch().setUnlocalizedName("matchstick").setCreativeTab(CreativeTabs.tabTools).setFull3D().setTextureName(RefStrings.MODID + ":matchstick"); - crowbar = new ModSword(MainRegistry.enumToolMaterialSteel).setUnlocalizedName("crowbar").setFull3D().setTextureName(RefStrings.MODID + ":crowbar"); - wrench = new WeaponSpecial(MainRegistry.enumToolMaterialSteel).setUnlocalizedName("wrench").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wrench"); - wrench_flipped = new WeaponSpecial(MainRegistry.enumToolMaterialElec).setUnlocalizedName("wrench_flipped").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wrench_flipped"); - memespoon = new WeaponSpecial(MainRegistry.enumToolMaterialSteel).setUnlocalizedName("memespoon").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":memespoon"); + crowbar = new ModSword(MainRegistry.tMatSteel).setUnlocalizedName("crowbar").setFull3D().setTextureName(RefStrings.MODID + ":crowbar"); + wrench = new WeaponSpecial(MainRegistry.tMatSteel).setUnlocalizedName("wrench").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wrench"); + wrench_flipped = new WeaponSpecial(MainRegistry.tMatElec).setUnlocalizedName("wrench_flipped").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wrench_flipped"); + memespoon = new WeaponSpecial(MainRegistry.tMatSteel).setUnlocalizedName("memespoon").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":memespoon"); multitool_hit = new ItemMultitoolPassive().setUnlocalizedName("multitool_hit").setCreativeTab(null).setTextureName(RefStrings.MODID + ":multitool_fist"); multitool_dig = new ItemMultitoolTool(4.0F, MainRegistry.enumToolMaterialMultitool, ItemMultitoolTool.getAllBlocks()).setFull3D().setUnlocalizedName("multitool_dig").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":multitool_claw"); @@ -3571,9 +3576,9 @@ public class ModItems { golf_club = new ModSword(MainRegistry.enumToolMaterialGolfClub).setUnlocalizedName("weapon_golf_club").setFull3D().setTextureName(RefStrings.MODID + ":golf_club"); pipe_rusty = new ModSword(MainRegistry.enumToolMaterialPipeRusty).setUnlocalizedName("weapon_pipe_rusty").setFull3D().setTextureName(RefStrings.MODID + ":pipe_rusty"); pipe_lead = new ModSword(MainRegistry.enumToolMaterialPipeLead).setUnlocalizedName("weapon_pipe_lead").setFull3D().setTextureName(RefStrings.MODID + ":pipe_lead"); - reer_graar = new ModSword(MainRegistry.enumToolMaterialTitanium).setUnlocalizedName("reer_graar").setFull3D().setTextureName(RefStrings.MODID + ":reer_graar_hd"); - stopsign = new WeaponSpecial(MainRegistry.enumToolMaterialAlloy).setUnlocalizedName("stopsign").setTextureName(RefStrings.MODID + ":stopsign"); - sopsign = new WeaponSpecial(MainRegistry.enumToolMaterialAlloy).setUnlocalizedName("sopsign").setTextureName(RefStrings.MODID + ":sopsign"); + reer_graar = new ModSword(MainRegistry.tMatTitan).setUnlocalizedName("reer_graar").setFull3D().setTextureName(RefStrings.MODID + ":reer_graar_hd"); + stopsign = new WeaponSpecial(MainRegistry.tMatAlloy).setUnlocalizedName("stopsign").setTextureName(RefStrings.MODID + ":stopsign"); + sopsign = new WeaponSpecial(MainRegistry.tMatAlloy).setUnlocalizedName("sopsign").setTextureName(RefStrings.MODID + ":sopsign"); crystal_horn = new ItemCustomLore().setUnlocalizedName("crystal_horn").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":crystal_horn"); crystal_charred = new ItemCustomLore().setUnlocalizedName("crystal_charred").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":crystal_charred"); @@ -5114,6 +5119,7 @@ public class ModItems { GameRegistry.registerItem(elec_pickaxe, elec_pickaxe.getUnlocalizedName()); GameRegistry.registerItem(elec_axe, elec_axe.getUnlocalizedName()); GameRegistry.registerItem(elec_shovel, elec_shovel.getUnlocalizedName()); + GameRegistry.registerItem(centri_stick, centri_stick.getUnlocalizedName()); GameRegistry.registerItem(matchstick, matchstick.getUnlocalizedName()); GameRegistry.registerItem(crowbar, crowbar.getUnlocalizedName()); GameRegistry.registerItem(wrench, wrench.getUnlocalizedName()); diff --git a/com/hbm/items/special/ItemRadioactive.java b/com/hbm/items/special/ItemRadioactive.java index 064ae226d..fd4e59d21 100644 --- a/com/hbm/items/special/ItemRadioactive.java +++ b/com/hbm/items/special/ItemRadioactive.java @@ -46,7 +46,7 @@ public class ItemRadioactive extends ItemCustomLore { if (entity instanceof EntityLivingBase) { if(this.radiation > 0) - Library.applyRadData(entity, this.radiation / 20F); + Library.applyRadData(entity, this.radiation * mod / 20F); if(this.fire) entity.setFire(5); diff --git a/com/hbm/items/tool/ItemToolAbility.java b/com/hbm/items/tool/ItemToolAbility.java index f68e5f70d..1bac26d6e 100644 --- a/com/hbm/items/tool/ItemToolAbility.java +++ b/com/hbm/items/tool/ItemToolAbility.java @@ -48,8 +48,7 @@ public class ItemToolAbility extends ItemTool { public static enum EnumToolType { SWORD( - Sets.newHashSet(new Material[] { Material.plants, Material.vine, Material.coral, Material.leaves, Material.gourd }), - Sets.newHashSet(new Block[] { Blocks.web }) + Sets.newHashSet(new Material[] { Material.plants, Material.vine, Material.coral, Material.leaves, Material.gourd , Material.web }) ), PICKAXE( Sets.newHashSet(new Material[] { Material.iron, Material.anvil, Material.rock }), @@ -62,8 +61,15 @@ public class ItemToolAbility extends ItemTool { SHOVEL( Sets.newHashSet(new Material[] { Material.clay, Material.sand, Material.ground, Material.snow, Material.craftedSnow }), Sets.newHashSet(new Block[] { Blocks.grass, Blocks.dirt, Blocks.sand, Blocks.gravel, Blocks.snow_layer, Blocks.snow, Blocks.clay, Blocks.farmland, Blocks.soul_sand, Blocks.mycelium }) + ), + MINER( + Sets.newHashSet(new Material[] { Material.iron, Material.anvil, Material.rock, Material.clay, Material.sand, Material.ground, Material.snow, Material.craftedSnow }) ); + private EnumToolType(Set materials) { + this.materials = materials; + } + private EnumToolType(Set materials, Set blocks) { this.materials = materials; this.blocks = blocks; diff --git a/com/hbm/items/tool/WeaponSpecial.java b/com/hbm/items/tool/WeaponSpecial.java index 57a5d0d53..72f0d6d87 100644 --- a/com/hbm/items/tool/WeaponSpecial.java +++ b/com/hbm/items/tool/WeaponSpecial.java @@ -60,7 +60,7 @@ public class WeaponSpecial extends ItemSword { { entity.setHealth(0.0F); } - world.playSoundAtEntity(entity, "random.anvil_land", 3.0F, 0.1F); + world.playSoundAtEntity(entity, "hbm:weapon.bonk", 3.0F, 1.0F); } if(this == ModItems.bottle_opener) { diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java index de11ada78..74dd80ecc 100644 --- a/com/hbm/lib/RefStrings.java +++ b/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (3514)"; + public static final String VERSION = "1.0.27 BETA (3515)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 9a27edf34..cf5851ab1 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -1124,6 +1124,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.elec_pickaxe, 1), new Object[] { "RDM", " PB", " P ", 'P', ModItems.ingot_polymer, 'D', ModItems.ingot_dura_steel, 'R', ModItems.bolt_dura_steel, 'M', ModItems.motor, 'B', ModItems.battery_lithium }); GameRegistry.addRecipe(new ItemStack(ModItems.elec_axe, 1), new Object[] { " DP", "RRM", " PB", 'P', ModItems.ingot_polymer, 'D', ModItems.ingot_dura_steel, 'R', ModItems.bolt_dura_steel, 'M', ModItems.motor, 'B', ModItems.battery_lithium }); GameRegistry.addRecipe(new ItemStack(ModItems.elec_shovel, 1), new Object[] { " P", "RRM", " B", 'P', ModItems.ingot_polymer, 'D', ModItems.ingot_dura_steel, 'R', ModItems.bolt_dura_steel, 'M', ModItems.motor, 'B', ModItems.battery_lithium }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.centri_stick, 1), new Object[] { ModItems.centrifuge_element, ModItems.energy_core, Items.stick }); GameRegistry.addRecipe(new ItemStack(ModItems.desh_sword, 1), new Object[] { "I", "I", "S", 'I', ModItems.ingot_desh, 'S', Items.stick }); GameRegistry.addRecipe(new ItemStack(ModItems.desh_pickaxe, 1), new Object[] { "III", " S ", " S ", 'I', ModItems.ingot_desh, 'S', Items.stick }); GameRegistry.addRecipe(new ItemStack(ModItems.desh_axe, 1), new Object[] { "II", "IS", " S", 'I', ModItems.ingot_desh, 'S', Items.stick }); @@ -1365,7 +1366,6 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_calamity, 1), new Object[] { " PI", "BBM", " PI", 'P', "plateIron", 'B', ModItems.pipes_steel, 'M', ModItems.mechanism_rifle_1, 'I', "ingotSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_calamity_dual, 1), new Object[] { "BBM", " PI", "BBM", 'P', "plateIron", 'B', ModItems.pipes_steel, 'M', ModItems.mechanism_rifle_1, 'I', "ingotSteel" })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_calamity_ammo, 8), new Object[] { "S", "C", "G", 'S', "plateSteel", 'C', "plateCopper", 'G', Items.gunpowder })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.analyzer, 1), new Object[] { " S ", "SGS", " S ", 'S', "plateSteel", 'G', "paneGlassColorless" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.custom_fall, 1), new Object[] { "IIP", "CHW", "IIP", 'I', ModItems.plate_polymer, 'P', "plateSaturnite", 'C', ModItems.circuit_red_copper, 'H', ModItems.hull_small_steel, 'W', ModItems.coil_copper })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.reactor_sensor, 1), new Object[] { "WPW", "CMC", "PPP", 'W', ModItems.wire_tungsten, 'P', "plateLead", 'C', ModItems.circuit_targeting_tier3, 'M', ModItems.magnetron })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_controller, 1), new Object[] { "PGP", "ICI", "PRP", 'P', ModItems.plate_desh, 'G', "paneGlass", 'I', "ingotPolymer", 'R', "blockRedstone", 'C', ModItems.circuit_targeting_tier4 })); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 6be1fb797..8fe3d294a 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -87,16 +87,16 @@ public class MainRegistry public static Logger logger; //Tool Materials - public static ToolMaterial enumToolMaterialSchrabidium = EnumHelper.addToolMaterial("SCHRABIDIUM", 3, 10000, 50.0F, 100.0F, 200); - public static ToolMaterial enumToolMaterialHammer = EnumHelper.addToolMaterial("SCHRABIDIUMHAMMER", 3, 0, 50.0F, 999999996F, 200); - public static ToolMaterial enumToolMaterialChainsaw = EnumHelper.addToolMaterial("CHAINSAW", 3, 1500, 50.0F, 22.0F, 0); - public static ToolMaterial enumToolMaterialSteel = EnumHelper.addToolMaterial("HBM_STEEL", 2, 500, 7.5F, 2.0F, 10); - public static ToolMaterial enumToolMaterialTitanium = EnumHelper.addToolMaterial("HBM_TITANIUM", 3, 750, 9.0F, 2.5F, 15); - public static ToolMaterial enumToolMaterialAlloy= EnumHelper.addToolMaterial("HBM_ALLOY", 3, 2000, 15.0F, 5.0F, 5); - public static ToolMaterial enumToolMaterialCmb = EnumHelper.addToolMaterial("CMB", 3, 8500, 40.0F, 55F, 100); - public static ToolMaterial enumToolMaterialElec = EnumHelper.addToolMaterial("ELEC", 3, 0, 30.0F, 12.0F, 2); - public static ToolMaterial enumToolMaterialDesh = EnumHelper.addToolMaterial("DESH", 2, 0, 7.5F, 2.0F, 10); - public static ToolMaterial enumToolMaterialCobalt = EnumHelper.addToolMaterial("HBM_COBALT", 3, 750, 9.0F, 2.5F, 15); + public static ToolMaterial tMatSchrab = EnumHelper.addToolMaterial("SCHRABIDIUM", 3, 10000, 50.0F, 100.0F, 200); + public static ToolMaterial tMatHammmer = EnumHelper.addToolMaterial("SCHRABIDIUMHAMMER", 3, 0, 50.0F, 999999996F, 200); + public static ToolMaterial tMatChainsaw = EnumHelper.addToolMaterial("CHAINSAW", 3, 1500, 50.0F, 22.0F, 0); + public static ToolMaterial tMatSteel = EnumHelper.addToolMaterial("HBM_STEEL", 2, 500, 7.5F, 2.0F, 10); + public static ToolMaterial tMatTitan = EnumHelper.addToolMaterial("HBM_TITANIUM", 3, 750, 9.0F, 2.5F, 15); + public static ToolMaterial tMatAlloy= EnumHelper.addToolMaterial("HBM_ALLOY", 3, 2000, 15.0F, 5.0F, 5); + public static ToolMaterial tMatCMB = EnumHelper.addToolMaterial("HBM_CMB", 3, 8500, 40.0F, 55F, 100); + public static ToolMaterial tMatElec = EnumHelper.addToolMaterial("HBM_ELEC", 3, 0, 30.0F, 12.0F, 2); + public static ToolMaterial tMatDesh = EnumHelper.addToolMaterial("HBM_DESH", 2, 0, 7.5F, 2.0F, 10); + public static ToolMaterial tMatCobalt = EnumHelper.addToolMaterial("HBM_COBALT", 3, 750, 9.0F, 2.5F, 15); public static ToolMaterial enumToolMaterialSaw = EnumHelper.addToolMaterial("SAW", 2, 750, 2.0F, 3.5F, 25); public static ToolMaterial enumToolMaterialBat = EnumHelper.addToolMaterial("BAT", 0, 500, 1.5F, 3F, 25); @@ -397,15 +397,15 @@ public class MainRegistry aMatSecurity.customCraftingMaterial = ModItems.plate_kevlar; aMatCobalt.customCraftingMaterial = ModItems.ingot_cobalt; aMatStarmetal.customCraftingMaterial = ModItems.ingot_starmetal; - enumToolMaterialSchrabidium.setRepairItem(new ItemStack(ModItems.ingot_schrabidium)); - enumToolMaterialHammer.setRepairItem(new ItemStack(Item.getItemFromBlock(ModBlocks.block_schrabidium))); - enumToolMaterialChainsaw.setRepairItem(new ItemStack(ModItems.ingot_steel)); - enumToolMaterialTitanium.setRepairItem(new ItemStack(ModItems.ingot_titanium)); - enumToolMaterialSteel.setRepairItem(new ItemStack(ModItems.ingot_steel)); - enumToolMaterialAlloy.setRepairItem(new ItemStack(ModItems.ingot_advanced_alloy)); - enumToolMaterialCmb.setRepairItem(new ItemStack(ModItems.ingot_combine_steel)); + tMatSchrab.setRepairItem(new ItemStack(ModItems.ingot_schrabidium)); + tMatHammmer.setRepairItem(new ItemStack(Item.getItemFromBlock(ModBlocks.block_schrabidium))); + tMatChainsaw.setRepairItem(new ItemStack(ModItems.ingot_steel)); + tMatTitan.setRepairItem(new ItemStack(ModItems.ingot_titanium)); + tMatSteel.setRepairItem(new ItemStack(ModItems.ingot_steel)); + tMatAlloy.setRepairItem(new ItemStack(ModItems.ingot_advanced_alloy)); + tMatCMB.setRepairItem(new ItemStack(ModItems.ingot_combine_steel)); enumToolMaterialBottleOpener.setRepairItem(new ItemStack(ModItems.plate_steel)); - enumToolMaterialDesh.setRepairItem(new ItemStack(ModItems.ingot_desh)); + tMatDesh.setRepairItem(new ItemStack(ModItems.ingot_desh)); NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GUIHandler()); GameRegistry.registerTileEntity(TileEntityTestBombAdvanced.class, "tilentity_testbombadvanced"); diff --git a/com/hbm/main/ModEventHandler.java b/com/hbm/main/ModEventHandler.java index 69f2ba076..d16a0d46c 100644 --- a/com/hbm/main/ModEventHandler.java +++ b/com/hbm/main/ModEventHandler.java @@ -283,7 +283,7 @@ public class ModEventHandler if(eRad > 2500) entity.getEntityData().setFloat("hfr_radiation", 2500); - if(eRad >= 1000) { + if(eRad >= 1000 && !(entity instanceof EntityPlayer && ((EntityPlayer)entity).capabilities.isCreativeMode)) { if(entity.attackEntityFrom(ModDamageSource.radiation, entity.getMaxHealth() * 100)) { entity.getEntityData().setFloat("hfr_radiation", 0); @@ -294,7 +294,7 @@ public class ModEventHandler //.attackEntityFrom ensures the recentlyHit var is set to enable drops. //if the attack is canceled, then nothing will drop. //that's what you get for trying to cheat death - entity.setHealth(0); + entity.setHealth(0); } else if(eRad >= 800) { if(event.world.rand.nextInt(300) == 0) diff --git a/com/hbm/tileentity/machine/TileEntityBarrel.java b/com/hbm/tileentity/machine/TileEntityBarrel.java index d0fc01480..2f727ea89 100644 --- a/com/hbm/tileentity/machine/TileEntityBarrel.java +++ b/com/hbm/tileentity/machine/TileEntityBarrel.java @@ -48,8 +48,6 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc tank.unloadTank(4, 5, slots); tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); - System.out.println(tank.getMaxFill()); - age++; if(age >= 20) age = 0; diff --git a/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java b/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java index 5343b4b96..70baca628 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java +++ b/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java @@ -497,8 +497,6 @@ public class TileEntityMachineReactorSmallOld extends TileEntity // itemstack in slots[id] has to contain ItemFuelRod item private void onRunOut(int id) { - System.out.println("aaa"); - Item item = slots[id].getItem(); if (item == ModItems.rod_uranium_fuel) {