Skip to content

Commit 99a7e77

Browse files
committed
Use a separate lang string for fixed-chance recipe entries
Used when bonusPerTier for that entry is 0. If a pack uses a custom chance function, this can help avoid confusing tooltips, particularly if they also override the usual lang entry.
1 parent 32a0d65 commit 99a7e77

4 files changed

Lines changed: 11 additions & 6 deletions

File tree

src/main/java/gregtech/integration/jei/recipe/GTRecipeWrapper.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,10 @@ public void getIngredients(IIngredients ingredients) {
108108
public void addTooltip(int slotIndex, boolean input, Object ingredient, List<String> tooltip) {
109109
boolean notConsumed = false;
110110
ChanceEntry entry = null;
111-
if (ingredient instanceof FluidStack) {
112-
FluidStack fluidStack = ((FluidStack) ingredient);
111+
if (ingredient instanceof FluidStack fluidStack) {
113112
if (notConsumedFluidInput.contains(fluidStack))
114113
notConsumed = true;
115-
} else if (ingredient instanceof ItemStack) {
116-
ItemStack itemStack = ((ItemStack) ingredient);
114+
} else if (ingredient instanceof ItemStack itemStack) {
117115
if (notConsumedInput.contains(itemStack))
118116
notConsumed = true;
119117
else entry = chanceOutput.get(itemStack);
@@ -123,8 +121,12 @@ public void addTooltip(int slotIndex, boolean input, Object ingredient, List<Str
123121

124122
if (entry != null && !input) {
125123
double chance = entry.getChance() / 100.0;
126-
double boost = entry.getBoostPerTier() / 100.0;
127-
tooltip.add(I18n.format("gregtech.recipe.chance", chance, boost));
124+
if(entry.getBoostPerTier() > 0) {
125+
double boost = entry.getBoostPerTier() / 100.0;
126+
tooltip.add(I18n.format("gregtech.recipe.chance", chance, boost));
127+
} else {
128+
tooltip.add(I18n.format("gregtech.recipe.fixed_chance", chance));
129+
}
128130
} else if (notConsumed && input) {
129131
tooltip.add(I18n.format("gregtech.recipe.not_consumed"));
130132
}

src/main/resources/assets/gregtech/lang/en_us.lang

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2919,6 +2919,7 @@ gregtech.recipe.duration=Duration: %,.1f secs
29192919
gregtech.recipe.amperage=Amperage: %,d
29202920
gregtech.recipe.not_consumed=Not consumed in process
29212921
gregtech.recipe.chance=Chance: %s%% +%s%%/tier
2922+
gregtech.recipe.fixed_chance=Chance: %s%%
29222923
gregtech.recipe.blast_furnace_temperature=Temperature: %,dK (%s)
29232924
gregtech.recipe.explosive=Explosive: %s
29242925
gregtech.recipe.eu_to_start=Energy To Start: %,dEU

src/main/resources/assets/gregtech/lang/ru_ru.lang

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2828,6 +2828,7 @@ gregtech.recipe.duration=Длительность: %.1f сек.
28282828
gregtech.recipe.amperage=Сила тока: %d
28292829
gregtech.recipe.not_consumed=Не расходуется
28302830
gregtech.recipe.chance=Шанс: %s%% +%s%%/уровень
2831+
gregtech.recipe.fixed_chance=Шанс: %s%%
28312832
gregtech.recipe.blast_furnace_temperature=Температура: %dK (%s)
28322833
gregtech.recipe.eu_to_start=Энергия для запуска: %dEU
28332834

src/main/resources/assets/gregtech/lang/zh_cn.lang

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2810,6 +2810,7 @@ gregtech.recipe.duration=耗时: %.1f 秒
28102810
gregtech.recipe.amperage=电流: %d
28112811
gregtech.recipe.not_consumed=不在加工时消耗
28122812
gregtech.recipe.chance=出产概率: %s%% +%s%%/tier
2813+
gregtech.recipe.fixed_chance=出产概率: %s%%
28132814
gregtech.recipe.blast_furnace_temperature=温度: %d K (%s)
28142815
gregtech.recipe.eu_to_start=启动耗电: %d EU
28152816

0 commit comments

Comments
 (0)