Skip to content

Commit 54c5863

Browse files
authored
Include Steam Grinder/Smelter for TOP/HWYLA changes (GregTechCEu#2033)
1 parent 259516b commit 54c5863

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

src/main/java/gregtech/integration/hwyla/provider/RecipeLogicDataProvider.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
import gregtech.api.GTValues;
44
import gregtech.api.capability.GregtechTileCapabilities;
55
import gregtech.api.capability.impl.AbstractRecipeLogic;
6+
import gregtech.api.metatileentity.MetaTileEntity;
67
import gregtech.api.metatileentity.SteamMetaTileEntity;
78
import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
9+
import gregtech.api.metatileentity.multiblock.RecipeMapSteamMultiblockController;
810
import gregtech.api.unification.material.Materials;
911
import gregtech.api.util.GTUtility;
1012
import gregtech.common.metatileentities.multi.MetaTileEntityLargeBoiler;
@@ -64,10 +66,11 @@ public List<String> getWailaBody(ItemStack itemStack, List<String> tooltip, IWai
6466
String endText = null;
6567

6668
if (accessor.getTileEntity() instanceof IGregTechTileEntity gtte) {
67-
if (gtte.getMetaTileEntity() instanceof SteamMetaTileEntity || gtte.getMetaTileEntity() instanceof MetaTileEntityLargeBoiler) {
68-
endText = ": " + absEUt + TextFormatting.RESET + " L/t " + I18n.format("gregtech.top.steam")+ " " + I18n.format(Materials.Steam.getUnlocalizedName());
69+
MetaTileEntity mte = gtte.getMetaTileEntity();
70+
if (mte instanceof SteamMetaTileEntity || mte instanceof MetaTileEntityLargeBoiler || mte instanceof RecipeMapSteamMultiblockController) {
71+
endText = ": " + absEUt + TextFormatting.RESET + " L/t " + I18n.format("gregtech.top.of") + " " + I18n.format(Materials.Steam.getUnlocalizedName());
6972
}
70-
AbstractRecipeLogic arl = gtte.getMetaTileEntity().getRecipeLogic();
73+
AbstractRecipeLogic arl = mte.getRecipeLogic();
7174
if (arl != null) {
7275
consumer = arl.consumesEnergy();
7376
}

src/main/java/gregtech/integration/theoneprobe/provider/RecipeLogicInfoProvider.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import gregtech.api.metatileentity.MetaTileEntity;
88
import gregtech.api.metatileentity.SteamMetaTileEntity;
99
import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
10+
import gregtech.api.metatileentity.multiblock.RecipeMapSteamMultiblockController;
1011
import gregtech.api.unification.material.Materials;
1112
import gregtech.api.util.GTUtility;
1213
import gregtech.common.metatileentities.multi.MetaTileEntityLargeBoiler;
@@ -42,14 +43,13 @@ protected void addProbeInfo(@Nonnull AbstractRecipeLogic capability, @Nonnull IP
4243
}
4344
int EUt = capability.getInfoProviderEUt();
4445
int absEUt = Math.abs(EUt);
45-
boolean consumer = capability.consumesEnergy();
4646
String text = null;
4747

4848
if (tileEntity instanceof IGregTechTileEntity) {
4949
IGregTechTileEntity gtTileEntity = (IGregTechTileEntity) tileEntity;
5050
MetaTileEntity mte = gtTileEntity.getMetaTileEntity();
51-
if (mte instanceof SteamMetaTileEntity || mte instanceof MetaTileEntityLargeBoiler) {
52-
text = TextFormatting.RED.toString() + absEUt + TextStyleClass.INFO + " L/t {*gregtech.top.steam*} {*" + Materials.Steam.getUnlocalizedName() + "*}";
51+
if (mte instanceof SteamMetaTileEntity || mte instanceof MetaTileEntityLargeBoiler || mte instanceof RecipeMapSteamMultiblockController) {
52+
text = TextFormatting.RED.toString() + absEUt + TextStyleClass.INFO + " L/t {*gregtech.top.of*} {*" + Materials.Steam.getUnlocalizedName() + "*}";
5353
}
5454
}
5555
if (text == null) {
@@ -59,7 +59,7 @@ protected void addProbeInfo(@Nonnull AbstractRecipeLogic capability, @Nonnull IP
5959

6060
if (EUt == 0) return; // idk what to do for 0 eut
6161

62-
if (consumer) {
62+
if (capability.consumesEnergy()) {
6363
probeInfo.text(TextStyleClass.INFO + "{*gregtech.top.energy_consumption*} " + text);
6464
} else {
6565
probeInfo.text(TextStyleClass.INFO + "{*gregtech.top.energy_production*} " + text);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ gregtech.top.working_disabled=Working Disabled
5757

5858
gregtech.top.energy_consumption=Using
5959
gregtech.top.energy_production=Producing
60-
gregtech.top.steam=of
60+
gregtech.top.of=of
6161

6262
gregtech.top.transform_up=Step Up
6363
gregtech.top.transform_down=Step Down

0 commit comments

Comments
 (0)