diff --git a/src/main/java/tconstruct/plugins/waila/TinkerWaila.java b/src/main/java/tconstruct/plugins/waila/TinkerWaila.java index 66863cf7..652ec983 100644 --- a/src/main/java/tconstruct/plugins/waila/TinkerWaila.java +++ b/src/main/java/tconstruct/plugins/waila/TinkerWaila.java @@ -1,5 +1,6 @@ package tconstruct.plugins.waila; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @@ -17,6 +18,10 @@ public class TinkerWaila { @Handler public void init(FMLInitializationEvent event) { + if(Loader.isModLoaded("wdmla")) { + return; + } + TConstruct.logger.info("Waila detected. Registering TConstruct tank blocks with Waila registry."); FMLInterModComms.sendMessage("Waila", "register", "tconstruct.plugins.waila.WailaRegistrar.wailaCallback"); } diff --git a/src/main/java/tconstruct/plugins/wdmla/SmelteryFluidProvider.java b/src/main/java/tconstruct/plugins/wdmla/SmelteryFluidProvider.java new file mode 100644 index 00000000..b863014a --- /dev/null +++ b/src/main/java/tconstruct/plugins/wdmla/SmelteryFluidProvider.java @@ -0,0 +1,50 @@ +package tconstruct.plugins.wdmla; + +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 { + INSTANCE; + + private static final int FLUID_LIMIT = 4; + + @Override + public List> getClientGroups(Accessor accessor, List> groups) { + return ClientViewGroup.map(groups, FluidView::readDefault, (group, clientGroup) -> {}); + } + + @Override + public List> getGroups(Accessor accessor) { + 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))) + ); + } + List> tanks = smelteryLogic.moltenMetal.stream().limit(FLUID_LIMIT).map( + fluidStack -> new ViewGroup<>( + Arrays.asList(new FluidView.Data(fluidStack, smelteryLogic.maxLiquid)))) + .collect(Collectors.toList()); + if(smelteryLogic.moltenMetal.size() > FLUID_LIMIT) { + tanks.get(FLUID_LIMIT - 1).getExtraData().setInteger("+", smelteryLogic.moltenMetal.size() - tanks.size()); + } + return tanks; + } + + @Override + public ResourceLocation getUid() { + return TinkerWDMla.TiC("smeltery_fluid"); + } +} diff --git a/src/main/java/tconstruct/plugins/wdmla/TinkerWDMla.java b/src/main/java/tconstruct/plugins/wdmla/TinkerWDMla.java index fbf38bfc..2f29fa7f 100644 --- a/src/main/java/tconstruct/plugins/wdmla/TinkerWDMla.java +++ b/src/main/java/tconstruct/plugins/wdmla/TinkerWDMla.java @@ -1,5 +1,6 @@ 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; @@ -14,6 +15,10 @@ import mantle.pulsar.pulse.Pulse; import tconstruct.TConstruct; import tconstruct.armor.blocks.DryingRack; import tconstruct.mechworks.blocks.BlockLandmine; +import tconstruct.smeltery.blocks.CastingChannelBlock; +import tconstruct.smeltery.blocks.LavaTankBlock; +import tconstruct.smeltery.blocks.SearedBlock; +import tconstruct.smeltery.blocks.SmelteryBlock; import tconstruct.tools.blocks.CraftingStationBlock; import tconstruct.tools.blocks.FurnaceSlab; import tconstruct.tools.blocks.ToolStationBlock; @@ -31,9 +36,16 @@ public class TinkerWDMla implements IWDMlaPlugin { registration.registerBlockDataProvider(DryingRackProvider.INSTANCE, DryingRack.class); registration.registerBlockDataProvider(TECustomNameHeaderProvider.INSTANCE, FurnaceSlab.class); registration.registerBlockDataProvider(FurnaceSlabProvider.INSTANCE, FurnaceSlab.class); + registration.registerItemStorage(ItemStorageProvider.Extension.INSTANCE, CraftingStationBlock.class); registration.registerItemStorage(ItemStorageProvider.Extension.INSTANCE, ToolStationBlock.class); registration.registerItemStorage(ItemStorageProvider.Extension.INSTANCE, InventorySlab.class); + registration.registerItemStorage(ItemStorageProvider.Extension.INSTANCE, SmelteryBlock.class); + + registration.registerFluidStorage(SmelteryFluidProvider.INSTANCE, SmelteryBlock.class); + registration.registerFluidStorage(FluidStorageProvider.Extension.INSTANCE, LavaTankBlock.class); + registration.registerFluidStorage(FluidStorageProvider.Extension.INSTANCE, CastingChannelBlock.class); + registration.registerFluidStorage(FluidStorageProvider.Extension.INSTANCE, SearedBlock.class); } @Override @@ -41,6 +53,8 @@ public class TinkerWDMla implements IWDMlaPlugin { registration.registerBlockComponent(LandmineHeaderProvider.INSTANCE, BlockLandmine.class); registration.registerBlockComponent(DryingRackProvider.INSTANCE, DryingRack.class); registration.registerBlockComponent(FurnaceSlabProvider.INSTANCE, FurnaceSlab.class); + + registration.registerFluidStorageClient(SmelteryFluidProvider.INSTANCE); } public static ResourceLocation TiC(String uid) {