diff --git a/src/main/java/tconstruct/plugins/wdmla/DryingRackProvider.java b/src/main/java/tconstruct/plugins/wdmla/DryingRackProvider.java index 8c6597c8..a656a54d 100644 --- a/src/main/java/tconstruct/plugins/wdmla/DryingRackProvider.java +++ b/src/main/java/tconstruct/plugins/wdmla/DryingRackProvider.java @@ -9,18 +9,14 @@ 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; -public enum DryingRackProvider - implements IBlockComponentProvider, IServerDataProvider, ITimeFormatConfigurable { +public enum DryingRackProvider implements IBlockComponentProvider, IServerDataProvider { INSTANCE; @@ -68,11 +64,6 @@ public enum DryingRackProvider @Override public ResourceLocation getUid() { - return new ResourceLocation(TConstruct.modID.toLowerCase(), "drying_rack"); - } - - @Override - public TimeFormattingPattern getDefaultTimeFormatter() { - return TimeFormattingPattern.ALWAYS_SECOND; + return TinkerWDMla.TiC("drying_rack"); } } diff --git a/src/main/java/tconstruct/plugins/wdmla/FurnaceSlabProvider.java b/src/main/java/tconstruct/plugins/wdmla/FurnaceSlabProvider.java new file mode 100644 index 00000000..ad8ced39 --- /dev/null +++ b/src/main/java/tconstruct/plugins/wdmla/FurnaceSlabProvider.java @@ -0,0 +1,81 @@ +package tconstruct.plugins.wdmla; + +import java.util.Arrays; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +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.IComponent; +import com.gtnewhorizons.wdmla.api.ui.ITooltip; +import com.gtnewhorizons.wdmla.impl.ui.ThemeHelper; + +import tconstruct.tools.logic.FurnaceLogic; + +public enum FurnaceSlabProvider implements IBlockComponentProvider, IServerDataProvider { + + INSTANCE; + + @Override + public void appendTooltip(ITooltip tooltip, BlockAccessor accessor) { + if (accessor.getTileEntity() instanceof FurnaceLogic) { + int cookTime = accessor.getServerData().getShort("Progress"); + int maxCookTime = accessor.getServerData().getShort("MaxProgress"); + + ItemStack[] items = new ItemStack[3]; + NBTTagList itemsTag = accessor.getServerData().getTagList("Items", 10); + + boolean allEmpty = true; + for (int i = 0; i < itemsTag.tagCount(); i++) { + NBTTagCompound itemTag = itemsTag.getCompoundTagAt(i); + byte slot = itemTag.getByte("Slot"); + + if (slot >= 0 && slot < items.length) { + items[slot] = ItemStack.loadItemStackFromNBT(itemTag); + if (items[slot] != null) { + allEmpty = false; + } + } + } + + if (items[0] != null && items[2] == null) { + ItemStack resultStack = FurnaceRecipes.smelting().getSmeltingResult(items[0]); + if (resultStack != null) { + items[2] = resultStack.copy(); + items[2].stackSize = 0; + } + } + + if (!allEmpty) { + IComponent progressComponent = ThemeHelper.INSTANCE.furnaceLikeProgress( + Arrays.asList(items[0], items[1]), + Arrays.asList(items[2]), + cookTime, + maxCookTime, + accessor.showDetails()); + if (progressComponent != null) { + tooltip.child(progressComponent); + } + } + } + } + + @Override + public void appendServerData(NBTTagCompound data, BlockAccessor accessor) { + if (accessor.getTileEntity() instanceof FurnaceLogic logic) { + logic.writeToNBT(data); + data.setInteger("Progress", logic.progress); + data.setInteger("MaxProgress", logic.fuelScale); + } + } + + @Override + public ResourceLocation getUid() { + return TinkerWDMla.TiC("furnace_slab"); + } +} diff --git a/src/main/java/tconstruct/plugins/wdmla/LandmineHeaderProvider.java b/src/main/java/tconstruct/plugins/wdmla/LandmineHeaderProvider.java index 3cc602ad..55f2d395 100644 --- a/src/main/java/tconstruct/plugins/wdmla/LandmineHeaderProvider.java +++ b/src/main/java/tconstruct/plugins/wdmla/LandmineHeaderProvider.java @@ -8,7 +8,6 @@ import com.gtnewhorizons.wdmla.api.provider.IBlockComponentProvider; import com.gtnewhorizons.wdmla.api.ui.ITooltip; import com.gtnewhorizons.wdmla.impl.ui.ThemeHelper; -import tconstruct.TConstruct; import tconstruct.mechworks.logic.TileEntityLandmine; public enum LandmineHeaderProvider implements IBlockComponentProvider { @@ -27,6 +26,6 @@ public enum LandmineHeaderProvider implements IBlockComponentProvider { @Override public ResourceLocation getUid() { - return new ResourceLocation(TConstruct.modID.toLowerCase(), "landmine_header"); + return TinkerWDMla.TiC("landmine_header"); } } diff --git a/src/main/java/tconstruct/plugins/wdmla/TinkerWDMla.java b/src/main/java/tconstruct/plugins/wdmla/TinkerWDMla.java index 41a29a35..e30a8140 100644 --- a/src/main/java/tconstruct/plugins/wdmla/TinkerWDMla.java +++ b/src/main/java/tconstruct/plugins/wdmla/TinkerWDMla.java @@ -1,13 +1,18 @@ package tconstruct.plugins.wdmla; +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.vanilla.TECustomNameHeaderProvider; import mantle.pulsar.pulse.Pulse; +import tconstruct.TConstruct; import tconstruct.armor.blocks.DryingRack; import tconstruct.mechworks.blocks.BlockLandmine; +import tconstruct.tools.blocks.FurnaceSlab; @Pulse( id = "Tinkers WDMla Compatibility", @@ -20,11 +25,18 @@ public class TinkerWDMla implements IWDMlaPlugin { @Override public void register(IWDMlaCommonRegistration registration) { registration.registerBlockDataProvider(DryingRackProvider.INSTANCE, DryingRack.class); + registration.registerBlockDataProvider(TECustomNameHeaderProvider.INSTANCE, FurnaceSlab.class); + registration.registerBlockDataProvider(FurnaceSlabProvider.INSTANCE, FurnaceSlab.class); } @Override public void registerClient(IWDMlaClientRegistration registration) { registration.registerBlockComponent(LandmineHeaderProvider.INSTANCE, BlockLandmine.class); registration.registerBlockComponent(DryingRackProvider.INSTANCE, DryingRack.class); + registration.registerBlockComponent(FurnaceSlabProvider.INSTANCE, FurnaceSlab.class); + } + + public static ResourceLocation TiC(String uid) { + return new ResourceLocation(TConstruct.modID.toLowerCase(), uid); } } diff --git a/src/main/resources/assets/tinker/lang/en_US.lang b/src/main/resources/assets/tinker/lang/en_US.lang index c27c57e4..33ef0b80 100644 --- a/src/main/resources/assets/tinker/lang/en_US.lang +++ b/src/main/resources/assets/tinker/lang/en_US.lang @@ -1207,4 +1207,5 @@ tconstruct.mobsinfocompat.tinkers_construct_beheading=Each level of beheading on tconstruct.mobsinfocompat.tinkers_construct_beheading_1=If you are using a Cleaver, it gives another %.2f%% provider.wdmla.tconstruct.landmine.header=Landmine Header -provider.wdmla.tconstruct.drying.rack=Drying Rack \ No newline at end of file +provider.wdmla.tconstruct.drying.rack=Drying Rack +provider.wdmla.tconstruct.furnace.slab=Slab Furnace \ No newline at end of file