Skip to content

Commit 676dcdb

Browse files
committed
refactor: Remove individual hud info support, use Balm's common hud info support
1 parent beadcbc commit 676dcdb

26 files changed

Lines changed: 146 additions & 466 deletions

common/dependencies.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,4 @@ dependencies {
22
implementation(libs.balmCommon) {
33
changing = libs.versions.balm.get().endsWith("SNAPSHOT")
44
}
5-
compileOnly "mezz.jei:jei-$jei_minecraft_version-common-api:$jei_version"
6-
7-
compileOnly "mcp.mobius.waila:wthit-api:mojmap-$wthit_version"
85
}

common/src/main/java/net/blay09/mods/cookingforblockheads/CookingForBlockheads.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import net.blay09.mods.cookingforblockheads.client.gui.NameSortButton;
1414
import net.blay09.mods.cookingforblockheads.client.gui.SaturationSortButton;
1515
import net.blay09.mods.cookingforblockheads.compat.Compat;
16+
import net.blay09.mods.cookingforblockheads.compat.hudinfo.ModHudInfo;
1617
import net.blay09.mods.cookingforblockheads.component.ModDataComponents;
1718
import net.blay09.mods.cookingforblockheads.crafting.KitchenShapedRecipeHandler;
1819
import net.blay09.mods.cookingforblockheads.crafting.KitchenShapelessRecipeHandler;
@@ -93,6 +94,8 @@ public int getNutrition(ItemStack itemStack, Player entityPlayer) {
9394
});
9495

9596
LivingEntityCallback.Damage.Before.EVENT.register(CowJarHandler::onLivingDamage);
97+
98+
ModHudInfo.initialize(Balm.modSupport().hudInfo());
9699
}
97100

98101
public static Identifier id(String path) {

common/src/main/java/net/blay09/mods/cookingforblockheads/compat/Compat.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
public class Compat {
1111

1212
public static final String HARVESTCRAFT_FOOD_CORE = "pamhc2foodcore";
13-
public static final String THEONEPROBE = "theoneprobe";
1413
public static final String APPLECORE = "applecore";
1514
public static final String EX_COMPRESSUM = "excompressum";
1615
public static final String SPICE_OF_LIFE = "solcarrot";

common/src/main/java/net/blay09/mods/cookingforblockheads/compat/CookingForBlockheadsWailaUtils.java

Lines changed: 0 additions & 77 deletions
This file was deleted.

common/src/main/java/net/blay09/mods/cookingforblockheads/compat/WTHITCookingForBlockheadsPlugin.java

Lines changed: 0 additions & 32 deletions
This file was deleted.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package net.blay09.mods.cookingforblockheads.compat.hudinfo;
2+
3+
import net.blay09.mods.balm.platform.compatibility.hudinfo.BlockInfoContext;
4+
import net.blay09.mods.balm.platform.compatibility.hudinfo.HudInfoOutput;
5+
import net.blay09.mods.cookingforblockheads.block.entity.CowJarBlockEntity;
6+
7+
public class CowJarBlockInfoProvider extends MilkJarBlockInfoProvider {
8+
@Override
9+
public void apply(BlockInfoContext context, HudInfoOutput output) {
10+
if (context.blockEntity() instanceof CowJarBlockEntity cowJar) {
11+
if (cowJar.getCustomName() != null) {
12+
output.text(cowJar.getCustomName());
13+
}
14+
}
15+
}
16+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package net.blay09.mods.cookingforblockheads.compat.hudinfo;
2+
3+
import net.blay09.mods.balm.platform.compatibility.hudinfo.BlockInfoContext;
4+
import net.blay09.mods.balm.platform.compatibility.hudinfo.BlockInfoProvider;
5+
import net.blay09.mods.balm.platform.compatibility.hudinfo.HudInfoOutput;
6+
import net.blay09.mods.cookingforblockheads.block.entity.FridgeBlockEntity;
7+
import net.minecraft.network.chat.Component;
8+
9+
public class FridgeBlockInfoProvider implements BlockInfoProvider {
10+
@Override
11+
public void apply(BlockInfoContext context, HudInfoOutput output) {
12+
if(context.blockEntity() instanceof FridgeBlockEntity fridge) {
13+
if (fridge.getBaseFridge().hasIceUpgrade()) {
14+
output.text(Component.translatable("waila.cookingforblockheads.ice_unit"));
15+
}
16+
}
17+
}
18+
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package net.blay09.mods.cookingforblockheads.compat.hudinfo;
2+
3+
import net.blay09.mods.balm.platform.compatibility.hudinfo.BlockInfoContext;
4+
import net.blay09.mods.balm.platform.compatibility.hudinfo.BlockInfoProvider;
5+
import net.blay09.mods.balm.platform.compatibility.hudinfo.HudInfoOutput;
6+
import net.blay09.mods.cookingforblockheads.block.entity.MilkJarBlockEntity;
7+
import net.minecraft.network.chat.Component;
8+
9+
public class MilkJarBlockInfoProvider implements BlockInfoProvider {
10+
@Override
11+
public void apply(BlockInfoContext context, HudInfoOutput output) {
12+
if (context.blockEntity() instanceof MilkJarBlockEntity milkJar) {
13+
output.text(Component.translatable("waila.cookingforblockheads.milk_stored", milkJar.getFluidTank().getAmount(), milkJar.getFluidTank().getCapacity()));
14+
}
15+
}
16+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package net.blay09.mods.cookingforblockheads.compat.hudinfo;
2+
3+
import net.blay09.mods.balm.platform.compatibility.hudinfo.BalmModSupportHudInfo;
4+
import net.blay09.mods.cookingforblockheads.block.ModBlocks;
5+
6+
import static net.blay09.mods.cookingforblockheads.CookingForBlockheads.id;
7+
8+
public class ModHudInfo {
9+
public static void initialize(BalmModSupportHudInfo hudInfo) {
10+
hudInfo.registerBlockInfo(id("milk_jar"), ModBlocks.milkJar, new MilkJarBlockInfoProvider());
11+
hudInfo.registerBlockInfo(id("cow_jar"), ModBlocks.cowJar, new CowJarBlockInfoProvider());
12+
hudInfo.registerBlockInfo(id("toaster"), ModBlocks.toaster, new ToasterBlockInfoProvider());
13+
ModBlocks.ovens.forEach((color, oven) -> hudInfo.registerBlockInfo(id("oven"), oven, new OvenBlockInfoProvider()));
14+
ModBlocks.fridges.forEach((color, fridge) -> hudInfo.registerBlockInfo(id("fridge"), fridge, new FridgeBlockInfoProvider()));
15+
ModBlocks.sinks.forEach((color, sink) -> hudInfo.registerBlockInfo(id("sink"), sink, new SinkBlockInfoProvider()));
16+
17+
hudInfo.registerGlobalBlockInfo(id("preservation_chamber"), new UpgradeablePreservationBlockInfoProvider());
18+
}
19+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package net.blay09.mods.cookingforblockheads.compat.hudinfo;
2+
3+
import net.blay09.mods.balm.platform.compatibility.hudinfo.BlockInfoContext;
4+
import net.blay09.mods.balm.platform.compatibility.hudinfo.BlockInfoProvider;
5+
import net.blay09.mods.balm.platform.compatibility.hudinfo.HudInfoOutput;
6+
import net.blay09.mods.cookingforblockheads.block.entity.OvenBlockEntity;
7+
import net.minecraft.network.chat.Component;
8+
9+
public class OvenBlockInfoProvider implements BlockInfoProvider {
10+
@Override
11+
public void apply(BlockInfoContext context, HudInfoOutput output) {
12+
if (context.blockEntity() instanceof OvenBlockEntity oven) {
13+
if (oven.hasPowerUpgrade()) {
14+
output.text(Component.translatable("waila.cookingforblockheads.heating_unit"));
15+
}
16+
}
17+
}
18+
}

0 commit comments

Comments
 (0)