From ef04a4148ca7d68bcbd4161c968ce2c9fd10095d Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sat, 31 May 2014 00:25:14 +0800 Subject: [PATCH] Zombie gen is done! --- resources/assets/enderio/models/ZombieJar.png | Bin 1353 -> 1985 bytes .../enderio/machine/MachineRecipes.java | 4 + .../zombie/BlockZombieGenerator.java | 13 +++- .../generator/zombie/TileZombieGenerator.java | 69 +++++++++--------- 4 files changed, 51 insertions(+), 35 deletions(-) diff --git a/resources/assets/enderio/models/ZombieJar.png b/resources/assets/enderio/models/ZombieJar.png index c4dc70aec619a718d34891b449e784c9a45774ea..c5cf77d8f50ce4aa6471f8c393d24a9c0e97f65e 100644 GIT binary patch delta 1947 zcmZ{lc{JOJ7RN(vuT{GcMO#YM5>a~*RpO1^6N4H;q8P1GkxDGdPpVJH)>ztFOVw7U zrJq#%idu@I5@Y7fd*{q~=lyrjx%YnW=X~!u_c9N@l+CpT=pc{` zT|`;WH5CK`so@X-IAm-D4v)r$gS^pEF*v9v!uME$DbyTl0)wq%D?uPhI~OMhUjl0B z{3S1Srn1I)Fjm1p>wJHlLb8Bv7`ereq!2Q?renMy=>4y~e*PjUwZ# z{BuZ`KB}>AG`)yt9AFvALhV+j)_N4HSQbl{aJZAPmD*Sh;d2qg&lHUCXS6h!{p69( z73Ff4UB{JoX)Imaj@MU3fTHIQXmtqp9ruzxhBwuNQ5WJ7wz>dBRm&2K-fE5`2y)-l zRRZm{u9hA|Adv-X#5Sr|fmNz~`B}YUI_69cBN{AEWw=XB;|`LYMB~S#YQg7) z{k>(YBe2#P^d}j*G0k_nzI)4?q=>AzTs0^8^?Yrxod+P0&1H_P05V~HS$&c*r&K1t!b1O z>wfn9ikn(HSn%93eaA|yLY7SI8Y%VC&v7e+){k|kETvG+-uHfBty|9O`LicB_49bJ z^6=qToz|(_zQ($3pBFgfP66WWVuzIfQIu~Lz_K7JS~=Yhcxau@yStY2gAGk81X=0m z_SJ;Ou5#`+=7?@4Hf9dkXzn(S*{Jd zPb=^+${(?2i!m)@#Ftj>D{YdGgh25a%yU_Cq_+Nrd+XxPZR}PG4PPfq^+zdjlkx;{ zK2GhGcBEkI#mMYFR~bI0j1ON>U)3z@YPiO%uJS*!&lOrdNoLN)yqnFJj33Yxzt9|} zdJ2a*#?7q6+Poos7rOUOg0?pSz)^c)Dw4|<|039B%||{TJYHy$9lo#V`G+F9HZC*c z?7awwUk;(I=8m+B`mx&0uhT6_4@re*g;!O_nj)t-8hz{jX#+=hR%iRAQC-13rQHIE zF}HE12>>#;rnTkYG^t}DJpuesDF4FemQnc#wK~<};`;NiJ`UTK0sEGV7z}f4l3+Q! zIHlsWW0)JL-kZ*HiRPKVTFOh*6Th+Qwx+qpUVsYa+TZDpCkhWaqLx`~p~}G3!F~58 zhx;s_$#WD%j6YDmZXVW(&%`Dip$CpwB;Z;^ymo%2eYMj3jfCJwL-whSB2q<$HJZ5;Ar zmRL0v_lKMN<=!@2jt-k+DjE)*^X}TGdnEq&FR3!m1yi@<^J}MlFj2v&=JmY3dC?Wm zP{dM7)=+2af6!pXuW}4xEFM=!Ck09Q5nN(6nkPpo_=MSKkAUhYUyK@CL4MhHW7C29 zkd^Nl6A;Vxfa8=~KMh_fEW8Mwn4q5MyF>~{$m%B07$X^k66LTDrRYy8wrHb)&a!Jf z2Hgd56gk{*Q2$|LLlLeXm!#FQ1uhhr8T5@>_KX_`jQ!+0o&+qk410JQ8uOZcriYss z4>PnxS3BN|fVn*W)9)~Uj;{wow!-trg4%pMl(9Y=>I^rXDCRi_@weM`K||3dV6HT> z+e-cf%M_nbY^&mcCs;FeYBF~w0u%2dPDAV@INRVt<%xzLOe|;+{>)2eccJdC2x0C_ zt6X373Esy`(J3)9GhZ<93jWjtBnQrU;$<~^I-P39N5lEyq?QqbYFj({_jJ73${Qj1mOXty$qD2JAFQ5|NDYm5S~tr=R&Xj E4$!#Pq5uE@ delta 1310 zcmX@ef0Ap0P5og82EN0L$MaXDFfg#Z_H=O!sfc?!?WVtUxX3Yg4W})xqPZGNbz9~p zm^B~t&fzFLa8SqZz#6`?gIw8{8w6AvG?=C+iMV>soA~RH^U|=|mB0Aw=DsgVSz5B> z*8;Ar zTDaq}(v4>`W}Pm-6MQv8ZuNl+)5QJ1IZ4zAHt646a_m+6=>>N$1_Ug8ST?`y(l@3W z;hjrwMeUXQHRr?={eK~ojqHo>^sDRtHY^r6dVt^Vt3cG_@_-8~9)4C!6=`j4)w=Oa z;`x*g)&%2CXOCYtjP1U0&Nj8a=GSwLOUnzdK8w(}+jS_7H~!Uno8IYDrmRSa?tNLT z^!Z|hW{~BjiR(1Oij2S5Wrwe~^HuLl(s~x(zryg`$Li;+>whv9_{?P$+nCkiaa}}v zr{oXLFY8N_3v63H-sQNIpY*C&;^w#J;+nJGdUcs1qM|DkcJHwH?e8#anZb0A>-AtA z{14`>3vR1qXbayfG3VQY{I#xstv_tpzf``gh9gyWd&q{fhF|>?1Xs6pl=yC(H2Y!R zni$Ei_4k|Z9rY8>k^Q+hAB>b-tJvo` z2x^#K{oWU|N7NX1?wl-fES^tcm!QLcZuw_?Z66;0j(jsm_u-fA^EXs)>xr+6 zKYrw3?cIp&rxNw97wDRw5jV$9M1Vo>}**z~!mI^z0qeq^>Md+j{n$;I4D~H-Mx5aEx5qUhTXi z+e?^tH&=YilIh>J%V5jh)^k6zZ0=+n`*i!b#h+5i{_yIMH*=N?T7Ow=8@RHle#U9j z7;oOJz{$XH;?PuX4s~|fwM^n!+4-xhofb>S{djb?qROV>qOH7D@GnKty}bWxWUH=8 zeRW>PJ2~1;bl-Ab4jt14zV=UM9FAG{Fe)pcdzRPjH*$rX;Iv|RW^JeFV%@;L7u({l zd`|0;{i3kxWt)0vYySKCruEIOD?00^959Y;b_n`!exW{co2_x^ikcrYPbI#4F)w`W z+&k|Ne(3YJHOVrTYTy6sylqqRoXJK;8t!IFw=MqYKS{jRmNR*`$J}j-x1Z<*Ezdn+ zwzK<6rt~J?cS@ziO4TE@o&Bo#`9e8R^}vFK;}#F;sdoOM;_=+|UC(sF*1FShtl up3#yuuMe;2n9ZYk`XDBF$aO({OFhGN*7ed2LDJ<6K;Y@>=d#Wzp$Pz|Q;_li diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 87c9736d..b5f0220e 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -50,6 +50,10 @@ public class MachineRecipes { ItemStack comGen = new ItemStack(EnderIO.blockCombustionGenerator, 1, 0); GameRegistry.addShapedRecipe(comGen, "eee", "rmr", "gcg", 'e', electricSteel, 'r', EnderIO.blockReservoir, 'm', machineChassi, 'g', basicGear,'c', capacitor); + //ZombieGen + ItemStack zg = new ItemStack(EnderIO.blockZombieGenerator, 1, 0); + GameRegistry.addShapedRecipe(zg, "eee", "qzq", "qcq", 'e', electricSteel, 'q', fusedQuartz, 'z', new ItemStack(Items.skull, 1, 2),'c', capacitor); + //Crafter ItemStack crafter = new ItemStack(EnderIO.blockCrafter, 1, 0); GameRegistry.addShapedRecipe(crafter, "iti", "imi", "ici", 'i', Items.iron_ingot, 't', Blocks.crafting_table, 'm', machineChassi, 'c', capacitor); diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java index eafe578c..58d15804 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java @@ -6,6 +6,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -33,7 +34,7 @@ public class BlockZombieGenerator extends AbstractMachineBlock fuelTank.getCapacity() * 0.9f; + return true; } - + private boolean transmitEnergy() { if(storedEnergy <= 0) { return false; @@ -215,8 +216,8 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IPower if(resource == null || resource.getFluid() == null || !canFill(from, resource.getFluid())) { return 0; } - tanksDirty = true; - return fuelTank.fill(resource, doFill); + tanksDirty = true; + return fuelTank.fill(resource, doFill); } @Override @@ -243,17 +244,17 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IPower public FluidTankInfo[] getTankInfo(ForgeDirection from) { return new FluidTankInfo[] { fuelTank.getInfo() }; } - + @Override public void readCustomNBT(NBTTagCompound nbtRoot) { super.readCustomNBT(nbtRoot); - active = nbtRoot.getBoolean("active"); + active = nbtRoot.getBoolean("active"); } @Override public void readCommon(NBTTagCompound nbtRoot) { super.readCommon(nbtRoot); - + if(nbtRoot.hasKey("fuelTank")) { NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag("fuelTank"); if(tankRoot != null) { @@ -269,18 +270,18 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IPower @Override public void writeCommon(NBTTagCompound nbtRoot) { - super.writeCommon(nbtRoot); + super.writeCommon(nbtRoot); if(fuelTank.getFluidAmount() > 0) { NBTTagCompound tankRoot = new NBTTagCompound(); fuelTank.writeToNBT(tankRoot); nbtRoot.setTag("fuelTank", tankRoot); - } + } } @Override public void writeCustomNBT(NBTTagCompound nbtRoot) { super.writeCustomNBT(nbtRoot); - nbtRoot.setBoolean("active", active); + nbtRoot.setBoolean("active", active); } }