From fe28f0af734c6c8bdbaa44439e9ceffdd901d21e Mon Sep 17 00:00:00 2001 From: HbmMods Date: Thu, 4 Jun 2020 23:13:29 +0200 Subject: [PATCH] base stuff for the crystallizer, removed unnecessary argument from slots --- .../gui/processing/gui_crystallizer.png | Bin 0 -> 1854 bytes .../hbm/textures/items/crystal_aluminium.png | Bin 0 -> 471 bytes .../hbm/textures/items/crystal_beryllium.png | Bin 0 -> 444 bytes assets/hbm/textures/items/crystal_copper.png | Bin 0 -> 436 bytes assets/hbm/textures/items/crystal_gold.png | Bin 0 -> 447 bytes assets/hbm/textures/items/crystal_iron.png | Bin 0 -> 476 bytes assets/hbm/textures/items/crystal_lead.png | Bin 0 -> 452 bytes assets/hbm/textures/items/crystal_rare.png | Bin 0 -> 482 bytes .../hbm/textures/items/crystal_redstone.png | Bin 0 -> 469 bytes .../textures/items/crystal_schrabidium.png | Bin 0 -> 436 bytes assets/hbm/textures/items/crystal_sulfur.png | Bin 0 -> 474 bytes assets/hbm/textures/items/crystal_thorium.png | Bin 0 -> 450 bytes .../hbm/textures/items/crystal_titanium.png | Bin 0 -> 421 bytes .../hbm/textures/items/crystal_tungsten.png | Bin 0 -> 417 bytes assets/hbm/textures/items/crystal_uranium.png | Bin 0 -> 461 bytes com/hbm/blocks/ModBlocks.java | 5 ++ com/hbm/blocks/machine/BlockMachineBase.java | 4 +- .../blocks/machine/MachineCrystallizer.java | 21 +++++ com/hbm/handler/GUIHandler.java | 20 +++++ com/hbm/inventory/CrystallizerRecipes.java | 64 +++++++++++++ com/hbm/inventory/RecipesCommon.java | 85 ++++++++++++++++++ com/hbm/inventory/SlotMachineOutput.java | 3 +- .../container/ContainerCentrifuge.java | 8 +- .../container/ContainerCoreAdvanced.java | 26 +++--- .../container/ContainerCoreInjector.java | 4 +- .../container/ContainerCoreTitanium.java | 22 ++--- .../container/ContainerCrystallizer.java | 77 ++++++++++++++++ .../container/ContainerDiFurnace.java | 2 +- .../container/ContainerElectricFurnace.java | 2 +- .../container/ContainerGenerator.java | 4 +- .../container/ContainerIGenerator.java | 2 +- .../container/ContainerMachineArcFurnace.java | 2 +- .../container/ContainerMachineAssembler.java | 2 +- .../container/ContainerMachineBoiler.java | 6 +- .../ContainerMachineBoilerElectric.java | 6 +- .../container/ContainerMachineCMBFactory.java | 4 +- .../container/ContainerMachineChemplant.java | 16 ++-- .../container/ContainerMachineCoal.java | 2 +- .../container/ContainerMachineCyclotron.java | 10 +-- .../container/ContainerMachineDeuterium.java | 2 +- .../container/ContainerMachineDiesel.java | 4 +- .../container/ContainerMachineEPress.java | 2 +- .../container/ContainerMachineGasCent.java | 12 +-- .../container/ContainerMachineGasFlare.java | 2 +- .../container/ContainerMachineInserter.java | 6 +- .../ContainerMachineMissileAssembly.java | 2 +- .../container/ContainerMachineOilWell.java | 4 +- .../container/ContainerMachinePress.java | 2 +- .../container/ContainerMachinePumpjack.java | 4 +- .../ContainerMachineReactorSmall.java | 4 +- .../ContainerMachineReactorSmallOld.java | 4 +- .../container/ContainerMachineRefinery.java | 12 +-- ...ntainerMachineSchrabidiumTransmutator.java | 2 +- .../container/ContainerMachineSelenium.java | 4 +- .../container/ContainerMachineShredder.java | 36 ++++---- .../container/ContainerMachineTurbine.java | 6 +- .../container/ContainerMachineTurbofan.java | 2 +- .../container/ContainerNukeFurnace.java | 2 +- .../container/ContainerPuF6Tank.java | 4 +- .../inventory/container/ContainerReactor.java | 2 +- .../container/ContainerReactorMultiblock.java | 8 +- .../container/ContainerRtgFurnace.java | 2 +- .../inventory/container/ContainerUF6Tank.java | 4 +- com/hbm/inventory/gui/GUICrystallizer.java | 41 +++++++++ com/hbm/main/MainRegistry.java | 2 + .../TileEntityMachineCrystallizer.java | 24 +++++ 66 files changed, 467 insertions(+), 129 deletions(-) create mode 100644 assets/hbm/textures/gui/processing/gui_crystallizer.png create mode 100644 assets/hbm/textures/items/crystal_aluminium.png create mode 100644 assets/hbm/textures/items/crystal_beryllium.png create mode 100644 assets/hbm/textures/items/crystal_copper.png create mode 100644 assets/hbm/textures/items/crystal_gold.png create mode 100644 assets/hbm/textures/items/crystal_iron.png create mode 100644 assets/hbm/textures/items/crystal_lead.png create mode 100644 assets/hbm/textures/items/crystal_rare.png create mode 100644 assets/hbm/textures/items/crystal_redstone.png create mode 100644 assets/hbm/textures/items/crystal_schrabidium.png create mode 100644 assets/hbm/textures/items/crystal_sulfur.png create mode 100644 assets/hbm/textures/items/crystal_thorium.png create mode 100644 assets/hbm/textures/items/crystal_titanium.png create mode 100644 assets/hbm/textures/items/crystal_tungsten.png create mode 100644 assets/hbm/textures/items/crystal_uranium.png create mode 100644 com/hbm/blocks/machine/MachineCrystallizer.java create mode 100644 com/hbm/inventory/CrystallizerRecipes.java create mode 100644 com/hbm/inventory/RecipesCommon.java create mode 100644 com/hbm/inventory/container/ContainerCrystallizer.java create mode 100644 com/hbm/inventory/gui/GUICrystallizer.java create mode 100644 com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java diff --git a/assets/hbm/textures/gui/processing/gui_crystallizer.png b/assets/hbm/textures/gui/processing/gui_crystallizer.png new file mode 100644 index 0000000000000000000000000000000000000000..87b69828f3a9c18c4794399cb67255cdba69fcd7 GIT binary patch literal 1854 zcmcIldo*4O|4*;YNA%M|TyDd>=47Ec=yLbd*)OG-~GYtSug@^0v!1z2_?^b4y zo1tdApZ;>&_VqEis+wdXZBrVQh)Za@AdrmHD2_?%_nN7C)tng%bK`UG`mkMUaxvL89hA3y*F6&Hs3U1YNo%T z*XMn};pQDxUh6Oi4))C4v|DM2u#P`tNKH+Mk9RN6siFw*6T8my`TPeVTORV2i^vbk z`We+8cxsY&TwGkk*x0=iZ0U;}VLBiv(k-tOc_f ziHZTzn*^83D}VRWp2dw@8`13>{6pw~eoY4{Y2skHl%I;Vz;ENrE3_PIHsbMkXHieM z{qFiL8BUj~=Yq_Logmyk_lVx}U9Y*W>Z+<*=wSX3$#cNFfvPk(>~_d#3W*zt!SkefZkxmc(SSg8*>J3EVmf(6@3#bGO0d6{pVEtdVk zei{uz9?Q5<{L1?`O@%Chg#zK=;BbaAZ&JivA{d>Kb(9*Fwu`K&n&*_iL(LYttk2E=tR<` zV1m15Zc5fA6)<^-Bsmk(Ooaq7nihl&4m#yfjj*Dp1wkWN*IQ$%d?|RV#Hh7| zR9MiM&NeGn-Mzi^7K(P;0@jzD96?&Lury42sakmSP-RJc*yPIWzFaT7u>OERz$TkH z-fG+rSy$i)ud{Q46n5|(Tf5}(6yD~eB5(NG2$IJ~?=3Sa;LxT9+DtJ4H?s64_3G2n zmV@E@#LJMO7-(LzhOqFZvLdC{NV1^Wx3~_Nbc_2Z5;$|LICeAbJFfOyi3mjCBNihG zh04+k%H4blINV~=-F)y@8%dxcbxJ*kDky{@_e&_$ufho!o6Y2dD*@S zNIzjQ{A_r(m1hfunTAx6R2NpT@|g>rLfT%N)7JIlcZ}%5ve?{fJ+d<6yFZF@ofrtd zI4rAmm1K+FHpKJm1Fco_CxAqs3^3t)LCq4~p+0KTqCJpLsmSlfYUoNYvx6m=o{MPh zapJ%^Lg|>}NL&<%!Lcf=cxce;)(Q%Yr@9(6qW2APn1>LO$*~)wGf@xaP)x*8zh^FZ zld!!8q}uXnt0@M8-CWRAtxc*OiA3s2Awp7783m|VU{3yvi&)sL0nJld(LtRVs9cW+ z1xT2=08Q&eQk^KM%+q$%v79j{IB%0Ss7y`LQ-A2NwY;YpXwObFP=8tTo-Cdh6G>zP z;UETJya6p30T2d2KO4Y86hPSkOA-Wx^MRA4Ydm+?_Q?D_rQ$oPZx*VO3b@bt~rCsXq$%$eoGM@V%Zqcw;izVS35CP^52w#!) z$A_W$os&{K;&c5sFEUE+ZE89cNknzD0Hb?@Z;H@}(sq#NHf2`VaMw>LHKeMS)&FBS ZmGN}Th8`m;joF0=Jl6QQR=5PG{0aSA+`<3= literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/crystal_aluminium.png b/assets/hbm/textures/items/crystal_aluminium.png new file mode 100644 index 0000000000000000000000000000000000000000..3e332dda462a97435dcd6a9800c59569d20e8927 GIT binary patch literal 471 zcmV;|0Vw{7P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0c=S`K~y+Tt&u-V z#6S?mM-e-lG-4MppCOfn7Xo$`HlCG48!fKV%4FmH(JMNyFFd83VA zL@-GbqDG@;X6+TQA<2T=qW3u)`B45A($In+&r*I6h#xa0EpSPP0LFbdm%os0Qv(EiR0M( zYd>7q<@vPJrSq$6F?}QeQxF7lNd7g_jyBOeV-;j$RD%8=-}?`UegLNZ>v9fvn#%wH N002ovPDHLkV1kfM!YBX$ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/crystal_beryllium.png b/assets/hbm/textures/items/crystal_beryllium.png new file mode 100644 index 0000000000000000000000000000000000000000..7e36f041c56e6637dcc2b192fa090b738ae003ce GIT binary patch literal 444 zcmV;t0YmPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0Z~arK~y+Tt&zQo zgFq0+$GfX+0@nx@sjNi^q>(`I5qt(qi#&{#jirzxWl9^nD{XA7(g|`Pf}P~@A9nWC z+`$$1gJEZO=X(wM13|FAE0v1kV-fSB&R;?B@pvT2PjCV_iSVsLf`R9G)HDt2b94t% zWxIXnBpDT;!oY2x=aZ|Y=60B7I#scl=^`!p_>3s)Y;k!;&mFW(8JtNAh)zW`mF1?i&i zdp@%)<6>+)Sp0(HINU0brOlUzPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0ZBJd6n)_j>guX6Cm^Y7LI|!X#D#>Us+~8T z+3xK@g5V`{yR$p*&D*&>`~exTwk>j?!r8a=SCE|bn_&C|70@CJJvBI)XmpM-*IgCC zfp_VeNJ@Ur3*D!vJs}_Uf(VI><kuD079!2z4&iJ$&nFGTS9LydH6}cCY z)CIw_GxB^ e$Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0aQsuK~y+Tt&p)V z1VI$WzZL!jkt;-^*vN&3R#vXkT#(@Y0Sy|3T1DY6unM(Cvl9JxCCY#Ap1#rio0>T$67!$cCkPyrrjQ9XT0C1NU!Z)`Kcnn z$sW&zQcSd%jfA(~b%3plI#!cR_7vw}`vyVWOwn(rczOVuxeKC#JmV$L-g892x2463 zy6At(f`i3WF0+~EU@3_(I&Q5J9hyHpicd`zFBAb<;s7Z^#wKJD*mT(j78;PJt;KZ- z#W{F64Mk+58&zBo?loF~sU2 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/crystal_iron.png b/assets/hbm/textures/items/crystal_iron.png new file mode 100644 index 0000000000000000000000000000000000000000..b982425d8c509b9bf26bdead31e1b7459efdb76e GIT binary patch literal 476 zcmV<20VDp2P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0dYx0K~y+Tt&zP; z13?hQCz47d0d0)pVS+*+s8>WR0$ONc6AQJm)IUs18!Ii;6dLUWNlqn@Dy0U3LXLbO zM56EIX1Tj4Soniscjso_zMYH6AK1%p_r0y0o}UGJM!fY`(7c>o5yVeW07V+idT2AS zEK6F=Cii}f1HENyZJi?F=2EG|eVCyq>>nH&5i}wy&lPc9m*2w}0e^8KnPLum#AmlH z{f{nl;ipmnlRY^;VlmKSG=ld|N9r%HvXotw{LU_Oig9pxcN=+nxR=ITLt5>Q%*-XF z7mf0p3gR0s@eh*%ep^}`?e(~-i@G~#DqI(M84uqW2bg#)9;a0R+x`_me16snTu1>} z!T|NR#l}Xt!UdX~YE|rXnomnDq#25FP%IWHlH1rEasiMVpO}=)VrDQWZw?gD_d%pq ztC_RT158aPxZYe{NcpjB=0E|*aUw_pZPK$JeGclqR1n*?`v~tCIETOe6Cz(+0Mz1N Sl0KvW0000 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/crystal_lead.png b/assets/hbm/textures/items/crystal_lead.png new file mode 100644 index 0000000000000000000000000000000000000000..0b89d35395857e050df4f2d806596efe1e57f600 GIT binary patch literal 452 zcmV;#0XzPQP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0a-~zK~y+Tt&u%z z!cY{3k4-0+f{WnL$yo%!EfVq*@*6T{$d7Sy$tXCuxM#`cm{FWM1cV@lKsK>`U+%e0 zVhbJmz~y}0dp_?#{=jnSKa48JW7>&%G4fXs?0KHx`~(x=ksf*t8Vu(1xtz~u>TPTX zT4gkPXOe#KcDtqC=V^rXdTo;+5GPGjaU6&DeO`^^Lx9Jt)k=z@pbjpVi_~>ZUB}dA zvI7`V6xo2=?M8_}fa-akOArJS$1#119pQTY80`0ZDa%rtrjhY@Y;L|2;toaH%k2CD zbbYL77gbeJCP~6#G`{Hk!gM-it3a35ULKM!7K=_nCO}JAqJGMuLf`e u4N|*}j)V8c)x~k%9yrGA*!{bILgW*bTf2M&F=_1p0000 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/crystal_rare.png b/assets/hbm/textures/items/crystal_rare.png new file mode 100644 index 0000000000000000000000000000000000000000..87f50a12a9a28e9280753bb1b9ca0dd631c8ca84 GIT binary patch literal 482 zcmV<80UiE{P)bZ!jbR)Gdq2NaXJU^0E+uq+w8gd7*Au0DQLFxcxqUyV7b%7JIoILI?o5 zwylT&laUC`MuYA3b@q36M=Lljl{COh8V1kJCJT#;>XO~*0MK(Bgb?%{CpbX9v+cTS zyM$EX_Idyu6^mR|tLmlHKS-MVS%d%vuFI;ftIsks zI~$O1y}n{55`45;qzr?UVW_@Ra8j$G>pE+jn=~7ZAKTyF-&u*riN#{{97p94_WOIN z)dGHHcmT^wO8}f*TyX#Nq;d!WJl@=Bx8-txBx^sqwjCfV1#$@B`Of(3>4^ys2$25; YU%tV>qQ#WmbpQYW07*qoM6N<$f{_!<%m4rY literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/crystal_redstone.png b/assets/hbm/textures/items/crystal_redstone.png new file mode 100644 index 0000000000000000000000000000000000000000..e236c3e863ce413b7a489bd6848fe7fa560fe4b8 GIT binary patch literal 469 zcmV;`0V@89P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0cuG^K~y+Tt&*`y z13?gm=QL?7)FvtjibX&%0g-h21eS@7g&_D8QLBii@d45c1`H9gu(Z<3pu#m;swl=- zh=ol~&int{Iqx=23O|_Jnce+oXJ^lmK3GmWzH#NU>-VLJfcT=(pv4m@1NdM;jk5;C zm7`<&GufCsQT0({-9Xcb*A6x1ra;bDfvD-1b5EEQ|yxLlMho(doY;UYH$w9r|Qw6}>)O=1>iY4|!e=6Q3FXHDH zg0I27a|N;XLn|20WTJ{(qh$pMAOb4VIF2puft3Vi!bEJZ{SzX;WJklp)`53|00000 LNkvXXu0mjf8wScE literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/crystal_schrabidium.png b/assets/hbm/textures/items/crystal_schrabidium.png new file mode 100644 index 0000000000000000000000000000000000000000..04bdf44fa90b5e9ac00ef86a7ccf87a58d077fa4 GIT binary patch literal 436 zcmV;l0ZaagP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0ZB+!=VN# ziPOzS)@9yWNaph_2!$fv?}67#?#rklE?Y90$Wk6(F2Lyobh~nf`yIGmf%6%tR`txA zsTH_QIvS~%JRUkzNSK}CUJsVY$Xi$}B5b#s{dNOdEq~##fbLF`1ZEb0f!JfisxZ-V zsmVNrUy%M-DlyYS^BBBdFC^3eE;`+|Z$qu7Gok2k0NQPBjmDa}j;w-owbCGi!Fv^i zXU!&(PDg$6EoBuD2KhW5^L|4=8V#A!*$mk2G9NU+dL79jF_G;Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0dGk}K~y+TV`Lx# z+&*mlAIfA#fVtw+dsZ;LdEs)fWnc~vz+C_e zaXDo{uv0+*7HG(U2Qpm8ga^e!umNBv0Rs>gZEWlUU>XEKn$8`4!eC@A1NNGtwl5gN z0Ne$y9xMPG;uKtt;R+A{iSY?ZF)*|1g2Mt94qyXd{sS5E>d_WBA2~c!v=qVgqpQ;x zj_tYy4+pRTfrU32L4qIv(*)xq1DJO}>Y+lYV12*(e-MUpQTXU`R00eP0FyA-qi@+k Qv;Y7A07*qoM6N<$g0RG~%m4rY literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/crystal_thorium.png b/assets/hbm/textures/items/crystal_thorium.png new file mode 100644 index 0000000000000000000000000000000000000000..68d8ed2c11823e33285ac8e4d9c34e2be29ceda1 GIT binary patch literal 450 zcmV;z0X_bSP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0ar;xK~y+Tt&y=x z13?gm|HuiNMz}JVE}f7Zq!x~Q0Uw4pJBb zIf(mDb}qMj3MulD&CTr2KQlYq!X8|O*jN)U1su(h{r(HZaXbLmUq}K5>5^TGib)hj zm=$6=R2^uQ3v844;xtXg_Gw(<{%%|)p^z)fGW@L8a_$q@uLKeX4|@R?MJYDP^Bn6{ zDYjlyhbbM7kEXKT0RBT)2al3t!e zuGa5&Whqq$)5j-Cay=R}x**&;3j-ucBD2sr$X!hGO=6x-$z~pZlBHr sBOQu}iqx;;iyN>LF6%nJe|8{%U;b&Uh{n+mc>n+a07*qoM6N<$f?X@MhyVZp literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/crystal_titanium.png b/assets/hbm/textures/items/crystal_titanium.png new file mode 100644 index 0000000000000000000000000000000000000000..483b39fcfb0f5290bc208c8f654f01d3599b94c5 GIT binary patch literal 421 zcmV;W0b2fvP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0Xj)UK~y+Tt&+cO zg)k7tFHu?+Kon520W3hx0t^8IfM5V7U;_$zCZM2a03@gpEz*1WE}V0aJSjzflJVKT zfBwuH{eil!AE!xKmR(}r&-o%a+683M|)!AU?6lG?V-eqk8$5KISc+j5d5Nq%$zu;(}q1wp`Chz=$J zK$3AB&(*hh03Cp)X=s`zqXQ?v0-HdBWUZ0wXb~^qHPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0X9iQK~y+Tt&%Z{ zgg_8Q%QZ7H8o|gDh({2aGk6YT58zb<&mf+`BNz#afgqU9_&=7@>MU%q51Q^S`&U)} z){;N)csySFQpRySX@2(kS0Ik#STMf91URIF(H#|oD2h;>Ym=h`qY9H;#bsG?edTtA zq9`yi34|C;(}-=`2;HC|sFr0J12{ZQlk|NrVHh$t41+AoB3;+vEMsaWJHRH-bBe({ z&zvCys1EV-`4larm{+jsx@PrtUB&afJ^V?CZzy7#d3pt`^{}E{C@8XV{0pa7!2QrF zP}5BFkQ`^sg6aX?)@O4Zhckc(NrNEZ)nKfe3yuz|s$!BfO>bQQ#C+eEBuVIn`k;4t zL9DcG%Vg?@cHp}1(b2}|88Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0b)r+K~y+Tt&y=x z13?gm=WO!=2Gd1MagZDe2bz@k1V-$vBc{uP&PECJv&|}Te-dpQ#o77`YT8df-A*(VL*jptM(# z$;*U$8`FVSIXJ9PB%2&X5%*a(p3rW$jR+E9gS&yORx93TF#>jQtyZHCd)Vx4CiC|> zec7i{0F!OCS_}pnj6{IyFZP$i-i<+3dzm4Ans7a z9wr6swlrALE|woluH9~z#d!F_bbyH$cZ+Nl=+NxpLELrSR6z=$B@9r%Etku21xOkW zhvNG_pXPZUO)(vWVMvk2d1Ips0AGGPFV&+eXQ6YTfW8kR@l$Nh_B_g!GS|*!NBXyY zGY1O9kIxRAK$G-rqt8Kn;!5N0m)5Z4m^x?g{t1y!dU(&cB3G6U00000NkvXXu0mjf DMIpe$ literal 0 HcmV?d00001 diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index e98d6f3a8..af9ce5191 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -375,6 +375,9 @@ public class ModBlocks { public static Block machine_gascent; public static final int guiID_gascent = 71; + public static Block machine_crystallizer; + public static final int guiID_crystallizer = 94; + public static Block machine_uf6_tank; public static final int guiID_uf6_tank = 7; @@ -1031,6 +1034,7 @@ public class ModBlocks { machine_centrifuge = new MachineCentrifuge(Material.iron).setBlockName("machine_centrifuge").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); machine_gascent = new MachineGasCent(Material.iron).setBlockName("machine_gascent").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); + machine_crystallizer = new MachineCrystallizer(Material.iron).setBlockName("machine_crystallizer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); machine_uf6_tank = new MachineUF6Tank(Material.iron).setBlockName("machine_uf6_tank").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); @@ -1701,6 +1705,7 @@ public class ModBlocks { GameRegistry.registerBlock(machine_difurnace_on, machine_difurnace_on.getUnlocalizedName()); GameRegistry.registerBlock(machine_centrifuge, machine_centrifuge.getUnlocalizedName()); GameRegistry.registerBlock(machine_gascent, machine_gascent.getUnlocalizedName()); + GameRegistry.registerBlock(machine_crystallizer, machine_crystallizer.getUnlocalizedName()); GameRegistry.registerBlock(machine_uf6_tank, machine_uf6_tank.getUnlocalizedName()); GameRegistry.registerBlock(machine_puf6_tank, machine_puf6_tank.getUnlocalizedName()); GameRegistry.registerBlock(machine_reactor, machine_reactor.getUnlocalizedName()); diff --git a/com/hbm/blocks/machine/BlockMachineBase.java b/com/hbm/blocks/machine/BlockMachineBase.java index e075737a9..f547f8b92 100644 --- a/com/hbm/blocks/machine/BlockMachineBase.java +++ b/com/hbm/blocks/machine/BlockMachineBase.java @@ -20,8 +20,8 @@ public abstract class BlockMachineBase extends BlockContainer { int guiID = -1; boolean rotatable = false; - protected BlockMachineBase(Material p_i45386_1_, int guiID) { - super(p_i45386_1_); + protected BlockMachineBase(Material mat, int guiID) { + super(mat); this.guiID = guiID; } diff --git a/com/hbm/blocks/machine/MachineCrystallizer.java b/com/hbm/blocks/machine/MachineCrystallizer.java new file mode 100644 index 000000000..7e155862d --- /dev/null +++ b/com/hbm/blocks/machine/MachineCrystallizer.java @@ -0,0 +1,21 @@ +package com.hbm.blocks.machine; + +import com.hbm.blocks.ModBlocks; +import com.hbm.tileentity.machine.TileEntityMachineCrystallizer; + +import net.minecraft.block.material.Material; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class MachineCrystallizer extends BlockMachineBase { + + public MachineCrystallizer(Material mat) { + super(mat, ModBlocks.guiID_crystallizer); + } + + @Override + public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + return new TileEntityMachineCrystallizer(); + } + +} diff --git a/com/hbm/handler/GUIHandler.java b/com/hbm/handler/GUIHandler.java index 19cd6a40c..565d38bb9 100644 --- a/com/hbm/handler/GUIHandler.java +++ b/com/hbm/handler/GUIHandler.java @@ -1,6 +1,7 @@ package com.hbm.handler; import com.hbm.blocks.ModBlocks; +import com.hbm.interfaces.Spaghetti; import com.hbm.inventory.container.*; import com.hbm.inventory.gui.*; import com.hbm.inventory.inv.InventoryLeadBox; @@ -13,6 +14,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import cpw.mods.fml.common.network.IGuiHandler; +@Spaghetti("ew") public class GUIHandler implements IGuiHandler { @Override @@ -840,6 +842,15 @@ public class GUIHandler implements IGuiHandler { } return null; } + + case ModBlocks.guiID_crystallizer: + { + if(entity instanceof TileEntityMachineCrystallizer) + { + return new ContainerCrystallizer(player.inventory, (TileEntityMachineCrystallizer) entity); + } + return null; + } } } else { //NON-TE CONTAINERS @@ -1679,6 +1690,15 @@ public class GUIHandler implements IGuiHandler { } return null; } + + case ModBlocks.guiID_crystallizer: + { + if(entity instanceof TileEntityMachineCrystallizer) + { + return new GUICrystallizer(player.inventory, (TileEntityMachineCrystallizer) entity); + } + return null; + } } } else { //CLIENTONLY GUIS diff --git a/com/hbm/inventory/CrystallizerRecipes.java b/com/hbm/inventory/CrystallizerRecipes.java new file mode 100644 index 000000000..1b0106d7e --- /dev/null +++ b/com/hbm/inventory/CrystallizerRecipes.java @@ -0,0 +1,64 @@ +package com.hbm.inventory; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import com.hbm.inventory.RecipesCommon.ComparableStack; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +//This time we're doing this right +//...right? +public class CrystallizerRecipes { + + //'Object' is either a ComparableStack or the key for th ore dict + private static HashMap recipes = new HashMap(); + + public static void register() { + + recipes.put("oreIron", new ItemStack(Items.iron_ingot)); + } + + public static ItemStack getOutput(ItemStack stack) { + + if(stack == null || stack.getItem() == null) + return null; + + ComparableStack comp = new ComparableStack(stack.getItem(), 1, stack.getItemDamage()); + + if(recipes.containsKey(comp)) + return recipes.get(comp); + + String[] dictKeys = comp.getDictKeys(); + + for(String key : dictKeys) { + + if(recipes.containsKey(key)) + return recipes.get(key); + } + + return null; + } + + public Map getRecipes() { + + Map recipes = new HashMap(); + + for(Entry entry : CrystallizerRecipes.recipes.entrySet()) { + + if(entry.getKey() instanceof String) { + List ingredients = OreDictionary.getOres((String)entry.getKey()); + recipes.put(ingredients, entry.getValue()); + } else { + recipes.put(((ComparableStack)entry.getKey()).toStack(), entry.getValue()); + } + } + + return recipes; + } + +} diff --git a/com/hbm/inventory/RecipesCommon.java b/com/hbm/inventory/RecipesCommon.java new file mode 100644 index 000000000..4c46719f7 --- /dev/null +++ b/com/hbm/inventory/RecipesCommon.java @@ -0,0 +1,85 @@ +package com.hbm.inventory; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +public class RecipesCommon { + + public static class ComparableStack { + + Item item; + int stacksize; + int meta; + + public ComparableStack(Item item) { + this.item = item; + this.stacksize = 1; + this.meta = 0; + } + + public ComparableStack(Item item, int stacksize) { + this(item); + this.stacksize = stacksize; + } + + public ComparableStack(Item item, int stacksize, int meta) { + this(item, stacksize); + this.meta = meta; + } + + public ItemStack toStack() { + + return new ItemStack(item, stacksize, meta); + } + + public String[] getDictKeys() { + + int[] ids = OreDictionary.getOreIDs(toStack()); + + if(ids == null || ids.length == 0) + return new String[0]; + + String[] entries = new String[ids.length]; + + for(int i = 0; i < ids.length; i++) { + + entries[i] = OreDictionary.getOreName(ids[i]); + } + + return entries; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + Item.getIdFromItem(item); + result = prime * result + meta; + result = prime * result + stacksize; + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ComparableStack other = (ComparableStack) obj; + if (item == null) { + if (other.item != null) + return false; + } else if (!item.equals(other.item)) + return false; + if (meta != other.meta) + return false; + if (stacksize != other.stacksize) + return false; + return true; + } + } + +} diff --git a/com/hbm/inventory/SlotMachineOutput.java b/com/hbm/inventory/SlotMachineOutput.java index d58efae39..fbe39ac73 100644 --- a/com/hbm/inventory/SlotMachineOutput.java +++ b/com/hbm/inventory/SlotMachineOutput.java @@ -1,13 +1,12 @@ package com.hbm.inventory; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; public class SlotMachineOutput extends Slot { - public SlotMachineOutput(EntityPlayer player, IInventory inventory, int i, int j, int k) { + public SlotMachineOutput(IInventory inventory, int i, int j, int k) { super(inventory, i, j, k); } diff --git a/com/hbm/inventory/container/ContainerCentrifuge.java b/com/hbm/inventory/container/ContainerCentrifuge.java index aa7ec57d8..6c2006573 100644 --- a/com/hbm/inventory/container/ContainerCentrifuge.java +++ b/com/hbm/inventory/container/ContainerCentrifuge.java @@ -19,10 +19,10 @@ public class ContainerCentrifuge extends Container { this.addSlotToContainer(new Slot(tedf, 0, 26, 17)); this.addSlotToContainer(new Slot(tedf, 1, 26, 53)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 134, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 152, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 134, 53)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 5, 152, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 134, 17)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 152, 17)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 134, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 5, 152, 53)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerCoreAdvanced.java b/com/hbm/inventory/container/ContainerCoreAdvanced.java index 7b6f6ca78..65282550f 100644 --- a/com/hbm/inventory/container/ContainerCoreAdvanced.java +++ b/com/hbm/inventory/container/ContainerCoreAdvanced.java @@ -34,26 +34,26 @@ public class ContainerCoreAdvanced extends Container { this.addSlotToContainer(new Slot(tedf, 9, 8, 54)); this.addSlotToContainer(new Slot(tedf, 10, 8, 72)); //Outputs - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 11, 134, 54)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 12, 134, 72)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 11, 134, 54)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 12, 134, 72)); //Output Storage - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 13, 8, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 14, 26, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 15, 44, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 16, 62, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 17, 80, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 18, 98, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 19, 116, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 20, 134, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 21, 152, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 13, 8, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 14, 26, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 15, 44, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 16, 62, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 17, 80, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 18, 98, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 19, 116, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 20, 134, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 21, 152, 108)); //Power Cell this.addSlotToContainer(new Slot(tedf, 22, 44, 72)); //More Inputs this.addSlotToContainer(new Slot(tedf, 23, 26, 54)); this.addSlotToContainer(new Slot(tedf, 24, 26, 72)); //More Outputs - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 25, 152, 54)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 26, 152, 72)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 25, 152, 54)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 26, 152, 72)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerCoreInjector.java b/com/hbm/inventory/container/ContainerCoreInjector.java index 095fec4c3..b844272af 100644 --- a/com/hbm/inventory/container/ContainerCoreInjector.java +++ b/com/hbm/inventory/container/ContainerCoreInjector.java @@ -18,9 +18,9 @@ public class ContainerCoreInjector extends Container { nukeBoy = tedf; this.addSlotToContainer(new Slot(tedf, 0, 26, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 26, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 26, 53)); this.addSlotToContainer(new Slot(tedf, 2, 134, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 134, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 134, 53)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerCoreTitanium.java b/com/hbm/inventory/container/ContainerCoreTitanium.java index 7bc363b4f..63c3ddf8a 100644 --- a/com/hbm/inventory/container/ContainerCoreTitanium.java +++ b/com/hbm/inventory/container/ContainerCoreTitanium.java @@ -34,18 +34,18 @@ public class ContainerCoreTitanium extends Container { this.addSlotToContainer(new Slot(tedf, 9, 8, 54)); this.addSlotToContainer(new Slot(tedf, 10, 8, 72)); //Outputs - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 11, 152, 54)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 12, 152, 72)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 11, 152, 54)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 12, 152, 72)); //Output Storage - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 13, 8, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 14, 26, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 15, 44, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 16, 62, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 17, 80, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 18, 98, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 19, 116, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 20, 134, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 21, 152, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 13, 8, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 14, 26, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 15, 44, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 16, 62, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 17, 80, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 18, 98, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 19, 116, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 20, 134, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 21, 152, 108)); //Power Cell this.addSlotToContainer(new Slot(tedf, 22, 44, 72)); diff --git a/com/hbm/inventory/container/ContainerCrystallizer.java b/com/hbm/inventory/container/ContainerCrystallizer.java new file mode 100644 index 000000000..3937ca03a --- /dev/null +++ b/com/hbm/inventory/container/ContainerCrystallizer.java @@ -0,0 +1,77 @@ +package com.hbm.inventory.container; + +import com.hbm.inventory.SlotMachineOutput; +import com.hbm.tileentity.machine.TileEntityMachineCrystallizer; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ContainerCrystallizer extends Container { + + private TileEntityMachineCrystallizer diFurnace; + + public ContainerCrystallizer(InventoryPlayer invPlayer, TileEntityMachineCrystallizer tedf) { + diFurnace = tedf; + + + this.addSlotToContainer(new Slot(tedf, 0, 80, 35)); + this.addSlotToContainer(new Slot(tedf, 1, 8, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 140, 35)); + + for(int i = 0; i < 3; i++) + { + for(int j = 0; j < 9; j++) + { + this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + } + } + + for(int i = 0; i < 9; i++) + { + this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142)); + } + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) + { + ItemStack var3 = null; + Slot var4 = (Slot) this.inventorySlots.get(par2); + + if (var4 != null && var4.getHasStack()) + { + ItemStack var5 = var4.getStack(); + var3 = var5.copy(); + + if (par2 <= diFurnace.getSizeInventory() - 1) { + if (!this.mergeItemStack(var5, diFurnace.getSizeInventory(), this.inventorySlots.size(), true)) + { + return null; + } + } + else if (!this.mergeItemStack(var5, 0, diFurnace.getSizeInventory(), false)) + { + return null; + } + + if (var5.stackSize == 0) + { + var4.putStack((ItemStack) null); + } + else + { + var4.onSlotChanged(); + } + } + + return var3; + } + + @Override + public boolean canInteractWith(EntityPlayer player) { + return diFurnace.isUseableByPlayer(player); + } +} diff --git a/com/hbm/inventory/container/ContainerDiFurnace.java b/com/hbm/inventory/container/ContainerDiFurnace.java index 3d7b6aeb9..bac28c2db 100644 --- a/com/hbm/inventory/container/ContainerDiFurnace.java +++ b/com/hbm/inventory/container/ContainerDiFurnace.java @@ -27,7 +27,7 @@ public class ContainerDiFurnace extends Container { this.addSlotToContainer(new Slot(tedf, 0, 80, 18)); this.addSlotToContainer(new Slot(tedf, 1, 80, 54)); this.addSlotToContainer(new Slot(tedf, 2, 8, 36)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 134, 36)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 134, 36)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerElectricFurnace.java b/com/hbm/inventory/container/ContainerElectricFurnace.java index ec58470e9..640484524 100644 --- a/com/hbm/inventory/container/ContainerElectricFurnace.java +++ b/com/hbm/inventory/container/ContainerElectricFurnace.java @@ -20,7 +20,7 @@ public class ContainerElectricFurnace extends Container { this.addSlotToContainer(new Slot(tedf, 0, 56, 53)); this.addSlotToContainer(new Slot(tedf, 1, 56, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 116, 35)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 116, 35)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerGenerator.java b/com/hbm/inventory/container/ContainerGenerator.java index 7500f8cab..9f6e15970 100644 --- a/com/hbm/inventory/container/ContainerGenerator.java +++ b/com/hbm/inventory/container/ContainerGenerator.java @@ -32,8 +32,8 @@ public class ContainerGenerator extends Container { this.addSlotToContainer(new Slot(tedf, 9, 8, 90)); this.addSlotToContainer(new Slot(tedf, 10, 26, 90)); this.addSlotToContainer(new Slot(tedf, 11, 62, 90)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 12, 8, 90 + 18)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 13, 26, 90 + 18)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 12, 8, 90 + 18)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 13, 26, 90 + 18)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerIGenerator.java b/com/hbm/inventory/container/ContainerIGenerator.java index 12174b4b8..71f1d91d9 100644 --- a/com/hbm/inventory/container/ContainerIGenerator.java +++ b/com/hbm/inventory/container/ContainerIGenerator.java @@ -43,7 +43,7 @@ public class ContainerIGenerator extends Container { //Fluid Slot this.addSlotToContainer(new Slot(tedf, 13, 98, 108)); //Container Slot - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 14, 98, 72)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 14, 98, 72)); //Battery Slot this.addSlotToContainer(new Slot(tedf, 15, 152, 108)); diff --git a/com/hbm/inventory/container/ContainerMachineArcFurnace.java b/com/hbm/inventory/container/ContainerMachineArcFurnace.java index d3f41dffb..ce4b36d92 100644 --- a/com/hbm/inventory/container/ContainerMachineArcFurnace.java +++ b/com/hbm/inventory/container/ContainerMachineArcFurnace.java @@ -18,7 +18,7 @@ public class ContainerMachineArcFurnace extends Container { diFurnace = tedf; this.addSlotToContainer(new Slot(tedf, 0, 56, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 116, 35)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 116, 35)); this.addSlotToContainer(new Slot(tedf, 2, 38, 53)); this.addSlotToContainer(new Slot(tedf, 3, 56, 53)); this.addSlotToContainer(new Slot(tedf, 4, 74, 53)); diff --git a/com/hbm/inventory/container/ContainerMachineAssembler.java b/com/hbm/inventory/container/ContainerMachineAssembler.java index 23f4cc186..6a27b9ddf 100644 --- a/com/hbm/inventory/container/ContainerMachineAssembler.java +++ b/com/hbm/inventory/container/ContainerMachineAssembler.java @@ -30,7 +30,7 @@ private TileEntityMachineAssembler nukeBoy; //Schematic this.addSlotToContainer(new Slot(tedf, 4, 80, 54)); //Output - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 5, 134, 90)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 5, 134, 90)); //Input this.addSlotToContainer(new Slot(tedf, 6, 8, 18)); this.addSlotToContainer(new Slot(tedf, 7, 26, 18)); diff --git a/com/hbm/inventory/container/ContainerMachineBoiler.java b/com/hbm/inventory/container/ContainerMachineBoiler.java index 44b7cb12d..3924f6bad 100644 --- a/com/hbm/inventory/container/ContainerMachineBoiler.java +++ b/com/hbm/inventory/container/ContainerMachineBoiler.java @@ -19,15 +19,15 @@ public class ContainerMachineBoiler extends Container { //Fluid ID this.addSlotToContainer(new Slot(tedf, 0, 8, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 8, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 8, 53)); //Input IO this.addSlotToContainer(new Slot(tedf, 2, 44, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 44, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 44, 53)); //Fuel this.addSlotToContainer(new Slot(tedf, 4, 98, 53)); //Output IO this.addSlotToContainer(new Slot(tedf, 5, 152, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 6, 152, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 6, 152, 53)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerMachineBoilerElectric.java b/com/hbm/inventory/container/ContainerMachineBoilerElectric.java index c5e05b496..e97af1cb8 100644 --- a/com/hbm/inventory/container/ContainerMachineBoilerElectric.java +++ b/com/hbm/inventory/container/ContainerMachineBoilerElectric.java @@ -20,15 +20,15 @@ public class ContainerMachineBoilerElectric extends Container { //Fluid ID this.addSlotToContainer(new Slot(tedf, 0, 8, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 8, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 8, 53)); //Input IO this.addSlotToContainer(new Slot(tedf, 2, 44, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 44, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 44, 53)); //Battery this.addSlotToContainer(new Slot(tedf, 4, 98, 53)); //Output IO this.addSlotToContainer(new Slot(tedf, 5, 152, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 6, 152, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 6, 152, 53)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerMachineCMBFactory.java b/com/hbm/inventory/container/ContainerMachineCMBFactory.java index 1a0e91fdb..833922392 100644 --- a/com/hbm/inventory/container/ContainerMachineCMBFactory.java +++ b/com/hbm/inventory/container/ContainerMachineCMBFactory.java @@ -23,8 +23,8 @@ public class ContainerMachineCMBFactory extends Container { this.addSlotToContainer(new Slot(tedf, 1, 80 + 9, 17)); this.addSlotToContainer(new Slot(tedf, 2, 62 + 9, 53)); this.addSlotToContainer(new Slot(tedf, 3, 80 + 9, 53)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 134 + 9, 35)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 5, 62 - 9, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 134 + 9, 35)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 5, 62 - 9, 53)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerMachineChemplant.java b/com/hbm/inventory/container/ContainerMachineChemplant.java index 86d5cdeeb..20941ea9f 100644 --- a/com/hbm/inventory/container/ContainerMachineChemplant.java +++ b/com/hbm/inventory/container/ContainerMachineChemplant.java @@ -30,16 +30,16 @@ private TileEntityMachineChemplant nukeBoy; //Schematic this.addSlotToContainer(new Slot(tedf, 4, 80, 54)); //Outputs - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 5, 134, 90)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 6, 152, 90)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 7, 134, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 8, 152, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 5, 134, 90)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 6, 152, 90)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 7, 134, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 8, 152, 108)); //Fluid Output In this.addSlotToContainer(new Slot(tedf, 9, 134, 54)); this.addSlotToContainer(new Slot(tedf, 10, 152, 54)); //Fluid Outputs Out - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 11, 134, 72)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 12, 152, 72)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 11, 134, 72)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 12, 152, 72)); //Input this.addSlotToContainer(new Slot(tedf, 13, 8, 90)); this.addSlotToContainer(new Slot(tedf, 14, 26, 90)); @@ -49,8 +49,8 @@ private TileEntityMachineChemplant nukeBoy; this.addSlotToContainer(new Slot(tedf, 17, 8, 54)); this.addSlotToContainer(new Slot(tedf, 18, 26, 54)); //Fluid Input Out - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 19, 8, 72)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 20, 26, 72)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 19, 8, 72)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 20, 26, 72)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerMachineCoal.java b/com/hbm/inventory/container/ContainerMachineCoal.java index cd826de2d..afde690b4 100644 --- a/com/hbm/inventory/container/ContainerMachineCoal.java +++ b/com/hbm/inventory/container/ContainerMachineCoal.java @@ -20,7 +20,7 @@ public class ContainerMachineCoal extends Container { this.addSlotToContainer(new Slot(tedf, 0, 44, 53 - 36)); this.addSlotToContainer(new Slot(tedf, 1, 80, 53)); this.addSlotToContainer(new Slot(tedf, 2, 116, 53)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 44, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 44, 53)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerMachineCyclotron.java b/com/hbm/inventory/container/ContainerMachineCyclotron.java index dde7cce44..7e80f2f4e 100644 --- a/com/hbm/inventory/container/ContainerMachineCyclotron.java +++ b/com/hbm/inventory/container/ContainerMachineCyclotron.java @@ -37,11 +37,11 @@ public class ContainerMachineCyclotron extends Container { //Cell this.addSlotToContainer(new Slot(tedf, 10, 8, 108)); //Output - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 11, 44, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 12, 62, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 13, 80, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 14, 98, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 15, 116, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 11, 44, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 12, 62, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 13, 80, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 14, 98, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 15, 116, 108)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerMachineDeuterium.java b/com/hbm/inventory/container/ContainerMachineDeuterium.java index dd5fffa31..132c5f96a 100644 --- a/com/hbm/inventory/container/ContainerMachineDeuterium.java +++ b/com/hbm/inventory/container/ContainerMachineDeuterium.java @@ -27,7 +27,7 @@ private TileEntityMachineDeuterium nukeBoy; this.addSlotToContainer(new Slot(tedf, 1, 26, 90)); this.addSlotToContainer(new Slot(tedf, 2, 44, 90)); this.addSlotToContainer(new Slot(tedf, 3, 80, 54)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 140, 54)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 140, 54)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerMachineDiesel.java b/com/hbm/inventory/container/ContainerMachineDiesel.java index 0306bcca9..652213ec3 100644 --- a/com/hbm/inventory/container/ContainerMachineDiesel.java +++ b/com/hbm/inventory/container/ContainerMachineDiesel.java @@ -19,10 +19,10 @@ public class ContainerMachineDiesel extends Container { diFurnace = tedf; this.addSlotToContainer(new Slot(tedf, 0, 44, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 44, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 44, 53)); this.addSlotToContainer(new Slot(tedf, 2, 116, 53)); this.addSlotToContainer(new Slot(tedf, 3, 8, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 8, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 8, 53)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerMachineEPress.java b/com/hbm/inventory/container/ContainerMachineEPress.java index fa7376df3..deb185f7c 100644 --- a/com/hbm/inventory/container/ContainerMachineEPress.java +++ b/com/hbm/inventory/container/ContainerMachineEPress.java @@ -26,7 +26,7 @@ private TileEntityMachineEPress nukeBoy; //Input this.addSlotToContainer(new Slot(tedf, 2, 80, 53)); //Output - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 140, 35)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 140, 35)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerMachineGasCent.java b/com/hbm/inventory/container/ContainerMachineGasCent.java index 0cffab34d..15890b445 100644 --- a/com/hbm/inventory/container/ContainerMachineGasCent.java +++ b/com/hbm/inventory/container/ContainerMachineGasCent.java @@ -22,15 +22,15 @@ public class ContainerMachineGasCent extends Container { this.addSlotToContainer(new Slot(tedf, 0, 8, 53)); //Fluid ID IO this.addSlotToContainer(new Slot(tedf, 1, 35, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 35, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 35, 53)); //Fluid IO this.addSlotToContainer(new Slot(tedf, 3, 71, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 71, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 71, 53)); //Output - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 5, 134, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 6, 152, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 7, 134, 53)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 8, 152, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 5, 134, 17)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 6, 152, 17)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 7, 134, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 8, 152, 53)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerMachineGasFlare.java b/com/hbm/inventory/container/ContainerMachineGasFlare.java index 01bb5effc..d54283141 100644 --- a/com/hbm/inventory/container/ContainerMachineGasFlare.java +++ b/com/hbm/inventory/container/ContainerMachineGasFlare.java @@ -20,7 +20,7 @@ public class ContainerMachineGasFlare extends Container { this.addSlotToContainer(new Slot(tedf, 0, 44, 53)); this.addSlotToContainer(new Slot(tedf, 1, 134, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 134, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 134, 53)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerMachineInserter.java b/com/hbm/inventory/container/ContainerMachineInserter.java index 72d465ff0..aa6201791 100644 --- a/com/hbm/inventory/container/ContainerMachineInserter.java +++ b/com/hbm/inventory/container/ContainerMachineInserter.java @@ -17,13 +17,13 @@ public class ContainerMachineInserter extends Container { this.addSlotToContainer(new Slot(tedf, 0, 8, 17)); this.addSlotToContainer(new Slot(tedf, 1, 26, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 26, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 26, 53)); this.addSlotToContainer(new Slot(tedf, 3, 62, 17)); this.addSlotToContainer(new Slot(tedf, 4, 80, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 5, 80, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 5, 80, 53)); this.addSlotToContainer(new Slot(tedf, 6, 116, 17)); this.addSlotToContainer(new Slot(tedf, 7, 134, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 8, 134, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 8, 134, 53)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerMachineMissileAssembly.java b/com/hbm/inventory/container/ContainerMachineMissileAssembly.java index 144a77997..285f44c15 100644 --- a/com/hbm/inventory/container/ContainerMachineMissileAssembly.java +++ b/com/hbm/inventory/container/ContainerMachineMissileAssembly.java @@ -22,7 +22,7 @@ public class ContainerMachineMissileAssembly extends Container { this.addSlotToContainer(new Slot(tedf, 2, 44, 36)); this.addSlotToContainer(new Slot(tedf, 3, 62, 36)); this.addSlotToContainer(new Slot(tedf, 4, 80, 36)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 5, 152, 36)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 5, 152, 36)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerMachineOilWell.java b/com/hbm/inventory/container/ContainerMachineOilWell.java index 9af1ec1a5..0372532de 100644 --- a/com/hbm/inventory/container/ContainerMachineOilWell.java +++ b/com/hbm/inventory/container/ContainerMachineOilWell.java @@ -27,11 +27,11 @@ public class ContainerMachineOilWell extends Container { //Canister Input this.addSlotToContainer(new Slot(tedf, 1, 134, 18)); //Canister Output - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 134, 54)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 134, 54)); //Gas Input this.addSlotToContainer(new Slot(tedf, 3, 134, 72)); //Gas Output - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 134, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 134, 108)); //Chip this.addSlotToContainer(new Slot(tedf, 5, 8, 90)); diff --git a/com/hbm/inventory/container/ContainerMachinePress.java b/com/hbm/inventory/container/ContainerMachinePress.java index a88aa8d27..f83151910 100644 --- a/com/hbm/inventory/container/ContainerMachinePress.java +++ b/com/hbm/inventory/container/ContainerMachinePress.java @@ -30,7 +30,7 @@ private TileEntityMachinePress nukeBoy; //Input this.addSlotToContainer(new Slot(tedf, 2, 80, 53)); //Output - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 140, 35)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 140, 35)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerMachinePumpjack.java b/com/hbm/inventory/container/ContainerMachinePumpjack.java index bbda70e7c..40d6be054 100644 --- a/com/hbm/inventory/container/ContainerMachinePumpjack.java +++ b/com/hbm/inventory/container/ContainerMachinePumpjack.java @@ -27,11 +27,11 @@ public class ContainerMachinePumpjack extends Container { //Canister Input this.addSlotToContainer(new Slot(tedf, 1, 134, 18)); //Canister Output - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 134, 54)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 134, 54)); //Gas Input this.addSlotToContainer(new Slot(tedf, 3, 134, 72)); //Gas Output - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 134, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 134, 108)); //Chip this.addSlotToContainer(new Slot(tedf, 5, 8, 90)); diff --git a/com/hbm/inventory/container/ContainerMachineReactorSmall.java b/com/hbm/inventory/container/ContainerMachineReactorSmall.java index 07410684c..8abf8eee3 100644 --- a/com/hbm/inventory/container/ContainerMachineReactorSmall.java +++ b/com/hbm/inventory/container/ContainerMachineReactorSmall.java @@ -32,9 +32,9 @@ private TileEntityMachineReactorSmall seleniumEngine; //Fluid IO this.addSlotToContainer(new Slot(tedf, 12, 8, 90)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 13, 8, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 13, 8, 108)); this.addSlotToContainer(new Slot(tedf, 14, 26, 90)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 15, 26, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 15, 26, 108)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerMachineReactorSmallOld.java b/com/hbm/inventory/container/ContainerMachineReactorSmallOld.java index 33bd3815c..3d837d440 100644 --- a/com/hbm/inventory/container/ContainerMachineReactorSmallOld.java +++ b/com/hbm/inventory/container/ContainerMachineReactorSmallOld.java @@ -33,9 +33,9 @@ private TileEntityMachineReactorSmallOld seleniumEngine; //Fluid IO this.addSlotToContainer(new Slot(tedf, 12, 8, 90)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 13, 8, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 13, 8, 108)); this.addSlotToContainer(new Slot(tedf, 14, 26, 90)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 15, 26, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 15, 26, 108)); //Battery this.addSlotToContainer(new Slot(tedf, 16, 62, 108)); diff --git a/com/hbm/inventory/container/ContainerMachineRefinery.java b/com/hbm/inventory/container/ContainerMachineRefinery.java index 0f1999299..f43a4265a 100644 --- a/com/hbm/inventory/container/ContainerMachineRefinery.java +++ b/com/hbm/inventory/container/ContainerMachineRefinery.java @@ -23,25 +23,25 @@ public class ContainerMachineRefinery extends Container { //Canister Input this.addSlotToContainer(new Slot(tedf, 1, 35, 90)); //Canister Output - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 35, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 35, 108)); //Heavy Oil Input this.addSlotToContainer(new Slot(tedf, 3, 80, 90)); //Heavy Oil Output - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 80, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 80, 108)); //Nahptha Input this.addSlotToContainer(new Slot(tedf, 5, 98, 90)); //Nahptha Output - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 6, 98, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 6, 98, 108)); //Light Oil Input this.addSlotToContainer(new Slot(tedf, 7, 116, 90)); //Light Oil Output - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 8, 116, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 8, 116, 108)); //Petroleum Input this.addSlotToContainer(new Slot(tedf, 9, 134, 90)); //Petroleum Output - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 10, 134, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 10, 134, 108)); //Sulfur Output - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 11, 152, 36)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 11, 152, 36)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerMachineSchrabidiumTransmutator.java b/com/hbm/inventory/container/ContainerMachineSchrabidiumTransmutator.java index 4edf5e28c..317870186 100644 --- a/com/hbm/inventory/container/ContainerMachineSchrabidiumTransmutator.java +++ b/com/hbm/inventory/container/ContainerMachineSchrabidiumTransmutator.java @@ -23,7 +23,7 @@ private TileEntityMachineSchrabidiumTransmutator nukeBoy; nukeBoy = tedf; this.addSlotToContainer(new Slot(tedf, 0, 44, 63)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 134, 63)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 134, 63)); this.addSlotToContainer(new Slot(tedf, 2, 26, 18)); this.addSlotToContainer(new Slot(tedf, 3, 8, 108)); diff --git a/com/hbm/inventory/container/ContainerMachineSelenium.java b/com/hbm/inventory/container/ContainerMachineSelenium.java index 1254431a1..bdf7ff91a 100644 --- a/com/hbm/inventory/container/ContainerMachineSelenium.java +++ b/com/hbm/inventory/container/ContainerMachineSelenium.java @@ -30,11 +30,11 @@ private TileEntityMachineSeleniumEngine seleniumEngine; //Fluid IO this.addSlotToContainer(new Slot(tedf, 9, 80, 18)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 10, 80, 54)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 10, 80, 54)); //Fluid IDs this.addSlotToContainer(new Slot(tedf, 11, 152, 18)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 12, 152, 54)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 12, 152, 54)); //Battery this.addSlotToContainer(new Slot(tedf, 13, 116, 90)); diff --git a/com/hbm/inventory/container/ContainerMachineShredder.java b/com/hbm/inventory/container/ContainerMachineShredder.java index a307833c0..bfaa4d891 100644 --- a/com/hbm/inventory/container/ContainerMachineShredder.java +++ b/com/hbm/inventory/container/ContainerMachineShredder.java @@ -28,24 +28,24 @@ public class ContainerMachineShredder extends Container { this.addSlotToContainer(new Slot(tedf, 6, 44, 54)); this.addSlotToContainer(new Slot(tedf, 7, 62, 54)); this.addSlotToContainer(new Slot(tedf, 8, 80, 54)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 9, 116, 18)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 10, 134, 18)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 11, 152, 18)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 12, 116, 36)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 13, 134, 36)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 14, 152, 36)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 15, 116, 54)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 16, 134, 54)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 17, 152, 54)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 18, 116, 72)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 19, 134, 72)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 20, 152, 72)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 21, 116, 90)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 22, 134, 90)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 23, 152, 90)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 24, 116, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 25, 134, 108)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 26, 152, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 9, 116, 18)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 10, 134, 18)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 11, 152, 18)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 12, 116, 36)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 13, 134, 36)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 14, 152, 36)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 15, 116, 54)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 16, 134, 54)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 17, 152, 54)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 18, 116, 72)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 19, 134, 72)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 20, 152, 72)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 21, 116, 90)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 22, 134, 90)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 23, 152, 90)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 24, 116, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 25, 134, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 26, 152, 108)); this.addSlotToContainer(new Slot(tedf, 27, 44, 108)); this.addSlotToContainer(new Slot(tedf, 28, 80, 108)); this.addSlotToContainer(new Slot(tedf, 29, 8, 108)); diff --git a/com/hbm/inventory/container/ContainerMachineTurbine.java b/com/hbm/inventory/container/ContainerMachineTurbine.java index 788cd8d08..18b4d16be 100644 --- a/com/hbm/inventory/container/ContainerMachineTurbine.java +++ b/com/hbm/inventory/container/ContainerMachineTurbine.java @@ -20,15 +20,15 @@ public class ContainerMachineTurbine extends Container { //Fluid ID this.addSlotToContainer(new Slot(tedf, 0, 8, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 8, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 8, 53)); //Input IO this.addSlotToContainer(new Slot(tedf, 2, 44, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 44, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 44, 53)); //Battery this.addSlotToContainer(new Slot(tedf, 4, 98, 53)); //Output IO this.addSlotToContainer(new Slot(tedf, 5, 152, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 6, 152, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 6, 152, 53)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerMachineTurbofan.java b/com/hbm/inventory/container/ContainerMachineTurbofan.java index 1086cf0b6..2c7e09615 100644 --- a/com/hbm/inventory/container/ContainerMachineTurbofan.java +++ b/com/hbm/inventory/container/ContainerMachineTurbofan.java @@ -21,7 +21,7 @@ public class ContainerMachineTurbofan extends Container { diFurnace = tedf; this.addSlotToContainer(new Slot(tedf, 0, 17, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 17, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 17, 53)); this.addSlotToContainer(new Slot(tedf, 2, 107, 17)); for(int i = 0; i < 3; i++) diff --git a/com/hbm/inventory/container/ContainerNukeFurnace.java b/com/hbm/inventory/container/ContainerNukeFurnace.java index 1519def7e..2cb1883d3 100644 --- a/com/hbm/inventory/container/ContainerNukeFurnace.java +++ b/com/hbm/inventory/container/ContainerNukeFurnace.java @@ -26,7 +26,7 @@ public class ContainerNukeFurnace extends Container { this.addSlotToContainer(new Slot(tedf, 0, 56, 53)); this.addSlotToContainer(new Slot(tedf, 1, 56, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 116, 35)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 116, 35)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerPuF6Tank.java b/com/hbm/inventory/container/ContainerPuF6Tank.java index 6aa912e99..2ea145880 100644 --- a/com/hbm/inventory/container/ContainerPuF6Tank.java +++ b/com/hbm/inventory/container/ContainerPuF6Tank.java @@ -18,9 +18,9 @@ public class ContainerPuF6Tank extends Container { testNuke = tedf; this.addSlotToContainer(new Slot(tedf, 0, 44, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 44, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 44, 53)); this.addSlotToContainer(new Slot(tedf, 2, 116, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 116, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 116, 53)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerReactor.java b/com/hbm/inventory/container/ContainerReactor.java index 108a5fbac..43a611582 100644 --- a/com/hbm/inventory/container/ContainerReactor.java +++ b/com/hbm/inventory/container/ContainerReactor.java @@ -26,7 +26,7 @@ public class ContainerReactor extends Container { this.addSlotToContainer(new Slot(tedf, 0, 56, 53)); this.addSlotToContainer(new Slot(tedf, 1, 56, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 116, 35)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 116, 35)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerReactorMultiblock.java b/com/hbm/inventory/container/ContainerReactorMultiblock.java index 1f872a4b1..a03392966 100644 --- a/com/hbm/inventory/container/ContainerReactorMultiblock.java +++ b/com/hbm/inventory/container/ContainerReactorMultiblock.java @@ -21,20 +21,20 @@ public class ContainerReactorMultiblock extends Container { //Water in this.addSlotToContainer(new Slot(tedf, 0, 8, 90)); //Water out - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 8, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 8, 108)); //Coolant in this.addSlotToContainer(new Slot(tedf, 2, 26, 90)); //Coolant out - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 26, 108)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 26, 108)); //Fuel in this.addSlotToContainer(new Slot(tedf, 4, 80, 36)); //Fuel out - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 5, 80, 72)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 5, 80, 72)); //Waste in this.addSlotToContainer(new Slot(tedf, 6, 152, 36)); //Waste out - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 7, 152, 72)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 7, 152, 72)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerRtgFurnace.java b/com/hbm/inventory/container/ContainerRtgFurnace.java index ba4919085..2d288d6f7 100644 --- a/com/hbm/inventory/container/ContainerRtgFurnace.java +++ b/com/hbm/inventory/container/ContainerRtgFurnace.java @@ -26,7 +26,7 @@ public class ContainerRtgFurnace extends Container { this.addSlotToContainer(new Slot(tedf, 1, 38, 53)); this.addSlotToContainer(new Slot(tedf, 2, 56, 53)); this.addSlotToContainer(new Slot(tedf, 3, 74, 53)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 116, 35)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 116, 35)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/container/ContainerUF6Tank.java b/com/hbm/inventory/container/ContainerUF6Tank.java index 24f6a7fee..73c5d6594 100644 --- a/com/hbm/inventory/container/ContainerUF6Tank.java +++ b/com/hbm/inventory/container/ContainerUF6Tank.java @@ -18,9 +18,9 @@ public class ContainerUF6Tank extends Container { testNuke = tedf; this.addSlotToContainer(new Slot(tedf, 0, 44, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 44, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 44, 53)); this.addSlotToContainer(new Slot(tedf, 2, 116, 17)); - this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 116, 53)); + this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 116, 53)); for(int i = 0; i < 3; i++) { diff --git a/com/hbm/inventory/gui/GUICrystallizer.java b/com/hbm/inventory/gui/GUICrystallizer.java new file mode 100644 index 000000000..cd791789f --- /dev/null +++ b/com/hbm/inventory/gui/GUICrystallizer.java @@ -0,0 +1,41 @@ +package com.hbm.inventory.gui; + +import org.lwjgl.opengl.GL11; + +import com.hbm.inventory.container.ContainerCrystallizer; +import com.hbm.lib.RefStrings; +import com.hbm.tileentity.machine.TileEntityMachineCrystallizer; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; + +public class GUICrystallizer extends GuiInfoContainer { + + private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/processing/gui_crystallizer.png"); + private TileEntityMachineCrystallizer acidomatic; + + public GUICrystallizer(InventoryPlayer invPlayer, TileEntityMachineCrystallizer acidomatic) { + super(new ContainerCrystallizer(invPlayer, acidomatic)); + this.acidomatic = acidomatic; + + this.xSize = 176; + this.ySize = 168; + } + + @Override + protected void drawGuiContainerForegroundLayer(int i, int j) { + String name = this.acidomatic.hasCustomInventoryName() ? this.acidomatic.getInventoryName() : I18n.format(this.acidomatic.getInventoryName()); + + this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + Minecraft.getMinecraft().getTextureManager().bindTexture(texture); + drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + } +} diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 752beb5d2..4fe16fdc3 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -560,6 +560,7 @@ public class MainRegistry GameRegistry.registerTileEntity(TileEntityBarrel.class, "tileentity_fluid_barrel"); GameRegistry.registerTileEntity(TileEntityCyberCrab.class, "tileentity_crabs"); GameRegistry.registerTileEntity(TileEntitySoyuzCapsule.class, "tileentity_soyuz_capsule"); + GameRegistry.registerTileEntity(TileEntityMachineCrystallizer.class, "tileentity_acidomatic"); EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true); EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true); @@ -1321,6 +1322,7 @@ public class MainRegistry public static void PostLoad(FMLPostInitializationEvent PostEvent) { MachineRecipes.registerShredder(); + CrystallizerRecipes.register(); MachineRecipes.overridePreSetRecipe(new ItemStack(ModItems.scrap), new ItemStack(ModItems.dust)); MachineRecipes.overridePreSetRecipe(new ItemStack(ModItems.dust), new ItemStack(ModItems.dust)); diff --git a/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java b/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java new file mode 100644 index 000000000..dea9a5e9b --- /dev/null +++ b/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java @@ -0,0 +1,24 @@ +package com.hbm.tileentity.machine; + +import com.hbm.tileentity.TileEntityMachineBase; + +public class TileEntityMachineCrystallizer extends TileEntityMachineBase { + + public TileEntityMachineCrystallizer() { + super(3); + } + + @Override + public String getName() { + return "container.crystallizer"; + } + + @Override + public void updateEntity() { + + if(!worldObj.isRemote) { + + } + } + +}