From 2b5465a7016cf6c90aab3aef443fa06e803a55af Mon Sep 17 00:00:00 2001 From: Quarri6343 Date: Fri, 25 Apr 2025 17:13:44 +0900 Subject: [PATCH] SmelteryFuelProvider --- .../tconstruct/plugins/waila/TinkerWaila.java | 2 +- .../wdmla/SearedBlockProgressProvider.java | 20 ++++--- .../plugins/wdmla/SmelteryFluidProvider.java | 27 ++++----- .../plugins/wdmla/SmelteryStatusProvider.java | 58 +++++++++++++++++++ .../tconstruct/plugins/wdmla/TinkerWDMla.java | 8 ++- .../smeltery/logic/SmelteryLogic.java | 8 +++ .../resources/assets/tinker/lang/en_US.lang | 3 +- 7 files changed, 100 insertions(+), 26 deletions(-) create mode 100644 src/main/java/tconstruct/plugins/wdmla/SmelteryStatusProvider.java diff --git a/src/main/java/tconstruct/plugins/waila/TinkerWaila.java b/src/main/java/tconstruct/plugins/waila/TinkerWaila.java index 652ec983..48cd9a63 100644 --- a/src/main/java/tconstruct/plugins/waila/TinkerWaila.java +++ b/src/main/java/tconstruct/plugins/waila/TinkerWaila.java @@ -18,7 +18,7 @@ public class TinkerWaila { @Handler public void init(FMLInitializationEvent event) { - if(Loader.isModLoaded("wdmla")) { + if (Loader.isModLoaded("wdmla")) { return; } diff --git a/src/main/java/tconstruct/plugins/wdmla/SearedBlockProgressProvider.java b/src/main/java/tconstruct/plugins/wdmla/SearedBlockProgressProvider.java index 14fb57d1..a4e25421 100644 --- a/src/main/java/tconstruct/plugins/wdmla/SearedBlockProgressProvider.java +++ b/src/main/java/tconstruct/plugins/wdmla/SearedBlockProgressProvider.java @@ -1,5 +1,11 @@ package tconstruct.plugins.wdmla; +import java.util.Arrays; +import java.util.List; + +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; + import com.gtnewhorizons.wdmla.api.accessor.Accessor; import com.gtnewhorizons.wdmla.api.provider.IClientExtensionProvider; import com.gtnewhorizons.wdmla.api.provider.IServerExtensionProvider; @@ -8,15 +14,12 @@ import com.gtnewhorizons.wdmla.api.view.ProgressView; import com.gtnewhorizons.wdmla.api.view.ViewGroup; import com.gtnewhorizons.wdmla.impl.ui.ThemeHelper; import com.gtnewhorizons.wdmla.util.FormatUtil; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import tconstruct.smeltery.logic.CastingBlockLogic; -import java.util.Arrays; -import java.util.List; +import tconstruct.smeltery.logic.CastingBlockLogic; public enum SearedBlockProgressProvider implements IServerExtensionProvider, IClientExtensionProvider { + INSTANCE; @Override @@ -25,7 +28,8 @@ public enum SearedBlockProgressProvider implements IServerExtensionProvider> getClientGroups(Accessor accessor, List> groups) { + public List> getClientGroups(Accessor accessor, + List> groups) { return ClientViewGroup.map(groups, ProgressView::read, (group, clientGroup) -> { ProgressView view = clientGroup.views.get(0); view.description = ThemeHelper.INSTANCE.value( @@ -37,9 +41,9 @@ public enum SearedBlockProgressProvider implements IServerExtensionProvider> getGroups(Accessor accessor) { - if(accessor.getTarget() instanceof CastingBlockLogic castingBlockLogic) { + if (accessor.getTarget() instanceof CastingBlockLogic castingBlockLogic) { int progress = castingBlockLogic.getProgress(); - if(progress == 0) { + if (progress == 0) { return null; } ProgressView.Data progressData = new ProgressView.Data(progress, 100); diff --git a/src/main/java/tconstruct/plugins/wdmla/SmelteryFluidProvider.java b/src/main/java/tconstruct/plugins/wdmla/SmelteryFluidProvider.java index b863014a..a8cb41d8 100644 --- a/src/main/java/tconstruct/plugins/wdmla/SmelteryFluidProvider.java +++ b/src/main/java/tconstruct/plugins/wdmla/SmelteryFluidProvider.java @@ -1,19 +1,23 @@ package tconstruct.plugins.wdmla; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import net.minecraft.util.ResourceLocation; + import com.gtnewhorizons.wdmla.api.accessor.Accessor; import com.gtnewhorizons.wdmla.api.provider.IClientExtensionProvider; import com.gtnewhorizons.wdmla.api.provider.IServerExtensionProvider; import com.gtnewhorizons.wdmla.api.view.ClientViewGroup; import com.gtnewhorizons.wdmla.api.view.FluidView; import com.gtnewhorizons.wdmla.api.view.ViewGroup; -import net.minecraft.util.ResourceLocation; + import tconstruct.smeltery.logic.SmelteryLogic; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; +public enum SmelteryFluidProvider + implements IServerExtensionProvider, IClientExtensionProvider { -public enum SmelteryFluidProvider implements IServerExtensionProvider, IClientExtensionProvider { INSTANCE; private static final int FLUID_LIMIT = 4; @@ -25,19 +29,16 @@ public enum SmelteryFluidProvider implements IServerExtensionProvider> getGroups(Accessor accessor) { - if(!(accessor.getTarget() instanceof SmelteryLogic smelteryLogic)) { + if (!(accessor.getTarget() instanceof SmelteryLogic smelteryLogic)) { return null; } - if(smelteryLogic.moltenMetal.isEmpty()) { - return Arrays.asList( - new ViewGroup<>(Arrays.asList(new FluidView.Data(null, smelteryLogic.maxLiquid))) - ); + if (smelteryLogic.moltenMetal.isEmpty()) { + return Arrays.asList(new ViewGroup<>(Arrays.asList(new FluidView.Data(null, smelteryLogic.maxLiquid)))); } List> tanks = smelteryLogic.moltenMetal.stream().limit(FLUID_LIMIT).map( - fluidStack -> new ViewGroup<>( - Arrays.asList(new FluidView.Data(fluidStack, smelteryLogic.maxLiquid)))) + fluidStack -> new ViewGroup<>(Arrays.asList(new FluidView.Data(fluidStack, smelteryLogic.maxLiquid)))) .collect(Collectors.toList()); - if(smelteryLogic.moltenMetal.size() > FLUID_LIMIT) { + if (smelteryLogic.moltenMetal.size() > FLUID_LIMIT) { tanks.get(FLUID_LIMIT - 1).getExtraData().setInteger("+", smelteryLogic.moltenMetal.size() - tanks.size()); } return tanks; diff --git a/src/main/java/tconstruct/plugins/wdmla/SmelteryStatusProvider.java b/src/main/java/tconstruct/plugins/wdmla/SmelteryStatusProvider.java new file mode 100644 index 00000000..a6a8063d --- /dev/null +++ b/src/main/java/tconstruct/plugins/wdmla/SmelteryStatusProvider.java @@ -0,0 +1,58 @@ +package tconstruct.plugins.wdmla; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ResourceLocation; + +import com.gtnewhorizons.wdmla.api.accessor.BlockAccessor; +import com.gtnewhorizons.wdmla.api.provider.IBlockComponentProvider; +import com.gtnewhorizons.wdmla.api.provider.IServerDataProvider; +import com.gtnewhorizons.wdmla.api.ui.ITooltip; +import com.gtnewhorizons.wdmla.impl.ui.StatusHelper; + +import tconstruct.smeltery.logic.SmelteryLogic; + +public enum SmelteryStatusProvider implements IBlockComponentProvider, IServerDataProvider { + + INSTANCE; + + @Override + public void appendTooltip(ITooltip tooltip, BlockAccessor accessor) { + if (accessor.getServerData().hasKey("State")) { + int status = accessor.getServerData().getByte("State"); + switch (status) { + case 1: + tooltip.child(StatusHelper.INSTANCE.insufficientFuel()); + break; + case 2: + tooltip.child(StatusHelper.INSTANCE.idle()); + break; + case 3: + tooltip.child(StatusHelper.INSTANCE.runningFine()); + break; + default: + tooltip.child(StatusHelper.INSTANCE.structureIncomplete()); + break; + } + } + } + + @Override + public void appendServerData(NBTTagCompound data, BlockAccessor accessor) { + if (accessor.getTileEntity() instanceof SmelteryLogic logic) { + if (!logic.validStructure) { + data.setByte("State", (byte) 0); + } else if (!logic.hasFuel()) { + data.setByte("State", (byte) 1); + } else if (!logic.isInUse()) { + data.setByte("State", (byte) 2); + } else { + data.setByte("State", (byte) 3); + } + } + } + + @Override + public ResourceLocation getUid() { + return TinkerWDMla.TiC("smeltery_status"); + } +} diff --git a/src/main/java/tconstruct/plugins/wdmla/TinkerWDMla.java b/src/main/java/tconstruct/plugins/wdmla/TinkerWDMla.java index c6fb9e85..7b1fd007 100644 --- a/src/main/java/tconstruct/plugins/wdmla/TinkerWDMla.java +++ b/src/main/java/tconstruct/plugins/wdmla/TinkerWDMla.java @@ -1,16 +1,16 @@ package tconstruct.plugins.wdmla; -import com.gtnewhorizons.wdmla.plugin.universal.FluidStorageProvider; -import com.gtnewhorizons.wdmla.plugin.universal.ItemStorageProvider; -import mantle.blocks.abstracts.InventorySlab; import net.minecraft.util.ResourceLocation; import com.gtnewhorizons.wdmla.api.IWDMlaClientRegistration; import com.gtnewhorizons.wdmla.api.IWDMlaCommonRegistration; import com.gtnewhorizons.wdmla.api.IWDMlaPlugin; import com.gtnewhorizons.wdmla.api.WDMlaPlugin; +import com.gtnewhorizons.wdmla.plugin.universal.FluidStorageProvider; +import com.gtnewhorizons.wdmla.plugin.universal.ItemStorageProvider; import com.gtnewhorizons.wdmla.plugin.vanilla.TECustomNameHeaderProvider; +import mantle.blocks.abstracts.InventorySlab; import mantle.pulsar.pulse.Pulse; import tconstruct.TConstruct; import tconstruct.armor.blocks.DryingRack; @@ -36,6 +36,7 @@ public class TinkerWDMla implements IWDMlaPlugin { registration.registerBlockDataProvider(DryingRackProvider.INSTANCE, DryingRack.class); registration.registerBlockDataProvider(TECustomNameHeaderProvider.INSTANCE, FurnaceSlab.class); registration.registerBlockDataProvider(FurnaceSlabProvider.INSTANCE, FurnaceSlab.class); + registration.registerBlockDataProvider(SmelteryStatusProvider.INSTANCE, SmelteryBlock.class); registration.registerItemStorage(ItemStorageProvider.Extension.INSTANCE, CraftingStationBlock.class); registration.registerItemStorage(ItemStorageProvider.Extension.INSTANCE, ToolStationBlock.class); @@ -56,6 +57,7 @@ public class TinkerWDMla implements IWDMlaPlugin { registration.registerBlockComponent(LandmineHeaderProvider.INSTANCE, BlockLandmine.class); registration.registerBlockComponent(DryingRackProvider.INSTANCE, DryingRack.class); registration.registerBlockComponent(FurnaceSlabProvider.INSTANCE, FurnaceSlab.class); + registration.registerBlockComponent(SmelteryStatusProvider.INSTANCE, SmelteryBlock.class); registration.registerFluidStorageClient(SmelteryFluidProvider.INSTANCE); diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java index 80d31fdc..0c53b6c5 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java @@ -601,6 +601,14 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci return new FluidStack(FluidRegistry.LAVA, 0); } + public boolean hasFuel() { + return activeLavaTank != null; + } + + public boolean isInUse() { + return inUse; + } + public FluidStack getResultFor(ItemStack stack) { return Smeltery.getSmelteryResult(stack); } diff --git a/src/main/resources/assets/tinker/lang/en_US.lang b/src/main/resources/assets/tinker/lang/en_US.lang index 33ef0b80..55d4ae20 100644 --- a/src/main/resources/assets/tinker/lang/en_US.lang +++ b/src/main/resources/assets/tinker/lang/en_US.lang @@ -1208,4 +1208,5 @@ tconstruct.mobsinfocompat.tinkers_construct_beheading_1=If you are using a Cleav provider.wdmla.tconstruct.landmine.header=Landmine Header provider.wdmla.tconstruct.drying.rack=Drying Rack -provider.wdmla.tconstruct.furnace.slab=Slab Furnace \ No newline at end of file +provider.wdmla.tconstruct.furnace.slab=Slab Furnace +provider.wdmla.tconstruct.smeltery.status=Smeltery Status \ No newline at end of file