aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlodBlock <1356392126@qq.com>2021-07-23 21:57:42 +0800
committerGlodBlock <1356392126@qq.com>2021-07-23 21:57:42 +0800
commit52e2fddb509f53c6e041cdbfefc44ac63cb05351 (patch)
treee46d611cfea2af36de40914a8fb8c4351c344b49
parent18a0a1de6ffd0a508ef2053f5db78ec3e9e4133d (diff)
downloadGT5-Unofficial-52e2fddb509f53c6e041cdbfefc44ac63cb05351.tar.gz
GT5-Unofficial-52e2fddb509f53c6e041cdbfefc44ac63cb05351.tar.bz2
GT5-Unofficial-52e2fddb509f53c6e041cdbfefc44ac63cb05351.zip
balance UCFE and add thaumcraft lib
-rw-r--r--build.gradle1
-rw-r--r--src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java14
-rw-r--r--src/main/java/GoodGenerator/Loader/RecipeLoader.java4
3 files changed, 13 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle
index eab7dbc4ff..19cf1e9e5e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -93,6 +93,7 @@ dependencies {
setChanging(true)
}*/
compile files('libs/TecTech-1.7.10-4.10.4-d35bc08e.jar')
+ compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
runtime("eu.usrv:YAMCore:${minecraftVersion}-${yamcoreVersion}:deobf");
}
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<UniversalChemicalFuelEngine> 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<FluidStack> input) {
@@ -301,6 +302,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){
if(aActive) return new ITexture[]{
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
);