From 815ddbfe127301f8586599f1c5483a09f9a6374a Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Tue, 18 Feb 2020 12:32:37 +0100 Subject: one more TFFT cell, fixed press/alloying recipes, improved fuel cells --- config/GregTech/Recipes.cfg | 1 + config/IC2.ini | 2 +- config/splash.properties | 2 +- .../java/itemBlocks/IB_TFFTStorageFieldBlockT5.java | 2 +- src/main/java/kekztech/KekzCore.java | 21 ++++++++++++++++++--- .../java/tileentities/GTMTE_FluidMultiStorage.java | 2 +- src/main/java/tileentities/GTMTE_SOFuelCellMK1.java | 19 +++++++++---------- src/main/java/tileentities/GTMTE_SOFuelCellMK2.java | 19 +++++++++---------- src/main/resources/assets/kekztech/lang/en_US.lang | 1 + 9 files changed, 42 insertions(+), 27 deletions(-) diff --git a/config/GregTech/Recipes.cfg b/config/GregTech/Recipes.cfg index b6226a0d1a..c24d5193da 100644 --- a/config/GregTech/Recipes.cfg +++ b/config/GregTech/Recipes.cfg @@ -4713,6 +4713,7 @@ assembling { I:tile.kekztech_tfftstoragefieldblock3_block_300=300 I:tile.kekztech_tfftstoragefieldblock3_block_400=400 I:tile.kekztech_tfftstoragefieldblock4_block_400=400 + I:tile.kekztech_tfftstoragefieldblock5_block_400=400 I:tile.kekztech_yszceramicelectrolyteunit_block_1200=1200 I:tile.kekztech_yszceramicelectrolyteunit_block_2400=2400 I:tile.lever_400=400 diff --git a/config/IC2.ini b/config/IC2.ini index d3e7151b25..9c17d451e1 100644 --- a/config/IC2.ini +++ b/config/IC2.ini @@ -1,5 +1,5 @@ ; ic2 general config -; created Nov 24, 2019 6:42:09 PM +; created Feb 18, 2020 12:21:02 PM ;--- [worldgen] diff --git a/config/splash.properties b/config/splash.properties index 49794cfda6..e6ad6c72ce 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Sun Nov 24 18:42:01 CET 2019 +#Tue Feb 18 12:20:53 CET 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 diff --git a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT5.java b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT5.java index caef257f93..304f2a221c 100644 --- a/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT5.java +++ b/src/main/java/itemBlocks/IB_TFFTStorageFieldBlockT5.java @@ -19,7 +19,7 @@ public class IB_TFFTStorageFieldBlockT5 extends ItemBlock { public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) { lines.add("This is not a fluid tank"); lines.add("Capacity: " + Block_TFFTStorageFieldBlockT5.getCapacity() + "L"); - lines.add("Power Draw: 0.5EU/t"); + lines.add("Power Draw: 8EU/t"); } } \ No newline at end of file diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index 247131c7f7..114446ad38 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -16,6 +16,7 @@ import blocks.Block_TFFTStorageFieldBlockT1; import blocks.Block_TFFTStorageFieldBlockT2; import blocks.Block_TFFTStorageFieldBlockT3; import blocks.Block_TFFTStorageFieldBlockT4; +import blocks.Block_TFFTStorageFieldBlockT5; import blocks.Block_YSZUnit; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.Loader; @@ -95,6 +96,7 @@ public class KekzCore { Block_TFFTStorageFieldBlockT2.getInstance().registerBlock(); Block_TFFTStorageFieldBlockT3.getInstance().registerBlock(); Block_TFFTStorageFieldBlockT4.getInstance().registerBlock(); + Block_TFFTStorageFieldBlockT5.getInstance().registerBlock(); Block_TFFTMultiHatch.getInstance().registerBlock(); Block_ReactorChamber_OFF.getInstance().registerBlock(); Block_ReactorChamber_ON.getInstance().registerBlock(); @@ -284,7 +286,7 @@ public class KekzCore { 200, 480); final ItemStack[] tfftstoragefield3 = { GT_Utility.getIntegratedCircuit(6), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 2), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1), ItemList.Field_Generator_MV.get(1L), @@ -308,6 +310,19 @@ public class KekzCore { FluidRegistry.getFluidStack("molten.epoxid", 1152), new ItemStack(Block_TFFTStorageFieldBlockT4.getInstance(), 1), 400, 4098); + final ItemStack[] tfftstoragefield5 = { + GT_Utility.getIntegratedCircuit(6), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4), + GT_OreDictUnificator.get(OrePrefixes.plateTriple, Materials.HSSS, 1), + GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Enderium, 1), + ItemList.Field_Generator_EV.get(1L), + ItemList.Electric_Pump_IV.get(1L) + }; + GT_Values.RA.addAssemblerRecipe( + tfftstoragefield5, + FluidRegistry.getFluidStack("molten.epoxid", 1152), + new ItemStack(Block_TFFTStorageFieldBlockT5.getInstance(), 1), + 400, 4098); final Object[] multi_hatch = { "PRP", "UFU", "PRP", 'P', GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 1), @@ -345,12 +360,12 @@ public class KekzCore { // Ceramic plates GT_Values.RA.addAlloySmelterRecipe( craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicDust.getMetaID(), Loader.isModLoaded("bartworks") ? 3 : 10), - ItemList.Shape_Mold_Plate.get(1), + ItemList.Shape_Mold_Plate.get(0), craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 1), 400, 480); GT_Values.RA.addFormingPressRecipe( craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicDust.getMetaID(), 10), - ItemList.Shape_Mold_Plate.get(1), + ItemList.Shape_Mold_Plate.get(0), craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicPlate.getMetaID(), 1), 800, 480); diff --git a/src/main/java/tileentities/GTMTE_FluidMultiStorage.java b/src/main/java/tileentities/GTMTE_FluidMultiStorage.java index 945309ad80..221fd03a49 100644 --- a/src/main/java/tileentities/GTMTE_FluidMultiStorage.java +++ b/src/main/java/tileentities/GTMTE_FluidMultiStorage.java @@ -343,7 +343,7 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { runningCostAcc += 4.0f; fluidCapacityAcc += (float) STORAGE_FIELD4.getCapacity(); } else if(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName() - .equals(STORAGE_FIELD4.getUnlocalizedName())) { + .equals(STORAGE_FIELD5.getUnlocalizedName())) { runningCostAcc += 8.0f; fluidCapacityAcc += (float) STORAGE_FIELD5.getCapacity(); } else { diff --git a/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java b/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java index 9aa0a5c01d..197799149c 100644 --- a/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java +++ b/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java @@ -35,9 +35,9 @@ public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_MultiBlockBase { private final int CASING_META = 1; private final int CASING_TEXTURE_ID = 49; - private final int OXYGEN_PER_TICK = 20; + private final int OXYGEN_PER_SEC = 400; private final int EU_PER_TICK = 1024; - private final int STEAM_PER_TICK = 900; + private final int STEAM_PER_SEC = 18000; public GTMTE_SOFuelCellMK1(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -60,8 +60,8 @@ public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_MultiBlockBase { b.addInfo("Oxidizes gas fuels to generate electricity without polluting the environment") .addInfo("Consumes 29,480EU worth of fuel with up to 97% efficiency each second") .addInfo("Steam production requires the SOFC to heat up completely first") - .addInfo("Outputs " + EU_PER_TICK + "EU/t and " + STEAM_PER_TICK + "L/t Steam") - .addInfo("Additionally requires " + OXYGEN_PER_TICK + "L/t Oxygen gas") + .addInfo("Outputs " + EU_PER_TICK + "EU/t and " + STEAM_PER_SEC + "L/s Steam") + .addInfo("Additionally requires " + OXYGEN_PER_SEC + "L/s Oxygen gas") .addSeparator() .beginStructureBlock(3, 3, 5) .addController("Front Center") @@ -119,22 +119,21 @@ public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_MultiBlockBase { if((liquid = GT_Utility.getFluidForFilledItem(aFuel.getRepresentativeInput(0), true)) != null && hatchFluid.isFluidEqual(liquid)) { - liquid.amount = EU_PER_TICK / aFuel.mSpecialValue; + liquid.amount = Math.round((EU_PER_TICK * 20) / aFuel.mSpecialValue); if(super.depleteInput(liquid)) { - if(!super.depleteInput(Materials.Oxygen.getGas(OXYGEN_PER_TICK))) { + if(!super.depleteInput(Materials.Oxygen.getGas(OXYGEN_PER_SEC))) { super.mEUt = 0; super.mEfficiency = 0; return false; } super.mEUt = EU_PER_TICK; - super.mProgresstime = 1; - super.mMaxProgresstime = 1; - super.mEfficiencyIncrease = 5; + super.mMaxProgresstime = 20; + super.mEfficiencyIncrease = 40; if(super.mEfficiency == getMaxEfficiency(null)) { - super.addOutput(GT_ModHandler.getSteam(STEAM_PER_TICK)); + super.addOutput(GT_ModHandler.getSteam(STEAM_PER_SEC)); } return true; } diff --git a/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java b/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java index 3ecba204ce..de8b37cb85 100644 --- a/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java +++ b/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java @@ -35,9 +35,9 @@ public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_MultiBlockBase { final int CASING_META = 0; final int CASING_TEXTURE_ID = 48; - private final int OXYGEN_PER_TICK = 100; + private final int OXYGEN_PER_SEC = 2000; private final int EU_PER_TICK = 24576; // 100% Efficiency, 3A IV - private final int STEAM_PER_TICK = 4800; // SH Steam (10,800EU/t @ 150% Efficiency) + private final int STEAM_PER_SEC = 96000; // SH Steam (10,800EU/t @ 150% Efficiency) public GTMTE_SOFuelCellMK2(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -60,8 +60,8 @@ public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_MultiBlockBase { b.addInfo("Oxidizes gas fuels to generate electricity without polluting the environment") .addInfo("Consumes 442,200EU worth of fuel with up to 97% efficiency each second") .addInfo("Steam production requires the SOFC to heat up completely first") - .addInfo("Outputs " + EU_PER_TICK + "EU/t and " + STEAM_PER_TICK + "L/t Steam") - .addInfo("Additionally requires " + OXYGEN_PER_TICK + "L/t Oxygen gas") + .addInfo("Outputs " + EU_PER_TICK + "EU/t and " + STEAM_PER_SEC + "L/s Steam") + .addInfo("Additionally requires " + OXYGEN_PER_SEC + "L/s Oxygen gas") .addSeparator() .beginStructureBlock(3, 3, 5) .addController("Front Center") @@ -119,22 +119,21 @@ public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_MultiBlockBase { if((liquid = GT_Utility.getFluidForFilledItem(aFuel.getRepresentativeInput(0), true)) != null && hatchFluid.isFluidEqual(liquid)) { - liquid.amount = EU_PER_TICK / aFuel.mSpecialValue; + liquid.amount = Math.round((EU_PER_TICK * 20) / aFuel.mSpecialValue); if(super.depleteInput(liquid)) { - if(!super.depleteInput(Materials.Oxygen.getGas(OXYGEN_PER_TICK))) { + if(!super.depleteInput(Materials.Oxygen.getGas(OXYGEN_PER_SEC))) { super.mEUt = 0; super.mEfficiency = 0; return false; } super.mEUt = EU_PER_TICK; - super.mProgresstime = 1; - super.mMaxProgresstime = 1; - super.mEfficiencyIncrease = 20; + super.mMaxProgresstime = 20; + super.mEfficiencyIncrease = 80; if(super.mEfficiency == getMaxEfficiency(null)) { - super.addOutput(FluidRegistry.getFluidStack("ic2superheatedsteam", STEAM_PER_TICK)); + super.addOutput(FluidRegistry.getFluidStack("ic2superheatedsteam", STEAM_PER_SEC)); } return true; } diff --git a/src/main/resources/assets/kekztech/lang/en_US.lang b/src/main/resources/assets/kekztech/lang/en_US.lang index d21ed0462e..1fffdf2b4e 100644 --- a/src/main/resources/assets/kekztech/lang/en_US.lang +++ b/src/main/resources/assets/kekztech/lang/en_US.lang @@ -82,6 +82,7 @@ tile.kekztech_tfftstoragefieldblock1_block.name=T.F.F.T Storage Field Block (Tie tile.kekztech_tfftstoragefieldblock2_block.name=T.F.F.T Storage Field Block (Tier II) tile.kekztech_tfftstoragefieldblock3_block.name=T.F.F.T Storage Field Block (Tier III) tile.kekztech_tfftstoragefieldblock4_block.name=T.F.F.T Storage Field Block (Tier IV) +tile.kekztech_tfftstoragefieldblock5_block.name=T.F.F.T Storage Field Block (Tier V) tile.kekztech_tfftmultihatch_block.name=T.F.F.T Multi-Fluid I/O Hatch tile.kekztech_controlrod_block.name=Nuclear Reactor Control Rod -- cgit