aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core
diff options
context:
space:
mode:
authorSteelux <70096037+Steelux8@users.noreply.github.com>2022-08-29 17:37:36 +0100
committerGitHub <noreply@github.com>2022-08-29 17:37:36 +0100
commita518e9fa13878c80a7382b4f0a460003865b3596 (patch)
tree8aca6354c0d5115fca781c92ca02c75b277849a8 /src/main/java/gtPlusPlus/core
parent7d1f51a8937e0a86486267437d444696e81e8aa0 (diff)
downloadGT5-Unofficial-a518e9fa13878c80a7382b4f0a460003865b3596.tar.gz
GT5-Unofficial-a518e9fa13878c80a7382b4f0a460003865b3596.tar.bz2
GT5-Unofficial-a518e9fa13878c80a7382b4f0a460003865b3596.zip
Bugfix and Rework of the GT++ Solar Tower (#290)
* Bugfix and Rework of the Solar Tower - Fixed several bugs that prevented the solar tower from recognizing the reflectors; - Added more information on the tooltip; - Reworked the math behind internal heat, and conversion from Cold to Hot Solar Salt; - Removed some MathUtils logs that spammed a log every tick if GT++ logs were enabled; - Changed the values in the conversion from Hot Solar Salt to SH Steam. * Fix Tooltip, Refactor Math * Additional Fixes * spotlessApply (#319) Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Revert "spotlessApply (#319)" This reverts commit d75249d1e98a4f99db072548263065983f86b3a3. * fix Co-authored-by: kuba6000 <kuba.123123.6000@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java10
-rw-r--r--src/main/java/gtPlusPlus/core/util/Utils.java4
-rw-r--r--src/main/java/gtPlusPlus/core/util/math/MathUtils.java4
3 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index f1c4aab409..11764b2c8b 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1497,7 +1497,7 @@ public class RECIPES_GREGTECH {
ItemUtils.getItemStackOfAmountFromOreDict("stickBlackSteel", 8)
},
null,
- ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard, 64),
+ ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard, 32),
30 * 20,
500);
@@ -1710,7 +1710,7 @@ public class RECIPES_GREGTECH {
CORE.RA.addSixSlotAssemblingRecipe(
new ItemStack[] {
ItemUtils.getGregtechCircuit(17),
- ItemUtils.getItemStackOfAmountFromOreDict("plateTrinium", GTNH ? 64 : 32),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateRefinedTrinium", GTNH ? 64 : 32),
CI.getSensor(6, GTNH ? 6 : 3),
CI.getBolt(7, GTNH ? 64 : 32),
ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", GTNH ? 64 : 32),
@@ -1847,9 +1847,9 @@ public class RECIPES_GREGTECH {
0);
HotFuel.addNewHotFuel(
- MISC_MATERIALS.SOLAR_SALT_HOT.getFluidStack(1000),
- MISC_MATERIALS.SOLAR_SALT_COLD.getFluidStack(1000),
- FluidUtils.getSuperHeatedSteam(10000),
+ MISC_MATERIALS.SOLAR_SALT_HOT.getFluidStack(100),
+ MISC_MATERIALS.SOLAR_SALT_COLD.getFluidStack(100),
+ FluidUtils.getSuperHeatedSteam(100000),
0);
/*
diff --git a/src/main/java/gtPlusPlus/core/util/Utils.java b/src/main/java/gtPlusPlus/core/util/Utils.java
index 274d180de8..2242b7e673 100644
--- a/src/main/java/gtPlusPlus/core/util/Utils.java
+++ b/src/main/java/gtPlusPlus/core/util/Utils.java
@@ -373,8 +373,8 @@ public class Utils {
final Color c = new Color(r, g, b);
String temp = Integer.toHexString(c.getRGB() & 0xFFFFFF).toUpperCase();
temp = Utils.appenedHexNotationToString(String.valueOf(temp));
- Logger.WARNING("Made " + temp + " - Hopefully it's not a mess.");
- Logger.WARNING("It will decode into " + Integer.decode(temp) + ".");
+ // Logger.WARNING("Made " + temp + " - Hopefully it's not a mess.");
+ // Logger.WARNING("It will decode into " + Integer.decode(temp) + ".");
return Integer.decode(temp);
}
diff --git a/src/main/java/gtPlusPlus/core/util/math/MathUtils.java b/src/main/java/gtPlusPlus/core/util/math/MathUtils.java
index 54a5ef8668..98032fc43f 100644
--- a/src/main/java/gtPlusPlus/core/util/math/MathUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/math/MathUtils.java
@@ -304,8 +304,8 @@ public class MathUtils {
Logger.WARNING("Operating with " + temp);
temp = Utils.appenedHexNotationToString(String.valueOf(temp));
- Logger.WARNING("Made " + temp + " - Hopefully it's not a mess.");
- Logger.WARNING("It will decode into " + Integer.decode(temp) + ".");
+ // Logger.WARNING("Made "+temp+" - Hopefully it's not a mess.");
+ // Logger.WARNING("It will decode into "+Integer.decode(temp)+".");
return Integer.decode(temp);
}