From 52e2fddb509f53c6e041cdbfefc44ac63cb05351 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Fri, 23 Jul 2021 21:57:42 +0800 Subject: balance UCFE and add thaumcraft lib --- .../Blocks/TEs/UniversalChemicalFuelEngine.java | 14 ++++++++++---- src/main/java/GoodGenerator/Loader/RecipeLoader.java | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'src/main/java/GoodGenerator') diff --git a/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java b/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java index e9f96bdf2b..de8470ef9b 100644 --- a/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java +++ b/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java @@ -33,8 +33,9 @@ import static gregtech.api.enums.Textures.BlockIcons.*; public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_MultiblockBase_EM implements TecTechEnabledMulti, IConstructable { - protected final double DIESEL_EFFICIENCY_COEFFICIENT = 0.45D; - protected final double GAS_EFFICIENCY_COEFFICIENT = 0.30D; + protected final double DIESEL_EFFICIENCY_COEFFICIENT = 0.02D; + protected final double GAS_EFFICIENCY_COEFFICIENT = 0.01D; + protected final double EFFICIENCY_CEILING = 1.5D; private IStructureDefinition multiDefinition = null; @@ -201,7 +202,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_MultiblockBas .addInfo("The proportion is bigger, and the efficiency will be higher.") .addInfo("It creates sqrt(Current Output Power) pollution every second") .addInfo("If you forge to supply Combustion Promoter, this engine will swallow all the fuel " + EnumChatFormatting.YELLOW + "without outputting energy" + EnumChatFormatting.GRAY + ".") - .addInfo("This engine follows the second law of thermodynamics, so the efficiency is up to 100%.") + .addInfo("The efficiency is up to 150%.") .addInfo("The structure is too complex!") .addInfo("Follow the" + EnumChatFormatting.DARK_BLUE + " Tec" + EnumChatFormatting.BLUE + "Tech" + EnumChatFormatting.GRAY + " blueprint to build the main structure.") .addSeparator() @@ -275,7 +276,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_MultiblockBas this.mEfficiency = 0; return; } - this.mEfficiency = (int)(Math.exp(-coefficient * (double)aFuel / (double)aPromoter) * 10000); + this.mEfficiency = (int)(Math.exp(-coefficient * (double)aFuel / (double)aPromoter) * EFFICIENCY_CEILING * 10000); } public int findLiquidAmount(FluidStack liquid, List input) { @@ -300,6 +301,11 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_MultiblockBas } } + @Override + public int getMaxEfficiency(ItemStack aStack) { + return (int)(10000 * EFFICIENCY_CEILING); + } + @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone){ if(aSide == aFacing){ diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader.java b/src/main/java/GoodGenerator/Loader/RecipeLoader.java index 6558591a9a..b3a1adc713 100644 --- a/src/main/java/GoodGenerator/Loader/RecipeLoader.java +++ b/src/main/java/GoodGenerator/Loader/RecipeLoader.java @@ -1109,7 +1109,7 @@ public class RecipeLoader { null, new ItemStack(Loaders.aluminumNitride,2), null, - 2000, + 200, 1920, 4600 ); @@ -1121,7 +1121,7 @@ public class RecipeLoader { null, new ItemStack(Loaders.aluminumNitride,2), null, - 2000, + 200, 1920, 4600 ); -- cgit