From 14e10e2f2d9a23a65f830b3b1e324f879a700751 Mon Sep 17 00:00:00 2001 From: Bob Date: Sat, 25 Jul 2020 21:00:57 +0200 Subject: [PATCH] finished new breeder crap, balefire rods, small tweaks --- src/main/java/assets/hbm/lang/de_DE.lang | 7 +++ src/main/java/assets/hbm/lang/en_US.lang | 7 +++ .../textures/gui/weapon/fstbmbSchematic.png | Bin 9529 -> 9817 bytes .../hbm/textures/items/balefire_and_steel.png | Bin 315 -> 320 bytes .../hbm/textures/items/battery_trixite.png | Bin 0 -> 339 bytes .../hbm/textures/items/rod_balefire.png | Bin 0 -> 255 bytes .../textures/items/rod_balefire_blazing.png | Bin 0 -> 322 bytes .../hbm/textures/items/rod_dual_balefire.png | Bin 0 -> 303 bytes .../items/rod_dual_balefire_blazing.png | Bin 0 -> 395 bytes .../hbm/textures/items/rod_quad_balefire.png | Bin 0 -> 380 bytes .../items/rod_quad_balefire_blazing.png | Bin 0 -> 571 bytes src/main/java/com/hbm/blocks/ModBlocks.java | 6 ++- .../blocks/machine/MachinePlasmaHeater.java | 30 ++++++++++++ .../java/com/hbm/creativetabs/ControlTab.java | 9 ++-- .../java/com/hbm/creativetabs/MachineTab.java | 6 +-- .../hbm/handler/nei/ReactorRecipeHandler.java | 44 ++++++++---------- .../com/hbm/inventory/BreederRecipes.java | 29 +++++++++++- .../com/hbm/inventory/gui/GUINukeFstbmb.java | 8 +++- src/main/java/com/hbm/items/ModItems.java | 25 +++++++++- .../com/hbm/items/block/ItemBlockLore.java | 37 ++++++++++----- .../com/hbm/items/tool/ItemBalefireMatch.java | 2 +- .../java/com/hbm/main/CraftingManager.java | 22 ++++++--- .../render/tileentity/RenderFluidBarrel.java | 28 ++++++----- .../bomb/TileEntityNukeBalefire.java | 14 +++++- 24 files changed, 205 insertions(+), 69 deletions(-) create mode 100644 src/main/java/assets/hbm/textures/items/battery_trixite.png create mode 100644 src/main/java/assets/hbm/textures/items/rod_balefire.png create mode 100644 src/main/java/assets/hbm/textures/items/rod_balefire_blazing.png create mode 100644 src/main/java/assets/hbm/textures/items/rod_dual_balefire.png create mode 100644 src/main/java/assets/hbm/textures/items/rod_dual_balefire_blazing.png create mode 100644 src/main/java/assets/hbm/textures/items/rod_quad_balefire.png create mode 100644 src/main/java/assets/hbm/textures/items/rod_quad_balefire_blazing.png create mode 100644 src/main/java/com/hbm/blocks/machine/MachinePlasmaHeater.java diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang index 37291dabf..92bd5f173 100644 --- a/src/main/java/assets/hbm/lang/de_DE.lang +++ b/src/main/java/assets/hbm/lang/de_DE.lang @@ -493,6 +493,7 @@ item.battery_steam.name=Dampfbetriebener Energiespeichertank item.battery_steam_large.name=Großer dampfbetriebener Energiespeichertank item.battery_su.name=Einwegbatterie item.battery_su_l.name=Große Einwegbatterie +item.battery_trixite.name=Billige Spark-Batterie-Nachmache item.big_sword.name=Großes Schwert item.biomass.name=Biomasse item.biomass_compressed.name=Verdichtete Biomasse @@ -1522,8 +1523,12 @@ item.remote.name=Kaputte Fernbedienung item.ring_pull.name=Dosenring item.rocket_fuel.name=Festbrennstoff (Raketentreibstoff) item.rod_australium.name=Australiumbrennstab +item.rod_balefire.name=Balefire-Brennstab +item.rod_balefire_blazing.name=Lodernder Balefire-Brennstab item.rod_coolant.name=Kühlzelle item.rod_daffergon.name=Daffergonbrennstab +item.rod_balefire.name=Balefire-Doppelbrennstab +item.rod_balefire_blazing.name=Lodernder Balefire-Doppelbrennstab item.rod_dual_coolant.name=Doppelte Kühlzelle item.rod_dual_empty.name=Leerer Doppelbrennstab item.rod_dual_lead.name=Bleidoppelstab @@ -1568,6 +1573,8 @@ item.rod_polonium.name=Poloniumbrennstab item.rod_pu238.name=Pu238-Brennstab item.rod_pu239.name=Pu239-Brennstab item.rod_pu240.name=Pu240-Brennstab +item.rod_balefire.name=Balefire-Vierfachbrennstab +item.rod_balefire_blazing.name=Lodernder Balefire-Vierfachbrennstab item.rod_quad_coolant.name=Vierfache Kühlzelle item.rod_quad_empty.name=Leerer Vierfachbrennstab item.rod_quad_euphemium.name=Ausgebrannter Schrabidiumvierfachbrennstab diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang index 922d311e5..a05dd5aa5 100644 --- a/src/main/java/assets/hbm/lang/en_US.lang +++ b/src/main/java/assets/hbm/lang/en_US.lang @@ -493,6 +493,7 @@ item.battery_steam.name=Steam Powered Energy Storage Tank item.battery_steam_large.name=Large Steam Powered Energy Storage Tank item.battery_su.name=SU-Battery item.battery_su_l.name=Large SU-Battery +item.battery_trixite.name=Off-Brand Spark Battery item.big_sword.name=Great Sword item.biomass.name=Biomass item.biomass_compressed.name=Compressed Biomass @@ -1522,8 +1523,12 @@ item.remote.name=Broken Remote item.ring_pull.name=Ring Pull item.rocket_fuel.name=Solid Fuel (Rocket Propellant) item.rod_australium.name=Australium Rod +item.rod_balefire.name=Balefire Rod +item.rod_balefire_blazing.name=Blazing Balefire Rod item.rod_coolant.name=Coolant Cell item.rod_daffergon.name=Daffergon Rod +item.rod_dual_balefire.name=Balefire Dual Rod +item.rod_dual_balefire_blazing.name=Blazing Balefire Dual Rod item.rod_dual_coolant.name=Dual Coolant Cell item.rod_dual_empty.name=Empty Dual Rod item.rod_dual_lead.name=Lead Dual Rod @@ -1568,6 +1573,8 @@ item.rod_polonium.name=Polonium Rod item.rod_pu238.name=Pu238 Rod item.rod_pu239.name=Pu239 Rod item.rod_pu240.name=Pu240 Rod +item.rod_quad_balefire.name=Balefire Quad Rod +item.rod_quad_balefire_blazing.name=Blazing Balefire Quad Rod item.rod_quad_coolant.name=Quad Coolant Cell item.rod_quad_empty.name=Empty Quad Rod item.rod_quad_euphemium.name=Burned Out Quad Schrabidium Rod diff --git a/src/main/java/assets/hbm/textures/gui/weapon/fstbmbSchematic.png b/src/main/java/assets/hbm/textures/gui/weapon/fstbmbSchematic.png index e3819577ac566fd0397a6dbe83f4ea6a23acb95f..e21aa322c7d75b14c5443a2d5e1ba8a2d81f2f92 100644 GIT binary patch literal 9817 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 literal 9529 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

G>X_N9HoyFn& z#ZfRsZERxN8;u5$U>g+O9gX3Izaer|t zl*3psH<(B|)vhyoo~NE4doF-_2C}=-O20N}#>*H+Ak|gN%3y@$tDQi$^;y12`N_W@hHXDFk(|5I^hRY6cmudcaoP z`m5fWV%#M_G@-!bPe;r2Tf_Ty&he$9XU%xh?q%9Fp--_gN?LTv>LT=A5V)|wqCaRET;^LfnM5-gi)eU|Eu6tW9lkx#XEA+gmHNp7E8 z^p{V2r!?73d7*p4=O8Ve);ERqVe9MNRBkW_snF+^kJ*fz^`BW{iiBu2S)}Ff41C{~ zC=(R?;F2wxB)#6iuhb-Q(qCy@)-qN{R?fx4V{31p)0~+}VdlHPCdW>45vUnvC5p}&!EDw>UGNlLcKPKpOk44x$B&#DSgV5K`*xw z>ItzI?$B~qW$B|Svq#{ zLJz*ZNSPO9Kh(WTnh=A7gJ+zW(=D;k4t3*OhpgJHn&>z@X}@Lj=9b_iTT~m;Y|TXV1d@S^=TrTstdM~KB4EgN?AA_Vg)IN< zOtrVZ>arBMiJ?2J^WXBH442Gym`!MXWhT`5J0v2<7`D#2C6Uc2)v{3nKfedmh3^H_ z1a6b|j?Cc1Tit`mhHuCQZ$6pZD&H^{XQat1yt-;fcS4SQbl)Ba=IqvhGz(&xYgn^#vdCi3qitMNqDYrsy>nG`;*uo#5lc4r<8{pGY;! zK;y2|jj8?F>?9(K-Tu7n-v3A3qq$(|W%N-uU&~2(S5wIv5`1iSk6HFnOh zm9Jr~vAC7wPl)&`9f`0kVOL5Gc!6lzo;3PG0ADk_6( zQ}40PlUZhWjt_P$WghBo^9FbI zW?F^YFA-hSTF)1>#J0$HuT;|k^v&QPO>`J`?F9Fv(l2Sihn{;2a?oh52=%;`x=eX=1bcDpD2QXCWjX}|FV zbUKX*-aF;DJZ@$UjEkPUUV`R7ic!(ZdC)Y=L2VjH}WNjdDIs<;<>lbWCS9JEJ=++s2 zi8DNWBNA@nZPoRfA3qeAy|59%Pw;e8?e*ia$3WPEWsrIKz#~c!x>KWJ^88Fj9p)kb zFNHZ{YTq_(TAtO}h6UK5B%A5@X@@LD`tu*Qh&#fDb4(E=l zm7#y7<`3hEqYcZh9yS7Ch^kx7UuEfhx@pIFzK#s;bq-fd*WI=xAMp+7zn^|_zZm2R zV{e0Hp{j^RjWYQ^#us;)x1I&_uly|dD+F(Ga9s4q5rSj7#5!$H=9KSPm|IK6n9_BB zjCx23G~V^q4MQ(ztJ!kC?J7n5}JXqXczR+)o8a7*c0)+0X^P07kM?K%8ti+`liJqmJec z1`r^b|7gzdKk ziC63<3@J5q68PCYd^+OS=>PWW|5P>lcYv^){0ER!QuF>-OxXjyKG6P`L*p&Vvo8{R z{kLIDr74er-zSx5aZlo@bm diff --git a/src/main/java/assets/hbm/textures/items/balefire_and_steel.png b/src/main/java/assets/hbm/textures/items/balefire_and_steel.png index 989be1bc41ed7045fad366fe10346974c3d4d937..d442c543635069ea7962cc9c704a3b512944b532 100755 GIT binary patch delta 277 zcmV+w0qXv{0>A>0G=KL=L_t(IjjfVBYQsPfh2I9d%!0R7DSU&Z&#zM zMJ8rg*?SKFh%v%@j~FAE*-X*^7Q;=JWhl!MB4V1R(V{43JAYVAU5JQb=2?Tg*%#Lu zSZmLwQMY+=mKbzhhY$jYNJ9uC)4I*oJ#0rNN!6(s>o(U{g}&^aZg}0_B|{VuQ&pAz ztxqd|y*n($;og1s%)c3*gAbpIr^jv2U6jHQK76Fe$m6_FAdy|M6 zI(zQ{05L{*?-64JGn*tEz+$+`vJ7QeLPSi{G+GqJYzK=}L4QOHGtUY<%-*7X zjk?W8XCr~G>kvW!5orivB3ie(x|iKVWaOHPv2JtyQ0V*K>4sN*Z8Ss?F;!LRd41{p zb#PdU!=wA|IlpFnjSK*9&)c4NQwl@!C6fPOh~wuIjyOGg{kog&dV&qFG&%Xd;s;sW WZ^E;%6leed00{s|MNUMnLSTYkIDCTu diff --git a/src/main/java/assets/hbm/textures/items/battery_trixite.png b/src/main/java/assets/hbm/textures/items/battery_trixite.png new file mode 100644 index 0000000000000000000000000000000000000000..73ae4e1200b2507959d86999c4be98be671c65a9 GIT binary patch literal 339 zcmV-Z0j&OsP)1uDg?pmKslU)*Yi-pe5fuJ|_Hb|r3B<_A2B(si zqS1fgu5hPlYAr-Qm%{R za@owPlUhn1oSfH;$Pg{UdTs+P!rSW$o>C~aLgTDD)w7%g>=g=lN^x^l=h628NN3XI z4-U~HRssu9>qe}t!s%rl2}869T7*)&PyA_5Yyl=}c6x*#F~K0BFC&-D4Jhtr#|c17 zOsPHF=lq3cr}te~y6yx{z;CrM!1)FM*S-)8qQ3#EI~hEsczBv_yx2~mWyDd!Z*Ag4 l&%wL-xd;1On@;aS`U1}RW;;Pph;sk{002ovPDHLkV1h!tl8gWV literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/items/rod_balefire.png b/src/main/java/assets/hbm/textures/items/rod_balefire.png new file mode 100644 index 0000000000000000000000000000000000000000..626dd61ed661ba7607301df29fbfc665e640adc5 GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfI38d$ut;$ZPz{+VY9gS}tuWQN^>3M4 z{{R0oS)C)Nu|AL4P$rZ+;dv#4fS^tX7sHI)-#*vGU7pmlhlVm1)XiCAp2ME1!SLbU zYU|kC3ClE(TOQ!Jz?jzZaaqcSJCSN{Irgs*{jlc#$A%|Y7w)^~+Yp(wv0?W6qm~(7 zGVAyX8Gg8BOyzopr07pt) ADF6Tf literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/items/rod_balefire_blazing.png b/src/main/java/assets/hbm/textures/items/rod_balefire_blazing.png new file mode 100644 index 0000000000000000000000000000000000000000..bd1cb23660c2b30d7a771d3fd8eef57e6daa268f GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf0TIwCwd?HlqM>z2e6o=Sgbq)nVGJYIi?l z3*RxuZlU^;Q(qn>fOK@`2E02Vl4PjQyXX_~hi SuW$eZfx*+&&t;ucLK6U4P>SRL literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/items/rod_dual_balefire.png b/src/main/java/assets/hbm/textures/items/rod_dual_balefire.png new file mode 100644 index 0000000000000000000000000000000000000000..15f18c4f9b0abbd0a5b8f5230a4560446020f337 GIT binary patch literal 303 zcmV+~0nq-5P)V4e5Jg`|nk2>+6)3OE48rlVVg zs6cFmrU*(zBBwGkYde_y&QGK7`QtHkWQ?(8S=wCQ^AA;3SpX5iFHZ5m0N`cz!1H8> zh-C3IgSKq}*nX`~HydMYm;1Wwf{k4QpsJ`Uu63U$4T_>*H3H}ZN?q4Ct`ndC8DTKp z@Hn26!vll=C~9y#{6vdmJTT~e-*VW0hJ^_p3~~7iA9_y?4?1wedU{&`=X>DuixHff zra8U4&yx{cvCHcA!0rFV8Hfn)Lx7ST9@Vwq`4_>>h=OWJ3)27q002ovPDHLkV1lAC Bd@KL} literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/items/rod_dual_balefire_blazing.png b/src/main/java/assets/hbm/textures/items/rod_dual_balefire_blazing.png new file mode 100644 index 0000000000000000000000000000000000000000..84b5f54f90b8faa1ea4f98fc913a53ab54ef9971 GIT binary patch literal 395 zcmV;60d)R}P)YU6oZM2e>^rlH{a~(=cns|+#?R*?Qxaa&X#Hv!M$a1+X|H`#!b9AyV z1NjWVQ^V)x`d0gm17xBCv*5COX|r?DU};rP+ji9r=l z2u9252%F~d`Zx!1t`z7-pMng~bHioT?}j;8G??H@LCfl4OPvp=gD0}%9F$fzWRxof p18<(I1Arp-`&26bvHts=zX7t^-X&%|K1=`r002ovPDHLkV1hu6s{a50 literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/items/rod_quad_balefire.png b/src/main/java/assets/hbm/textures/items/rod_quad_balefire.png new file mode 100644 index 0000000000000000000000000000000000000000..31308b0dd5f6f3ad42d570d65464de0b0cca77fb GIT binary patch literal 380 zcmV-?0fYXDP)3;V>xU0B+G} zG^WNFq?9B{0)W<`<@A?Q!aH ztBw3dO~*j}H_lSkS_2@2C~(gp3_~vWG*TY%cmhxd<~?Y&S_Qtegwtn1k|Z<-itY3J zQtlb7t3M6CQ}ZugFsMvI7t^=Tl^hnDIPULKtyUTL;azV!ezE_Gl!pcGWnhe>sq-ZI7=k!D=)bxp&WV&mhY(VE##Ltx*)wz5DREl^dqTiL+8lv5ebc3i592 ajPnmXZ|6@7*xW||0000u4^P)ljQ6oo&#p?2+*(j-Djpj|?nRtiEW0;C`Wh=B!mBxY75 zwoVx;egPvA6Tbj4F;-#=WerPJQdGOC5;?|o>IC~eh9)L%0s}{S(!Jksbnnr-3KJ?8 zi&6+drBcClT^fys@-Ge$7i$|=q-KQNt<~`QM*tk`4QRL9Xhuk_R^w!Xf8P130H|Yw zTp{A+?h5%*hbQkG?!Vn*wWMLB1uu5j$rjxNA1gM{j1ZjwF0@JGp@}Y<5pwg!J$9Z+ z9LFJzhd$zCrN%|yQ#h0kZYPT+9Xz4ZX`gcReIEeb)Uo7{lM$aX81z$odODz5EzsNs zC~)d4^gIjA2+3w|(cJcd0)Zb#mt5iTM~z6e*{s{FY&BUhBbF}@dHyAZY96pzx4F92 zL^q@935-QanvftDu*`r3RiK+u%$ITjml&Xr_|ydFB_f&VmC=*ucx=%36#CITZbzpl zbPhd1;LrV)&kXU~t2~)ZhURPV{Y3(Q4(E8D_jiUoe6*V2GecZ|V-c!08+Ds&^%lAr zal86}eC9gcZa2YahbRO~xqyruqNUElYVDt;ele>i_|ydcPw2}Ob}Pb>TD+^{{-E~3 z!}t9Jp9~j((pp~XW< 0) + list.add(index, empty); } } } diff --git a/src/main/java/com/hbm/creativetabs/MachineTab.java b/src/main/java/com/hbm/creativetabs/MachineTab.java index e25e61e90..13f3c934f 100644 --- a/src/main/java/com/hbm/creativetabs/MachineTab.java +++ b/src/main/java/com/hbm/creativetabs/MachineTab.java @@ -15,10 +15,8 @@ public class MachineTab extends CreativeTabs { @Override public Item getTabIconItem() { - if(ModBlocks.machine_generator != null) - { - return Item.getItemFromBlock(ModBlocks.machine_rtg_grey); - } + if(ModBlocks.reactor_element != null) + return Item.getItemFromBlock(ModBlocks.reactor_element); return Items.iron_pickaxe; } diff --git a/src/main/java/com/hbm/handler/nei/ReactorRecipeHandler.java b/src/main/java/com/hbm/handler/nei/ReactorRecipeHandler.java index 8de3287e4..fd09fa9a3 100644 --- a/src/main/java/com/hbm/handler/nei/ReactorRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/ReactorRecipeHandler.java @@ -8,7 +8,6 @@ import java.util.Map; import com.hbm.inventory.BreederRecipes; import com.hbm.inventory.BreederRecipes.BreederRecipe; -import com.hbm.inventory.MachineRecipes; import com.hbm.inventory.gui.GUIMachineReactor; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; @@ -18,19 +17,24 @@ import net.minecraft.item.ItemStack; public class ReactorRecipeHandler extends TemplateRecipeHandler { - public static ArrayList fuels; - - public class SmeltingSet extends TemplateRecipeHandler.CachedRecipe - { + public class BreedingSet extends TemplateRecipeHandler.CachedRecipe { + PositionedStack input; PositionedStack result; - int heat; + public int heat; + public ArrayList fuels; - public SmeltingSet(ItemStack input, ItemStack result, int heat) { + public BreedingSet(ItemStack input, ItemStack result, int heat) { input.stackSize = 1; this.input = new PositionedStack(input, 51, 6); this.result = new PositionedStack(result, 111, 24); this.heat = heat; + + fuels = new ArrayList(); + + for(ItemStack sta : BreederRecipes.getAllFuelsFromHEAT(heat)) { + fuels.add(new Fuel(sta)); + } } @Override @@ -49,8 +53,8 @@ public class ReactorRecipeHandler extends TemplateRecipeHandler { } } - public static class Fuel - { + public static class Fuel { + public Fuel(ItemStack ingred) { this.stack = new PositionedStack(ingred, 51, 42, false); @@ -77,7 +81,7 @@ public class ReactorRecipeHandler extends TemplateRecipeHandler { Map recipes = BreederRecipes.getAllRecipes(); for (Map.Entry recipe : recipes.entrySet()) { - this.arecipes.add(new SmeltingSet(recipe.getKey(), recipe.getValue().output, recipe.getValue().heat)); + this.arecipes.add(new BreedingSet(recipe.getKey(), recipe.getValue().output, recipe.getValue().heat)); } } else { super.loadCraftingRecipes(outputId, results); @@ -91,7 +95,7 @@ public class ReactorRecipeHandler extends TemplateRecipeHandler { for (Map.Entry recipe : recipes.entrySet()) { if (NEIServerUtils.areStacksSameType(recipe.getValue().output, result)) - this.arecipes.add(new SmeltingSet(recipe.getKey(), recipe.getValue().output, recipe.getValue().heat)); + this.arecipes.add(new BreedingSet(recipe.getKey(), recipe.getValue().output, recipe.getValue().heat)); } } @@ -111,7 +115,7 @@ public class ReactorRecipeHandler extends TemplateRecipeHandler { for (Map.Entry recipe : recipes.entrySet()) { if (NEIServerUtils.areStacksSameType(ingredient, (ItemStack)recipe.getKey())) - this.arecipes.add(new SmeltingSet(recipe.getKey(), recipe.getValue().output, recipe.getValue().heat)); + this.arecipes.add(new BreedingSet(recipe.getKey(), recipe.getValue().output, recipe.getValue().heat)); } } @@ -128,17 +132,9 @@ public class ReactorRecipeHandler extends TemplateRecipeHandler { @Override public void drawExtras(int recipe) { drawProgressBar(50, 24, 176, 0, 14, 14, 48 * 3, 7); - drawProgressBar(74, 23, 176, 16, 24, 16, 48, 0); - } - - @Override - public TemplateRecipeHandler newInstance() { - if (fuels == null || fuels.isEmpty()) - fuels = new ArrayList(); - for(ItemStack i : MachineRecipes.instance().getReactorFuels()) - { - fuels.add(new Fuel(i)); - } - return super.newInstance(); + drawProgressBar(75, 23, 176, 16, 24, 16, 48, 0); + + int heat = ((BreedingSet)this.arecipes.get(recipe)).heat; + drawProgressBar(43, 24, 194, 0, 4, 16, (float) 1 - heat / 4F, 7); } } diff --git a/src/main/java/com/hbm/inventory/BreederRecipes.java b/src/main/java/com/hbm/inventory/BreederRecipes.java index 71a852281..f3e63a9bf 100644 --- a/src/main/java/com/hbm/inventory/BreederRecipes.java +++ b/src/main/java/com/hbm/inventory/BreederRecipes.java @@ -1,6 +1,8 @@ package com.hbm.inventory; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import com.hbm.blocks.ModBlocks; @@ -61,7 +63,10 @@ public class BreederRecipes { recipes.put(new ComparableStack(ModItems.rod_schrabidium), new BreederRecipe(ModItems.rod_solinium, 3)); recipes.put(new ComparableStack(ModItems.rod_dual_schrabidium), new BreederRecipe(ModItems.rod_dual_solinium, 3)); recipes.put(new ComparableStack(ModItems.rod_quad_schrabidium), new BreederRecipe(ModItems.rod_quad_solinium, 3)); - recipes.put(new ComparableStack(ModItems.rod_quad_euphemium), new BreederRecipe(ModItems.rod_quad_euphemium, 4)); + recipes.put(new ComparableStack(ModItems.rod_quad_solinium), new BreederRecipe(ModItems.rod_quad_euphemium, 4)); + recipes.put(new ComparableStack(ModItems.rod_balefire), new BreederRecipe(ModItems.rod_balefire_blazing, 4)); + recipes.put(new ComparableStack(ModItems.rod_dual_balefire), new BreederRecipe(ModItems.rod_dual_balefire_blazing, 4)); + recipes.put(new ComparableStack(ModItems.rod_quad_balefire), new BreederRecipe(ModItems.rod_quad_balefire_blazing, 4)); //rocks recipes.put(new ComparableStack(Blocks.stone), new BreederRecipe(new ItemStack(ModBlocks.sellafield_0), 2)); @@ -116,6 +121,14 @@ public class BreederRecipes { fuels.put(new ComparableStack(ModItems.rod_tritium), new int[] {1, 1}); fuels.put(new ComparableStack(ModItems.rod_dual_tritium), new int[] {1, 2}); fuels.put(new ComparableStack(ModItems.rod_quad_tritium), new int[] {1, 4}); + + fuels.put(new ComparableStack(ModItems.rod_balefire), new int[] {2, 150}); + fuels.put(new ComparableStack(ModItems.rod_dual_balefire), new int[] {2, 300}); + fuels.put(new ComparableStack(ModItems.rod_quad_balefire), new int[] {2, 600}); + + fuels.put(new ComparableStack(ModItems.rod_balefire_blazing), new int[] {4, 75}); + fuels.put(new ComparableStack(ModItems.rod_dual_balefire_blazing), new int[] {4, 150}); + fuels.put(new ComparableStack(ModItems.rod_quad_balefire_blazing), new int[] {4, 300}); } public static HashMap getAllRecipes() { @@ -129,6 +142,20 @@ public class BreederRecipes { return map; } + public static List getAllFuelsFromHEAT(int heat) { + + List list = new ArrayList(); + + for(Map.Entry fuel : fuels.entrySet()) { + + if(fuel.getValue()[0] >= heat) { + list.add(fuel.getKey().toStack()); + } + } + + return list; + } + public static BreederRecipe getOutput(ItemStack stack) { if(stack == null) diff --git a/src/main/java/com/hbm/inventory/gui/GUINukeFstbmb.java b/src/main/java/com/hbm/inventory/gui/GUINukeFstbmb.java index 1a731c6a4..1d7fad6de 100644 --- a/src/main/java/com/hbm/inventory/gui/GUINukeFstbmb.java +++ b/src/main/java/com/hbm/inventory/gui/GUINukeFstbmb.java @@ -74,7 +74,7 @@ public class GUINukeFstbmb extends GuiInfoContainer { String timer = bomb.getMinutes() + ":" + bomb.getSeconds(); double scale = 0.75; GL11.glScaled(scale, scale, scale); - this.fontRendererObj.drawString(timer, (int) ((69 - this.fontRendererObj.getStringWidth(timer) / 2) * (1/scale)), (int) (95 * (1/scale)), 0xff0000); + this.fontRendererObj.drawString(timer, (int) ((69 - this.fontRendererObj.getStringWidth(timer) / 2) * (1/scale)), (int) (95.5 * (1/scale)), 0xff0000); GL11.glScaled(1/scale, 1/scale, 1/scale); } @@ -89,8 +89,12 @@ public class GUINukeFstbmb extends GuiInfoContainer { if(bomb.hasEgg()) drawTexturedModalRect(guiLeft + 19, guiTop + 90, 176, 0, 30, 16); - if(bomb.hasBattery()) + int battery = bomb.getBattery(); + + if(battery == 1) drawTexturedModalRect(guiLeft + 88, guiTop + 93, 176, 16, 18, 10); + else if(battery == 2) + drawTexturedModalRect(guiLeft + 88, guiTop + 93, 194, 16, 18, 10); if(bomb.started) drawTexturedModalRect(guiLeft + 142, guiTop + 35, 176, 26, 18, 18); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index b4c5b7c89..b4b926c63 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -759,6 +759,8 @@ public class ModItems { public static Item rod_unobtainium; public static Item rod_daffergon; public static Item rod_verticium; + public static Item rod_balefire; + public static Item rod_balefire_blazing; public static Item rod_dual_empty; public static Item rod_dual_uranium; @@ -775,6 +777,8 @@ public class ModItems { public static Item rod_dual_lead; public static Item rod_dual_schrabidium; public static Item rod_dual_solinium; + public static Item rod_dual_balefire; + public static Item rod_dual_balefire_blazing; public static Item rod_quad_empty; public static Item rod_quad_uranium; @@ -791,6 +795,8 @@ public class ModItems { public static Item rod_quad_lead; public static Item rod_quad_schrabidium; public static Item rod_quad_solinium; + public static Item rod_quad_balefire; + public static Item rod_quad_balefire_blazing; public static Item rod_uranium_fuel; public static Item rod_dual_uranium_fuel; @@ -1423,6 +1429,7 @@ public class ModItems { public static Item battery_lithium; public static Item battery_schrabidium; public static Item battery_spark; + public static Item battery_trixite; public static Item battery_creative; public static Item battery_red_cell; @@ -2600,6 +2607,8 @@ public class ModItems { rod_unobtainium = new ItemCustomLore().setUnlocalizedName("rod_unobtainium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_unobtainium"); rod_daffergon = new ItemCustomLore().setUnlocalizedName("rod_daffergon").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_daffergon"); rod_verticium = new ItemCustomLore().setUnlocalizedName("rod_verticium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_verticium"); + rod_balefire = new ItemRadioactive(1500F).setUnlocalizedName("rod_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_balefire"); + rod_balefire_blazing = new ItemRadioactive(2500F, true).setUnlocalizedName("rod_balefire_blazing").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_balefire_blazing"); rod_dual_empty = new Item().setUnlocalizedName("rod_dual_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_dual_empty"); rod_dual_th232 = new ItemCustomLore().setUnlocalizedName("rod_dual_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_th232"); @@ -2616,6 +2625,8 @@ public class ModItems { rod_dual_lead = new Item().setUnlocalizedName("rod_dual_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_lead"); rod_dual_schrabidium = new ItemRadioactive(15F, false, true).setUnlocalizedName("rod_dual_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_schrabidium"); rod_dual_solinium = new ItemRadioactive(15F, false, true).setUnlocalizedName("rod_dual_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_solinium"); + rod_dual_balefire = new ItemRadioactive(3000F).setUnlocalizedName("rod_dual_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_dual_balefire"); + rod_dual_balefire_blazing = new ItemRadioactive(5000F, true).setUnlocalizedName("rod_dual_balefire_blazing").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_dual_balefire_blazing"); rod_quad_empty = new Item().setUnlocalizedName("rod_quad_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_quad_empty"); rod_quad_th232 = new ItemCustomLore().setUnlocalizedName("rod_quad_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_th232"); @@ -2632,6 +2643,8 @@ public class ModItems { rod_quad_lead = new Item().setUnlocalizedName("rod_quad_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_lead"); rod_quad_schrabidium = new ItemRadioactive(30F, false, true).setUnlocalizedName("rod_quad_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_schrabidium"); rod_quad_solinium = new ItemRadioactive(30F, false, true).setUnlocalizedName("rod_quad_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_solinium"); + rod_quad_balefire = new ItemRadioactive(6000F).setUnlocalizedName("rod_quad_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_quad_balefire"); + rod_quad_balefire_blazing = new ItemRadioactive(10000F, true).setUnlocalizedName("rod_quad_balefire_blazing").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_quad_balefire_blazing"); rod_thorium_fuel = new ItemFuelRod(0.5F, false, 100000, 10).setUnlocalizedName("rod_thorium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_thorium_fuel"); rod_dual_thorium_fuel = new ItemFuelRod(1.5F, false, 100000, 20).setUnlocalizedName("rod_dual_thorium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_thorium_fuel"); @@ -3219,7 +3232,7 @@ public class ModItems { n2_charge = new ItemN2().setUnlocalizedName("n2_charge").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":n2_charge"); - egg_balefire_shard = new ItemRadioactive(1500F, true).setUnlocalizedName("egg_balefire_shard").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":egg_balefire_shard"); + egg_balefire_shard = new ItemRadioactive(1500F, true).setUnlocalizedName("egg_balefire_shard").setMaxStackSize(16).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":egg_balefire_shard"); egg_balefire = new ItemRadioactive(10000F, true).setUnlocalizedName("egg_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":egg_balefire"); custom_tnt = new ItemCustomLore().setUnlocalizedName("custom_tnt").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":custom_tnt"); @@ -3235,6 +3248,7 @@ public class ModItems { battery_lithium = new ItemBattery(250000, 1000, 1000).setUnlocalizedName("battery_lithium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_lithium"); battery_schrabidium = new ItemBattery(1000000, 5000, 5000).setUnlocalizedName("battery_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_schrabidium_new"); battery_spark = new ItemBattery(100000000, 2000000, 2000000).setUnlocalizedName("battery_spark").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark"); + battery_trixite = new ItemBattery(5000000, 40000, 200000).setUnlocalizedName("battery_trixite").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_trixite"); battery_creative = new Item().setUnlocalizedName("battery_creative").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_creative_new"); battery_red_cell = new ItemBattery(15000, 100, 100).setUnlocalizedName("battery_red_cell").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_red_cell"); @@ -4456,6 +4470,7 @@ public class ModItems { GameRegistry.registerItem(battery_schrabidium_cell_2, battery_schrabidium_cell_2.getUnlocalizedName()); GameRegistry.registerItem(battery_schrabidium_cell_4, battery_schrabidium_cell_4.getUnlocalizedName()); GameRegistry.registerItem(battery_spark, battery_spark.getUnlocalizedName()); + GameRegistry.registerItem(battery_trixite, battery_trixite.getUnlocalizedName()); GameRegistry.registerItem(battery_spark_cell_6, battery_spark_cell_6.getUnlocalizedName()); GameRegistry.registerItem(battery_spark_cell_25, battery_spark_cell_25.getUnlocalizedName()); GameRegistry.registerItem(battery_spark_cell_100, battery_spark_cell_100.getUnlocalizedName()); @@ -4743,6 +4758,14 @@ public class ModItems { GameRegistry.registerItem(rod_tritium, rod_tritium.getUnlocalizedName()); GameRegistry.registerItem(rod_dual_tritium, rod_dual_tritium.getUnlocalizedName()); GameRegistry.registerItem(rod_quad_tritium, rod_quad_tritium.getUnlocalizedName()); + + GameRegistry.registerItem(rod_balefire, rod_balefire.getUnlocalizedName()); + GameRegistry.registerItem(rod_dual_balefire, rod_dual_balefire.getUnlocalizedName()); + GameRegistry.registerItem(rod_quad_balefire, rod_quad_balefire.getUnlocalizedName()); + + GameRegistry.registerItem(rod_balefire_blazing, rod_balefire_blazing.getUnlocalizedName()); + GameRegistry.registerItem(rod_dual_balefire_blazing, rod_dual_balefire_blazing.getUnlocalizedName()); + GameRegistry.registerItem(rod_quad_balefire_blazing, rod_quad_balefire_blazing.getUnlocalizedName()); GameRegistry.registerItem(rod_euphemium, rod_euphemium.getUnlocalizedName()); GameRegistry.registerItem(rod_australium, rod_australium.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/block/ItemBlockLore.java b/src/main/java/com/hbm/items/block/ItemBlockLore.java index 9e4b59bdc..16547a8f4 100644 --- a/src/main/java/com/hbm/items/block/ItemBlockLore.java +++ b/src/main/java/com/hbm/items/block/ItemBlockLore.java @@ -10,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; public class ItemBlockLore extends ItemBlock { @@ -25,27 +26,39 @@ public class ItemBlockLore extends ItemBlock { } if(this.field_150939_a == ModBlocks.barrel_plastic) { - list.add("Cannot store hot fluids"); - list.add("Cannot store corrosive fluids"); - list.add("Cannot store antimatter"); + list.add(EnumChatFormatting.AQUA + "Capacity: 12,000mB"); + list.add(EnumChatFormatting.YELLOW + "Cannot store hot fluids"); + list.add(EnumChatFormatting.YELLOW + "Cannot store corrosive fluids"); + list.add(EnumChatFormatting.YELLOW + "Cannot store antimatter"); + } + + if(this.field_150939_a == ModBlocks.barrel_corroded) { + list.add(EnumChatFormatting.AQUA + "Capacity: 6,000mB"); + list.add(EnumChatFormatting.GREEN + "Can store hot fluids"); + list.add(EnumChatFormatting.GREEN + "Can store corrosive fluids"); + list.add(EnumChatFormatting.YELLOW + "Cannot store antimatter"); + list.add(EnumChatFormatting.RED + "Leaky"); } if(this.field_150939_a == ModBlocks.barrel_iron) { - list.add("Can store hot fluids"); - list.add("Cannot store corrosive fluids properly"); - list.add("Cannot store antimatter"); + list.add(EnumChatFormatting.AQUA + "Capacity: 8,000mB"); + list.add(EnumChatFormatting.GREEN + "Can store hot fluids"); + list.add(EnumChatFormatting.YELLOW + "Cannot store corrosive fluids properly"); + list.add(EnumChatFormatting.YELLOW + "Cannot store antimatter"); } if(this.field_150939_a == ModBlocks.barrel_steel) { - list.add("Can store hot fluids"); - list.add("Can store corrosive fluids"); - list.add("Cannot store antimatter"); + list.add(EnumChatFormatting.AQUA + "Capacity: 16,000mB"); + list.add(EnumChatFormatting.GREEN + "Can store hot fluids"); + list.add(EnumChatFormatting.GREEN + "Can store corrosive fluids"); + list.add(EnumChatFormatting.YELLOW + "Cannot store antimatter"); } if(this.field_150939_a == ModBlocks.barrel_antimatter) { - list.add("Can store hot fluids"); - list.add("Can store corrosive fluids"); - list.add("Can store antimatter"); + list.add(EnumChatFormatting.AQUA + "Capacity: 16,000mB"); + list.add(EnumChatFormatting.GREEN + "Can store hot fluids"); + list.add(EnumChatFormatting.GREEN + "Can store corrosive fluids"); + list.add(EnumChatFormatting.GREEN + "Can store antimatter"); } if(this.field_150939_a == ModBlocks.meteor_battery) { diff --git a/src/main/java/com/hbm/items/tool/ItemBalefireMatch.java b/src/main/java/com/hbm/items/tool/ItemBalefireMatch.java index cd367b1bb..890beca7a 100644 --- a/src/main/java/com/hbm/items/tool/ItemBalefireMatch.java +++ b/src/main/java/com/hbm/items/tool/ItemBalefireMatch.java @@ -12,7 +12,7 @@ public class ItemBalefireMatch extends Item { public ItemBalefireMatch() { this.maxStackSize = 1; - this.setMaxDamage(64); + this.setMaxDamage(256); this.setCreativeTab(CreativeTabs.tabTools); } diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 0d5325f88..8317fc8a0 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -295,6 +295,7 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_unobtainium, 1), new Object[] { ModItems.rod_empty, ModItems.nugget_unobtainium, ModItems.nugget_unobtainium, ModItems.nugget_unobtainium, ModItems.nugget_unobtainium, ModItems.nugget_unobtainium, ModItems.nugget_unobtainium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_daffergon, 1), new Object[] { ModItems.rod_empty, ModItems.nugget_daffergon, ModItems.nugget_daffergon, ModItems.nugget_daffergon, ModItems.nugget_daffergon, ModItems.nugget_daffergon, ModItems.nugget_daffergon }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_verticium, 1), new Object[] { ModItems.rod_empty, ModItems.nugget_verticium, ModItems.nugget_verticium, ModItems.nugget_verticium, ModItems.nugget_verticium, ModItems.nugget_verticium, ModItems.nugget_verticium }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_balefire, 1), new Object[] { ModItems.rod_empty, ModItems.egg_balefire_shard }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_empty, 2), new Object[] { ModItems.rod_dual_empty }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_empty, 1), new Object[] { ModItems.rod_empty, ModItems.rod_empty }); @@ -317,6 +318,7 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_plutonium_fuel, 1), new Object[] { ModItems.rod_dual_empty, ModItems.ingot_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_mox_fuel, 1), new Object[] { ModItems.rod_dual_empty, ModItems.ingot_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_schrabidium_fuel, 1), new Object[] { ModItems.rod_dual_empty, ModItems.ingot_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_balefire, 1), new Object[] { ModItems.rod_dual_empty, ModItems.egg_balefire_shard, ModItems.egg_balefire_shard }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_lithium, 1), new Object[] { ModItems.rod_empty, ModItems.lithium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_lithium, 1), new Object[] { ModItems.rod_dual_empty, ModItems.lithium, ModItems.lithium }); @@ -347,6 +349,7 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_quad_plutonium_fuel, 1), new Object[] { ModItems.rod_quad_empty, ModItems.ingot_plutonium_fuel, ModItems.ingot_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_quad_mox_fuel, 1), new Object[] { ModItems.rod_quad_empty, ModItems.ingot_mox_fuel, ModItems.ingot_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_quad_schrabidium_fuel, 1), new Object[] { ModItems.rod_quad_empty, ModItems.ingot_schrabidium_fuel, ModItems.ingot_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_quad_balefire, 1), new Object[] { ModItems.rod_quad_empty, ModItems.egg_balefire_shard, ModItems.egg_balefire_shard, ModItems.egg_balefire_shard, ModItems.egg_balefire_shard }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_water, 1), new Object[] { ModItems.rod_empty, Items.water_bucket }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_water, 1), new Object[] { ModItems.rod_dual_empty, Items.water_bucket, Items.water_bucket }); @@ -366,11 +369,11 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_lead, 6), new Object[] { ModItems.rod_lead }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium, 6), new Object[] { ModItems.rod_schrabidium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_solinium, 6), new Object[] { ModItems.rod_solinium }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_uranium_fuel, 6), new Object[] { ModItems.rod_uranium_fuel }); + /*GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_uranium_fuel, 6), new Object[] { ModItems.rod_uranium_fuel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_thorium_fuel, 6), new Object[] { ModItems.rod_thorium_fuel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_plutonium_fuel, 6), new Object[] { ModItems.rod_plutonium_fuel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_mox_fuel, 6), new Object[] { ModItems.rod_mox_fuel }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium_fuel, 6), new Object[] { ModItems.rod_schrabidium_fuel }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium_fuel, 6), new Object[] { ModItems.rod_schrabidium_fuel });*/ GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_australium, 6), new Object[] { ModItems.rod_australium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_weidanium, 6), new Object[] { ModItems.rod_weidanium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_reiium, 6), new Object[] { ModItems.rod_reiium }); @@ -378,6 +381,7 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_daffergon, 6), new Object[] { ModItems.rod_daffergon }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_verticium, 6), new Object[] { ModItems.rod_verticium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_euphemium, 6), new Object[] { ModItems.rod_euphemium }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.egg_balefire_shard, 1), new Object[] { ModItems.rod_balefire }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_th232, 12), new Object[] { ModItems.rod_dual_th232 }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_uranium, 12), new Object[] { ModItems.rod_dual_uranium }); @@ -393,11 +397,12 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_lead, 12), new Object[] { ModItems.rod_dual_lead }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium, 12), new Object[] { ModItems.rod_dual_schrabidium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_solinium, 12), new Object[] { ModItems.rod_dual_solinium }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_thorium_fuel, 12), new Object[] { ModItems.rod_dual_thorium_fuel }); + /*GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_thorium_fuel, 12), new Object[] { ModItems.rod_dual_thorium_fuel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_uranium_fuel, 12), new Object[] { ModItems.rod_dual_uranium_fuel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_plutonium_fuel, 12), new Object[] { ModItems.rod_dual_plutonium_fuel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_mox_fuel, 12), new Object[] { ModItems.rod_dual_mox_fuel }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium_fuel, 12), new Object[] { ModItems.rod_dual_schrabidium_fuel }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium_fuel, 12), new Object[] { ModItems.rod_dual_schrabidium_fuel });*/ + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.egg_balefire_shard, 2), new Object[] { ModItems.rod_dual_balefire }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_th232, 24), new Object[] { ModItems.rod_quad_th232 }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_uranium, 24), new Object[] { ModItems.rod_quad_uranium }); @@ -413,11 +418,12 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_lead, 24), new Object[] { ModItems.rod_quad_lead }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium, 24), new Object[] { ModItems.rod_quad_schrabidium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_solinium, 24), new Object[] { ModItems.rod_quad_solinium }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_thorium_fuel, 24), new Object[] { ModItems.rod_quad_thorium_fuel }); + /*GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_thorium_fuel, 24), new Object[] { ModItems.rod_quad_thorium_fuel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_uranium_fuel, 24), new Object[] { ModItems.rod_quad_uranium_fuel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_plutonium_fuel, 24), new Object[] { ModItems.rod_quad_plutonium_fuel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_mox_fuel, 24), new Object[] { ModItems.rod_quad_mox_fuel }); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium_fuel, 24), new Object[] { ModItems.rod_quad_schrabidium_fuel }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium_fuel, 24), new Object[] { ModItems.rod_quad_schrabidium_fuel });*/ + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.egg_balefire_shard, 4), new Object[] { ModItems.rod_quad_balefire }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nuclear_waste, 1), new Object[] { ModItems.rod_waste }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nuclear_waste, 2), new Object[] { ModItems.rod_dual_waste }); @@ -1077,6 +1083,8 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_schrabidium), new Object[] { " A ", "PNP", "PSP", 'A', ModItems.wire_schrabidium, 'P', "plateSchrabidium", 'S', "dustSchrabidium", 'N', ModItems.powder_neptunium })); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_schrabidium), new Object[] { " A ", "PSP", "PNP", 'A', ModItems.wire_schrabidium, 'P', "plateSchrabidium", 'S', "dustSchrabidium", 'N', ModItems.powder_neptunium })); GameRegistry.addRecipe(ItemBattery.getEmptyBattery(ModItems.battery_spark), new Object[] { " A ", "PSP", "PSP", 'A', ModItems.wire_magnetized_tungsten, 'P', ModItems.plate_dineutronium, 'S', ModItems.powder_spark_mix }); + GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getFullBattery(ModItems.battery_trixite), new Object[] { " A ", "PSP", "PTP", 'A', ModItems.wire_aluminium, 'P', "plateAluminum", 'S', ModItems.powder_spark_mix, 'T', ModItems.crystal_trixite })); + GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getFullBattery(ModItems.battery_trixite), new Object[] { " A ", "PTP", "PSP", 'A', ModItems.wire_aluminium, 'P', "plateAluminum", 'S', ModItems.powder_spark_mix, 'T', ModItems.crystal_trixite })); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getFullBattery(ModItems.energy_core), new Object[] { "PCW", "TRD", "PCW", 'P', ModItems.plate_advanced_alloy, 'C', ModItems.coil_advanced_alloy, 'W', ModItems.wire_advanced_alloy, 'R', ModItems.cell_tritium, 'D', ModItems.cell_deuterium, 'T', "ingotTungsten" })); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getFullBattery(ModItems.energy_core), new Object[] { "PCW", "TDR", "PCW", 'P', ModItems.plate_advanced_alloy, 'C', ModItems.coil_advanced_alloy, 'W', ModItems.wire_advanced_alloy, 'R', ModItems.cell_tritium, 'D', ModItems.cell_deuterium, 'T', "ingotTungsten" })); @@ -1267,7 +1275,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.matchstick, 16), new Object[] { "I", "S", 'I', "sulfur", 'S', Items.stick })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.matchstick, 16), new Object[] { "I", "S", 'I', "dustSulfur", 'S', Items.stick })); GameRegistry.addRecipe(new ItemStack(ModItems.matchstick, 24), new Object[] { "I", "S", 'I', ModItems.powder_fire, 'S', Items.stick }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.balefire_and_steel, 1), new Object[] { "I ", " B", 'I', "ingotIron", 'B', ModItems.egg_balefire_shard })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.balefire_and_steel, 1), new Object[] { "ingotIron", ModItems.egg_balefire_shard })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.crowbar, 1), new Object[] { "II", " I", " I", 'I', "ingotSteel" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_power, 5), new Object[] { "dustRedstone", "dustGlowstone", "dustDiamond", "dustNeptunium", "dustMagnetizedTungsten" })); diff --git a/src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java b/src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java index 9ae93cf83..c7c021fff 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java +++ b/src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java @@ -7,6 +7,7 @@ import com.hbm.render.util.DiamondPronter; import com.hbm.render.util.EnumSymbol; import com.hbm.tileentity.machine.TileEntityBarrel; +import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -23,19 +24,24 @@ public class RenderFluidBarrel extends TileEntitySpecialRenderer { TileEntityBarrel barrel = (TileEntityBarrel)te; FluidType type = barrel.tank.getTankType(); - int poison = type.poison; - int flammability = type.flammability; - int reactivity = type.reactivity; - EnumSymbol symbol = type.symbol; - for(int j = 0; j < 4; j++) { + if(type != FluidType.NONE) { + int poison = type.poison; + int flammability = type.flammability; + int reactivity = type.reactivity; + EnumSymbol symbol = type.symbol; - GL11.glPushMatrix(); - GL11.glTranslated(0.4, 0.25, -0.15); - GL11.glScalef(1.0F, 0.35F, 0.35F); - DiamondPronter.pront(poison, flammability, reactivity, symbol); - GL11.glPopMatrix(); - GL11.glRotatef(90, 0, 1, 0); + for(int j = 0; j < 4; j++) { + + RenderHelper.disableStandardItemLighting(); + GL11.glPushMatrix(); + GL11.glTranslated(0.4, 0.25, -0.15); + GL11.glScalef(1.0F, 0.35F, 0.35F); + DiamondPronter.pront(poison, flammability, reactivity, symbol); + GL11.glPopMatrix(); + GL11.glRotatef(90, 0, 1, 0); + RenderHelper.enableStandardItemLighting(); + } } } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java index 9101085bf..c92caa00e 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java @@ -90,12 +90,22 @@ public class TileEntityNukeBalefire extends TileEntityMachineBase { public boolean hasBattery() { + return getBattery() > 0; + } + + public int getBattery() { + if(slots[1] != null && slots[1].getItem() == ModItems.battery_spark && ((IBatteryItem)ModItems.battery_spark).getCharge(slots[1]) == ((IBatteryItem)ModItems.battery_spark).getMaxCharge()) { - return true; + return 1; } - return false; + if(slots[1] != null && slots[1].getItem() == ModItems.battery_trixite && + ((IBatteryItem)ModItems.battery_trixite).getCharge(slots[1]) == ((IBatteryItem)ModItems.battery_trixite).getMaxCharge()) { + return 2; + } + + return 0; } public void explode() {