diff --git a/dependencies.gradle b/dependencies.gradle index 5afb1e50..804fc08e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,7 +7,8 @@ dependencies { implementation("com.github.GTNewHorizons:NotEnoughItems:2.7.34-GTNH:dev") compileOnlyApi("curse.maven:cofh-core-69162:2388751") compileOnly("com.github.GTNewHorizons:inventory-tweaks:1.7.1:api") - compileOnly("com.github.GTNewHorizons:WDMla:2.3.0:dev") +// compileOnly("com.github.GTNewHorizons:WDMla:2.3.0:dev") + compileOnly fileTree(dir: 'run/mods', include: ['wdmla*.jar']) compileOnly("com.github.GTNewHorizons:Battlegear2:1.4.2:api") compileOnly("curse.maven:minefactory-reloaded-66672:2366150") compileOnly("curse.maven:zelda-sword-skills-220540:2384889") diff --git a/src/main/java/tconstruct/plugins/wdmla/DryingRackProvider.java b/src/main/java/tconstruct/plugins/wdmla/DryingRackProvider.java index 66ef56ed..8c6597c8 100644 --- a/src/main/java/tconstruct/plugins/wdmla/DryingRackProvider.java +++ b/src/main/java/tconstruct/plugins/wdmla/DryingRackProvider.java @@ -1,66 +1,51 @@ package tconstruct.plugins.wdmla; -import com.google.common.collect.Lists; -import com.gtnewhorizons.wdmla.api.accessor.Accessor; -import com.gtnewhorizons.wdmla.api.accessor.BlockAccessor; -import com.gtnewhorizons.wdmla.api.provider.IBlockComponentProvider; -import com.gtnewhorizons.wdmla.api.provider.IClientExtensionProvider; -import com.gtnewhorizons.wdmla.api.provider.IServerDataProvider; -import com.gtnewhorizons.wdmla.api.provider.IServerExtensionProvider; -import com.gtnewhorizons.wdmla.api.provider.ITimeFormatConfigurable; -import com.gtnewhorizons.wdmla.api.ui.IComponent; -import com.gtnewhorizons.wdmla.api.ui.ITooltip; -import com.gtnewhorizons.wdmla.api.view.ClientViewGroup; -import com.gtnewhorizons.wdmla.api.view.ItemView; -import com.gtnewhorizons.wdmla.api.view.ViewGroup; -import com.gtnewhorizons.wdmla.config.WDMlaConfig; -import com.gtnewhorizons.wdmla.impl.format.TimeFormattingPattern; -import com.gtnewhorizons.wdmla.impl.ui.ThemeHelper; -import com.gtnewhorizons.wdmla.impl.ui.component.ItemComponent; -import com.gtnewhorizons.wdmla.impl.ui.component.TextComponent; -import com.gtnewhorizons.wdmla.impl.ui.sizer.Size; -import mcp.mobius.waila.overlay.DisplayUtil; +import java.util.Arrays; + import net.minecraft.item.ItemStack; 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.provider.ITimeFormatConfigurable; +import com.gtnewhorizons.wdmla.api.ui.IComponent; +import com.gtnewhorizons.wdmla.api.ui.ITooltip; +import com.gtnewhorizons.wdmla.impl.format.TimeFormattingPattern; +import com.gtnewhorizons.wdmla.impl.ui.ThemeHelper; + import tconstruct.TConstruct; import tconstruct.blocks.logic.DryingRackLogic; import tconstruct.library.crafting.DryingRackRecipes; -import java.util.Arrays; +public enum DryingRackProvider + implements IBlockComponentProvider, IServerDataProvider, ITimeFormatConfigurable { -public enum DryingRackProvider implements IBlockComponentProvider, IServerDataProvider, ITimeFormatConfigurable { INSTANCE; @Override public void appendTooltip(ITooltip tooltip, BlockAccessor accessor) { ItemStack content = ItemStack.loadItemStackFromNBT(accessor.getServerData()); - if(content != null) { + if (content != null) { int time = accessor.getServerData().getInteger("Time"); int maxTime = accessor.getServerData().getInteger("MaxTime"); - if(time != 0 && maxTime != 0) { + if (time != 0 && maxTime != 0) { ItemStack result = DryingRackRecipes.getDryingResult(content); - if(result != null) { + if (result != null) { result.stackSize = 0; } - IComponent progressComponent = ThemeHelper.INSTANCE.itemProgress( + IComponent progressComponent = ThemeHelper.INSTANCE.furnaceLikeProgress( Arrays.asList(content), Arrays.asList(result), time, maxTime, - new TextComponent("TODO"), accessor.showDetails()); if (progressComponent != null) { tooltip.child(progressComponent); } - } - else { - String strippedName = DisplayUtil.stripSymbols(DisplayUtil.itemDisplayNameShort(content)); - TextComponent name = new TextComponent(strippedName); - int itemSize = name.getHeight(); - tooltip.horizontal().child( - new ItemComponent(content).doDrawOverlay(false).size(new Size(itemSize, itemSize))) - .text(String.valueOf(content.stackSize)).text("× ").child(name);// TODO: storage view like item display api + } else { + tooltip.child(ThemeHelper.INSTANCE.itemStackFullLine(content)); } } } diff --git a/src/main/java/tconstruct/plugins/wdmla/LandmineHeaderProvider.java b/src/main/java/tconstruct/plugins/wdmla/LandmineHeaderProvider.java index 1b659860..3cc602ad 100644 --- a/src/main/java/tconstruct/plugins/wdmla/LandmineHeaderProvider.java +++ b/src/main/java/tconstruct/plugins/wdmla/LandmineHeaderProvider.java @@ -1,22 +1,25 @@ package tconstruct.plugins.wdmla; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + import com.gtnewhorizons.wdmla.api.accessor.BlockAccessor; import com.gtnewhorizons.wdmla.api.provider.IBlockComponentProvider; import com.gtnewhorizons.wdmla.api.ui.ITooltip; import com.gtnewhorizons.wdmla.impl.ui.ThemeHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; + import tconstruct.TConstruct; import tconstruct.mechworks.logic.TileEntityLandmine; public enum LandmineHeaderProvider implements IBlockComponentProvider { + INSTANCE; @Override public void appendTooltip(ITooltip tooltip, BlockAccessor accessor) { - if(accessor.getTileEntity() instanceof TileEntityLandmine landmine) { + if (accessor.getTileEntity() instanceof TileEntityLandmine landmine) { ItemStack cover = landmine.getStackInSlot(3); - if(cover != null) { + if (cover != null) { ThemeHelper.INSTANCE.overrideTooltipHeader(tooltip, cover); } } diff --git a/src/main/java/tconstruct/plugins/wdmla/TinkerWDMla.java b/src/main/java/tconstruct/plugins/wdmla/TinkerWDMla.java index fc2736d3..41a29a35 100644 --- a/src/main/java/tconstruct/plugins/wdmla/TinkerWDMla.java +++ b/src/main/java/tconstruct/plugins/wdmla/TinkerWDMla.java @@ -4,6 +4,7 @@ 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 mantle.pulsar.pulse.Pulse; import tconstruct.armor.blocks.DryingRack; import tconstruct.mechworks.blocks.BlockLandmine;