From fb64552ca40cb18688567285f62627d49ebbdd0c Mon Sep 17 00:00:00 2001 From: Zoko061602 <32712367+Zoko061602@users.noreply.github.com> Date: Sat, 8 Feb 2020 03:20:54 +0100 Subject: [PATCH] Added more 1.12 content - Added Generators - Added Fluids - made grindingBalls seperate Items - Added solar Panel 3 --- .../enderio/config/SAGMillRecipes_Core.xml | 54 ++++- .../assets/enderio/config/VatRecipes_Core.xml | 20 ++ resources/assets/enderio/lang/en_US.lang | 37 +++ resources/assets/enderio/models/EnderJar.png | Bin 0 -> 1218 bytes .../enderio/models/FrankenzombieJar.png | Bin 0 -> 2234 bytes .../textures/blocks/blockEndSteelBars.png | Bin 0 -> 478 bytes .../textures/blocks/blockSoulariumBars.png | Bin 0 -> 3079 bytes .../blocks/ender_distillation_flow.png | Bin 0 -> 10028 bytes .../blocks/ender_distillation_flow.png.mcmeta | 3 + .../blocks/ender_distillation_still.png | Bin 0 -> 8988 bytes .../ender_distillation_still.png.mcmeta | 5 + .../blocks/solarPanelAdvancedBorder.png | Bin 1098 -> 194 bytes .../blocks/solarPanelAdvancedSide.png | Bin 17921 -> 138 bytes .../textures/blocks/solarPanelBorder.png | Bin 1098 -> 216 bytes .../textures/blocks/solarPanelSide.png | Bin 18039 -> 187 bytes .../enderio/textures/blocks/solarPanelTop.png | Bin 2846 -> 1996 bytes .../blocks/solarPanelVibrantBorder.png | Bin 0 -> 281 bytes .../textures/blocks/solarPanelVibrantSide.png | Bin 0 -> 424 bytes .../textures/blocks/solarPanelVibrantTop.png | Bin 0 -> 2033 bytes .../textures/blocks/vapor_of_levity_flow.png | Bin 0 -> 10024 bytes .../blocks/vapor_of_levity_flow.png.mcmeta | 4 + .../textures/blocks/vapor_of_levity_still.png | Bin 0 -> 8621 bytes .../blocks/vapor_of_levity_still.png.mcmeta | 5 + .../textures/gui/23/zombieGenerator.png | Bin 2112 -> 1844 bytes .../items/bucketEnder_distillation.png | Bin 0 -> 440 bytes .../textures/items/bucketVapor_of_levity.png | Bin 0 -> 427 bytes ...all.png => conductiveIronGrindingBall.png} | Bin .../textures/items/darkSteelGrindingBall.png | Bin 0 -> 1240 bytes ...ll.png => electricalSteelGrindingBall.png} | Bin ...=> electricalSteelGrindingBall.png.mcmeta} | 0 .../textures/items/enderCrystalPowder.png | Bin 0 -> 592 bytes ...all.png => energeticAlloyGrindingBall.png} | Bin ...ingBall.png => phasedGoldGrindingBall.png} | Bin ...ingBall.png => phasedIronGrindingBall.png} | Bin .../textures/items/precientCrystal.png | Bin 0 -> 395 bytes .../enderio/textures/items/precientPowder.png | Bin 0 -> 460 bytes .../textures/items/pulsatingPowder.png | Bin 0 -> 460 bytes ...Ball.png => redstoneAlloyGrindingBall.png} | Bin .../enderio/textures/items/vibrantPowder.png | Bin 0 -> 451 bytes src/main/java/crazypants/enderio/EnderIO.java | 112 ++++++--- .../java/crazypants/enderio/ModObject.java | 15 +- .../crazypants/enderio/config/Config.java | 28 ++- .../enderio/fluid/BlockFluidEio.java | 225 +++++++++++++++--- .../java/crazypants/enderio/fluid/Fluids.java | 41 ++-- .../darksteel/DarkSteelRecipeManager.java | 1 + .../item/darksteel/upgrade/SolarUpgrade.java | 20 +- .../enderio/machine/MachineRecipes.java | 25 +- .../enderio/machine/farm/TileFarmStation.java | 14 +- .../zombie/BlockZombieGenerator.java | 49 +++- .../generator/zombie/GeneratorType.java | 19 ++ .../generator/zombie/GuiZombieGenerator.java | 22 +- .../generator/zombie/TileZombieGenerator.java | 93 ++++++-- .../zombie/ZombieGeneratorRenderer.java | 44 ++-- .../machine/solar/BlockItemSolarPanel.java | 14 +- .../machine/solar/BlockSolarPanel.java | 29 ++- .../machine/solar/TileEntitySolarPanel.java | 33 +-- .../soul/SoulBinderPrecientCystalRecipe.java | 26 ++ .../machine/soul/SoulBinderRecipeManager.java | 11 +- .../crazypants/enderio/material/Alloy.java | 5 + .../enderio/material/BlockDarkIronBars.java | 32 --- .../enderio/material/BlockDarkSteelBars.java | 69 ++++++ .../enderio/material/ItemAlloy.java | 6 +- .../enderio/material/ItemGrindingBall.java | 50 ++++ .../crazypants/enderio/material/Material.java | 16 +- .../enderio/material/MaterialRecipes.java | 34 +-- 65 files changed, 874 insertions(+), 287 deletions(-) create mode 100644 resources/assets/enderio/models/EnderJar.png create mode 100644 resources/assets/enderio/models/FrankenzombieJar.png create mode 100644 resources/assets/enderio/textures/blocks/blockEndSteelBars.png create mode 100644 resources/assets/enderio/textures/blocks/blockSoulariumBars.png create mode 100644 resources/assets/enderio/textures/blocks/ender_distillation_flow.png create mode 100644 resources/assets/enderio/textures/blocks/ender_distillation_flow.png.mcmeta create mode 100644 resources/assets/enderio/textures/blocks/ender_distillation_still.png create mode 100644 resources/assets/enderio/textures/blocks/ender_distillation_still.png.mcmeta create mode 100644 resources/assets/enderio/textures/blocks/solarPanelVibrantBorder.png create mode 100644 resources/assets/enderio/textures/blocks/solarPanelVibrantSide.png create mode 100644 resources/assets/enderio/textures/blocks/solarPanelVibrantTop.png create mode 100644 resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png create mode 100644 resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png.mcmeta create mode 100644 resources/assets/enderio/textures/blocks/vapor_of_levity_still.png create mode 100644 resources/assets/enderio/textures/blocks/vapor_of_levity_still.png.mcmeta create mode 100644 resources/assets/enderio/textures/items/bucketEnder_distillation.png create mode 100644 resources/assets/enderio/textures/items/bucketVapor_of_levity.png rename resources/assets/enderio/textures/items/{conductiveGrindingBall.png => conductiveIronGrindingBall.png} (100%) create mode 100644 resources/assets/enderio/textures/items/darkSteelGrindingBall.png rename resources/assets/enderio/textures/items/{electricalGrindingBall.png => electricalSteelGrindingBall.png} (100%) rename resources/assets/enderio/textures/items/{electricalGrindingBall.png.mcmeta => electricalSteelGrindingBall.png.mcmeta} (100%) create mode 100644 resources/assets/enderio/textures/items/enderCrystalPowder.png rename resources/assets/enderio/textures/items/{energeticGrindingBall.png => energeticAlloyGrindingBall.png} (100%) rename resources/assets/enderio/textures/items/{vibrantGrindingBall.png => phasedGoldGrindingBall.png} (100%) rename resources/assets/enderio/textures/items/{pulsatingGrindingBall.png => phasedIronGrindingBall.png} (100%) create mode 100644 resources/assets/enderio/textures/items/precientCrystal.png create mode 100644 resources/assets/enderio/textures/items/precientPowder.png create mode 100644 resources/assets/enderio/textures/items/pulsatingPowder.png rename resources/assets/enderio/textures/items/{redstoneGrindingBall.png => redstoneAlloyGrindingBall.png} (100%) create mode 100644 resources/assets/enderio/textures/items/vibrantPowder.png create mode 100644 src/main/java/crazypants/enderio/machine/generator/zombie/GeneratorType.java create mode 100644 src/main/java/crazypants/enderio/machine/soul/SoulBinderPrecientCystalRecipe.java delete mode 100644 src/main/java/crazypants/enderio/material/BlockDarkIronBars.java create mode 100644 src/main/java/crazypants/enderio/material/BlockDarkSteelBars.java create mode 100644 src/main/java/crazypants/enderio/material/ItemGrindingBall.java diff --git a/resources/assets/enderio/config/SAGMillRecipes_Core.xml b/resources/assets/enderio/config/SAGMillRecipes_Core.xml index 82332836..a6870938 100644 --- a/resources/assets/enderio/config/SAGMillRecipes_Core.xml +++ b/resources/assets/enderio/config/SAGMillRecipes_Core.xml @@ -236,6 +236,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2964,40 +2996,44 @@ - + - + - + - + - + - + - + + + + + - + - + diff --git a/resources/assets/enderio/config/VatRecipes_Core.xml b/resources/assets/enderio/config/VatRecipes_Core.xml index 284f80ad..302e91f0 100644 --- a/resources/assets/enderio/config/VatRecipes_Core.xml +++ b/resources/assets/enderio/config/VatRecipes_Core.xml @@ -127,6 +127,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index ab8f4aa4..83ed95c5 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -127,6 +127,8 @@ enderio.conduitBinder.name=Conduit Binder enderio.binderComposite.name=Binder Composite enderio.phasedIronNugget.name=Pulsating Iron Nugget tile.blockDarkIronBars.name=Dark Iron Bars +tile.blockSoulariumBars.name=Soularium Bars +tile.blockEndSteelBars.name=End Steel Bars tile.blockEndermanSkull.name=Enderman Skull tile.blockEndermanSkull.base.name=Enderman Head tile.blockEndermanSkull.reanimated.name=Reanimated Enderman Head @@ -173,6 +175,14 @@ fluid.cloud_seed_concentrated=Concentrated Cloud Seed tile.fluid.cloud_seed_concentrated.name=Concentrated Cloud Seed item.bucketCloud_seed_concentrated.name=Concentrated Cloud Seed Bucket +fluid.ender_distillation=Dew of the Void +tile.fluid.ender_distillation.name=Dew of the Void +item.bucketEnder_distillation.name=Dew of the Void Bucket + +fluid.vapor_of_levity=Vapor of Levity +tile.fluid.vapor_of_levity.name=Vapor of Levity +item.bucketVapor_of_levity.name=Vapor of Levity Bucket + fluid.eio.xpjuice=Liquid XP tile.fluid.eio.xpjuice.name=Liquid XP item.bucketXpjuice.name=XP Bucket @@ -240,7 +250,23 @@ enderio.darkSteel.name=Dark Steel enderio.soularium.name=Soularium enderio.endSteel.name=End Steel enderio.endSteelNugget.name=End Steel Nugget +enderio.precientCrystal.name=Precient Crystal +enderio.pulsatingPowder.name=Grains of Piezallity +enderio.vibrantPowder.name=Grains of Vibrancy +enderio.enderCrystalPowder.name=Grains of the End +enderio.precientPowder.name=Grains of Prescience +//Balls +enderio.electricalSteel_ball.name=Electrical Steel Ball +enderio.energeticAlloy_ball.name=Energetic Alloy Ball +enderio.phasedGold_ball.name=Vibrant Alloy Ball +enderio.redstoneAlloy_ball.name=Redstone Alloy Ball +enderio.conductiveIron_ball.name=Conductive Iron Ball +enderio.phasedIron_ball.name=Pulsating Iron Ball +enderio.vibrantNugget_ball.name=Vibrant Alloy Nugget Ball +enderio.darkSteel_ball.name=Dark Steel Ball +enderio.soularium_ball.name=Soularium Ball +enderio.endSteel_ball.name=End Steel Ball tile.blockIngotStorage.name=Ingot Storage tile.enderio.electricalSteel.name=Electrical Steel Block @@ -299,6 +325,7 @@ tile.blockAlloySmelter.tooltip.detailed.line5=speed and energy storage tile.blockSolarPanel.name=Photovoltaic Cell tile.blockSolarPanel.advanced.name=Advanced Photovoltaic Cell +tile.blockSolarPanel.vibrant.name=Vibrant Photovoltaic Cell tile.blockSolarPanel.tooltip.common.line1=Solar Power! tile.blockSolarPanel.tooltip.detailed.line1=Produces power during daylight hours tile.blockSolarPanel.tooltip.detailed.line2=Must have a clear line of sight to @@ -428,6 +455,16 @@ tile.blockZombieGenerator.tooltip.detailed.line2=to generate power enderio.zombieGenerator.fuelTank=Nutrient Tank enderio.gui.fluid.minReq=%s Required for activation +tile.blockFrankenzombieGenerator.name=Frank'N'Zombie Generator +tile.blockFrankenzombieGenerator.tooltip.detailed.line1=Consumes Nutrient Distillation +tile.blockFrankenzombieGenerator.tooltip.detailed.line2=to generate even more power +enderio.frankenzombieGenerator.fuelTank=Nutrient Tank + +tile.blockEnderGenerator.name=Ender Generator +tile.blockZombieGenerator.tooltip.detailed.line1=Consumes Dew of the Void +tile.blockZombieGenerator.tooltip.detailed.line2=to generate power +enderio.enderGenerator.fuelTank=Void Tank + tile.blockKillerJoe.name=Killer Joe tile.blockKillerJoe.tooltip.detailed.line1=Attacks nearby creatures when tile.blockKillerJoe.tooltip.detailed.line2=supplied with a sword and diff --git a/resources/assets/enderio/models/EnderJar.png b/resources/assets/enderio/models/EnderJar.png new file mode 100644 index 0000000000000000000000000000000000000000..b7e377e1b801fb5492bf6d686eae7ad441d9d5e9 GIT binary patch literal 1218 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 IM6N<$f*2TCtpET3 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/blockEndSteelBars.png b/resources/assets/enderio/textures/blocks/blockEndSteelBars.png new file mode 100644 index 0000000000000000000000000000000000000000..ff79bdfd20375b9599b71a58c4405c4177f9fa9f GIT binary patch literal 478 zcmV<40U`d0P)N2bZe?^J zG%heMGBNQWX_Wu~0b5B#K~y+Tby8bPLO~cjKRmkk(mg7=(mjfvBGWWYyJ%Xb$GoL! zMiE30Vi5H@HD4>XXSadF;hX(-_S@NU+PF>6Ark0^Dh2MHBJDy$fjnr z1t4p1`I~u!{e3op9G+@Bs1{biQ@9zZ;PQ0T5b#bV_-uudh>gg1ax@?t+nj0Ej;Fi{`6O zNL31KL1G{MQe_7uy@oX^TZRB%>iDqN6tKN7!^A06DKJcI!!F?B;cgR^{E8U&o6fqC z4FLtbqtRG4(=-~!|JQrO2%Nx{uzGpJIE{(*##>Nwmka?0E3n_Cao6$5KW015H&Ekt Unl)Lnxc~qF07*qoM6N<$f?!_8xc~qF literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/blockSoulariumBars.png b/resources/assets/enderio/textures/blocks/blockSoulariumBars.png new file mode 100644 index 0000000000000000000000000000000000000000..a5d4d5f54e85b8c2396facacd9f0603bc6314f12 GIT binary patch literal 3079 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 Vre2?h2K literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/ender_distillation_flow.png b/resources/assets/enderio/textures/blocks/ender_distillation_flow.png new file mode 100644 index 0000000000000000000000000000000000000000..53d33aac293149d99a1e46359476820e59c9c466 GIT binary patch literal 10028 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 o004R= z004l4008;_004mK002@5009+P0026d000+n*IFNt00009a7bBm000XS000XS0e@s) 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 D>`h|C diff --git a/resources/assets/enderio/textures/blocks/solarPanelSide.png b/resources/assets/enderio/textures/blocks/solarPanelSide.png index e5c00c349103031ef37eb4f714d98ddd85c7d126..16c894f10b7b0781cadfd1888b020955f0e12111 100644 GIT binary patch delta 11 Scmey~!?>Gqg5~6|u1x?SyaibR literal 18039 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 Ied@XY0%|8Lv;Y7A diff --git a/resources/assets/enderio/textures/blocks/solarPanelTop.png b/resources/assets/enderio/textures/blocks/solarPanelTop.png index a60c8f937916d4e401d2196903649db17a411395..24e14b6319963f49704e9aa729b18ed06a53161a 100644 GIT binary patch delta 11 ScmbOyc7}g~^5#+4zGqD;*ZPJQL1dTcs)2*AhZPam`aa@vCLb(Db zm+Z8IP-^~$#1d;k6a->>KQFTOO(#!EGvscW%NIhCx@kHnmTF{ev5 zVKmy_{bapH^KfGEo50O4QXZDMA4#^WX)Q_XIUuYRK+3zl_Z^ujdG#3dgy_tM_q)H z>^LYrGE~qMVZ*F?s)0dJK}+r71eWs$c%~+-c6j!&#zgZuFPid6ZjLlc!(`Kxi`|-a{kamNr-Tt%d`b#IMx*oHusD3=8pCvl-QfK?wXY>Bs+1ICk E00D;(6951J diff --git a/resources/assets/enderio/textures/blocks/solarPanelVibrantBorder.png b/resources/assets/enderio/textures/blocks/solarPanelVibrantBorder.png new file mode 100644 index 0000000000000000000000000000000000000000..4d57072dca713c51896852bcbc367f75a0f710f8 GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sEXgD|57Yp@DXaGj@%V~B;S(H3f;v zd9QCpZgkGE$<`jBcL5VmKNq~RMoqE%y3K+=K}{c4)G-P#nJjAZyH4cv zeusAj3>RfAb}#;aQf$)Gts6zH<{91ZP1_K>z@;j|==^1poj6N=ZaPRCwA|Qdx4vFbFe?^Ul=&-v2sn zW0ndh&fz@;j|==^1pojClSxEDRCwA=R$FgfM-^VPW@hhwE;hw6 zc2$r{5k&|P50$D05YQlSQZ;U(nlum;)FPxv`~)8O2?!)aT0t*vsUW2ZZkrTvqE>2) zh(H2fpaK*cnM8`QL*n>c_GK=7Yxc3jk$t>9duGj=^;E_K9CU{WPUde{OCnx9jUy<)6UhgFGn8=lAqFoz3^wC=G<*NJTuD+4-Kan`>*B zL(^Rox3{dZITmUL^`dn=a_sl}gJvXE zsME>XqEqN;yEUq@R!3DKC!DnjzEa&R8!E{^#L6`5>jVrG=d-g}FDn7E4s(O0!E>sFa1WaeaBRL9-HM- z6Ggob&UZ4~xw(G-;lQl+KPFqnfm{ zA!tBhf}lGC?T}*R~Q3lb~4hG<4 zB_)-j0GJpcDbyDUe)Qf?{rZJd@(LNKNqu9bxE*ORs43R!tH&Q-dG!n%3CNWQNG&cu z)9p`lrRs5w6s!?0V^vd&thLsk+xy@9vB-lVubKucYBRbuSU9k7 z{>}6C;0E}uN5MyxPfwZQ*x@~(0%wb?7&WzWf^gFyJ=*usmsZcc-tQE{*l^Q;Cpxp3 zjIuG9ZS1XKI#BSR{^Dm=R?h;1ruMzUj6#WG)_!b;8yjI`6M&fcIpcWq(j^_BL6sE+ z7M^=l=;G+wf5?E! zg%Qpw_!lcw$if(KVAQ6?F~TZDZgp}V1#bwRgZ8W|&n3hF{AllyrPr396;1fW3h^ty ztBf5T04J7b375W^(z_4^a?#U{Qj91WB?@4H){DoF|L*i@`acyVHmch?5Q%m)h-7B^ zwy@b?Mx?LUhL*WtQ-%Gitqn+@V{82p?rHLw$Z=))XXLzR78gvWEMAL)=#*frdB?m` zx?pXqgS5xwWMZ5l8a>G_Dj!ta8^n_!5;pB}$)+uUkCPFm)DJ-0hQ&#evy1=eWFC6w zbGQK**$nNk4e_=PyikdQ|dwYnw#ZUS(qJOc^%T zidEp)MCXD+n=&4+VB~-lJVv;Nowg>3?hsyRGDKiu@Kg-Yus7Rd_z*muMtklIyt- zu*tUn@lP={3sj|Qvg8Z*fA((|-Vr*BK_?=&wN5QI@?<2G;n1<;GN&!HPvFTkp0tD} zp}x~&COUZJ=&`r|@JBIX>0&W`RO|T3-(%~V_&l(5W0dt+YR%hPdt9{^qDqjR6F{MiKfV9H?!0;R)4$7tyZG!pj-E0vHo-s3DRBK zn@-p{!I@`&qHT`YQb$DeJLQ8Ms^k(L+Dw{guS3`rQH)>^INdWa2l;xQC=}k-Qvz*J z4;@%k5B}%}IapMwa*PfTvgxiYX71ZNKpT*ir@P9=x~^3z1d8=ICSJI*gnF8)fnk7k zcnBVRz&{?BC0y?g9(?TV%V*FJywj}?%3f|qp%&vrTK%$BzoD$-^mq(xnskY%CC!HX zxb9}fu&i1PaII=98C}!Y-TS_L;MA!Xr9{K4S8FIaQtzI7I$d+)%GI`fH~zbYbUwdy z=r3=)fg0Xg`*(XKofuxEY|k7#$6eoSuS2-FwdQGO_TWzSo1Z?De9ZC0i%2LO$7-U3 zG_rK$8*l&OSE6T?E=YnxJRnh++equgECLBzh P00000NkvXXu0mjfHf-OW literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png b/resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png new file mode 100644 index 0000000000000000000000000000000000000000..291badfbd99b7a25f117713e9015d6dbce1e8809 GIT binary patch literal 10024 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/vapor_of_levity_still.png.mcmeta b/resources/assets/enderio/textures/blocks/vapor_of_levity_still.png.mcmeta new file mode 100644 index 00000000..0645f48c --- /dev/null +++ b/resources/assets/enderio/textures/blocks/vapor_of_levity_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/assets/enderio/textures/gui/23/zombieGenerator.png b/resources/assets/enderio/textures/gui/23/zombieGenerator.png index d6518d7a2fd6b9d252b6f8bdcbeffff554cbdd12..47e196be8e475bca2b9150b611e31b24be98e9f8 100644 GIT binary patch literal 1844 zcmcIlc~H_>9Dl!`h()mn&s?lvL({<1Jy3l(m&*hIXd1P&7uBM^{q$^scxY(p^v;EtfdGp@)nD6oVe%`!aws^bgYAw_P z0O)$SyKDmhQe7c{LaL74QP=m+NYUHeNT8$%GpG^}2b?xL0dO--dooB}C2K~y?~Dcj z&7av2Ce2S}MAmt@IPFOAm%bFyOsE)*Ku+?XMr|3J%79vQezh@|xL5oXy~_02Dawka z+S+@ALh>z7M(FHWkXh`!l)K zO`aPH-5TnNWei6@xhL_DB?u#Ev{J^gCF+%82gToH<{3vtYokZLLqe$NU}tQpAlJX< zYMX8*ip6HLM|6H}6&@Zx_2Psc)+lHTLqM2_jU1P8*u}-gJ>`v!&BzlSU4+4r^>P#V zjE^%bxtff%AxO`&+1LYPS_ctew533PMu|yn_H4&g4sw~Jlj7KZV6F-1(%@V2;ovk! zT}|@~%>f_!3VJTCfrzE46$&?Ym7HKkSZ$3yK5TI$pYAC1x9YwC@?O>dq!eEvdz*ur z%Wosr4Eh?Am77ywnAK&HHpM4&E{`Ca8eZP=d@`Dnv(*BK?^cCU7nhRXwmbF}`a3Bo zLSGih8}Jsv8_TuQ!)Q$3oTa@35@&S;aENcYTUrWlR0=oR+DQ#BG>bOwIEfdow0MQc z8aPel(_UFN@2@yAC1}fE+em|-9#9n0*GX<>XJ^;NR^{D-aW-#mKkMom!#mrx>abkH zBO;oLI1*(>kTW28F4E@#-2K``I1sqx5DEpBx#~a=uz5nNTtQ4pyhtjz>0&49Ur}kj zFx)4gBgv2mg1G|@-0JTJCzWZyy=D55H4YIYd0IRYCLDx_(#B; zK9aa@xsCGDdYaKd3fPVUP^72GJQNB#%&*he$*3dL*S?; zKzRXTAPiswz}u}&%++Lhm8j=6BLKo2;8xFi1V`aPk~y$0H)1&&0DUfCRnB^(*WCr9 zJW%_37nqm}_0hvf8I&#*3VYn}O^5a{7rgfAe{WZYMe=g7$ib#RAXWg<&I-=6SD`Qy zuip&zG8xZt9kQf_hi8mWH0yUW7QitFE(6M)mQp|Jd@$e)Vk|;Ykqido+P-X`4)~rK z%dtL3En#9bL~>L1TPU$s(cOC5fJ4veL$6Ei#Q8=#_V<-Sl9=Rpyi-mrog-;V|x zXsWW!p+$4>d;(CPBC!q>j9B>!q9Wtt`ShUdkZpW z()g&V4spwqJ^SVv?nI#A!rBzv%Qc8u%9ZghCHHT-MEXk+XV-Vfv+tQ|6~+~Y7i7il$!IO&#Hq`?B`LVFQ(>qUQ|C`l zh2?)kFdcJcAtArckY*{|i^c`CtKD0TK{srtBrRmF&!pv14JSyw8md3&o2)>o4ssfr WUsCe8$(}5kN#Wt@?NUMtO#T<{C(uU# literal 2112 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6kEG#S|BV(Sb^fEQ+9ollo^%bufDc|sM{lAUj|9|=J?(Sp9j{X1t zAEbpHv#SClmb1VkvY3H^ZwCl7W;uS11`0}* zxJHx&=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_mvsmUy~2hE&A8z15vJ+d;%N za8`Ma-2eYuzw}u;IEkK|AvyKr&1kRu7SZnAO_OJBlRUm`-m$_r`hR0;#Mt?+^_&gx zSG*8E`M}%9x1KVr$o#)B|Jc6$$39(lH*2WaW>r;{^~?MA*IMc64!Yv%;z&v15Mi^@ZKj8`KZHeYHQ9Eq9LuSpSRmh<&oRDp-%G12u{M z6Y$y3aOu;>nNROC@2dEzU!T#o7%rch?Z>iUeO%R> z%(@ru4F_c(9OZcMH2U*DH-`JOzi(&r_&uNf!OzI}^{1Hcd^6w2wCry!cZFz4MpWeMY5Va0q#JdhI7`@#trZG zt`ps}fA!9?>k}_A{L0-N@M N^K|udS?83{1OVbQ!xR7j diff --git a/resources/assets/enderio/textures/items/bucketEnder_distillation.png b/resources/assets/enderio/textures/items/bucketEnder_distillation.png new file mode 100644 index 0000000000000000000000000000000000000000..b195c778a9c7f7bfff806c83b4d228c6ec37d29b GIT binary patch literal 440 zcmV;p0Z0CcP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0ZmCnK~y+TrIWo% z#6T2S zGCOxN88R^_xZe=w-pSlEXD*Dv7{fM<JQk{WVXm+? zE38Hp*8E#q3+|#8#a*-}Mo|QC5!y7a?M6&8o__HIN(4b5R~jriD})H=?Bxpf^b@wo zIQ)77-M~))!gXETmJ^f*rCb4SiU(ZooFM0;i}FaF4Z~1oz~tjjMh$jlAPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0YFJaK~y+TrIWEv zgg_96XSsUp9pX5iZO`h!#`$r;nTb_^reEFOK-YC@P1_&`Hb#M| zed7A!lCwQKkPrmHY#U3C27TYd-NQY6J-u)R;OJ}(&E^e!Fu&wXpePCz{bUWRo z|H)!LI+!xv1KPqc3~Cb9c35+SK;!HdYYtA|KEJA^z7OLWP%};a##~_I5`Xk?flUtD zSO{##8V#6Y+(dmiUUEVz*t++xT+n+TTeYt1dOV0<{|lbyab`AZtOEbx&o|Kyzz;!V VbJif1yN>_>002ovPDHLkV1latwKD(! literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/conductiveGrindingBall.png b/resources/assets/enderio/textures/items/conductiveIronGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/conductiveGrindingBall.png rename to resources/assets/enderio/textures/items/conductiveIronGrindingBall.png diff --git a/resources/assets/enderio/textures/items/darkSteelGrindingBall.png b/resources/assets/enderio/textures/items/darkSteelGrindingBall.png new file mode 100644 index 0000000000000000000000000000000000000000..54f5d3de589f564f99dd5faad1443298dabf76f1 GIT binary patch literal 1240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!ZaB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26e|})15+16H*-fr0~bR>R})J!QzsWoXG0@P zBO@0VBS)BCm;B_?+|;}hnBEkGUJIOhK`9}(0BEyIYEfocYKmJ?ey#%8$5xrR-C~N< zJgD9j+-@<$saGH97=2K@BE>UI2$*<4On9mVa^UGcH4m8Bi-4)xP+?LZ0|TS4r;B4q z#jPX3zU!MDc-D9@@IGXc;}GmS^8bIbO`+05HWdN8kdpg;^Ib2LfBvABx$Vt1}%cr;MnUWd*eiF4!SX4ebu^OzW?|vh8u6orlii?q|@!UT=?cT z-^Ug~x3^7sZu$MyZ#!cdzIJ~mmF1aU>s|+mxOyZp9X8P5asGCCQ;5?hC5^781wBt5 zf8;RQ6{8p9djGr6rn`BZxe5Q*E3Q)U)Zk#UntxuVC1J&DnH!ey%5wJ3IRyZrimC5e?n`fy!HcR-xTI5{Jdb;Q!pV1edR7HWH z1+RDAkErZC|2uSt9LwSm%Vr~|+vd$@? F2>^CEu=M}{ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/electricalGrindingBall.png b/resources/assets/enderio/textures/items/electricalSteelGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/electricalGrindingBall.png rename to resources/assets/enderio/textures/items/electricalSteelGrindingBall.png diff --git a/resources/assets/enderio/textures/items/electricalGrindingBall.png.mcmeta b/resources/assets/enderio/textures/items/electricalSteelGrindingBall.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/items/electricalGrindingBall.png.mcmeta rename to resources/assets/enderio/textures/items/electricalSteelGrindingBall.png.mcmeta diff --git a/resources/assets/enderio/textures/items/enderCrystalPowder.png b/resources/assets/enderio/textures/items/enderCrystalPowder.png new file mode 100644 index 0000000000000000000000000000000000000000..40643c8f86379f82d789fa454549ff112f79003f GIT binary patch literal 592 zcmV-W0pG@<~KNR5(wilHW^{VHC%o{m{FnMVjUc z(hUV6(7?SS)D(ng>o9h8;tGq95{{eEXDItHr1OvsFoO`##f$UwBXSZld#&AE-*c$AREq?%N!a@A`c|55&U9V?2Tv(96>nJa7 z(0SRh^l@s z4sV+oV6odpO(aPDyhc;{3e8W(Xt*DyVOnGN)CF9#8tz9URP-vwB255eyE3+)@1|2F8aY=*Biz$W$UFE|1U6@CSWuMJ19M;c`4HR;oTtqJh2 eDw+IyA$|ZB)J6%TwG&bR0000? literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/energeticGrindingBall.png b/resources/assets/enderio/textures/items/energeticAlloyGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/energeticGrindingBall.png rename to resources/assets/enderio/textures/items/energeticAlloyGrindingBall.png diff --git a/resources/assets/enderio/textures/items/vibrantGrindingBall.png b/resources/assets/enderio/textures/items/phasedGoldGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/vibrantGrindingBall.png rename to resources/assets/enderio/textures/items/phasedGoldGrindingBall.png diff --git a/resources/assets/enderio/textures/items/pulsatingGrindingBall.png b/resources/assets/enderio/textures/items/phasedIronGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/pulsatingGrindingBall.png rename to resources/assets/enderio/textures/items/phasedIronGrindingBall.png diff --git a/resources/assets/enderio/textures/items/precientCrystal.png b/resources/assets/enderio/textures/items/precientCrystal.png new file mode 100644 index 0000000000000000000000000000000000000000..e09b68d808db9ff05b598cdf19d5c7252e7c0bb6 GIT binary patch literal 395 zcmV;60d)R}P)pGElET{R5(v#`2YVuMHs6fDHy9D39@V{(c)PE4Y=+1=yUE6a0hh^FV zrBT&_Fopm~)BM}*|Bt@h{eQ{%Y5xzr*ab9X(*L&2>HkABtbs~U)uV7gIHxD%|KXRr z{vQDvaOczI|CisL2J(0OpLwbZ>>_maC>#(5DLVFQ&;Ms%@BP07)O_Ii*8d%w%m2?m z*F;AHPQO0zf7R7F|MxuG0Q3qd3?}|Bm=KCJN>Ml<3^HKNgSr1VJzDaA;(_}AOYTnj zzvJnq|E(L-h%=yebqv@LP{=p0O#eUcT*LpiE$KKD6ovpO9W<;@0vnRrgBd literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/precientPowder.png b/resources/assets/enderio/textures/items/precientPowder.png new file mode 100644 index 0000000000000000000000000000000000000000..106bec540c596f4122dc8f7e4ec242b5a9560b11 GIT binary patch literal 460 zcmV;-0W}s(J)^98PfA90H|Eq2; z{2$fo`+vdJ$zU3rAs7N6+cw`>{(s-|&Hq?I4*Wmoa{vD; z@6UiWgA7la81g@3M$~^reMz7eGy^>I?fy?X+yb_7&Xo!Or=Dv24+=;SojETCY#_*> z!ezVQ1viW})&oWg?(g27Z2h;@82(lR@u4$_XR*Yc)%n*|R?f>Q>x?meYwz+0n{ZE@70d}^5n;JwB z5a2Wb20)5c&1J!wK$@Y#DC)s_&;>}vSOtm4{}}*1z@pzv_z;f(0000G~E6A_5ZvlPyWa3+4Fw^kcJt8(*UK647lbkZ{LD#?+4lrVuR?mn>XQxfB=R8 zAOKRZ`PHlcbAdL3G%W`j0@4U#7oIuuKV<7xxFHw@fFwYQy6)WhKl9G{RK79C}4|GitP&3H+pn!Boqq1=QlF? z&!esmSBTR97~s{`2HOV1P+>U0Fo0Z)Rgif6p8)_zEnQ?v`MS~o0000JlP#A?fS(Q2zh5CYO zE%?GBBBj2l4I-_II9RG8YSBWbige0UP=XFFF5)8M;wDZVGdSqjHEZV1cR$|$w-M4@ z!QzEOZchI5o!pQBfPYD8wj-t4j+CaWBWD%+c1mv5&q+#?bn0k$#1%}TBl$2WC)Kk` zvtTDt$0u&Y1s0!%VTc31svtgt+U|vcXI$eFXSl^V^7VOStqCN|J|Dz$GkX`|R#H_Q zb92$j@DbLnaRx>Ax;>De&6E*_?&O-S6)e3(Q4x8(mwG@Sk3!T+phJ5ZdLxUJJOYUzbMj64(?LIg z7M*X)p21E%0s04Mzam2vq-OGma-BTv1GtdUlMrI15I0iWbTy1jEyk}svfK4NB-gJ1 tchT^G7UU3xo3>}3Gp$CuQks7k0$2 literal 0 HcmV?d00001 diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 3d16d119..89b46303 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -92,6 +92,8 @@ import crazypants.enderio.machine.farm.FarmersRegistry; import crazypants.enderio.machine.generator.combustion.BlockCombustionGenerator; import crazypants.enderio.machine.generator.stirling.BlockStirlingGenerator; import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator; +import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockEnderGenerator; +import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockFrankenZombieGenerator; import crazypants.enderio.machine.generator.zombie.PacketNutrientTank; import crazypants.enderio.machine.hypercube.BlockHyperCube; import crazypants.enderio.machine.hypercube.HyperCubeRegister; @@ -134,13 +136,16 @@ import crazypants.enderio.machine.vat.BlockVat; import crazypants.enderio.machine.vat.VatRecipeManager; import crazypants.enderio.machine.wireless.BlockWirelessCharger; import crazypants.enderio.material.Alloy; -import crazypants.enderio.material.BlockDarkIronBars; +import crazypants.enderio.material.BlockDarkSteelBars; +import crazypants.enderio.material.BlockDarkSteelBars.BlockEndSteelBars; +import crazypants.enderio.material.BlockDarkSteelBars.BlockSoulariumBars; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.BlockIngotStorage; import crazypants.enderio.material.ItemAlloy; import crazypants.enderio.material.ItemCapacitor; import crazypants.enderio.material.ItemFrankenSkull; import crazypants.enderio.material.ItemFusedQuartzFrame; +import crazypants.enderio.material.ItemGrindingBall; import crazypants.enderio.material.ItemMachinePart; import crazypants.enderio.material.ItemMaterial; import crazypants.enderio.material.ItemPowderIngot; @@ -189,13 +194,16 @@ public class EnderIO { // Materials public static ItemCapacitor itemBasicCapacitor; public static ItemAlloy itemAlloy; + public static ItemAlloy itemGrindingBall; public static BlockFusedQuartz blockFusedQuartz; public static ItemFusedQuartzFrame itemFusedQuartzFrame; public static ItemMachinePart itemMachinePart; public static ItemPowderIngot itemPowderIngot; public static ItemMaterial itemMaterial; public static BlockIngotStorage blockIngotStorage; - public static BlockDarkIronBars blockDarkIronBars; + public static BlockDarkSteelBars blockDarkIronBars; + public static BlockSoulariumBars blockSoulariumBars; + public static BlockEndSteelBars blockEndSteelBars; public static ItemEnderFood itemEnderFood; // Enderface @@ -241,6 +249,8 @@ public class EnderIO { public static BlockStirlingGenerator blockStirlingGenerator; public static BlockCombustionGenerator blockCombustionGenerator; public static BlockZombieGenerator blockZombieGenerator; + public static BlockFrankenZombieGenerator blockFrankenZombieGenerator; + public static BlockEnderGenerator blockEnderGenerator; public static BlockSolarPanel blockSolarPanel; public static BlockReservoir blockReservoir; public static BlockAlloySmelter blockAlloySmelter; @@ -299,19 +309,27 @@ public class EnderIO { public static Fluid fluidFireWater; public static BlockFluidEio blockFireWater; public static ItemBucketEio itemBucketFireWater; - - public static Fluid fluidLiquidSunshine; - public static Fluid fluidCloudSeed; - public static Fluid fluidCloudSeedConcentrated; - - public static BlockFluidEio blockLiquidSunshine; - public static BlockFluidEio blockCloudSeed; - public static BlockFluidEio blockCloudSeedConcentrated; + public static Fluid fluidLiquidSunshine; + public static BlockFluidEio blockLiquidSunshine; public static ItemBucketEio itemBucketLiquidSunshine; + + public static Fluid fluidCloudSeed; + public static BlockFluidEio blockCloudSeed; public static ItemBucketEio itemBucketCloudSeed; + + public static Fluid fluidCloudSeedConcentrated; + public static BlockFluidEio blockCloudSeedConcentrated; public static ItemBucketEio itemBucketCloudSeedConcentrated; - + + public static Fluid fluidEnderDistillation; + public static BlockFluidEio blockEnderDistillation; + public static ItemBucketEio itemBucketEnderDistillation; + + public static Fluid fluidVapourOfLevity; + public static BlockFluidEio blockVapourOfLevity; + public static ItemBucketEio itemBucketVapourOfLevity; + //Open block compatable liquid XP public static Fluid fluidXpJuice; public static ItemBucketEio itemBucketXpJuice; @@ -328,11 +346,11 @@ public class EnderIO { @EventHandler public void preInit(FMLPreInitializationEvent event) { - + EnderIOCrashCallable.create(); Config.load(event); - + proxy.loadIcons(); ConduitGeometryUtil.setupBounds((float) Config.conduitScale); @@ -340,6 +358,8 @@ public class EnderIO { blockStirlingGenerator = BlockStirlingGenerator.create(); blockCombustionGenerator = BlockCombustionGenerator.create(); blockZombieGenerator = BlockZombieGenerator.create(); + blockFrankenZombieGenerator = BlockFrankenZombieGenerator.create(); + blockEnderGenerator = BlockEnderGenerator.create(); blockSolarPanel = BlockSolarPanel.create(); blockCrusher = BlockCrusher.create(); @@ -432,6 +452,7 @@ public class EnderIO { itemMachinePart = ItemMachinePart.create(); itemMaterial = ItemMaterial.create(); itemAlloy = ItemAlloy.create(); + itemGrindingBall = ItemGrindingBall.create(); itemPowderIngot = ItemPowderIngot.create(); registerFluids(); @@ -447,8 +468,11 @@ public class EnderIO { blockIngotStorage = BlockIngotStorage.create(); - blockDarkIronBars = BlockDarkIronBars.create(); - + blockDarkIronBars = BlockDarkSteelBars.create(); + blockSoulariumBars = BlockSoulariumBars.create(); + blockEndSteelBars = BlockEndSteelBars.create(); + + itemEnderFood = ItemEnderFood.create(); DarkSteelItems.createDarkSteelArmorItems(); @@ -467,52 +491,63 @@ public class EnderIO { } private void registerFluids() { - Fluid f = new Fluid(Fluids.NUTRIENT_DISTILLATION_NAME).setDensity(1500).setViscosity(3000); + Fluid f = new Fluid(Fluids.NUTRIENT_DISTILLATION).setDensity(1500).setViscosity(3000); FluidRegistry.registerFluid(f); fluidNutrientDistillation = FluidRegistry.getFluid(f.getName()); - blockNutrientDistillation = BlockFluidEio.create(fluidNutrientDistillation, Material.water); + blockNutrientDistillation = BlockFluidEio.NutrientDistillation.create(fluidNutrientDistillation, Material.water); PacketHandler.INSTANCE.registerMessage(PacketNutrientTank.class, PacketNutrientTank.class, PacketHandler.nextID(), Side.CLIENT); - f = new Fluid(Fluids.HOOTCH_NAME).setDensity(900).setViscosity(1000); + f = new Fluid(Fluids.HOOTCH).setDensity(900).setViscosity(1000); FluidRegistry.registerFluid(f); fluidHootch = FluidRegistry.getFluid(f.getName()); - blockHootch = BlockFluidEio.create(fluidHootch, Material.water); + blockHootch = BlockFluidEio.Hootch.create(fluidHootch, Material.water); FluidFuelRegister.instance.addFuel(f, Config.hootchPowerPerCycleRF, Config.hootchPowerTotalBurnTime); - FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.HOOTCH_NAME + "@" + FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.HOOTCH + "@" + (Config.hootchPowerPerCycleRF / 10 * Config.hootchPowerTotalBurnTime)); - f = new Fluid(Fluids.ROCKET_FUEL_NAME).setDensity(900).setViscosity(1000); + f = new Fluid(Fluids.ROCKET_FUEL).setDensity(900).setViscosity(1000); FluidRegistry.registerFluid(f); fluidRocketFuel = FluidRegistry.getFluid(f.getName()); - blockRocketFuel = BlockFluidEio.create(fluidRocketFuel, Material.water); + blockRocketFuel = BlockFluidEio.RocketFuel.create(fluidRocketFuel, Material.water); FluidFuelRegister.instance.addFuel(f, Config.rocketFuelPowerPerCycleRF, Config.rocketFuelPowerTotalBurnTime); - FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.ROCKET_FUEL_NAME + "@" + FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.ROCKET_FUEL + "@" + (Config.rocketFuelPowerPerCycleRF / 10 * Config.rocketFuelPowerTotalBurnTime)); - f = new Fluid(Fluids.FIRE_WATER_NAME).setDensity(900).setViscosity(1000).setTemperature(FluidRegistry.LAVA.getTemperature() * 2); + f = new Fluid(Fluids.FIRE_WATER).setDensity(900).setViscosity(1000).setTemperature(FluidRegistry.LAVA.getTemperature() * 2); FluidRegistry.registerFluid(f); fluidFireWater = FluidRegistry.getFluid(f.getName()); - blockFireWater = BlockFluidEio.create(fluidFireWater, Material.lava); + blockFireWater = BlockFluidEio.FireWater.create(fluidFireWater, Material.lava); FluidFuelRegister.instance.addFuel(f, Config.fireWaterPowerPerCycleRF, Config.fireWaterPowerTotalBurnTime); - FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.FIRE_WATER_NAME + "@" + FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.FIRE_WATER + "@" + (Config.fireWaterPowerPerCycleRF / 10 * Config.fireWaterPowerTotalBurnTime)); - f = new Fluid(Fluids.LIQUID_SUNSHINE_NAME).setDensity(200).setViscosity(400); + f = new Fluid(Fluids.LIQUID_SUNSHINE).setDensity(200).setViscosity(400); FluidRegistry.registerFluid(f); fluidLiquidSunshine = FluidRegistry.getFluid(f.getName()); blockLiquidSunshine = BlockFluidEio.create(fluidLiquidSunshine, Material.water); - f = new Fluid(Fluids.CLOUD_SEED_NAME).setDensity(500).setViscosity(800); + f = new Fluid(Fluids.CLOUD_SEED).setDensity(500).setViscosity(800); FluidRegistry.registerFluid(f); fluidCloudSeed = FluidRegistry.getFluid(f.getName()); blockCloudSeed = BlockFluidEio.create(fluidCloudSeed, Material.water); - - f = new Fluid(Fluids.CLOUD_SEED_CONCENTRATED_NAME).setDensity(1000).setViscosity(1200); + + f = new Fluid(Fluids.CLOUD_SEED_CONCENTRATED).setDensity(1000).setViscosity(1200); FluidRegistry.registerFluid(f); fluidCloudSeedConcentrated = FluidRegistry.getFluid(f.getName()); - blockCloudSeedConcentrated = BlockFluidEio.create(fluidCloudSeedConcentrated, Material.water); - + blockCloudSeedConcentrated = BlockFluidEio.CloudSeedConcentrated.create(fluidCloudSeedConcentrated, Material.water); + + f = new Fluid(Fluids.ENDER_DISTILLATION).setDensity(200).setViscosity(1000).setTemperature(175); + FluidRegistry.registerFluid(f); + fluidEnderDistillation = FluidRegistry.getFluid(f.getName()); + blockEnderDistillation = BlockFluidEio.create(fluidEnderDistillation, Material.water); + + f = new Fluid(Fluids.VAPOR_OF_LEVITY).setDensity(-10).setViscosity(100).setTemperature(5).setGaseous(true); + FluidRegistry.registerFluid(f); + fluidVapourOfLevity = FluidRegistry.getFluid(f.getName()); + blockVapourOfLevity = BlockFluidEio.VapourOfLevity.create(fluidVapourOfLevity, Material.water); + FluidFuelRegister.instance.addCoolant(f, 0.0314f); + if (!Loader.isModLoaded("OpenBlocks")) { Log.info("XP Juice registered by Ender IO."); fluidXpJuice = new Fluid(Config.xpJuiceName).setLuminosity(10).setDensity(800).setViscosity(1500).setUnlocalizedName("eio.xpjuice"); @@ -529,6 +564,9 @@ public class EnderIO { itemBucketLiquidSunshine = ItemBucketEio.create(fluidLiquidSunshine); itemBucketCloudSeed = ItemBucketEio.create(fluidCloudSeed); itemBucketCloudSeedConcentrated = ItemBucketEio.create(fluidCloudSeedConcentrated); + itemBucketEnderDistillation = ItemBucketEio.create(fluidEnderDistillation); + itemBucketVapourOfLevity = ItemBucketEio.create(fluidVapourOfLevity); + } @EventHandler @@ -617,7 +655,7 @@ public class EnderIO { ItemRecipes.addRecipes(); TeleportRecipes.addRecipes(); EE3Util.registerMiscRecipes(); - + proxy.load(); } @@ -628,7 +666,7 @@ public class EnderIO { //Regsiter the enchants Enchantments.getInstance(); - + //This must be loaded before parsing the recipes so we get the preferred outputs OreDictionaryPreferences.loadConfig(); @@ -641,7 +679,7 @@ public class EnderIO { SoulBinderRecipeManager.getInstance().addDefaultRecipes(); PaintSourceValidator.instance.loadConfig(); - if(fluidXpJuice == null) { //should have been registered by open blocks + if(fluidXpJuice == null) { //should have been registered by open blocks fluidXpJuice = FluidRegistry.getFluid(getXPJuiceName()); if(fluidXpJuice == null) { Log.error("Liquid XP Juice registration left to open blocks but could not be found."); @@ -667,7 +705,7 @@ public class EnderIO { } addModIntegration(); - + //Register villagers FMLInterModComms.sendMessage("EnderStructures", "addResourcePath", "/assets/enderio/villagers"); FMLInterModComms.sendMessage("EnderStructures", "registerVillageGenerator", "enderioMobDropVillager"); @@ -714,7 +752,7 @@ public class EnderIO { Log.info("Failed to registered Capacitor Banks as Tinkers Construct Flux Upgrades"); } } - + ThaumcraftCompat.load(); } diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 0bfd7e40..e68a09bf 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -30,17 +30,22 @@ public enum ModObject { // Materials itemBasicCapacitor, itemAlloy, + itemGrindingBall, itemMaterial, itemMachinePart, itemPowderIngot, blockFusedQuartz, itemFusedQuartzFrame, blockDarkIronBars, + blockSoulariumBars, + blockEndSteelBars, // Machines blockStirlingGenerator, blockCombustionGenerator, blockZombieGenerator, + blockFrankenzombieGenerator, + blockEnderGenerator, blockReservoir, blockAlloySmelter, blockSolarPanel, @@ -104,12 +109,12 @@ public enum ModObject { itemTravelStaff, itemMagnet, itemGliderWing, - blockEndermanSkull, - itemSoulVessel, - itemFrankenSkull, - + blockEndermanSkull, + itemSoulVessel, + itemFrankenSkull, + blockEnderRail, - + itemEnderFood; public final String unlocalisedName; diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index fcd0f6ca..29487dbc 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -253,6 +253,9 @@ public final class Config { public static int darkSteelSolarOneCost = 15; public static int darkSteelSolarTwoGen = 40; public static int darkSteelSolarTwoCost = 30; + public static int darkSteelSolarThreeGen = 160; + public static int darkSteelSolarThreeCost = 40; + public static boolean darkSteelSolarChargeOthers = true; public static float darkSteelAnvilDamageChance = 0.024f; @@ -269,9 +272,16 @@ public final class Config { public static int maxPhotovoltaicOutputRF = 10; public static int maxPhotovoltaicAdvancedOutputRF = 40; + public static int maxPhotovoltaicVibrantOutputRF = 160; public static int zombieGeneratorRfPerTick = 80; - public static int zombieGeneratorTicksPerBucketFuel = 10000; + public static int zombieGeneratorTicksPerBucketFuel = 12000; + + public static int frankenzombieGeneratorRfPerTick = 120; + public static int frankenzombieGeneratorTicksPerBucketFuel = 12000; + + public static int enderGeneratorRfPerTick = 360; + public static int enderGeneratorTicksPerBucketFuel = 96000; public static int stirlingGeneratorBaseRfPerTick = 20; public static float stirlingGeneratorEnergyMultiplierT1 = 1f; @@ -420,6 +430,8 @@ public final class Config { public static int soulBinderReanimationLevels = 10; public static int soulBinderEnderCystalRF = 100000; public static int soulBinderEnderCystalLevels = 10; + public static int soulBinderPrecientCystalRF = 100000; + public static int soulBinderPrecientCystalLevels = 10; public static int soulBinderAttractorCystalRF = 100000; public static int soulBinderAttractorCystalLevels = 10; public static int soulBinderEnderRailRF = 100000; @@ -1037,6 +1049,16 @@ public final class Config { zombieGeneratorTicksPerBucketFuel = config.get(sectionPower.name, "zombieGeneratorTicksPerMbFuel", zombieGeneratorTicksPerBucketFuel, "The number of ticks one bucket of fuel lasts.").getInt(zombieGeneratorTicksPerBucketFuel); + frankenzombieGeneratorRfPerTick = config.get(sectionPower.name, "frankenzombieGeneratorRfPerTick", frankenzombieGeneratorRfPerTick, + "The amount of power generated per tick.").getInt(frankenzombieGeneratorRfPerTick); + frankenzombieGeneratorTicksPerBucketFuel = config.get(sectionPower.name, "frankenzombieGeneratorTicksPerMbFuel", frankenzombieGeneratorTicksPerBucketFuel, + "The number of ticks one bucket of fuel lasts.").getInt(frankenzombieGeneratorTicksPerBucketFuel); + + enderGeneratorRfPerTick = config.get(sectionPower.name, "enderGeneratorRfPerTick", enderGeneratorRfPerTick, + "The amount of power generated per tick.").getInt(enderGeneratorRfPerTick); + enderGeneratorTicksPerBucketFuel = config.get(sectionPower.name, "enderGeneratorTicksPerMbFuel", enderGeneratorTicksPerBucketFuel, + "The number of ticks one bucket of fuel lasts.").getInt(enderGeneratorTicksPerBucketFuel); + stirlingGeneratorBaseRfPerTick = config.get(sectionPower.name, "stirlingGeneratorBaseRfPerTick", stirlingGeneratorBaseRfPerTick, "The amount of power generated per tick.").getInt(stirlingGeneratorBaseRfPerTick); @@ -1232,6 +1254,8 @@ public final class Config { "The number of RF required to to re-animated a mob head.").getInt(soulBinderReanimationRF); soulBinderEnderCystalRF = config.get(sectionSoulBinder.name, "soulBinderEnderCystalRF", soulBinderEnderCystalRF, "The number of RF required to create an ender crystal.").getInt(soulBinderEnderCystalRF); + soulBinderPrecientCystalRF = config.get(sectionSoulBinder.name, "soulBinderPrecientCystalRF", soulBinderPrecientCystalRF, + "The number of RF required to create an precient crystal.").getInt(soulBinderPrecientCystalRF); soulBinderAttractorCystalRF = config.get(sectionSoulBinder.name, "soulBinderAttractorCystalRF", soulBinderAttractorCystalRF, "The number of RF required to create an attractor crystal.").getInt(soulBinderAttractorCystalRF); soulBinderEnderRailRF = config.get(sectionSoulBinder.name, "soulBinderEnderRailRF", soulBinderEnderRailRF, @@ -1241,6 +1265,8 @@ public final class Config { "The number of levels required to create an attractor crystal.").getInt(soulBinderAttractorCystalLevels); soulBinderEnderCystalLevels = config.get(sectionSoulBinder.name, "soulBinderEnderCystalLevels", soulBinderEnderCystalLevels, "The number of levels required to create an ender crystal.").getInt(soulBinderEnderCystalLevels); + soulBinderPrecientCystalLevels = config.get(sectionSoulBinder.name, "soulBinderPrecientCystalLevels", soulBinderPrecientCystalLevels, + "The number of levels required to create an precient crystal.").getInt(soulBinderPrecientCystalLevels); soulBinderReanimationLevels = config.get(sectionSoulBinder.name, "soulBinderReanimationLevels", soulBinderReanimationLevels, "The number of levels required to re-animate a mob head.").getInt(soulBinderReanimationLevels); soulBinderBrokenSpawnerLevels = config.get(sectionSoulBinder.name, "soulBinderBrokenSpawnerLevels", soulBinderBrokenSpawnerLevels, diff --git a/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java b/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java index 151cead3..c706e568 100644 --- a/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java +++ b/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java @@ -1,28 +1,203 @@ package crazypants.enderio.fluid; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fluids.BlockFluidClassic; -import net.minecraftforge.fluids.Fluid; +import java.util.Random; import org.apache.commons.lang3.StringUtils; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.BlockFluidClassic; +import net.minecraftforge.fluids.Fluid; public class BlockFluidEio extends BlockFluidClassic { + public static class FireWater extends BlockFluidEio { + + protected FireWater(Fluid fluid, Material material) { + super(fluid, material); + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (!world.isRemote){ + entity.setFire(50); + super.onEntityCollidedWithBlock(world, x, y, z, entity); + } + } + + @Override + public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return true; + } + + @Override + public boolean isFireSource(World world, int x, int y, int z, ForgeDirection side) { + return true; + } + + @Override + public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return 60; + } + + } + + public static class Hootch extends BlockFluidEio { + + protected Hootch(Fluid fluid, Material material) { + super(fluid, material); + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (!world.isRemote && entity instanceof EntityLivingBase) + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.confusion.id, 150, 0, true)); + super.onEntityCollidedWithBlock(world, x, y, z, entity); + + } + + @Override + public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return true; + } + + @Override + public boolean isFireSource(World world, int x, int y, int z, ForgeDirection side) { + return true; + } + + @Override + public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return 1; + } + + @Override + public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return 60; + } + + } + + public static class RocketFuel extends BlockFluidEio { + + protected RocketFuel(Fluid fluid, Material material) { + super(fluid, material); + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (!world.isRemote && entity instanceof EntityLivingBase) + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.jump.id, 150, 3, true)); + + super.onEntityCollidedWithBlock(world, x, y, z, entity); + + } + + @Override + public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return true; + } + + @Override + public boolean isFireSource(World world, int x, int y, int z, ForgeDirection side) { + return true; + } + + @Override + public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return 1; + } + + @Override + public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return 60; + } + + } + + public static class NutrientDistillation extends BlockFluidEio { + + private static final String EIO_LAST_FOOD_BOOST = "eioLastFoodBoost"; + + protected NutrientDistillation(Fluid fluid, Material material) { + super(fluid, material); + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (!world.isRemote && entity instanceof EntityLivingBase) { + long time = entity.worldObj.getTotalWorldTime(); + EntityPlayerMP player = (EntityPlayerMP) entity; + if(time % Config.nutrientFoodBoostDelay == 0 && player.getEntityData().getLong(EIO_LAST_FOOD_BOOST) != time) { + player.getFoodStats().addStats(1, 0.1f); + player.getEntityData().setLong(EIO_LAST_FOOD_BOOST, time); + } + super.onEntityCollidedWithBlock(world, x, y, z, entity); + } + + } + + } + + public static class CloudSeedConcentrated extends BlockFluidEio { + + protected CloudSeedConcentrated(Fluid fluid, Material material) { + super(fluid, material); + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (!world.isRemote && entity instanceof EntityLivingBase) { + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.blindness.id, 40, 0, true)); + } + super.onEntityCollidedWithBlock(world, x, y, z, entity); + + } + + } + + public static class VapourOfLevity extends BlockFluidEio { + + private static final int[] COLORS = { 0x0c82d0, 0x90c8ec, 0x5174ed, 0x0d2f65, 0x4accee }; + + protected VapourOfLevity(Fluid fluid, Material material, int fogColor) { + super(fluid, material); + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (entity instanceof EntityPlayer || (!world.isRemote && entity instanceof EntityLivingBase)) { + ((EntityLivingBase) entity).motionY += 0.1; + } + super.onEntityCollidedWithBlock(world, x, y, z, entity); + + } + + @Override + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + if (rand.nextFloat() < .5f) { + int col = COLORS[rand.nextInt(COLORS.length)]; + world.spawnParticle("reddust", x, y, z, (col >> 16 & 255) / 255d, (col >> 8 & 255) / 255d, (col & 255) / 255d); + } + } + + } + + public static BlockFluidEio create(Fluid fluid, Material material) { BlockFluidEio res = new BlockFluidEio(fluid, material); res.init(); @@ -76,28 +251,4 @@ public class BlockFluidEio extends BlockFluidClassic { return super.displaceIfPossible(world, x, y, z); } - @Override - public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity entity) { - if(entity.worldObj.isRemote) { - super.onEntityCollidedWithBlock(p_149670_1_, p_149670_2_, p_149670_3_, p_149670_4_, entity); - return; - } - - if(this == EnderIO.blockFireWater) { - entity.setFire(50); - } else if(this == EnderIO.blockRocketFuel && entity instanceof EntityLivingBase) { - ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.jump.id, 150, 3, true)); - } else if(this == EnderIO.blockNutrientDistillation && entity instanceof EntityPlayerMP) { - long time = entity.worldObj.getTotalWorldTime(); - EntityPlayerMP player = (EntityPlayerMP) entity; - if(time % Config.nutrientFoodBoostDelay == 0 && player.getEntityData().getLong("eioLastFoodBoost") != time) { - player.getFoodStats().addStats(1, 0.1f); - player.getEntityData().setLong("eioLastFoodBoost", time); - } - } else if (this == EnderIO.blockHootch && entity instanceof EntityLivingBase) { - ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.confusion.id, 150, 0, true)); - } - - super.onEntityCollidedWithBlock(p_149670_1_, p_149670_2_, p_149670_3_, p_149670_4_, entity); - } } \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/fluid/Fluids.java b/src/main/java/crazypants/enderio/fluid/Fluids.java index ac004331..5917e5e3 100644 --- a/src/main/java/crazypants/enderio/fluid/Fluids.java +++ b/src/main/java/crazypants/enderio/fluid/Fluids.java @@ -1,32 +1,29 @@ package crazypants.enderio.fluid; -import net.minecraftforge.fluids.IFluidTank; import crazypants.enderio.EnderIO; +import net.minecraftforge.fluids.IFluidTank; public class Fluids { - public static final String NUTRIENT_DISTILLATION_NAME = "nutrient_distillation"; + public static final String NUTRIENT_DISTILLATION = "nutrient_distillation"; + public static final String HOOTCH = "hootch"; + public static final String ROCKET_FUEL = "rocket_fuel"; + public static final String FIRE_WATER = "fire_water"; + public static final String LIQUID_SUNSHINE = "liquid_sunshine"; + public static final String CLOUD_SEED = "cloud_seed"; + public static final String CLOUD_SEED_CONCENTRATED = "cloud_seed_concentrated"; + public static final String ENDER_DISTILLATION = "ender_distillation"; + public static final String VAPOR_OF_LEVITY = "vapor_of_levity"; - public static final String HOOTCH_NAME = "hootch"; - - public static final String ROCKET_FUEL_NAME = "rocket_fuel"; - - public static final String FIRE_WATER_NAME = "fire_water"; - - public static final String LIQUID_SUNSHINE_NAME = "liquid_sunshine"; - public static final String CLOUD_SEED_NAME = "cloud_seed"; - public static final String CLOUD_SEED_CONCENTRATED_NAME = "cloud_seed_concentrated"; - - public static String toCapactityString(IFluidTank tank) { - if(tank == null) { - return "0/0 " + MB(); - } - return tank.getFluidAmount() + "/" + tank.getCapacity() + " " + MB(); - } - - public static String MB() { - return EnderIO.lang.localize("fluid.millibucket.abr"); - } + public static String toCapactityString(IFluidTank tank) { + if(tank == null) { + return "0/0 " + MB(); + } + return tank.getFluidAmount() + "/" + tank.getCapacity() + " " + MB(); + } + public static String MB() { + return EnderIO.lang.localize("fluid.millibucket.abr"); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java index 05cbd218..2c822051 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java @@ -63,6 +63,7 @@ public class DarkSteelRecipeManager { upgrades.add(SpoonUpgrade.INSTANCE); upgrades.add(SolarUpgrade.SOLAR_ONE); upgrades.add(SolarUpgrade.SOLAR_TWO); + upgrades.add(SolarUpgrade.SOLAR_THREE); if(Loader.isModLoaded("Thaumcraft")) { ThaumcraftCompat.loadUpgrades(upgrades); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java index 2c9c16ad..ff03d2a8 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java @@ -30,6 +30,7 @@ public class SolarUpgrade extends AbstractUpgrade { public static final SolarUpgrade SOLAR_ONE = new SolarUpgrade("enderio.darksteel.upgrade.solar_one", (byte) 1, Config.darkSteelSolarOneCost); public static final SolarUpgrade SOLAR_TWO = new SolarUpgrade("enderio.darksteel.upgrade.solar_two", (byte) 2, Config.darkSteelSolarTwoCost); + public static final SolarUpgrade SOLAR_THREE = new SolarUpgrade("enderio.darksteel.upgrade.solar_three", (byte) 3, Config.darkSteelSolarThreeCost); private Render render; @@ -46,12 +47,8 @@ public class SolarUpgrade extends AbstractUpgrade { return new SolarUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - private static ItemStack createUpgradeItem() { - ItemStack pot = new ItemStack(Items.potionitem, 1, 0); - int res = PotionHelper.applyIngredient(0, Items.nether_wart.getPotionEffect(new ItemStack(Items.nether_wart))); - res = PotionHelper.applyIngredient(res, PotionHelper.sugarEffect); - pot.setItemDamage(res); - return pot; + private static ItemStack createUpgradeItem(int level) { + return new ItemStack(EnderIO.blockSolarPanel,1,level-1); } private byte level; @@ -62,7 +59,7 @@ public class SolarUpgrade extends AbstractUpgrade { } public SolarUpgrade(String unlocName, byte level, int levelCost) { - super(UPGRADE_NAME, unlocName, createUpgradeItem(), levelCost); + super(UPGRADE_NAME, unlocName, createUpgradeItem(level), levelCost); this.level = (byte) level; } @@ -101,7 +98,10 @@ public class SolarUpgrade extends AbstractUpgrade { } public int getRFPerSec() { - return level == 1 ? Config.darkSteelSolarOneGen : Config.darkSteelSolarTwoGen; + if(level==0) return Config.darkSteelSolarOneGen; + if(level==1) return Config.darkSteelSolarTwoGen; + else return Config.darkSteelSolarThreeGen; + } @Override @@ -114,8 +114,6 @@ public class SolarUpgrade extends AbstractUpgrade { private class Render implements IRenderUpgrade { private EntityItem item = new EntityItem(Minecraft.getMinecraft().theWorld); - private ItemStack panel1 = new ItemStack(EnderIO.blockSolarPanel, 1, 0); - private ItemStack panel2 = new ItemStack(EnderIO.blockSolarPanel, 1, 1); @Override public void render(RenderPlayerEvent event, ItemStack stack, boolean head) { @@ -128,7 +126,7 @@ public class SolarUpgrade extends AbstractUpgrade { GL11.glRotated(180, 1, 0, 0); GL11.glScalef(2.1f, 2.1f, 2.1f); byte level = loadFromItem(stack).level; - item.setEntityItemStack(level == 0 ? panel1 : panel2); + item.setEntityItemStack(new ItemStack(EnderIO.blockSolarPanel, 1, level-1)); RenderManager.instance.renderEntityWithPosYaw(item, 0, 0, 0, 0, 0); } } diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 03e9f5b1..24c48b5e 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -42,12 +42,14 @@ public class MachineRecipes { ItemStack sentientEnder = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.SENTIENT_ENDER.ordinal()); ItemStack obsidian = new ItemStack(Blocks.obsidian); + String redstoneAlloy = REDSTONE_ALLOY.getOreIngot(); String electricalSteel = ELECTRICAL_STEEL.getOreIngot(); String darkSteel = DARK_STEEL.getOreIngot(); String energeticAlloy = ENERGETIC_ALLOY.getOreIngot(); String phasedGold = PHASED_GOLD.getOreIngot(); String phasedIron = PHASED_IRON.getOreIngot(); String soularium = SOULARIUM.getOreIngot(); + String endSteel = END_STEEL.getOreIngot(); String vibCry = VIBRANT_CYSTAL.oreDict; String pulCry = PULSATING_CYSTAL.oreDict; @@ -73,6 +75,14 @@ public class MachineRecipes { ItemStack zg = new ItemStack(EnderIO.blockZombieGenerator, 1, 0); addShaped(zg, "eee", "qzq", "qqq", 'e', electricalSteel, 'q', fusedQuartz, 'z', new ItemStack(EnderIO.itemFrankenSkull, 1, 0)); + //FrankenzombieGen + ItemStack fg = new ItemStack(EnderIO.blockFrankenZombieGenerator, 1, 0); + addShaped(fg, "eee", "qzq", "qqq", 'e', soularium, 'q', fusedQuartz, 'z', new ItemStack(EnderIO.itemFrankenSkull, 1, 2)); + + //EnderGen + ItemStack eg = new ItemStack(EnderIO.blockEnderGenerator, 1, 0); + addShaped(eg, "eee", "qzq", "qqq", 'e', endSteel, 'q', fusedQuartz, 'z', new ItemStack(EnderIO.itemFrankenSkull, 1, 3)); + //KillerJoe ItemStack kj = new ItemStack(EnderIO.blockKillerJoe, 1, 0); addShaped(kj, "sss", "qzq", "qqq", 's', darkSteel, 'q', fusedQuartz, 'z', frankenZombie); @@ -97,7 +107,7 @@ public class MachineRecipes { addShaped(poweredSpawner, "ese", "eme", "vzv", 'e', electricalSteel, 's', "itemSkull", 'v', vibCry, 'm', machineChassi, 'z', zombieBit); if (Config.reservoirEnabled) { - //reservoir + //reservoir ItemStack reservoir = new ItemStack(EnderIO.blockReservoir, 2, 0); Object glassSides; if (Config.useHardRecipes) { @@ -185,14 +195,17 @@ public class MachineRecipes { ItemStack solarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 0); ItemStack advSolarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 1); + ItemStack vibSolarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 2); + if (Config.useHardRecipes) { - addShaped(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', "blockGlassHardened", 'c', capacitor, 'e', energeticAlloy, 'p', - phasedGold); + addShaped(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', "blockGlassHardened", 'c', capacitor, 'e', energeticAlloy, 'p', phasedGold); addShaped(advSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'c', capacitor2, 'e', phasedIron, 'p', phasedGold); + addShaped(vibSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'c', capacitor3, 'e', endSteel, 'p', phasedGold); } else { - addShaped(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', "blockGlassHardened", 'p', silicon, 'e', energeticAlloy, 'c', - electricalSteel); - addShaped(advSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'p', vibCry, 'e', phasedGold, 'c', phasedIron); + addShaped(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', "blockGlassHardened", 'p', silicon, 'e', energeticAlloy, 'c', redstoneAlloy); + addShaped(advSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'p', pulCry, 'e', phasedIron, 'c', electricalSteel); + addShaped(vibSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'p', vibCry, 'e', phasedGold, 'c', endSteel); + } } diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index 69b60241..6473cb1f 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -129,7 +129,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { public static final int maxFirtSlot = maxToolSlot + NUM_FERTILIZER_SLOTS; public static final int NUM_SUPPLY_SLOTS = 4; - + public static final int minSupSlot = maxFirtSlot + 1; public static final int maxSupSlot = maxFirtSlot + NUM_SUPPLY_SLOTS; @@ -486,7 +486,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { } private int bonemealCooldown = 5; // no need to persist this - + private boolean hasBonemeal() { if (inventory[minFirtSlot] != null) { return true; @@ -519,7 +519,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { /* * Returns a fuzzy boolean: - * + * * <=0 - break no leaves for saplings * 50 - break half the leaves for saplings * 90 - break 90% of the leaves for saplings @@ -527,7 +527,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { public int isLowOnSaplings(BlockCoord bc) { int slot = getSupplySlotForCoord(bc); ItemStack inv = inventory[slot]; - + return 90 * (Config.farmSaplingReserveAmount - (inv == null ? 0 : inv.stackSize)) / Config.farmSaplingReserveAmount; } @@ -614,7 +614,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { for (int j = minSupSlot; j < slot; j++) { slots[k++] = j; } - + int origSize = stack.stackSize; stack = stack.copy(); @@ -717,6 +717,8 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { case ENDER_CAPACITOR: setCapacitor(new BasicCapacitor(ppt * 40, 1000000, ppt)); break; + default: + break; } currentTask = createTask(); } @@ -781,6 +783,8 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { return 32; case ENDER_CAPACITOR: return 64; + default: + break; } } return 64; 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 e4987add..2f296ae3 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java @@ -18,9 +18,48 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileFrankenZombieGenerator; +import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileEnderGenerator; + public class BlockZombieGenerator extends AbstractMachineBlock { + public static class BlockFrankenZombieGenerator extends BlockZombieGenerator { + + public BlockFrankenZombieGenerator() { + super(ModObject.blockFrankenzombieGenerator, TileFrankenZombieGenerator.class); + } + + public static BlockFrankenZombieGenerator create() { + BlockFrankenZombieGenerator gen = new BlockFrankenZombieGenerator(); + gen.init(); + return gen; + } + + public GeneratorType getGeneratorType(){ + return GeneratorType.FRANKENZOMBIE; + } + + } + + public static class BlockEnderGenerator extends BlockZombieGenerator { + + public BlockEnderGenerator() { + super(ModObject.blockEnderGenerator, TileEnderGenerator.class); + } + + public static BlockEnderGenerator create() { + BlockEnderGenerator gen = new BlockEnderGenerator(); + gen.init(); + return gen; + } + + public GeneratorType getGeneratorType(){ + return GeneratorType.ENDER; + } + + } + public static BlockZombieGenerator create() { BlockZombieGenerator gen = new BlockZombieGenerator(); gen.init(); @@ -28,7 +67,11 @@ public class BlockZombieGenerator extends AbstractMachineBlock clazz) { + super(obj, (Class) clazz, Material.anvil); } @Override @@ -117,4 +160,8 @@ public class BlockZombieGenerator extends AbstractMachineBlock= (getMaxEnergyStored() - (outputPerTick * 200)) && getEnergyStored() > (getMaxEnergyStored() / 8)) { + if (inPause && getEnergyStored() >= (getMaxEnergyStored() - (getOutputPerTick() * 200)) && getEnergyStored() > (getMaxEnergyStored() / 8)) { return false; } inPause = false; - if(fuelTank.getFluidAmount() < getActivationAmount()) { + if(fuelTank.getFluidAmount() < getActivationAmount()) { return false; } - - - ticksRemaingFuel--; + + + ticksRemaingFuel--; if(ticksRemaingFuel <= 0) { fuelTank.drain(1, true); - ticksRemaingFuel = tickPerBucketOfFuel/1000; + ticksRemaingFuel = tickPerBucketOfFuel/1000; tanksDirty = true; - } - setEnergyStored(getEnergyStored() + outputPerTick); + } + setEnergyStored(getEnergyStored() + getOutputPerTick()); return true; } - + int getActivationAmount() { - return (int) (fuelTank.getCapacity() * 0.7f); + return minimumTankLevel; } private boolean transmitEnergy() { @@ -177,8 +214,8 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu if(powerDis == null) { powerDis = new PowerDistributor(new BlockCoord(this)); } - int transmitted = powerDis.transmitEnergy(worldObj, Math.min(outputPerTick * 2, getEnergyStored())); - setEnergyStored(getEnergyStored() - transmitted); + int transmitted = powerDis.transmitEnergy(worldObj, Math.min(getOutputPerTick() * 2, getEnergyStored())); + setEnergyStored(getEnergyStored() - transmitted); return transmitted > 0; } @@ -219,7 +256,7 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu public int getFluidStored(ForgeDirection from) { return fuelTank.getFluidAmount(); } - + @Override public void readCustomNBT(NBTTagCompound nbtRoot) { super.readCustomNBT(nbtRoot); @@ -257,7 +294,7 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu @Override public FluidTank getInputTank(FluidStack forFluidType) { - if (forFluidType != null && forFluidType.getFluid() == EnderIO.fluidNutrientDistillation) { + if (forFluidType != null && forFluidType.getFluid() == getFluidType()) { return fuelTank; } return null; @@ -278,4 +315,22 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu return fuelTank; } + protected Fluid getFluidType() { + return EnderIO.fluidNutrientDistillation; + } + + public int getTicksPerBucketOfFuel() { + return tickPerBucketOfFuel; + } + + public GeneratorType getGeneratorType(){ + return ((BlockZombieGenerator) worldObj.getBlock(xCoord, yCoord, zCoord)).getGeneratorType(); + } + + public int getOutputPerTick(){ + if(inventory[slotDefinition.getMaxUpgradeSlot()] != null) + return baseOutputPerTick*(4+inventory[slotDefinition.getMaxUpgradeSlot()].getItemDamage())/4; + else return baseOutputPerTick; + } + } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java b/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java index 7f3d807a..11c463e9 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java @@ -1,18 +1,5 @@ package crazypants.enderio.machine.generator.zombie; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidTank; - import org.lwjgl.opengl.GL11; import com.enderio.core.client.render.BoundingBox; @@ -23,13 +10,27 @@ import com.enderio.core.common.vecmath.Vector3d; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockFrankenZombieGenerator; +import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockEnderGenerator; +import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileEnderGenerator; +import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileFrankenZombieGenerator; import crazypants.util.RenderPassHelper; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidTank; @SideOnly(Side.CLIENT) public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implements IItemRenderer { - private static final String TEXTURE = "enderio:models/ZombieJar.png"; - private ModelZombieJar model = new ModelZombieJar(); @Override @@ -48,7 +49,7 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement GL11.glPushMatrix(); GL11.glTranslatef((float) x, (float) y, (float) z); if (RenderPassHelper.getEntityRenderPass() == 0) { - renderModel(gen.facing); + renderModel(gen.getGeneratorType(), gen.facing); } else if (RenderPassHelper.getEntityRenderPass() == 1) { renderFluid(gen); } @@ -106,7 +107,7 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement } } - private void renderModel(int facing) { + private void renderModel(GeneratorType gen, int facing) { GL11.glPushMatrix(); @@ -123,7 +124,7 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement } GL11.glRotatef(facing * -90F, 0F, 1F, 0F); - RenderUtil.bindTexture(TEXTURE); + RenderUtil.bindTexture(gen.getTexture()); model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); GL11.glTranslatef(-0.5F, 0, -0.5F); @@ -143,15 +144,16 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - renderItem(0, 0, 0); + renderItem(((BlockZombieGenerator) Block.getBlockFromItem(item.getItem())).getGeneratorType(),0,0,0); + } - private void renderItem(float x, float y, float z) { + private void renderItem(GeneratorType gen, float x, float y, float z) { GL11.glPushMatrix(); GL11.glTranslatef(x, y, z); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - renderModel(ForgeDirection.SOUTH.ordinal()); + renderModel(gen,ForgeDirection.SOUTH.ordinal()); GL11.glDisable(GL11.GL_BLEND); GL11.glPopMatrix(); } diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java index 3c64fcfb..4d6323eb 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java @@ -38,9 +38,9 @@ public class BlockItemSolarPanel extends ItemBlockWithMetadata implements IAdvan public String getUnlocalizedName(ItemStack par1ItemStack) { int meta = par1ItemStack.getItemDamage(); String result = super.getUnlocalizedName(par1ItemStack); - if(meta == 1) { - result += ".advanced"; - } + if(meta == 1) result += ".advanced"; + if(meta == 2) result += ".vibrant"; + return result; } @@ -52,6 +52,8 @@ public class BlockItemSolarPanel extends ItemBlockWithMetadata implements IAdvan par3List.add(stack); stack = new ItemStack(this, 1,1); par3List.add(stack); + stack = new ItemStack(this, 1,2); + par3List.add(stack); } @SuppressWarnings("rawtypes") @@ -70,9 +72,11 @@ public class BlockItemSolarPanel extends ItemBlockWithMetadata implements IAdvan public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack); int prod = Config.maxPhotovoltaicOutputRF; - if(itemstack.getItemDamage() == 1) { + if(itemstack.getItemDamage() == 1) prod = Config.maxPhotovoltaicAdvancedOutputRF; - } + if(itemstack.getItemDamage() == 2) + prod = Config.maxPhotovoltaicVibrantOutputRF; + list.add(EnderIO.lang.localize("maxSolorProduction") + " " + PowerDisplayUtil.formatPowerPerTick(prod)); } diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java index b90242ad..601396ac 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java @@ -45,6 +45,10 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide IIcon borderIcon; IIcon advancedBorderIcon; + IIcon vibrantIcon; + IIcon vibrantSideIcon; + IIcon vibrantBorderIcon; + private BlockSolarPanel() { super(ModObject.blockSolarPanel.unlocalisedName, TileEntitySolarPanel.class); if(!Config.photovoltaicCellEnabled) { @@ -80,13 +84,28 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { if(side == ForgeDirection.UP.ordinal()) { - return meta == 0 ? blockIcon : advancedIcon; + switch(meta){ + case 0:return blockIcon; + case 1:return advancedIcon; + case 2:return vibrantIcon; + default: return blockIcon; + } } - return meta == 0 ? sideIcon : advancedSideIcon; + switch(meta){ + case 0:return sideIcon; + case 1:return advancedSideIcon; + case 2:return vibrantSideIcon; + default: return sideIcon; + } } public IIcon getBorderIcon(int i, int meta) { - return meta == 0 ? borderIcon : advancedBorderIcon; + switch(meta){ + case 0:return borderIcon; + case 1:return advancedBorderIcon; + case 2:return vibrantBorderIcon; + default: return borderIcon; + } } @Override @@ -107,10 +126,14 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide public void registerBlockIcons(IIconRegister register) { blockIcon = register.registerIcon("enderio:solarPanelTop"); advancedIcon = register.registerIcon("enderio:solarPanelAdvancedTop"); + vibrantIcon = register.registerIcon("enderio:solarPanelVibrantTop"); sideIcon = register.registerIcon("enderio:solarPanelSide"); advancedSideIcon = register.registerIcon("enderio:solarPanelAdvancedSide"); + vibrantSideIcon = register.registerIcon("enderio:solarPanelVibrantSide"); borderIcon = register.registerIcon("enderio:solarPanelBorder"); advancedBorderIcon = register.registerIcon("enderio:solarPanelAdvancedBorder"); + vibrantBorderIcon = register.registerIcon("enderio:solarPanelVibrantBorder"); + } @Override diff --git a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java index d96952f1..842cc7e2 100644 --- a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java @@ -25,24 +25,24 @@ import crazypants.enderio.power.PowerHandlerUtil; import crazypants.enderio.waila.IWailaNBTProvider; public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowerProvider, IWailaNBTProvider { - + private final List receptors = new ArrayList(); private ListIterator receptorIterator = receptors.listIterator(); private boolean receptorsDirty = true; private int lastCollectionValue = -1; - + private static final int CHECK_INTERVAL = 100; - + EnergyStorage destroyedNetworkBuffer = null; - + protected SolarPanelNetwork network = new SolarPanelNetwork(); public void onNeighborBlockChange() { receptorsDirty = true; } - + // RF Power @@ -65,7 +65,7 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe public int getMaxEnergyStored(ForgeDirection from) { return getMaxEnergyStored(); } - + @Override public int getMaxEnergyRecieved(ForgeDirection dir) { return 0; @@ -93,7 +93,7 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe } collectEnergy(); transmitEnergy(); - + if (network.isValid()) { if (destroyedNetworkBuffer != null) { network.addBuffer(destroyedNetworkBuffer); @@ -101,12 +101,12 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe } network.onUpdate(this); } - + if (!network.isValid() || (shouldDoWorkThisTick(20, 1) && network.addToNetwork(this))) { findNetwork(); } } - + @Override public void invalidate() { network.removeFromNetwork(this); @@ -147,16 +147,17 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe private int getEnergyPerTick() { int meta = getBlockMetadata(); - if(meta == 0) { + if(meta == 0) return Config.maxPhotovoltaicOutputRF; - } - return Config.maxPhotovoltaicAdvancedOutputRF; + if(meta == 1) + return Config.maxPhotovoltaicAdvancedOutputRF; + return Config.maxPhotovoltaicVibrantOutputRF; } float calculateLightRatio() { return calculateLightRatio(worldObj, xCoord, yCoord, zCoord); } - + boolean canSeeSun() { return worldObj.canBlockSeeTheSky(xCoord, yCoord, zCoord); } @@ -211,7 +212,7 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe appliedCount++; } - setEnergyStored(getEnergyStored() - transmitted); + setEnergyStored(getEnergyStored() - transmitted); return transmitted > 0; @@ -269,7 +270,7 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { readFromNBT(pkt.func_148857_g()); } - + @Override public boolean displayPower() { return true; @@ -278,7 +279,7 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe public void setNetwork(SolarPanelNetwork network) { this.network = network; } - + public boolean isMaster() { return network.getMaster() == this; } diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderPrecientCystalRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderPrecientCystalRecipe.java new file mode 100644 index 00000000..4a0f6d88 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderPrecientCystalRecipe.java @@ -0,0 +1,26 @@ +package crazypants.enderio.machine.soul; + +import net.minecraft.item.ItemStack; +import crazypants.enderio.EnderIO; +import crazypants.enderio.config.Config; +import crazypants.enderio.material.Material; + +public class SoulBinderPrecientCystalRecipe extends AbstractSoulBinderRecipe { + + public static SoulBinderPrecientCystalRecipe instance = new SoulBinderPrecientCystalRecipe(); + + private SoulBinderPrecientCystalRecipe() { + super(Config.soulBinderPrecientCystalRF, Config.soulBinderPrecientCystalLevels, "SoulBinderPrecientCystalRecipe", "SpecialMobs.SpecialEnderman", "Enderman"); + } + + @Override + public ItemStack getInputStack() { + return new ItemStack(EnderIO.itemMaterial, 1, Material.PULSATING_CYSTAL.ordinal()); + } + + @Override + public ItemStack getOutputStack() { + return new ItemStack(EnderIO.itemMaterial, 1, Material.PRECIENT_CRYSTAL.ordinal()); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRecipeManager.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRecipeManager.java index ebbf9cb6..08238927 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRecipeManager.java @@ -30,6 +30,7 @@ public class SoulBinderRecipeManager { MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderSentientRecipe.instance); MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderEnderCystalRecipe.instance); MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderAttractorCystalRecipe.instance); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderPrecientCystalRecipe.instance); //Ender Rail if(Config.transceiverEnabled && Config.enderRailEnabled) { @@ -40,7 +41,7 @@ public class SoulBinderRecipeManager { } // Example of how to add a recipe: - // + // // NBTTagCompound root = new NBTTagCompound(); // root.setString(SoulBinderRecipeManager.KEY_RECIPE_UID, "diamondToWood"); // root.setInteger(SoulBinderRecipeManager.KEY_REQUIRED_ENERGY, 50000); @@ -54,14 +55,14 @@ public class SoulBinderRecipeManager { // stackRoot = new NBTTagCompound(); // is.writeToNBT(stackRoot); // root.setTag(SoulBinderRecipeManager.KEY_OUTPUT_STACK, stackRoot); - // + // // SoulBinderRecipeManager.getInstance().addRecipeFromNBT(root); // FMLInterModComms.sendMessage("EnderIO", "recipe:soulbinder", root); //@formatter:off /** * Example of how to add a recipe: - * + * * NBTTagCompound root = new NBTTagCompound(); * root.setString(SoulBinderRecipeManager.KEY_RECIPE_UID, "diamondToWood"); * root.setInteger(SoulBinderRecipeManager.KEY_REQUIRED_ENERGY, 50000); @@ -75,10 +76,10 @@ public class SoulBinderRecipeManager { * stackRoot = new NBTTagCompound(); * is.writeToNBT(stackRoot); * root.setTag(SoulBinderRecipeManager.KEY_OUTPUT_STACK, stackRoot); - * + * * SoulBinderRecipeManager.getInstance().addRecipeFromNBT(root); * FMLInterModComms.sendMessage("EnderIO", "recipe:soulbinder", root); - * + * * @param root * @return */ diff --git a/src/main/java/crazypants/enderio/material/Alloy.java b/src/main/java/crazypants/enderio/material/Alloy.java index 24a041a5..df5c5064 100644 --- a/src/main/java/crazypants/enderio/material/Alloy.java +++ b/src/main/java/crazypants/enderio/material/Alloy.java @@ -56,6 +56,10 @@ public enum Alloy { return new ItemStack(EnderIO.itemAlloy, size, ordinal()); } + public ItemStack getStackBall(int size) { + return new ItemStack(EnderIO.itemGrindingBall, size, ordinal()); + } + public ItemStack getStackBlock() { return getStackBlock(1); } @@ -79,4 +83,5 @@ public enum Alloy { public List getOreBlocks() { return oreBlocks; } + } diff --git a/src/main/java/crazypants/enderio/material/BlockDarkIronBars.java b/src/main/java/crazypants/enderio/material/BlockDarkIronBars.java deleted file mode 100644 index 2476fff4..00000000 --- a/src/main/java/crazypants/enderio/material/BlockDarkIronBars.java +++ /dev/null @@ -1,32 +0,0 @@ -package crazypants.enderio.material; - -import net.minecraft.block.BlockPane; -import net.minecraft.block.material.Material; -import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.registry.GameRegistry; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; - -public class BlockDarkIronBars extends BlockPane { - - public static BlockDarkIronBars create() { - BlockDarkIronBars res = new BlockDarkIronBars(); - res.init(); - return res; - } - - public BlockDarkIronBars() { - super("enderio:blockDarkIronBars", "enderio:blockDarkIronBars", Material.iron, true); - setResistance(2000.0F); //TNT Proof - setHardness(5.0F); - setStepSound(soundTypeMetal); - setBlockName(ModObject.blockDarkIronBars.unlocalisedName); - setCreativeTab(EnderIOTab.tabEnderIO); - } - - protected void init() { - GameRegistry.registerBlock(this, BlockItemDarkIronBars.class, ModObject.blockDarkIronBars.unlocalisedName); - OreDictionary.registerOre("barsIron", this); - } - -} diff --git a/src/main/java/crazypants/enderio/material/BlockDarkSteelBars.java b/src/main/java/crazypants/enderio/material/BlockDarkSteelBars.java new file mode 100644 index 00000000..819b53b1 --- /dev/null +++ b/src/main/java/crazypants/enderio/material/BlockDarkSteelBars.java @@ -0,0 +1,69 @@ +package crazypants.enderio.material; + +import net.minecraft.block.BlockPane; +import net.minecraft.block.material.Material; +import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; + +public class BlockDarkSteelBars extends BlockPane { + + public static class BlockSoulariumBars extends BlockDarkSteelBars { + + public BlockSoulariumBars() { + super(ModObject.blockSoulariumBars, "blockSoulariumBars"); + setBlockName(ModObject.blockSoulariumBars.unlocalisedName); + } + + public static BlockSoulariumBars create() { + BlockSoulariumBars res = new BlockSoulariumBars(); + res.init(); + return res; + } + + } + + public static class BlockEndSteelBars extends BlockDarkSteelBars { + + public BlockEndSteelBars() { + super(ModObject.blockEndSteelBars, "blockEndSteelBars"); + setBlockName(ModObject.blockEndSteelBars.unlocalisedName); + } + + public static BlockEndSteelBars create() { + BlockEndSteelBars res = new BlockEndSteelBars(); + res.init(); + return res; + } + + } + + public static BlockDarkSteelBars create() { + BlockDarkSteelBars res = new BlockDarkSteelBars(); + res.init(); + return res; + } + + ModObject modObj; + + public BlockDarkSteelBars(ModObject obj, String name) { + super("enderio:"+name, "enderio:"+name, Material.iron, true); + this.modObj = obj; + setResistance(2000.0F); //TNT Proof + setHardness(5.0F); + setStepSound(soundTypeMetal); + setBlockName(obj.unlocalisedName); + setCreativeTab(EnderIOTab.tabEnderIO); + } + + public BlockDarkSteelBars() { + this(ModObject.blockDarkIronBars,"blockDarkIronBars"); + } + + protected void init() { + GameRegistry.registerBlock(this, BlockItemDarkIronBars.class, modObj.unlocalisedName); + OreDictionary.registerOre("barsIron", this); + } + +} diff --git a/src/main/java/crazypants/enderio/material/ItemAlloy.java b/src/main/java/crazypants/enderio/material/ItemAlloy.java index fc380639..665f5bdc 100644 --- a/src/main/java/crazypants/enderio/material/ItemAlloy.java +++ b/src/main/java/crazypants/enderio/material/ItemAlloy.java @@ -18,8 +18,8 @@ public class ItemAlloy extends Item { static final boolean useNuggets = false; - private final IIcon[] icons; - private final int numItems; + protected final IIcon[] icons; + protected final int numItems; public static ItemAlloy create() { ItemAlloy alloy = new ItemAlloy(); @@ -27,7 +27,7 @@ public class ItemAlloy extends Item { return alloy; } - private ItemAlloy() { + protected ItemAlloy() { setHasSubtypes(true); setMaxDamage(0); setCreativeTab(EnderIOTab.tabEnderIO); diff --git a/src/main/java/crazypants/enderio/material/ItemGrindingBall.java b/src/main/java/crazypants/enderio/material/ItemGrindingBall.java new file mode 100644 index 00000000..98289f01 --- /dev/null +++ b/src/main/java/crazypants/enderio/material/ItemGrindingBall.java @@ -0,0 +1,50 @@ +package crazypants.enderio.material; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.ModObject; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; + +public class ItemGrindingBall extends ItemAlloy { + + public static ItemGrindingBall create() { + ItemGrindingBall ball = new ItemGrindingBall(); + ball.init(); + return ball; + } + + private ItemGrindingBall() { + setUnlocalizedName(ModObject.itemGrindingBall.unlocalisedName); + } + + private void init() { + GameRegistry.registerItem(this, ModObject.itemGrindingBall.unlocalisedName); + + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, numItems - 1); + return icons[damage]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + int numAlloys = Alloy.values().length; + for (int i = 0; i < numAlloys; i++) + icons[i] = IIconRegister.registerIcon(Alloy.values()[i].iconKey+"GrindingBall"); + + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); + return Alloy.values()[i].unlocalisedName+"_ball"; + } +} diff --git a/src/main/java/crazypants/enderio/material/Material.java b/src/main/java/crazypants/enderio/material/Material.java index c20831a7..5baf4493 100644 --- a/src/main/java/crazypants/enderio/material/Material.java +++ b/src/main/java/crazypants/enderio/material/Material.java @@ -22,15 +22,13 @@ public enum Material { ATTRACTOR_CRYSTAL("attractorCrystal", true), WEATHER_CRYSTAL("weatherCrystal", true), END_STEEL_NUGGET("endSteelNugget"), - ELECTRICAL_GRINDING_BALL("electricalGrindingBall"), - ENERGETIC_GRINDING_BALL("energeticGrindingBall"), - VIBRANT_GRINDING_BALL("vibrantGrindingBall"), - REDSTONE_GRINDING_BALL("redstoneGrindingBall"), - CONDUCTIVE_GRINDING_BALL("conductiveGrindingBall"), - PULSATING_GRINDING_BALL("pulsatingGrindingBall"), - SOULARIUM_GRINDING_BALL("soulariumGrindingBall"), - END_STEEL_GRINDING_BALL("endSteelGrindingBall"), - DARK_STEEL_ROD("darkSteelRod"); + DARK_STEEL_ROD("darkSteelRod"), + PRECIENT_CRYSTAL("precientCrystal",true), + PULSATING_POWDER("pulsatingPowder", true), + VIBRANT_POWDER("vibrantPowder", true), + ENDER_POWDER("enderCrystalPowder", true), + PRECIENT_POWDER("precientPowder",true); + diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index 1e78e5b7..88d1cff6 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -106,6 +106,7 @@ public class MaterialRecipes { String phasedGold = PHASED_GOLD.getOreIngot(); String phasedIron = PHASED_IRON.getOreIngot(); String darkSteel = DARK_STEEL.getOreIngot(); + String soularium = SOULARIUM.getOreIngot(); String endSteel = END_STEEL.getOreIngot(); ItemStack capacitor = new ItemStack(itemBasicCapacitor, 1, 0); @@ -145,26 +146,6 @@ public class MaterialRecipes { ItemStack vibCry = new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()); addShaped(vibCry, "nnn", "ngn", "nnn", 'n', vibrantNugget, 'g', "gemEmerald"); - //Balls - ItemStack darkBall = new ItemStack(EnderIO.itemMaterial, 5, Material.DARK_GRINDING_BALL.ordinal()); - addShaped(darkBall, " s ", "sss", " s ", 's', darkSteel); - ItemStack electricalBall = new ItemStack(EnderIO.itemMaterial, 5, Material.ELECTRICAL_GRINDING_BALL.ordinal()); - addShaped(electricalBall, " s ", "sss", " s ", 's', ELECTRICAL_STEEL.getStackIngot()); - ItemStack energeticBall = new ItemStack(EnderIO.itemMaterial, 5, Material.ENERGETIC_GRINDING_BALL.ordinal()); - addShaped(energeticBall, " s ", "sss", " s ", 's', ENERGETIC_ALLOY.getStackIngot()); - ItemStack vibrantBall = new ItemStack(EnderIO.itemMaterial, 5, Material.VIBRANT_GRINDING_BALL.ordinal()); - addShaped(vibrantBall, " s ", "sss", " s ", 's', PHASED_GOLD.getStackIngot()); - ItemStack redstoneBall = new ItemStack(EnderIO.itemMaterial, 5, Material.REDSTONE_GRINDING_BALL.ordinal()); - addShaped(redstoneBall, " s ", "sss", " s ", 's', REDSTONE_ALLOY.getStackIngot()); - ItemStack conductiveBall = new ItemStack(EnderIO.itemMaterial, 5, Material.CONDUCTIVE_GRINDING_BALL.ordinal()); - addShaped(conductiveBall, " s ", "sss", " s ", 's', CONDUCTIVE_IRON.getStackIngot()); - ItemStack pulsatingBall = new ItemStack(EnderIO.itemMaterial, 5, Material.PULSATING_GRINDING_BALL.ordinal()); - addShaped(pulsatingBall, " s ", "sss", " s ", 's', PHASED_IRON.getStackIngot()); - ItemStack soulariumBall = new ItemStack(EnderIO.itemMaterial, 5, Material.SOULARIUM_GRINDING_BALL.ordinal()); - addShaped(soulariumBall, " s ", "sss", " s ", 's', SOULARIUM.getStackIngot()); - ItemStack endBall = new ItemStack(EnderIO.itemMaterial, 5, Material.END_STEEL_GRINDING_BALL.ordinal()); - addShaped(endBall, " s ", "sss", " s ", 's', END_STEEL.getStackIngot()); - //Smelting ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal()); ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal()); @@ -182,6 +163,14 @@ public class MaterialRecipes { ItemStack diBars = new ItemStack(EnderIO.blockDarkIronBars, 16, 0); addShaped(diBars, "ddd", "ddd", 'd', darkSteel); + //Dark Iron Bars + ItemStack soBars = new ItemStack(EnderIO.blockSoulariumBars, 16, 0); + addShaped(soBars, "ddd", "ddd", 'd', soularium); + + //Dark Iron Bars + ItemStack esBars = new ItemStack(EnderIO.blockEndSteelBars, 16, 0); + addShaped(esBars, "ddd", "ddd", 'd', endSteel); + // Fused Quartz Frame addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "stickWood"); addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "woodStick"); @@ -195,10 +184,10 @@ public class MaterialRecipes { addShaped(chassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', mat, 'c', capacitor); ItemStack soulchassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.SOUL_MACHINE_CHASSIS.ordinal()); - addShaped(soulchassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', Alloy.SOULARIUM.getOreIngot(), 'c', capacitor); + addShaped(soulchassis, "fif", "ici", "fif", 'f', EnderIO.blockSoulariumBars, 'i', Alloy.SOULARIUM.getOreIngot(), 'c', capacitor); ItemStack endchassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.END_STEEL_MACHINE_CHASSIS.ordinal()); - addShaped(endchassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', Alloy.END_STEEL.getOreIngot(), 'c', capacitor); + addShaped(endchassis, "fif", "ici", "fif", 'f', EnderIO.blockEndSteelBars, 'i', Alloy.END_STEEL.getOreIngot(), 'c', capacitor); // Basic Gear @@ -242,6 +231,7 @@ public class MaterialRecipes { for (Alloy alloy : Alloy.values()) { addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot()); + addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot()); addShapeless(alloy.getStackIngot(9), alloy.getOreBlock()); }