feat: readded cap support and some other cleanup

Author: MichaelHillcox

common/src/main/java/dev/ftb/mods/ftbquests/client/FTBQuestsClientEventHandler.java

@@ -9,7 +9,6 @@
 import dev.architectury.injectables.annotations.ExpectPlatform;
 import dev.architectury.networking.NetworkManager;
 import dev.architectury.registry.client.rendering.BlockEntityRendererRegistry;
-import dev.architectury.registry.client.rendering.ColorHandlerRegistry;
 import dev.ftb.mods.ftblibrary.api.sidebar.ButtonOverlayRender;
 import dev.ftb.mods.ftblibrary.api.sidebar.SidebarButtonCreatedEvent;
 import dev.ftb.mods.ftblibrary.client.icon.IconHelper;
@@ -24,11 +23,9 @@
 import dev.ftb.mods.ftbquests.net.SubmitTaskMessage;
 import dev.ftb.mods.ftbquests.quest.BaseQuestFile;
 import dev.ftb.mods.ftbquests.quest.TeamData;
-import dev.ftb.mods.ftbquests.quest.loot.LootCrate;
 import dev.ftb.mods.ftbquests.quest.task.ObservationTask;
 import dev.ftb.mods.ftbquests.quest.task.StructureTask;
 import dev.ftb.mods.ftbquests.registry.ModBlockEntityTypes;
-import dev.ftb.mods.ftbquests.registry.ModItems;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
@@ -38,10 +35,8 @@
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.data.AtlasIds;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.resources.Identifier;
-import net.minecraft.world.inventory.InventoryMenu;
 import net.minecraft.world.phys.HitResult;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
@@ -83,8 +78,7 @@ public void init() {
     // Note: Architectury doesn't have a texture stitch post event anymore,
     // so this is handled by the Forge/NeoForge events, and a mixin on Fabric
     public static void onTextureStitchPost(TextureAtlas textureAtlas) {
-        // TODO: @since 21.11: Verify this is the correct replacement.
-        if (textureAtlas.location().equals(AtlasIds.BLOCKS)) {//InventoryMenu.BLOCK_ATLAS)) {
+        if (textureAtlas.location().toString().equals("minecraft:textures/atlas/blocks.png")) {//InventoryMenu.BLOCK_ATLAS)) {
             inputOnlySprite = textureAtlas.getSprite(INPUT_ONLY_TEXTURE);
             tankSprite = textureAtlas.getSprite(TANK_TEXTURE);
             feEnergyEmptySprite = textureAtlas.getSprite(FE_ENERGY_EMPTY_TEXTURE);

common/src/main/java/dev/ftb/mods/ftbquests/client/TaskScreenRenderer.java

@@ -225,7 +225,6 @@ private void drawString(TaskScreenRenderState taskScreen, SubmitNodeCollector co
 
             poseStack.scale(scale, scale, 1F);
             collector.submitText(poseStack, -len / 2f, 0, text.getVisualOrderText(), taskScreen.textHasShadow, Font.DisplayMode.POLYGON_OFFSET, 15728880, 0xFFD8D8D8, 0, 0);
-//            font.drawInBatch(text, -len / 2f, 0, 0xFFD8D8D8, taskScreen.isTextShadow(), posMat, bufferSource, Font.DisplayMode.NORMAL, 0x0, 0x00F000F0);
             poseStack.popPose();
         }
     }

fabric/src/main/java/dev/ftb/mods/ftbquests/util/fabric/InventoryUtilImpl.java

@@ -29,7 +29,6 @@ public static NonNullList<ItemStack> getItemsInInventory(Level level, BlockPos p
         return items;
     }
 
-    @SuppressWarnings("UnstableApiUsage")
     public static boolean putItemsInInventory(List<ItemStack> items, Level level, BlockPos pos, Direction side, boolean clearFirst) {
         Storage<ItemVariant> storage = ItemStorage.SIDED.find(level, pos, side);
         if (storage == null || !storage.supportsInsertion()) {

neoforge/src/main/java/dev/ftb/mods/ftbquests/block/neoforge/NeoForgeLootCrateOpenerBlockEntity.java

@@ -5,6 +5,8 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
 import net.neoforged.neoforge.items.IItemHandler;
+import net.neoforged.neoforge.transfer.ResourceHandler;
+import net.neoforged.neoforge.transfer.item.ItemResource;
 import org.jetbrains.annotations.NotNull;
 
 public class NeoForgeLootCrateOpenerBlockEntity extends LootCrateOpenerBlockEntity {
@@ -14,7 +16,7 @@ public NeoForgeLootCrateOpenerBlockEntity(BlockPos blockPos, BlockState blockSta
         super(blockPos, blockState);
     }
 
-    public IItemHandler getLootCrateHandler() {
+    public ResourceHandler<ItemResource> getLootCrateHandler() {
         return lootCrateHandler;
     }
 

neoforge/src/main/java/dev/ftb/mods/ftbquests/block/neoforge/NeoForgeTaskScreenAuxBlockEntity.java

@@ -3,24 +3,25 @@
 import dev.ftb.mods.ftbquests.block.entity.TaskScreenAuxBlockEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.state.BlockState;
-import net.neoforged.neoforge.energy.IEnergyStorage;
-import net.neoforged.neoforge.fluids.capability.IFluidHandler;
-import net.neoforged.neoforge.items.IItemHandler;
+import net.neoforged.neoforge.transfer.ResourceHandler;
+import net.neoforged.neoforge.transfer.energy.EnergyHandler;
+import net.neoforged.neoforge.transfer.fluid.FluidResource;
+import net.neoforged.neoforge.transfer.item.ItemResource;
 
 public class NeoForgeTaskScreenAuxBlockEntity extends TaskScreenAuxBlockEntity {
     public NeoForgeTaskScreenAuxBlockEntity(BlockPos blockPos, BlockState blockState) {
         super(blockPos, blockState);
     }
 
-    public IItemHandler getItemHandler() {
+    public ResourceHandler<ItemResource> getItemHandler() {
         return getCoreScreen().map(s -> ((NeoForgeTaskScreenBlockEntity) s).getItemHandler()).orElse(null);
     }
 
-    public IFluidHandler getFluidHandler() {
+    public ResourceHandler<FluidResource> getFluidHandler() {
         return getCoreScreen().map(s -> ((NeoForgeTaskScreenBlockEntity) s).getFluidHandler()).orElse(null);
     }
 
-    public IEnergyStorage getEnergyHandler() {
+    public EnergyHandler getEnergyHandler() {
         return getCoreScreen().map(s -> ((NeoForgeTaskScreenBlockEntity) s).getEnergyHandler()).orElse(null);
     }
 }