From df3c785493e397e632efd56c32761cdc31577ecc Mon Sep 17 00:00:00 2001 From: cp Date: Mon, 31 Mar 2014 21:09:20 +0800 Subject: [PATCH] New vat model, new fuels and stuff. --- .../assets/enderio/config/VatRecipes_Core.xml | 22 ++- resources/assets/enderio/lang/en_US.lang | 4 +- .../textures/blocks/fire_water_flow.png | Bin 0 -> 12637 bytes .../blocks/fire_water_flow.png.mcmeta | 5 + .../textures/blocks/fire_water_still.png | Bin 0 -> 7108 bytes .../blocks/fire_water_still.png.mcmeta | 5 + .../textures/blocks/rocket_fuel_flow.png | Bin 0 -> 12637 bytes .../blocks/rocket_fuel_flow.png.mcmeta | 5 + .../textures/blocks/rocket_fuel_still.png | Bin 0 -> 7106 bytes .../blocks/rocket_fuel_still.png.mcmeta | 5 + .../enderio/textures/blocks/vatFront.png | Bin 1257 -> 1266 bytes .../enderio/textures/blocks/vatFrontOn.png | Bin 3356 -> 1360 bytes .../textures/blocks/vatFrontOn.png.mcmeta | 1 - .../assets/enderio/textures/blocks/vatTop.png | Bin 0 -> 180 bytes .../enderio/textures/fire_water_flow.png | Bin 0 -> 12637 bytes .../textures/fire_water_flow.png.mcmeta | 5 + .../enderio/textures/fire_water_still.png | Bin 0 -> 7108 bytes .../textures/fire_water_still.png.mcmeta | 5 + .../textures/items/bucketFire_water.png | Bin 0 -> 349 bytes .../textures/items/bucketRocket_fuel.png | Bin 0 -> 339 bytes .../enderio/textures/rocket_fuel_flow.png | Bin 0 -> 12637 bytes .../textures/rocket_fuel_flow.png.mcmeta | 5 + .../enderio/textures/rocket_fuel_still.png | Bin 0 -> 7106 bytes .../textures/rocket_fuel_still.png.mcmeta | 5 + .../java/crazypants/enderio/ClientProxy.java | 20 ++- src/main/java/crazypants/enderio/Config.java | 40 ++++-- src/main/java/crazypants/enderio/EnderIO.java | 43 ++++-- .../java/crazypants/enderio/fluid/Fluids.java | 16 ++- .../generator/BlockCombustionGenerator.java | 73 +++++++--- .../CombustionGeneratorRenderer.java | 6 - .../machine/recipe/RecipeConfigParser.java | 6 +- .../enderio/machine/still/BlockVat.java | 71 ++++++++- .../enderio/machine/still/TileVat.java | 19 ++- .../machine/still/VatRecipeManager.java | 21 +++ .../enderio/machine/still/VatRenderer.java | 136 ++++++++++++++++++ 35 files changed, 443 insertions(+), 75 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/fire_water_flow.png create mode 100644 resources/assets/enderio/textures/blocks/fire_water_flow.png.mcmeta create mode 100644 resources/assets/enderio/textures/blocks/fire_water_still.png create mode 100644 resources/assets/enderio/textures/blocks/fire_water_still.png.mcmeta create mode 100644 resources/assets/enderio/textures/blocks/rocket_fuel_flow.png create mode 100644 resources/assets/enderio/textures/blocks/rocket_fuel_flow.png.mcmeta create mode 100644 resources/assets/enderio/textures/blocks/rocket_fuel_still.png create mode 100644 resources/assets/enderio/textures/blocks/rocket_fuel_still.png.mcmeta delete mode 100644 resources/assets/enderio/textures/blocks/vatFrontOn.png.mcmeta create mode 100644 resources/assets/enderio/textures/blocks/vatTop.png create mode 100644 resources/assets/enderio/textures/fire_water_flow.png create mode 100644 resources/assets/enderio/textures/fire_water_flow.png.mcmeta create mode 100644 resources/assets/enderio/textures/fire_water_still.png create mode 100644 resources/assets/enderio/textures/fire_water_still.png.mcmeta create mode 100644 resources/assets/enderio/textures/items/bucketFire_water.png create mode 100644 resources/assets/enderio/textures/items/bucketRocket_fuel.png create mode 100644 resources/assets/enderio/textures/rocket_fuel_flow.png create mode 100644 resources/assets/enderio/textures/rocket_fuel_flow.png.mcmeta create mode 100644 resources/assets/enderio/textures/rocket_fuel_still.png create mode 100644 resources/assets/enderio/textures/rocket_fuel_still.png.mcmeta create mode 100644 src/main/java/crazypants/enderio/machine/still/VatRenderer.java diff --git a/resources/assets/enderio/config/VatRecipes_Core.xml b/resources/assets/enderio/config/VatRecipes_Core.xml index ab75e4e4..d6092d71 100644 --- a/resources/assets/enderio/config/VatRecipes_Core.xml +++ b/resources/assets/enderio/config/VatRecipes_Core.xml @@ -54,19 +54,29 @@ The vat always uses 1 MJ per tick, so energy cost also equates to duration. - - + - - - + + + - + + + + + + + + + + + + diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index a1b31acd..01d7ae48 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -44,7 +44,9 @@ enderio.phasedIronNugget.name=Pulsating Iron Nugget //Fluids fluid.nutrient_distillation=Nutrient Distillation fluid.hootch=Hootch -item.bucketNutrientdistillation.name=Nutrient Distillation Bucket +fluid.fire_water=Fire Water +fluid.rocket_fuel=Rocket Fuel +item.bucketNutrient_distillation.name=Nutrient Distillation Bucket item.bucketHootch.name=Hootch Bucket enderio.fluid.millibucket.abr=MB diff --git a/resources/assets/enderio/textures/blocks/fire_water_flow.png b/resources/assets/enderio/textures/blocks/fire_water_flow.png new file mode 100644 index 0000000000000000000000000000000000000000..fb0aef9e92d0d207d2a3d12cef2a64f22c7309f5 GIT binary patch literal 12637 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 Y74I*9a?GoS|J?y?vUS{$W#bv~Z#jxf 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/fire_water_still.png.mcmeta b/resources/assets/enderio/textures/blocks/fire_water_still.png.mcmeta new file mode 100644 index 00000000..0645f48c --- /dev/null +++ b/resources/assets/enderio/textures/blocks/fire_water_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/assets/enderio/textures/blocks/rocket_fuel_flow.png b/resources/assets/enderio/textures/blocks/rocket_fuel_flow.png new file mode 100644 index 0000000000000000000000000000000000000000..d763f8a182df2c35b2a3787258a41119e48c1182 GIT binary patch literal 12637 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 VXT^1S_}?ASMq9`ASvH;#{|g`w3j6>7 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/rocket_fuel_flow.png.mcmeta b/resources/assets/enderio/textures/blocks/rocket_fuel_flow.png.mcmeta new file mode 100644 index 00000000..1e64ff03 --- /dev/null +++ b/resources/assets/enderio/textures/blocks/rocket_fuel_flow.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/blocks/rocket_fuel_still.png b/resources/assets/enderio/textures/blocks/rocket_fuel_still.png new file mode 100644 index 0000000000000000000000000000000000000000..e8a6fe9af578ad49ebb8b7e6e0235afa6b5a98b2 GIT binary patch literal 7106 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/rocket_fuel_still.png.mcmeta b/resources/assets/enderio/textures/blocks/rocket_fuel_still.png.mcmeta new file mode 100644 index 00000000..0645f48c --- /dev/null +++ b/resources/assets/enderio/textures/blocks/rocket_fuel_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/assets/enderio/textures/blocks/vatFront.png b/resources/assets/enderio/textures/blocks/vatFront.png index 662cb545acdd15f2dff3f0819f1006fdbf974760..6823cd983588acc13ed9466c5e6be2408730cbaf 100644 GIT binary patch delta 1185 zcmV;S1YY~;3GxY$JPN@801m+cxRGn^kwz(hZb?KzR7gv`mf2R@NEAi=LERxC9Wchg zQ-{f5Yp^v>mSp6C|9|Y>_m(8&bdtpj%{s`cD(Rd%mTL6J+1a1x=by&olZ%Tlmy<7- zm#5P=Fa)0`6L2!Q;2DEY7h}PAfD2)0SI1*GVFn^_G9JV7^=kU{>gwCg^|zaw4%dHw zU4tv;Pp_t@(`kD}xYO>T2AS0$m&@7e4Gh79 z>wU?yuKD*}@0wg2`o`xmoI_iIXID65DZP zfoOm@V$zOdM^kc~WYCy@`#$6% zU_~KQ*emS&UB26iK+`aDettf?z5P89fH&T3BmghsH)2>!lx7H!6G9eN6)}OjXa&Ul z_}v0R-MnN?!;4&#O&yjcH3IpO2NtGB4Et#J%}_!k^_3duF|ow40VQomJ#QE5ZKgh z<f7DGX#7q-k!rLu0)}Kb-E3A__H4Ea1k8TNj-*>@AQ~#;Ch?NQWT}^DSQM;_ zuv|xj9JCr-6*9woT}Neq>BKQ5gz2O2^ZA`klw1>~RzS^H_RjY8TG-1H_hS(d4Mjyy z0a+@`kj=O#yezZBkod@M$~Qp;+BEd+COBT6tL?&0VTk!k*Yn2AbkreF<~dlUsYQm_ zt}UzefI@oqC{_v1F!X+ro5&oocQ~R}c0bE}1d?Ro`wy+a0s(t}Mx_S6=Jsca?brtb zYBN&o`64Q{@M=I>UZn<01ej0LIZe>z zK>C12V^3vAYBP*~o1_6-0DF<%$Yh%0s7tqlD54e(2rp#=*dDN*df{6JyPPV_x#-@p zX$6iRbO)O&O^8pNR*s~iq>@S`LDA9(mZJNp;(!2vmgNYZHx00000NkvXXu0mjfl}SM9 delta 1176 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 diff --git a/resources/assets/enderio/textures/blocks/vatFrontOn.png.mcmeta b/resources/assets/enderio/textures/blocks/vatFrontOn.png.mcmeta deleted file mode 100644 index ffc0e720..00000000 --- a/resources/assets/enderio/textures/blocks/vatFrontOn.png.mcmeta +++ /dev/null @@ -1 +0,0 @@ -{ "animation": { "frametime": 20, "frames": [ 0, 1, 2, 3, ] } } \ No newline at end of file diff --git a/resources/assets/enderio/textures/blocks/vatTop.png b/resources/assets/enderio/textures/blocks/vatTop.png new file mode 100644 index 0000000000000000000000000000000000000000..7c8d188eb8a86e3ad91e27a7273b6c186191d1be GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WSkfJR9T^xl_H+M9WCij$3p^r= z85sEXfH33KJw={CL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0gN_s>q|Kvf2w zE{-7{-fzzu@&fH)F_bafU!Uyp;z*h2_j$W(LmgN{kkA*)8*&`)TjX!&INk;7W$<+M Kb6Mw<&;$T#8ZrF< literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/fire_water_flow.png b/resources/assets/enderio/textures/fire_water_flow.png new file mode 100644 index 0000000000000000000000000000000000000000..fb0aef9e92d0d207d2a3d12cef2a64f22c7309f5 GIT binary patch literal 12637 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 Y74I*9a?GoS|J?y?vUS{$W#bv~Z#jxf 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/fire_water_still.png.mcmeta b/resources/assets/enderio/textures/fire_water_still.png.mcmeta new file mode 100644 index 00000000..0645f48c --- /dev/null +++ b/resources/assets/enderio/textures/fire_water_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/assets/enderio/textures/items/bucketFire_water.png b/resources/assets/enderio/textures/items/bucketFire_water.png new file mode 100644 index 0000000000000000000000000000000000000000..85cffc6a9631bf5df2afd0ab765d4a7ffbc4a30a GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0gN_s>q|Kvg$A zT^vI!{LfC<$agS6qV>01(u)U@1|bGFb)MO^USKU$pZ(O%EuKl1WwNh}`{}3Izv3^w zxO(t`in{N+|MTC^i+gYX^!GkNcE^Od{ij_YSgo7+IV)jX;OU%YzQqwGXA5r{Pyc#> zS80yltH=(9gRxi6IV7bWxOp~N-!W~&{L)PZb}RSgHZ*Ps=JJ?yL~lt|O8vucIcm=n zC3Z0;aduQT|K1bG+wjQ3EGj#j!E0p^gAm7~XcmjZD{eR`-1+mh>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0gN_s>q|Kvm~G zT^vI!{LfA>IUe_Zun^Zs{NS(e7HCUIh|7JN%HFVdQ&MBb@04&6Ood5s; literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/rocket_fuel_flow.png b/resources/assets/enderio/textures/rocket_fuel_flow.png new file mode 100644 index 0000000000000000000000000000000000000000..d763f8a182df2c35b2a3787258a41119e48c1182 GIT binary patch literal 12637 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 VXT^1S_}?ASMq9`ASvH;#{|g`w3j6>7 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/rocket_fuel_flow.png.mcmeta b/resources/assets/enderio/textures/rocket_fuel_flow.png.mcmeta new file mode 100644 index 00000000..1e64ff03 --- /dev/null +++ b/resources/assets/enderio/textures/rocket_fuel_flow.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/rocket_fuel_still.png b/resources/assets/enderio/textures/rocket_fuel_still.png new file mode 100644 index 0000000000000000000000000000000000000000..e8a6fe9af578ad49ebb8b7e6e0235afa6b5a98b2 GIT binary patch literal 7106 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/rocket_fuel_still.png.mcmeta b/resources/assets/enderio/textures/rocket_fuel_still.png.mcmeta new file mode 100644 index 00000000..0645f48c --- /dev/null +++ b/resources/assets/enderio/textures/rocket_fuel_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 5a297587..52b46094 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -54,6 +54,8 @@ import crazypants.enderio.machine.power.CapBankRenderer2; import crazypants.enderio.machine.power.CapacitorBankRenderer; import crazypants.enderio.machine.reservoir.ReservoirRenderer; import crazypants.enderio.machine.reservoir.TileReservoir; +import crazypants.enderio.machine.still.BlockVat; +import crazypants.enderio.machine.still.VatRenderer; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.FusedQuartzFrameRenderer; import crazypants.enderio.material.FusedQuartzRenderer; @@ -67,12 +69,12 @@ public class ClientProxy extends CommonProxy { // @formatter:off public static int[][] sideAndFacingToSpriteOffset = new int[][] { - { 3, 2, 0, 0, 0, 0 }, - { 2, 3, 1, 1, 1, 1 }, - { 1, 1, 3, 2, 5, 4 }, - { 0, 0, 2, 3, 4, 5 }, - { 4, 5, 4, 5, 3, 2 }, - { 5, 4, 5, 4, 2, 3 } }; + { 3, 2, 0, 0, 0, 0 }, + { 2, 3, 1, 1, 1, 1 }, + { 1, 1, 3, 2, 5, 4 }, + { 0, 0, 2, 3, 4, 5 }, + { 4, 5, 4, 5, 3, 2 }, + { 5, 4, 5, 4, 2, 3 } }; // @formatter:on static { @@ -117,12 +119,16 @@ public class ClientProxy extends CommonProxy { BlockFusedQuartz.renderId = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(new FusedQuartzRenderer()); - + BlockCombustionGenerator.renderId = RenderingRegistry.getNextAvailableRenderId(); CombustionGeneratorRenderer cr = new CombustionGeneratorRenderer(); RenderingRegistry.registerBlockHandler(cr); ClientRegistry.bindTileEntitySpecialRenderer(TileCombustionGenerator.class, cr); + BlockVat.renderId = RenderingRegistry.getNextAvailableRenderId(); + VatRenderer vr = new VatRenderer(); + RenderingRegistry.registerBlockHandler(vr); + FusedQuartzFrameRenderer fqfr = new FusedQuartzFrameRenderer(); MinecraftForgeClient.registerItemRenderer(EnderIO.itemFusedQuartzFrame, fqfr); diff --git a/src/main/java/crazypants/enderio/Config.java b/src/main/java/crazypants/enderio/Config.java index 9a2f682f..e103798c 100644 --- a/src/main/java/crazypants/enderio/Config.java +++ b/src/main/java/crazypants/enderio/Config.java @@ -107,7 +107,11 @@ public final class Config { public static float darkSteelPickEffeciencyBoostWhenPowered = 2; public static int hootchPowerPerCycle = 6; - public static int hootchPowerTotalBurnTime = 25000; + public static int hootchPowerTotalBurnTime = 12000; + public static int rocketFuelPowerPerCycle = 9; + public static int rocketFuelPowerTotalBurnTime = 12000; + public static int fireWaterPowerPerCycle = 12; + public static int fireWaterPowerTotalBurnTime = 12000; public static void load(FMLPreInitializationEvent event) { configDirectory = new File(event.getModConfigurationDirectory(), "enderio"); @@ -151,7 +155,7 @@ public final class Config { conduitScale = config.get("Settings", "conduitScale", DEFAULT_CONDUIT_SCALE, "Valid values are between 0-1, smallest conduits at 0, largest at 1.\n" + - "In SMP, all clients must be using the same value as the server.").getDouble(DEFAULT_CONDUIT_SCALE); + "In SMP, all clients must be using the same value as the server.").getDouble(DEFAULT_CONDUIT_SCALE); conduitScale = VecmathUtil.clamp(conduitScale, 0, 1); fluidConduitExtractRate = config.get("Settings", "fluidConduitExtractRate", fluidConduitExtractRate, @@ -184,7 +188,7 @@ public final class Config { "perInterfacePowerTrackingEnabled", detailedPowerTrackingEnabled, "Enable per tick sampling on individual power inputs and outputs. This allows slightly more detailed messages from the MJ Reader but has a negative impact on server performance.") - .getBoolean(detailedPowerTrackingEnabled); + .getBoolean(detailedPowerTrackingEnabled); useSneakMouseWheelYetaWrench = config.get("Settings", "useSneakMouseWheelYetaWrench", useSneakMouseWheelYetaWrench, "If true, shift-mouse wheel will change the conduit display mode when the YetaWrench is eqipped.") @@ -240,8 +244,8 @@ public final class Config { .get("Settings", "travelStaffBlinkThroughClearBlocksEnabled", travelStaffBlinkThroughClearBlocksEnabled, "If travelStaffBlinkThroughSolidBlocksEnabled is set to false and this is true, the travel " + "staff can only be used to blink through transparent or partial blocks (e.g. torches). " + - "If both are false, only air blocks may be teleported through.") - .getBoolean(travelStaffBlinkThroughClearBlocksEnabled); + "If both are false, only air blocks may be teleported through.") + .getBoolean(travelStaffBlinkThroughClearBlocksEnabled); enderIoRange = config.get("Settings", "enderIoRange", enderIoRange, "Range accessable (in blocks) when using the Ender IO.").getInt(enderIoRange); @@ -253,7 +257,7 @@ public final class Config { "When true, correct lighting is recalculated (client side) for conduit bundles when transitioning to" + " from being hidden behind a facade. This produces " + "better quality rendering but can result in frame stutters when switching to/from a wrench.") - .getBoolean(updateLightingWhenHidingFacades); + .getBoolean(updateLightingWhenHidingFacades); darkSteelLeggingWalkModifier = config.get("Settings", "darkSteelLeggingWalkModifier", darkSteelLeggingWalkModifier, "Speed modifier applied when walking in the Dark Steel Boots.").getDouble(darkSteelLeggingWalkModifier); @@ -278,22 +282,22 @@ public final class Config { "The base chance a skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance)").getDouble(darkSteelSwordSkullChance); darkSteelSwordSkullLootingModifier = (float) config.get("Settings", "darkSteelSwordSkullLootingModifier", darkSteelSwordSkullLootingModifier, "The chance per looting level that a skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( - darkSteelSwordSkullLootingModifier); + darkSteelSwordSkullLootingModifier); darkSteelSwordWitherSkullChance = (float) config.get("Settings", "darkSteelSwordWitherSkullChance", darkSteelSwordWitherSkullChance, "The base chance a wither skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( - darkSteelSwordWitherSkullChance); + darkSteelSwordWitherSkullChance); darkSteelSwordWitherSkullLootingModifier = (float) config.get("Settings", "darkSteelSwordWitherSkullLootingModifie", darkSteelSwordWitherSkullLootingModifier, "The chance per looting level that a wither skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( - darkSteelSwordWitherSkullLootingModifier); + darkSteelSwordWitherSkullLootingModifier); vanillaSwordSkullLootingModifier = (float) config.get("Settings", "vanillaSwordSkullLootingModifier", vanillaSwordSkullLootingModifier, "The chance per looting level that a skull will be dropped when using a non-dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( - vanillaSwordSkullLootingModifier); + vanillaSwordSkullLootingModifier); darkSteelSwordPowerUsePerHit = config.get("Settings", "darkSteelSwordPowerUsePerHit", darkSteelSwordPowerUsePerHit, "The amount of power (RF) used per hit.").getInt(darkSteelSwordPowerUsePerHit); darkSteelSwordEnderPearlDropChance = config.get("Settings", "darkSteelSwordEnderPearlDropChance", darkSteelSwordEnderPearlDropChance, "The chance that an ender pearl will be dropped when using a dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( - darkSteelSwordEnderPearlDropChance); + darkSteelSwordEnderPearlDropChance); darkSteelSwordEnderPearlDropChancePerLooting = config.get("Settings", "darkSteelSwordEnderPearlDropChancePerLooting", darkSteelSwordEnderPearlDropChancePerLooting, "The chance for each looting level that an additional ender pearl will be dropped when using a dark steel sword (0 = no chance, 1 = 100% chance)") @@ -314,6 +318,20 @@ public final class Config { hootchPowerTotalBurnTime = config.get("Settings", "hootchPowerTotalBurnTime", hootchPowerTotalBurnTime, "The total burn time. Examples: BC Oil = 5000, BC Fuel = 25000").getInt(hootchPowerTotalBurnTime); + rocketFuelPowerPerCycle = config.get("Settings", "rocketFuelPowerPerCycle", rocketFuelPowerPerCycle, + "The amount of power generated per BC engine cycle. Examples: BC Oil = 3, BC Fuel = 6").getInt(rocketFuelPowerPerCycle); + rocketFuelPowerTotalBurnTime = config.get("Settings", "rocketFuelPowerTotalBurnTime", rocketFuelPowerTotalBurnTime, + "The total burn time. Examples: BC Oil = 5000, BC Fuel = 25000").getInt(rocketFuelPowerTotalBurnTime); + + + + + fireWaterPowerPerCycle = config.get("Settings", "fireWaterPowerPerCycle", fireWaterPowerPerCycle, + "The amount of power generated per BC engine cycle. Examples: BC Oil = 3, BC Fuel = 6").getInt(fireWaterPowerPerCycle); + fireWaterPowerTotalBurnTime = config.get("Settings", "fireWaterPowerTotalBurnTime", fireWaterPowerTotalBurnTime, + "The total burn time. Examples: BC Oil = 5000, BC Fuel = 25000").getInt(fireWaterPowerTotalBurnTime); + + //TODO: Debug renderCapBankGauge = config.get("Debug", "renderCapBankGauge", renderCapBankGauge, "If not true capacitor banks will not render the level gauge at all.") .getBoolean(renderCapBankGauge); diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 0e760d05..387209d1 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -152,6 +152,14 @@ public class EnderIO { public static BlockFluidEio blocHootch; public static ItemBucketEio itemBucketHootch; + public static Fluid fluidRocketFuel; + public static BlockFluidEio blockRocketFuel; + public static ItemBucketEio itemBucketRocketFuel; + + public static Fluid fluidFireWater; + public static BlockFluidEio blockFireWater; + public static ItemBucketEio itemBucketFireWater; + // Items public static ItemYetaWrench itemYetaWench; public static ItemConduitProbe itemConduitProbe; @@ -163,6 +171,8 @@ public class EnderIO { public static ItemDarkSteelSword itemDarkSteelSword; public static ItemDarkSteelPickaxe itemDarkSteelPickaxe; + + // public static ITrigger triggerNoEnergy; // public static ITrigger triggerHasEnergy; // public static ITrigger triggerFullEnergy; @@ -204,41 +214,56 @@ public class EnderIO { blockElectricLight = BlockElectricLight.create(); blockLightNode = BlockLightNode.create(); blockReservoir = BlockReservoir.create(); - + blockFusedQuartz = BlockFusedQuartz.create(); itemFusedQuartzFrame = ItemFusedQuartzFrame.create(); blockConduitBundle = BlockConduitBundle.create(); blockConduitFacade = BlockConduitFacade.create(); - itemConduitFacade = ItemConduitFacade.create(); + itemConduitFacade = ItemConduitFacade.create(); itemRedstoneConduit = ItemRedstoneConduit.create(); itemPowerConduit = ItemPowerConduit.create(); itemLiquidConduit = ItemLiquidConduit.create(); itemItemConduit = ItemItemConduit.create(); - + Fluid f = new Fluid(Fluids.NUTRIENT_DISTILLATION_NAME).setDensity(1500).setViscosity(3000); FluidRegistry.registerFluid(f); fluidNutrientDistillation = FluidRegistry.getFluid(f.getName()); blockNutrientDistillation = BlockFluidEio.create(fluidNutrientDistillation, new MaterialLiquid(MapColor.brownColor)); - + f = new Fluid(Fluids.HOOTCH_NAME).setDensity(900).setViscosity(1000); FluidRegistry.registerFluid(f); fluidHootch = FluidRegistry.getFluid(f.getName()); blocHootch = BlockFluidEio.create(fluidHootch, new MaterialLiquid(MapColor.grayColor)); - IronEngineFuel.addFuel("hootch", Config.hootchPowerPerCycle, Config.hootchPowerTotalBurnTime); - + IronEngineFuel.addFuel(Fluids.HOOTCH_NAME, Config.hootchPowerPerCycle, Config.hootchPowerTotalBurnTime); + + + f = new Fluid(Fluids.ROCKET_FUEL_NAME).setDensity(900).setViscosity(1000); + FluidRegistry.registerFluid(f); + fluidRocketFuel = FluidRegistry.getFluid(f.getName()); + blockRocketFuel = BlockFluidEio.create(fluidRocketFuel, new MaterialLiquid(MapColor.grayColor)); + IronEngineFuel.addFuel(Fluids.ROCKET_FUEL_NAME, Config.rocketFuelPowerPerCycle, Config.rocketFuelPowerTotalBurnTime); + + + f = new Fluid(Fluids.FIRE_WATER_NAME).setDensity(900).setViscosity(1000); + FluidRegistry.registerFluid(f); + fluidFireWater = FluidRegistry.getFluid(f.getName()); + blockFireWater = BlockFluidEio.create(fluidFireWater, new MaterialLiquid(MapColor.grayColor)); + IronEngineFuel.addFuel(Fluids.FIRE_WATER_NAME, Config.fireWaterPowerPerCycle, Config.fireWaterPowerTotalBurnTime); + itemBasicCapacitor = ItemCapacitor.create(); itemMachinePart = ItemMachinePart.create(); itemMaterial = ItemMaterial.create(); itemAlloy = ItemAlloy.create(); itemPowderIngot = ItemPowderIngot.create(); - + itemBucketNutrientDistillation = ItemBucketEio.create(fluidNutrientDistillation); itemBucketHootch = ItemBucketEio.create(fluidHootch); - + itemBucketRocketFuel = ItemBucketEio.create(fluidRocketFuel); + itemYetaWench = ItemYetaWrench.create(); itemEnderface = ItemEnderface.create(); itemTravelStaff = ItemTravelStaff.create(); @@ -271,7 +296,7 @@ public class EnderIO { ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem( new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()), 1, 3, 60)); ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST) - .addItem(new WeightedRandomChestContent(new ItemStack(EnderIO.itemYetaWench, 1, 0), 1, 1, 15)); + .addItem(new WeightedRandomChestContent(new ItemStack(EnderIO.itemYetaWench, 1, 0), 1, 1, 15)); ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(EnderIO.itemConduitProbe, 1, 0), 1, 1, 1)); ItemStack staff = new ItemStack(EnderIO.itemTravelStaff, 1, 0); diff --git a/src/main/java/crazypants/enderio/fluid/Fluids.java b/src/main/java/crazypants/enderio/fluid/Fluids.java index ad2592db..69968d4d 100644 --- a/src/main/java/crazypants/enderio/fluid/Fluids.java +++ b/src/main/java/crazypants/enderio/fluid/Fluids.java @@ -1,24 +1,28 @@ package crazypants.enderio.fluid; -import crazypants.util.Lang; import net.minecraftforge.fluids.IFluidTank; +import crazypants.util.Lang; public class Fluids { public static final String NUTRIENT_DISTILLATION_NAME = "nutrient_distillation"; 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 String toCapactityString(IFluidTank tank) { if(tank == null) { - return "0/0 " + MB(); - } + return "0/0 " + MB(); + } return tank.getFluidAmount() + "/" + tank.getCapacity() + " " + MB(); } - + public static String MB() { return Lang.localize("fluid.millibucket.abr"); } - + } diff --git a/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java index 7c8b3886..f8da61bc 100644 --- a/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java @@ -2,16 +2,24 @@ package crazypants.enderio.machine.generator; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.util.Util; public class BlockCombustionGenerator extends AbstractMachineBlock { public static int renderId; - + protected IIcon frontOn; protected IIcon frontOff; @@ -21,19 +29,53 @@ public class BlockCombustionGenerator extends AbstractMachineBlock= fluid.amount) { + gen.fill(ForgeDirection.UP, fluid, true); + if(!entityPlayer.capabilities.isCreativeMode) { + entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, Util.consumeItem(item)); + } + return true; + } + } + + return super.onBlockActivated(world, x, y, z, entityPlayer, par6, par7, par8, par9); } @Override @@ -52,22 +94,20 @@ public class BlockCombustionGenerator extends AbstractMachineBlock { + public static int renderId; + + + public static BlockVat create() { BlockVat res = new BlockVat(); res.init(); return res; } + protected IIcon onIcon; + protected IIcon topIcon; + public BlockVat() { super(ModObject.blockVat, TileVat.class); } + @Override + public void registerBlockIcons(IIconRegister iIconRegister) { + blockIcon = iIconRegister.registerIcon("enderio:vatFront"); + onIcon = iIconRegister.registerIcon("enderio:vatFrontOn"); + topIcon = iIconRegister.registerIcon("enderio:vatTop"); + } + + @Override + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { + // used to render the block in the world + TileEntity te = world.getTileEntity(x, y, z); + boolean on = false; + if(te instanceof AbstractMachineEntity) { + AbstractMachineEntity me = (AbstractMachineEntity) te; + on = me.isActive(); + } + + if(blockSide == ForgeDirection.UP.ordinal() || blockSide == ForgeDirection.DOWN.ordinal()) { + return topIcon; + } + + if(on) { + return onIcon; + } else { + return blockIcon; + } + } + + @Override + public IIcon getIcon(int blockSide, int blockMeta) { + if(blockSide == ForgeDirection.UP.ordinal() || blockSide == ForgeDirection.DOWN.ordinal()) { + return topIcon; + } + return blockIcon; + } + @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { @@ -86,9 +132,9 @@ public class BlockVat extends AbstractMachineBlock { entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, item); for (int i = 0; i < entityPlayer.inventory.mainInventory.length; i++) { if(entityPlayer.inventory.mainInventory[i] == null) { - entityPlayer.inventory.setInventorySlotContents(i, res); + entityPlayer.inventory.setInventorySlotContents(i, res); return true; - } + } } if(!world.isRemote) { Util.dropItems(world, res, x, y, z, true); @@ -104,7 +150,24 @@ public class BlockVat extends AbstractMachineBlock { return super.onBlockActivated(world, x, y, z, entityPlayer, par6, par7, par8, par9); } - + + @Override + public int getRenderType() { + return renderId; + } + + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + + @Override + public boolean isOpaqueCube() { + return false; + } + @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { diff --git a/src/main/java/crazypants/enderio/machine/still/TileVat.java b/src/main/java/crazypants/enderio/machine/still/TileVat.java index a3a43466..549b2fd7 100644 --- a/src/main/java/crazypants/enderio/machine/still/TileVat.java +++ b/src/main/java/crazypants/enderio/machine/still/TileVat.java @@ -47,12 +47,16 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler @Override protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { - return VatRecipeManager.getInstance().isValidInput(new MachineRecipeInput(i, itemstack)); + MachineRecipeInput[] inputs = getInputs(); + inputs[i] = new MachineRecipeInput(i, itemstack); + + //return VatRecipeManager.getInstance().isValidInput(new MachineRecipeInput(i, itemstack)); + return VatRecipeManager.getInstance().isValidInput(inputs); } @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(resource == null || !resource.isFluidEqual(WATER)) { + if(resource == null || !canFill(from, resource.getFluid())) { return 0; } tanksDirty = true; @@ -115,10 +119,17 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler @Override public boolean canFill(ForgeDirection from, Fluid fluid) { - if(fluid == null || fluid.getID() != WATER.getFluid().getID()) { + + if(fluid == null || (inputTank.getFluid() != null && inputTank.getFluid().getFluid().getID() != fluid.getID())) { return false; } - return true; + + MachineRecipeInput[] inputs = getInputs(); + if(inputTank.getFluidAmount() <= 0) { + inputs[inputs.length - 1] = new MachineRecipeInput(0, new FluidStack(fluid, 1)); + } + + return VatRecipeManager.getInstance().isValidInput(inputs); } @Override diff --git a/src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java b/src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java index 7a2204a2..dcc67931 100644 --- a/src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/still/VatRecipeManager.java @@ -101,4 +101,25 @@ public class VatRecipeManager { return false; } + public boolean isValidInput(MachineRecipeInput[] inputs) { + for (IRecipe recipe : recipes) { + boolean allValid = true; + String name = recipe.getOutputs()[0].getFluidOutput().getFluid().getName(); + for(MachineRecipeInput input : inputs) { + if(input.item != null) { + allValid = recipe.isValidInput(input.slotNumber, input.item); + } else if(input.fluid != null) { + allValid = recipe.isValidInput(input.fluid); + } + if(!allValid) { + break; + } + } + if(allValid) { + return true; + } + } + return false; + } + } diff --git a/src/main/java/crazypants/enderio/machine/still/VatRenderer.java b/src/main/java/crazypants/enderio/machine/still/VatRenderer.java new file mode 100644 index 00000000..de3d10b5 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/still/VatRenderer.java @@ -0,0 +1,136 @@ +package crazypants.enderio.machine.still; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.generator.TileCombustionGenerator; +import crazypants.render.BoundingBox; +import crazypants.render.CubeRenderer; +import crazypants.render.RenderUtil; +import crazypants.render.VertexTransform; +import crazypants.vecmath.Vector3d; +import crazypants.vecmath.Vector3f; + +public class VatRenderer implements ISimpleBlockRenderingHandler { + + private VertXForm xform = new VertXForm(); + + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + + short facing = 3; + boolean active = false; + if(world != null) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileCombustionGenerator) { + TileCombustionGenerator gen = (TileCombustionGenerator) te; + facing = gen.facing; + active = gen.isActive(); + } + } + + + IIcon[] textures = new IIcon[6]; + if(world != null) { + textures[0] = EnderIO.blockVat.getIcon(world, x, y, z, ForgeDirection.NORTH.ordinal()); + textures[1] = EnderIO.blockVat.getIcon(world, x, y, z, ForgeDirection.NORTH.ordinal()); + textures[2] = EnderIO.blockVat.getIcon(world, x, y, z, ForgeDirection.UP.ordinal()); + textures[3] = EnderIO.blockVat.getIcon(world, x, y, z, ForgeDirection.DOWN.ordinal()); + textures[4] = EnderIO.blockVat.getIcon(world, x, y, z, ForgeDirection.NORTH.ordinal()); + textures[5] = EnderIO.blockVat.getIcon(world, x, y, z, ForgeDirection.NORTH.ordinal()); + } else { + textures[0] = EnderIO.blockVat.getIcon(3, 0); + textures[1] = EnderIO.blockVat.getIcon(3, 0); + textures[2] = EnderIO.blockVat.getIcon(1, 0); + textures[3] = EnderIO.blockVat.getIcon(0, 0); + textures[4] = EnderIO.blockVat.getIcon(3, 0); + textures[5] = EnderIO.blockVat.getIcon(3, 0); + } + + float b = 1; + if(world instanceof World) { + b = RenderUtil.claculateTotalBrightnessForLocation((World) world, x, y, z); + } + + float[] cols = new float[6]; + for (int i = 0; i < 6; i++) { + float m = RenderUtil.getColorMultiplierForFace(ForgeDirection.values()[i]); + cols[i] = b * m; + } + + //-x side + BoundingBox bb = BoundingBox.UNIT_CUBE.scale(0.333, 1,1); + bb = bb.translate(0.5f - (0.3f/2),0,0); + xform.set(x, y, z); + CubeRenderer.render(bb, textures, xform, cols); + + bb = BoundingBox.UNIT_CUBE.scale(0.4, 1,1); + xform.set(x, y, z); + CubeRenderer.render(bb, textures, xform, cols); + + bb = BoundingBox.UNIT_CUBE.scale(0.333, 1,1); + bb = bb.translate(-0.5f + (0.3f/2),0,0); + xform.set(x, y, z); + CubeRenderer.render(bb, textures, xform, cols); + + return true; + } + + + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + Tessellator tes = Tessellator.instance; + tes.startDrawingQuads(); + renderWorldBlock(null, 0, 0, 0, block, 0, renderer); + tes.draw(); + } + + @Override + public int getRenderId() { + return BlockVat.renderId; + } + + private static class VertXForm implements VertexTransform { + + int x; + int y; + int z; + + public VertXForm() { + } + + void set(int x, int y, int z) { + this.x = x; + this.y = y; + this.z = z; + } + + @Override + public void apply(Vector3d vec) { + if(vec.x > 0.9 || vec.x < 0.1) { + + vec.z -= 0.5; + vec.z *= 0.4; + vec.z += 0.5; + } + vec.add(x, y, z); + } + + @Override + public void applyToNormal(Vector3f vec) { + } + + } +}