aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/objects/overclockdescriber
diff options
context:
space:
mode:
authorNotAPenguin <michiel.vandeginste@gmail.com>2024-09-02 23:17:17 +0200
committerGitHub <noreply@github.com>2024-09-02 23:17:17 +0200
commit1b820de08a05070909a267e17f033fcf58ac8710 (patch)
tree02831a025986a06b20f87e5bcc69d1e0c639a342 /src/main/java/gregtech/api/objects/overclockdescriber
parentafd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff)
downloadGT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz
GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2
GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip
The Great Renaming (#3014)
* move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names
Diffstat (limited to 'src/main/java/gregtech/api/objects/overclockdescriber')
-rw-r--r--src/main/java/gregtech/api/objects/overclockdescriber/EUNoOverclockDescriber.java38
-rw-r--r--src/main/java/gregtech/api/objects/overclockdescriber/EUOverclockDescriber.java34
-rw-r--r--src/main/java/gregtech/api/objects/overclockdescriber/FusionOverclockDescriber.java16
-rw-r--r--src/main/java/gregtech/api/objects/overclockdescriber/OverclockDescriber.java36
-rw-r--r--src/main/java/gregtech/api/objects/overclockdescriber/SteamOverclockDescriber.java20
5 files changed, 72 insertions, 72 deletions
diff --git a/src/main/java/gregtech/api/objects/overclockdescriber/EUNoOverclockDescriber.java b/src/main/java/gregtech/api/objects/overclockdescriber/EUNoOverclockDescriber.java
index 1e29e2d812..6f73b5467a 100644
--- a/src/main/java/gregtech/api/objects/overclockdescriber/EUNoOverclockDescriber.java
+++ b/src/main/java/gregtech/api/objects/overclockdescriber/EUNoOverclockDescriber.java
@@ -1,13 +1,13 @@
package gregtech.api.objects.overclockdescriber;
-import static gregtech.api.util.GT_Utility.trans;
+import static gregtech.api.util.GTUtility.trans;
import javax.annotation.ParametersAreNonnullByDefault;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
import gregtech.api.util.MethodsReturnNonnullByDefault;
+import gregtech.api.util.OverclockCalculator;
import gregtech.nei.RecipeDisplayInfo;
@ParametersAreNonnullByDefault
@@ -28,13 +28,13 @@ public class EUNoOverclockDescriber extends OverclockDescriber {
}
@Override
- public GT_OverclockCalculator createCalculator(GT_OverclockCalculator template, GT_Recipe recipe) {
- return GT_OverclockCalculator.ofNoOverclock(recipe);
+ public OverclockCalculator createCalculator(OverclockCalculator template, GTRecipe recipe) {
+ return OverclockCalculator.ofNoOverclock(recipe);
}
@Override
public String getTierString() {
- return GT_Utility.getColoredTierNameFromTier(tier);
+ return GTUtility.getColoredTierNameFromTier(tier);
}
@Override
@@ -60,48 +60,48 @@ public class EUNoOverclockDescriber extends OverclockDescriber {
}
}
- protected String getTotalPowerString(GT_OverclockCalculator calculator) {
- return GT_Utility.formatNumbers(calculator.getConsumption() * calculator.getDuration()) + " EU";
+ protected String getTotalPowerString(OverclockCalculator calculator) {
+ return GTUtility.formatNumbers(calculator.getConsumption() * calculator.getDuration()) + " EU";
}
/**
* @return If amperage should be shown on NEI.
*/
- protected boolean shouldShowAmperage(GT_OverclockCalculator calculator) {
+ protected boolean shouldShowAmperage(OverclockCalculator calculator) {
return amperage != 1;
}
/**
* @return Whole EU/t usage, without tier display.
*/
- protected String getEUtWithoutTier(GT_OverclockCalculator calculator) {
- return GT_Utility.formatNumbers(calculator.getConsumption()) + " EU/t";
+ protected String getEUtWithoutTier(OverclockCalculator calculator) {
+ return GTUtility.formatNumbers(calculator.getConsumption()) + " EU/t";
}
/**
* @return Whole EU/t usage, with tier display.
*/
- protected String getEUtWithTier(GT_OverclockCalculator calculator) {
- return getEUtWithoutTier(calculator) + GT_Utility.getTierNameWithParentheses(calculator.getConsumption());
+ protected String getEUtWithTier(OverclockCalculator calculator) {
+ return getEUtWithoutTier(calculator) + GTUtility.getTierNameWithParentheses(calculator.getConsumption());
}
/**
* @return Whole EU/t usage. Also displays voltage tier if it should be shown.
*/
- protected String getEUtDisplay(GT_OverclockCalculator calculator) {
+ protected String getEUtDisplay(OverclockCalculator calculator) {
return shouldShowAmperage(calculator) ? getEUtWithoutTier(calculator) : getEUtWithTier(calculator);
}
/**
* @return EU/t usage, divided by amperage. With tier display.
*/
- protected String getVoltageString(GT_OverclockCalculator calculator) {
+ protected String getVoltageString(OverclockCalculator calculator) {
long voltage = computeVoltageForEURate(calculator.getConsumption());
- return GT_Utility.formatNumbers(voltage) + " EU/t" + GT_Utility.getTierNameWithParentheses(voltage);
+ return GTUtility.formatNumbers(voltage) + " EU/t" + GTUtility.getTierNameWithParentheses(voltage);
}
- protected String getAmperageString(GT_OverclockCalculator calculator) {
- return GT_Utility.formatNumbers(amperage);
+ protected String getAmperageString(OverclockCalculator calculator) {
+ return GTUtility.formatNumbers(amperage);
}
protected long computeVoltageForEURate(long euPerTick) {
diff --git a/src/main/java/gregtech/api/objects/overclockdescriber/EUOverclockDescriber.java b/src/main/java/gregtech/api/objects/overclockdescriber/EUOverclockDescriber.java
index 9d53711515..42b459e874 100644
--- a/src/main/java/gregtech/api/objects/overclockdescriber/EUOverclockDescriber.java
+++ b/src/main/java/gregtech/api/objects/overclockdescriber/EUOverclockDescriber.java
@@ -1,17 +1,17 @@
package gregtech.api.objects.overclockdescriber;
-import static gregtech.api.enums.GT_Values.V;
-import static gregtech.api.util.GT_Utility.trans;
+import static gregtech.api.enums.GTValues.V;
+import static gregtech.api.util.GTUtility.trans;
import javax.annotation.ParametersAreNonnullByDefault;
import com.google.common.primitives.Ints;
-import gregtech.GT_Mod;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.GTMod;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
import gregtech.api.util.MethodsReturnNonnullByDefault;
+import gregtech.api.util.OverclockCalculator;
import gregtech.nei.RecipeDisplayInfo;
@ParametersAreNonnullByDefault
@@ -23,7 +23,7 @@ public class EUOverclockDescriber extends EUNoOverclockDescriber {
}
@Override
- public GT_OverclockCalculator createCalculator(GT_OverclockCalculator template, GT_Recipe recipe) {
+ public OverclockCalculator createCalculator(OverclockCalculator template, GTRecipe recipe) {
return template.setEUt(Ints.saturatedCast(V[tier] * amperage));
}
@@ -38,9 +38,9 @@ public class EUOverclockDescriber extends EUNoOverclockDescriber {
if (shouldShowAmperage(recipeInfo.calculator)) {
recipeInfo.drawText(trans("154", "Voltage: ") + getVoltageString(recipeInfo.calculator));
}
- if (GT_Mod.gregtechproxy.mNEIOriginalVoltage) {
+ if (GTMod.gregtechproxy.mNEIOriginalVoltage) {
EUNoOverclockDescriber originalPower = new EUNoOverclockDescriber(tier, amperage);
- GT_OverclockCalculator originalPowerCalculator = GT_OverclockCalculator.ofNoOverclock(recipeInfo.recipe)
+ OverclockCalculator originalPowerCalculator = OverclockCalculator.ofNoOverclock(recipeInfo.recipe)
.calculate();
recipeInfo
.drawText(trans("275", "Original usage: ") + originalPower.getEUtDisplay(originalPowerCalculator));
@@ -51,30 +51,30 @@ public class EUOverclockDescriber extends EUNoOverclockDescriber {
}
@Override
- protected String getEUtWithoutTier(GT_OverclockCalculator calculator) {
+ protected String getEUtWithoutTier(OverclockCalculator calculator) {
return decorateWithOverclockLabel(super.getEUtWithoutTier(calculator), calculator);
}
@Override
- protected String getEUtWithTier(GT_OverclockCalculator calculator) {
- return this.getEUtWithoutTier(calculator) + GT_Utility.getTierNameWithParentheses(calculator.getConsumption());
+ protected String getEUtWithTier(OverclockCalculator calculator) {
+ return this.getEUtWithoutTier(calculator) + GTUtility.getTierNameWithParentheses(calculator.getConsumption());
}
@Override
- protected String getVoltageString(GT_OverclockCalculator calculator) {
+ protected String getVoltageString(OverclockCalculator calculator) {
long voltage = computeVoltageForEURate(calculator.getConsumption());
- return decorateWithOverclockLabel(GT_Utility.formatNumbers(voltage) + " EU/t", calculator)
- + GT_Utility.getTierNameWithParentheses(voltage);
+ return decorateWithOverclockLabel(GTUtility.formatNumbers(voltage) + " EU/t", calculator)
+ + GTUtility.getTierNameWithParentheses(voltage);
}
- protected String decorateWithOverclockLabel(String s, GT_OverclockCalculator calculator) {
+ protected String decorateWithOverclockLabel(String s, OverclockCalculator calculator) {
if (wasOverclocked(calculator)) {
s += " (OC)";
}
return s;
}
- protected boolean wasOverclocked(GT_OverclockCalculator calculator) {
+ protected boolean wasOverclocked(OverclockCalculator calculator) {
return calculator.getPerformedOverclocks() > 0;
}
}
diff --git a/src/main/java/gregtech/api/objects/overclockdescriber/FusionOverclockDescriber.java b/src/main/java/gregtech/api/objects/overclockdescriber/FusionOverclockDescriber.java
index b570ebcab5..019af073f0 100644
--- a/src/main/java/gregtech/api/objects/overclockdescriber/FusionOverclockDescriber.java
+++ b/src/main/java/gregtech/api/objects/overclockdescriber/FusionOverclockDescriber.java
@@ -4,11 +4,11 @@ import javax.annotation.ParametersAreNonnullByDefault;
import net.minecraft.util.EnumChatFormatting;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
import gregtech.api.util.MethodsReturnNonnullByDefault;
+import gregtech.api.util.OverclockCalculator;
import gregtech.nei.formatter.FusionSpecialValueFormatter;
@ParametersAreNonnullByDefault
@@ -23,7 +23,7 @@ public class FusionOverclockDescriber extends EUOverclockDescriber {
}
@Override
- public GT_OverclockCalculator createCalculator(GT_OverclockCalculator template, GT_Recipe recipe) {
+ public OverclockCalculator createCalculator(OverclockCalculator template, GTRecipe recipe) {
return super.createCalculator(template, recipe)
.limitOverclockCount(overclock(recipe.mSpecialValue, recipe.mEUt))
.setEUtIncreasePerOC(getEUtIncreasePerOC())
@@ -40,12 +40,12 @@ public class FusionOverclockDescriber extends EUOverclockDescriber {
@Override
public String getTierString() {
- return GT_Values.TIER_COLORS[tier] + "MK " + getFusionTier() + EnumChatFormatting.RESET;
+ return GTValues.TIER_COLORS[tier] + "MK " + getFusionTier() + EnumChatFormatting.RESET;
}
@Override
- public boolean canHandle(GT_Recipe recipe) {
- byte tier = GT_Utility.getTier(recipe.mEUt);
+ public boolean canHandle(GTRecipe recipe) {
+ byte tier = GTUtility.getTier(recipe.mEUt);
if (this.tier < tier) {
return false;
}
diff --git a/src/main/java/gregtech/api/objects/overclockdescriber/OverclockDescriber.java b/src/main/java/gregtech/api/objects/overclockdescriber/OverclockDescriber.java
index 0b253c95fa..9f995e4758 100644
--- a/src/main/java/gregtech/api/objects/overclockdescriber/OverclockDescriber.java
+++ b/src/main/java/gregtech/api/objects/overclockdescriber/OverclockDescriber.java
@@ -1,14 +1,14 @@
package gregtech.api.objects.overclockdescriber;
-import static gregtech.api.util.GT_Utility.trans;
+import static gregtech.api.util.GTUtility.trans;
import javax.annotation.ParametersAreNonnullByDefault;
-import gregtech.GT_Mod;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.GTMod;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
import gregtech.api.util.MethodsReturnNonnullByDefault;
+import gregtech.api.util.OverclockCalculator;
import gregtech.nei.RecipeDisplayInfo;
/**
@@ -45,12 +45,12 @@ public abstract class OverclockDescriber {
/**
* Creates overclock calculator from given template. This template should be used instead of building from the
* ground to avoid issues coming from different caller using different templates, but it's not applicable when using
- * {@link GT_OverclockCalculator#ofNoOverclock(GT_Recipe)}.
+ * {@link OverclockCalculator#ofNoOverclock(GTRecipe)}.
*
* @param template Calculator that can be used as template. Recipe EU/t and duration are already set.
* @param recipe Recipe to calculate.
*/
- public abstract GT_OverclockCalculator createCalculator(GT_OverclockCalculator template, GT_Recipe recipe);
+ public abstract OverclockCalculator createCalculator(OverclockCalculator template, GTRecipe recipe);
/**
* Draws info about the energy this object can handle on NEI recipe GUI.
@@ -61,7 +61,7 @@ public abstract class OverclockDescriber {
if (getDurationTicks(recipeInfo.calculator) <= 0) return;
String textToDraw = trans("158", "Time: ");
- if (GT_Mod.gregtechproxy.mNEIRecipeSecondMode) {
+ if (GTMod.gregtechproxy.mNEIRecipeSecondMode) {
textToDraw += getDurationStringSeconds(recipeInfo.calculator);
if (getDurationSeconds(recipeInfo.calculator) <= 1.0d) {
textToDraw += String.format(" (%s)", getDurationStringTicks(recipeInfo.calculator));
@@ -81,26 +81,26 @@ public abstract class OverclockDescriber {
*
* @return If this object can handle the supplied recipe
*/
- public boolean canHandle(GT_Recipe recipe) {
- byte tier = GT_Utility.getTier(recipe.mEUt);
+ public boolean canHandle(GTRecipe recipe) {
+ byte tier = GTUtility.getTier(recipe.mEUt);
return this.tier >= tier;
}
- private int getDurationTicks(GT_OverclockCalculator calculator) {
+ private int getDurationTicks(OverclockCalculator calculator) {
return calculator.getDuration();
}
- private double getDurationSeconds(GT_OverclockCalculator calculator) {
+ private double getDurationSeconds(OverclockCalculator calculator) {
return 0.05d * getDurationTicks(calculator);
}
- private String getDurationStringSeconds(GT_OverclockCalculator calculator) {
- return GT_Utility.formatNumbers(getDurationSeconds(calculator)) + GT_Utility.trans("161", " secs");
+ private String getDurationStringSeconds(OverclockCalculator calculator) {
+ return GTUtility.formatNumbers(getDurationSeconds(calculator)) + GTUtility.trans("161", " secs");
}
- private String getDurationStringTicks(GT_OverclockCalculator calculator) {
- String ticksString = getDurationTicks(calculator) == 1 ? GT_Utility.trans("209.1", " tick")
- : GT_Utility.trans("209", " ticks");
- return GT_Utility.formatNumbers(getDurationTicks(calculator)) + ticksString;
+ private String getDurationStringTicks(OverclockCalculator calculator) {
+ String ticksString = getDurationTicks(calculator) == 1 ? GTUtility.trans("209.1", " tick")
+ : GTUtility.trans("209", " ticks");
+ return GTUtility.formatNumbers(getDurationTicks(calculator)) + ticksString;
}
}
diff --git a/src/main/java/gregtech/api/objects/overclockdescriber/SteamOverclockDescriber.java b/src/main/java/gregtech/api/objects/overclockdescriber/SteamOverclockDescriber.java
index 5da64d4028..3a2da01b08 100644
--- a/src/main/java/gregtech/api/objects/overclockdescriber/SteamOverclockDescriber.java
+++ b/src/main/java/gregtech/api/objects/overclockdescriber/SteamOverclockDescriber.java
@@ -1,16 +1,16 @@
package gregtech.api.objects.overclockdescriber;
-import static gregtech.api.util.GT_Utility.trans;
+import static gregtech.api.util.GTUtility.trans;
import javax.annotation.ParametersAreNonnullByDefault;
import net.minecraft.util.StatCollector;
import gregtech.api.enums.SteamVariant;
-import gregtech.api.util.GT_OverclockCalculator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
import gregtech.api.util.MethodsReturnNonnullByDefault;
+import gregtech.api.util.OverclockCalculator;
import gregtech.nei.RecipeDisplayInfo;
@ParametersAreNonnullByDefault
@@ -34,8 +34,8 @@ public class SteamOverclockDescriber extends OverclockDescriber {
}
@Override
- public GT_OverclockCalculator createCalculator(GT_OverclockCalculator template, GT_Recipe recipe) {
- return GT_OverclockCalculator.ofNoOverclock(recipe)
+ public OverclockCalculator createCalculator(OverclockCalculator template, GTRecipe recipe) {
+ return OverclockCalculator.ofNoOverclock(recipe)
.setEUtDiscount(euPerTickMultiplier)
.setSpeedBoost(durationMultiplier);
}
@@ -48,13 +48,13 @@ public class SteamOverclockDescriber extends OverclockDescriber {
recipeInfo.drawText(trans("153", "Usage: ") + getSteamUsageString(recipeInfo.calculator));
}
- private String getTotalPowerString(GT_OverclockCalculator calculator) {
- return GT_Utility.formatNumbers(convertEUToSteam(calculator.getConsumption() * calculator.getDuration()))
+ private String getTotalPowerString(OverclockCalculator calculator) {
+ return GTUtility.formatNumbers(convertEUToSteam(calculator.getConsumption() * calculator.getDuration()))
+ " Steam";
}
- private String getSteamUsageString(GT_OverclockCalculator calculator) {
- return GT_Utility.formatNumbers(20 * convertEUToSteam(calculator.getConsumption())) + " L/s Steam";
+ private String getSteamUsageString(OverclockCalculator calculator) {
+ return GTUtility.formatNumbers(20 * convertEUToSteam(calculator.getConsumption())) + " L/s Steam";
}
private static long convertEUToSteam(long eu) {