From d81cd2891d9cedce9e7d36c3259e52ca8e691e81 Mon Sep 17 00:00:00 2001 From: trinsdar <30245301+Trinsdar@users.noreply.github.com> Date: Sun, 23 Feb 2025 16:13:59 -0500 Subject: [PATCH] finished up fluid changeover enough to compile again --- .../blockentity/BlockEntityTank.java | 2 +- .../gui/widget/FluidSlotWidget.java | 2 +- .../integration/jei/AntimatterJEIPlugin.java | 55 ++++++++++++- .../jei/category/RecipeMapCategory.java | 20 ++--- .../jei/forge/JEIPlatformHelperImpl.java | 81 ------------------- .../jeirei/AntimatterJEIREIPlugin.java | 5 +- .../integration/kubejs/KubeJSRecipe.java | 24 +++--- .../antimatter/integration/rei/REIUtils.java | 13 ++- .../antimatter/item/ItemFluidCell.java | 11 ++- .../antimatter/item/ItemFluidIcon.java | 6 +- ...timatter.integration.jei.JEIPlatformHelper | 1 - 11 files changed, 97 insertions(+), 123 deletions(-) delete mode 100644 common/src/main/java/muramasa/antimatter/integration/jei/forge/JEIPlatformHelperImpl.java delete mode 100644 common/src/main/resources/META-INF/services/muramasa.antimatter.integration.jei.JEIPlatformHelper diff --git a/common/src/main/java/muramasa/antimatter/blockentity/BlockEntityTank.java b/common/src/main/java/muramasa/antimatter/blockentity/BlockEntityTank.java index 59be231fa..367f7e61f 100644 --- a/common/src/main/java/muramasa/antimatter/blockentity/BlockEntityTank.java +++ b/common/src/main/java/muramasa/antimatter/blockentity/BlockEntityTank.java @@ -52,7 +52,7 @@ public int drawInfo(TankMachine.TankRenderWidget instance, PoseStack stack, Font return 8; } renderer.draw(stack, FluidPlatformUtils.INSTANCE.getFluidDisplayName(instance.stack).getString(), left, top, 0xFAFAFF); - String fluidAmount = String.valueOf(instance.stack.getFluidAmount()); + String fluidAmount = String.valueOf(instance.stack.getAmount()); renderer.draw(stack, fluidAmount + " mb", left, top + 8, 0xFAFAFF); return 16; } diff --git a/common/src/main/java/muramasa/antimatter/gui/widget/FluidSlotWidget.java b/common/src/main/java/muramasa/antimatter/gui/widget/FluidSlotWidget.java index ea387ba19..05263bee0 100644 --- a/common/src/main/java/muramasa/antimatter/gui/widget/FluidSlotWidget.java +++ b/common/src/main/java/muramasa/antimatter/gui/widget/FluidSlotWidget.java @@ -86,7 +86,7 @@ public void mouseOver(PoseStack stack, double mouseX, double mouseY, float parti RenderSystem.enableDepthTest(); List str = new ArrayList<>(); str.add(FluidPlatformUtils.INSTANCE.getFluidDisplayName(this.stack)); - long mb = this.stack.getAmount(); + int mb = this.stack.getAmount(); str.add(Utils.translatable("antimatter.tooltip.fluid.amount", mb + " L").withStyle(ChatFormatting.BLUE)); str.add(Utils.translatable("antimatter.tooltip.fluid.temp", FluidPlatformUtils.INSTANCE.getFluidTemperature(this.stack.getFluid())).withStyle(ChatFormatting.RED)); String liquid = !FluidPlatformUtils.INSTANCE.isFluidGaseous(this.stack.getFluid()) ? "liquid" : "gas"; diff --git a/common/src/main/java/muramasa/antimatter/integration/jei/AntimatterJEIPlugin.java b/common/src/main/java/muramasa/antimatter/integration/jei/AntimatterJEIPlugin.java index 44a347748..66358bbc7 100644 --- a/common/src/main/java/muramasa/antimatter/integration/jei/AntimatterJEIPlugin.java +++ b/common/src/main/java/muramasa/antimatter/integration/jei/AntimatterJEIPlugin.java @@ -2,14 +2,20 @@ import com.google.common.collect.ImmutableList; import earth.terrarium.botarium.common.fluid.base.FluidHolder; +import earth.terrarium.botarium.forge.fluid.ForgeFluidHolder; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; import lombok.Getter; import mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; import mezz.jei.api.constants.VanillaTypes; +import mezz.jei.api.forge.ForgeTypes; import mezz.jei.api.helpers.IJeiHelpers; +import mezz.jei.api.ingredients.IIngredientType; +import mezz.jei.api.ingredients.ITypedIngredient; import mezz.jei.api.ingredients.subtypes.UidContext; +import mezz.jei.api.recipe.IFocus; +import mezz.jei.api.recipe.RecipeIngredientRole; import mezz.jei.api.recipe.RecipeType; import mezz.jei.api.registration.IRecipeCatalystRegistration; import mezz.jei.api.registration.IRecipeCategoryRegistration; @@ -44,6 +50,7 @@ import net.minecraft.world.level.material.Fluid; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.loading.FMLEnvironment; import net.minecraftforge.server.ServerLifecycleHooks; import org.jetbrains.annotations.NotNull; @@ -58,6 +65,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; @SuppressWarnings("removal") @@ -91,7 +99,7 @@ public void onRuntimeAvailable(@NotNull IJeiRuntime jeiRuntime) { AntimatterJEIREIPlugin.getFluidsToHide().forEach(c -> c.accept(fluidList)); // wish there was a better way to do this if (!fluidList.isEmpty()){ - runtime.getIngredientManager().removeIngredientsAtRuntime(JEIPlatformHelper.INSTANCE.getFluidIngredientObjectType(), (Collection) fluidList.stream().map(f -> JEIPlatformHelper.INSTANCE.getFluidObject(FluidHolder.of(f))).toList()); + runtime.getIngredientManager().removeIngredientsAtRuntime(ForgeTypes.FLUID_STACK, fluidList.stream().map(f -> new FluidStack(f, 1)).toList()); runtime.getIngredientManager().removeIngredientsAtRuntime(VanillaTypes.ITEM, fluidList.stream().map(i -> i.getBucket().getDefaultInstance()).toList()); } //runtime.getIngredientManager().removeIngredientsAtRuntime(VanillaTypes.ITEM, AntimatterAPI.all(BlockSurfaceRock.class).stream().map(b -> new ItemStack(b, 1)).filter(t -> !t.isEmpty()).collect(Collectors.toList())); @@ -236,9 +244,7 @@ public void registerRecipeTransferHandlers(IRecipeTransferRegistration registrat public static void addModDescriptor(List tooltip, T t) { if (t == null || helpers == null) return; - Object o = t; - if (t instanceof FluidHolder holder) o = JEIPlatformHelper.INSTANCE.getFluidObject(holder); - String text = helpers.getModIdHelper().getFormattedModNameForModId(getRuntime().getIngredientManager().getIngredientHelper(o).getDisplayModId(o)); + String text = helpers.getModIdHelper().getFormattedModNameForModId(getRuntime().getIngredientManager().getIngredientHelper((Object) t).getDisplayModId(t)); tooltip.add(Utils.literal(text)); } @@ -264,4 +270,45 @@ public void registerRecipeCatalysts(@NotNull IRecipeCatalystRegistration registr }); }); } + + public static void uses(FluidStack val, boolean USE) { + AntimatterJEIPlugin.getRuntime().getRecipesGui().show(new IFocus() { + @Override + public ITypedIngredient getTypedValue() { + return new ITypedIngredient<>() { + @Override + public IIngredientType getType() { + return ForgeTypes.FLUID_STACK; + } + + @Override + public FluidStack getIngredient() { + return val; + } + + @Override + public Optional getIngredient(IIngredientType ingredientType) { + if (ingredientType == ForgeTypes.FLUID_STACK) return ((Optional) Optional.of(val)); + return Optional.empty(); + } + }; + } + + @Override + public RecipeIngredientRole getRole() { + return USE ? RecipeIngredientRole.INPUT : RecipeIngredientRole.OUTPUT; + } + + @Override + public Optional> checkedCast(IIngredientType ingredientType) { + return Optional.empty(); + } + + @Override + public Mode getMode() { + return USE ? Mode.INPUT : Mode.OUTPUT; + } + + }); + } } diff --git a/common/src/main/java/muramasa/antimatter/integration/jei/category/RecipeMapCategory.java b/common/src/main/java/muramasa/antimatter/integration/jei/category/RecipeMapCategory.java index fa6711279..d13390ded 100644 --- a/common/src/main/java/muramasa/antimatter/integration/jei/category/RecipeMapCategory.java +++ b/common/src/main/java/muramasa/antimatter/integration/jei/category/RecipeMapCategory.java @@ -5,6 +5,7 @@ import earth.terrarium.botarium.common.fluid.base.FluidHolder; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import mezz.jei.api.constants.VanillaTypes; +import mezz.jei.api.forge.ForgeTypes; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.builder.IRecipeSlotBuilder; import mezz.jei.api.gui.drawable.IDrawable; @@ -43,6 +44,7 @@ import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ItemLike; +import net.minecraftforge.fluids.FluidStack; import tesseract.TesseractGraphWrappers; import java.util.Arrays; @@ -230,11 +232,11 @@ public void setRecipe(IRecipeLayoutBuilder builder, IRecipe recipe, IFocusGroup slotCount = Math.min(slotCount, fluids.size()); for (int s = 0; s < slotCount; s++) { IRecipeSlotBuilder slot = builder.addSlot(RecipeIngredientRole.INPUT, slots.get(s).getX() - (offsetX - 1), slots.get(s).getY() - (offsetY - 1)); - JEIPlatformHelper.INSTANCE.addFluidIngredients(slot, Arrays.asList(fluids.get(s).getStacks())); + slot.addIngredients(ForgeTypes.FLUID_STACK, Arrays.asList(fluids.get(s).getStacks())); slot.setFluidRenderer((int)fluids.get(s).getAmount(), true, 16, 16); int finalS = s; slot.addTooltipCallback((ing, list) -> { - FluidHolder stack = fluids.get(finalS).getStacks()[0]; + FluidStack stack = fluids.get(finalS).getStacks()[0]; createFluidTooltip(ing, list, stack); }); inputFluids++; @@ -245,15 +247,15 @@ public void setRecipe(IRecipeLayoutBuilder builder, IRecipe recipe, IFocusGroup slots = gui.getSlots().getSlots(SlotType.FL_OUT, guiTier); slotCount = slots.size(); if (slotCount > 0) { - FluidHolder[] fluids = recipe.getOutputFluids(); + FluidStack[] fluids = recipe.getOutputFluids(); slotCount = Math.min(slotCount, fluids.length); for (int s = 0; s < slotCount; s++) { IRecipeSlotBuilder slot = builder.addSlot(RecipeIngredientRole.OUTPUT, slots.get(s).getX() - (offsetX - 1), slots.get(s).getY() - (offsetY - 1)); - slot.setFluidRenderer((int)fluids[s].getFluidAmount(), true, 16, 16); - JEIPlatformHelper.INSTANCE.addFluidIngredients(slot, Collections.singletonList(fluids[s])); + slot.setFluidRenderer(fluids[s].getAmount(), true, 16, 16); + slot.addIngredients(ForgeTypes.FLUID_STACK, Collections.singletonList(fluids[s])); int finalS = s; slot.addTooltipCallback((ing, list) -> { - FluidHolder stack = fluids[finalS]; + FluidStack stack = fluids[finalS]; createFluidTooltip(ing, list, stack); }); } @@ -261,16 +263,16 @@ public void setRecipe(IRecipeLayoutBuilder builder, IRecipe recipe, IFocusGroup } } - private void createFluidTooltip(IRecipeSlotView ing, List list, FluidHolder stack) { + private void createFluidTooltip(IRecipeSlotView ing, List list, FluidStack stack) { Component component = list.get(2); list.remove(2); list.remove(1); - long mb = stack.getFluidAmount(); + int mb = stack.getAmount(); list.add(Utils.translatable("antimatter.tooltip.fluid.amount", mb + " L").withStyle(ChatFormatting.BLUE)); list.add(Utils.translatable("antimatter.tooltip.fluid.temp", FluidPlatformUtils.INSTANCE.getFluidTemperature(stack.getFluid())).withStyle(ChatFormatting.RED)); String liquid = !FluidPlatformUtils.INSTANCE.isFluidGaseous(stack.getFluid()) ? "liquid" : "gas"; list.add(Utils.translatable("antimatter.tooltip.fluid." + liquid).withStyle(ChatFormatting.GREEN)); - if (Utils.hasNoConsumeTag(JEIPlatformHelper.INSTANCE.getIngredient(ing.getDisplayedIngredient().get()))) + if (Utils.hasNoConsumeTag(ing.getDisplayedIngredient().get().getIngredient(ForgeTypes.FLUID_STACK).get())) list.add(Utils.literal("Does not get consumed in the process").withStyle(ChatFormatting.WHITE)); list.add(component); } diff --git a/common/src/main/java/muramasa/antimatter/integration/jei/forge/JEIPlatformHelperImpl.java b/common/src/main/java/muramasa/antimatter/integration/jei/forge/JEIPlatformHelperImpl.java deleted file mode 100644 index 4b757148b..000000000 --- a/common/src/main/java/muramasa/antimatter/integration/jei/forge/JEIPlatformHelperImpl.java +++ /dev/null @@ -1,81 +0,0 @@ -package muramasa.antimatter.integration.jei.forge; - -import earth.terrarium.botarium.common.fluid.base.FluidHolder; -import earth.terrarium.botarium.forge.fluid.ForgeFluidHolder; -import mezz.jei.api.forge.ForgeTypes; -import mezz.jei.api.gui.builder.IRecipeSlotBuilder; -import mezz.jei.api.ingredients.IIngredientType; -import mezz.jei.api.ingredients.ITypedIngredient; -import mezz.jei.api.recipe.IFocus; -import mezz.jei.api.recipe.RecipeIngredientRole; -import muramasa.antimatter.integration.jei.AntimatterJEIPlugin; -import muramasa.antimatter.integration.jei.JEIPlatformHelper; -import net.minecraftforge.fluids.FluidStack; - -import java.util.List; -import java.util.Optional; - -public class JEIPlatformHelperImpl implements JEIPlatformHelper { - @Override - public void uses(FluidHolder val, boolean USE) { - FluidStack v = ForgeFluidHolder.toStack(val); - AntimatterJEIPlugin.getRuntime().getRecipesGui().show(new IFocus() { - @Override - public ITypedIngredient getTypedValue() { - return new ITypedIngredient<>() { - @Override - public IIngredientType getType() { - return ForgeTypes.FLUID_STACK; - } - - @Override - public FluidStack getIngredient() { - return v; - } - - @Override - public Optional getIngredient(IIngredientType ingredientType) { - if (ingredientType == ForgeTypes.FLUID_STACK) return ((Optional) Optional.of(v)); - return Optional.empty(); - } - }; - } - - @Override - public RecipeIngredientRole getRole() { - return USE ? RecipeIngredientRole.INPUT : RecipeIngredientRole.OUTPUT; - } - - @Override - public Optional> checkedCast(IIngredientType ingredientType) { - return Optional.empty(); - } - - @Override - public Mode getMode() { - return USE ? Mode.INPUT : Mode.OUTPUT; - } - - }); - } - - @Override - public Object getFluidObject(FluidHolder fluidHolder){ - return ForgeFluidHolder.toStack(fluidHolder); - } - - @Override - public IIngredientType getFluidIngredientObjectType(){ - return ForgeTypes.FLUID; - } - - @Override - public void addFluidIngredients(IRecipeSlotBuilder builder, List stacks){ - builder.addIngredients(ForgeTypes.FLUID_STACK, stacks.stream().map(ForgeFluidHolder::toStack).toList()); - } - - @Override - public FluidHolder getIngredient(ITypedIngredient ingredient){ - return new ForgeFluidHolder(ingredient.getIngredient(ForgeTypes.FLUID_STACK).get()); - } -} diff --git a/common/src/main/java/muramasa/antimatter/integration/jeirei/AntimatterJEIREIPlugin.java b/common/src/main/java/muramasa/antimatter/integration/jeirei/AntimatterJEIREIPlugin.java index 4e61318ba..812dafe56 100644 --- a/common/src/main/java/muramasa/antimatter/integration/jeirei/AntimatterJEIREIPlugin.java +++ b/common/src/main/java/muramasa/antimatter/integration/jeirei/AntimatterJEIREIPlugin.java @@ -26,6 +26,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.material.Fluid; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.loading.FMLEnvironment; import java.util.ArrayList; @@ -159,9 +160,9 @@ public static void showCategories(ResourceLocation... categories){ //To perform a JEI lookup for fluid. Use defines direction. - public static void uses(FluidHolder val, boolean USE) { + public static void uses(FluidStack val, boolean USE) { if (AntimatterAPI.isModLoaded(Ref.MOD_JEI) && !AntimatterAPI.isModLoaded(Ref.MOD_REI)){ - JEIPlatformHelper.INSTANCE.uses(val, USE); + AntimatterJEIPlugin.uses(val, USE); } else if (AntimatterAPI.isModLoaded(Ref.MOD_REI)){ REIUtils.uses(val, USE); } diff --git a/common/src/main/java/muramasa/antimatter/integration/kubejs/KubeJSRecipe.java b/common/src/main/java/muramasa/antimatter/integration/kubejs/KubeJSRecipe.java index 95f81d462..fda582ea4 100644 --- a/common/src/main/java/muramasa/antimatter/integration/kubejs/KubeJSRecipe.java +++ b/common/src/main/java/muramasa/antimatter/integration/kubejs/KubeJSRecipe.java @@ -59,7 +59,7 @@ public void create(ListJS listJS) { } if (listJS.get(3) != null) for (Object inputFluid : ListJS.orSelf(listJS.get(3))) { if (inputFluid instanceof FluidStackJS fluidStack){ - this.fluidInput.add(FluidIngredient.of(REIUtils.fromREIFluidStack(fluidStack.getFluidStack())); + this.fluidInput.add(FluidIngredient.of(REIUtils.fromREIFluidStack(fluidStack.getFluidStack()))); } else if (inputFluid instanceof MapJS map){ this.fluidInput.add(AntimatterRecipeSerializer.getFluidIngredient(map.toJson())); } else { @@ -97,7 +97,7 @@ public void create(ListJS listJS) { amps = 1; special = 0; } - if (inputItems.size() == 0 && fluidInput.size() == 0) { + if (inputItems.isEmpty() && fluidInput.isEmpty()) { throw new IllegalStateException("No input in recipe"); } } @@ -132,12 +132,12 @@ public void deserialize() { } } - public static JsonElement serializeStack(FluidHolder stack) { + public static JsonElement serializeStack(FluidStack stack) { JsonObject obj = new JsonObject(); obj.addProperty("fluid", FluidPlatformUtils.INSTANCE.getFluidId(stack.getFluid()).toString()); - obj.addProperty("amount", stack.getFluidAmount()); - if (stack.getCompound() != null) { - obj.add("tag", NbtOps.INSTANCE.convertTo(JsonOps.INSTANCE, stack.getCompound())); + obj.addProperty("amount", stack.getAmount()); + if (stack.getTag() != null) { + obj.add("tag", NbtOps.INSTANCE.convertTo(JsonOps.INSTANCE, stack.getTag())); } return obj; } @@ -166,32 +166,32 @@ public static JsonElement serializeFluid(FluidIngredient stack) { @Override public void serialize() { - if (inputItems.size() > 0) { + if (!inputItems.isEmpty()) { JsonArray arr = new JsonArray(); inputItems.forEach(t -> arr.add(t.toJson())); this.json.add("inputItems", arr); } - if (outputItems.size() > 0) { + if (!outputItems.isEmpty()) { JsonArray arr = new JsonArray(); outputItems.forEach(t -> arr.add(t.toResultJson())); this.json.add("outputItems", arr); } - if (fluidInput.size() > 0) { + if (!fluidInput.isEmpty()) { JsonArray arr = new JsonArray(); fluidInput.forEach(t -> arr.add(serializeFluid(t))); this.json.add("inputFluids", arr); } - if (fluidOutput.size() > 0) { + if (!fluidOutput.isEmpty()) { JsonArray arr = new JsonArray(); fluidOutput.forEach(t -> arr.add(serializeStack(t))); this.json.add("outputFluids", arr); } - if (outputChances.size() > 0) { + if (!outputChances.isEmpty()) { JsonArray arr = new JsonArray(); outputChances.forEach(arr::add); this.json.add("outputChances", arr); } - if (inputChances.size() > 0) { + if (!inputChances.isEmpty()) { JsonArray arr = new JsonArray(); inputChances.forEach(arr::add); this.json.add("inputChances", arr); diff --git a/common/src/main/java/muramasa/antimatter/integration/rei/REIUtils.java b/common/src/main/java/muramasa/antimatter/integration/rei/REIUtils.java index 844c5ae84..d9b9b1369 100644 --- a/common/src/main/java/muramasa/antimatter/integration/rei/REIUtils.java +++ b/common/src/main/java/muramasa/antimatter/integration/rei/REIUtils.java @@ -13,6 +13,7 @@ import muramasa.antimatter.util.FluidPlatformUtils; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; import java.util.ArrayList; import java.util.Arrays; @@ -26,14 +27,12 @@ public class REIUtils { static List> EXTRA_CATEGORIES = new ArrayList<>(); static List> EXTRA_DISPLAYS = new ArrayList<>(); - public static FluidHolder fromREIFluidStack(dev.architectury.fluid.FluidStack from){ - FluidHolder stack = FluidPlatformUtils.createFluidStack(from.getFluid(), from.getAmount()); - stack.setCompound(from.getTag()); - return stack; + public static FluidStack fromREIFluidStack(dev.architectury.fluid.FluidStack from){ + return new FluidStack(from.getFluid(), (int) from.getAmount(), from.getTag()); } - public static dev.architectury.fluid.FluidStack toREIFLuidStack(FluidHolder from){ - return dev.architectury.fluid.FluidStack.create(from.getFluid(), from.getFluidAmount(), from.getCompound()); + public static dev.architectury.fluid.FluidStack toREIFLuidStack(FluidStack from){ + return dev.architectury.fluid.FluidStack.create(from.getFluid(), from.getAmount(), from.getTag()); } public static void addModDescriptor(List tooltip, T t) { @@ -48,7 +47,7 @@ public static void addExtraCategory(Consumer registry){ EXTRA_CATEGORIES.add(registry); } - public static void uses(FluidHolder val, boolean USE) { + public static void uses(FluidStack val, boolean USE) { EntryStack stack = EntryStack.of(VanillaEntryTypes.FLUID, toREIFLuidStack(val)); if (USE) ViewSearchBuilder.builder().addUsagesFor(stack).open(); else ViewSearchBuilder.builder().addRecipesFor(stack).open(); diff --git a/common/src/main/java/muramasa/antimatter/item/ItemFluidCell.java b/common/src/main/java/muramasa/antimatter/item/ItemFluidCell.java index 9df5dfdb8..1982d763f 100644 --- a/common/src/main/java/muramasa/antimatter/item/ItemFluidCell.java +++ b/common/src/main/java/muramasa/antimatter/item/ItemFluidCell.java @@ -51,6 +51,8 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import net.minecraftforge.event.ForgeEventFactory; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import org.jetbrains.annotations.Nullable; import tesseract.TesseractGraphWrappers; @@ -108,15 +110,18 @@ public long getTankSize() { @Override public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List tooltip, TooltipFlag flagIn) { if (worldIn == null) return; - FluidHooks.safeGetItemFluidManager(stack).ifPresent(x -> { - FluidHolder fluid = x.getFluidInTank(0); + stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY).ifPresent(x -> { + FluidStack fluid = x.getFluidInTank(0); if (!fluid.isEmpty()) { MutableComponent fluidname = (MutableComponent) FluidPlatformUtils.INSTANCE.getFluidDisplayName(fluid); - fluidname.append(": ").append(Utils.literal(NumberFormat.getNumberInstance(Locale.US).format(fluid.getFluidAmount()) + " mB").withStyle(ChatFormatting.GRAY)); + fluidname.append(": ").append(Utils.literal(NumberFormat.getNumberInstance(Locale.US).format(fluid.getAmount()) + " mB").withStyle(ChatFormatting.GRAY)); tooltip.add(fluidname); } tooltip.add(Utils.literal("Max Temp: " + ((ItemFluidCell) stack.getItem()).getMaxTemp() + "K")); }); + FluidHooks.safeGetItemFluidManager(stack).ifPresent(x -> { + + }); } public static TagKey getTag() { diff --git a/common/src/main/java/muramasa/antimatter/item/ItemFluidIcon.java b/common/src/main/java/muramasa/antimatter/item/ItemFluidIcon.java index 580311e00..3cce49567 100644 --- a/common/src/main/java/muramasa/antimatter/item/ItemFluidIcon.java +++ b/common/src/main/java/muramasa/antimatter/item/ItemFluidIcon.java @@ -21,6 +21,8 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.Fluids; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import org.jetbrains.annotations.Nullable; import tesseract.TesseractGraphWrappers; @@ -69,8 +71,8 @@ public long getTankSize() { @Override public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List tooltip, TooltipFlag flagIn) { tooltip.remove(0); - FluidHooks.safeGetItemFluidManager(stack).ifPresent(x -> { - FluidHolder fluid = x.getFluidInTank(0); + stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY).ifPresent(x -> { + FluidStack fluid = x.getFluidInTank(0); if (fluid.isEmpty()) return; List str = new ArrayList<>(); str.add(FluidPlatformUtils.INSTANCE.getFluidDisplayName(fluid)); diff --git a/common/src/main/resources/META-INF/services/muramasa.antimatter.integration.jei.JEIPlatformHelper b/common/src/main/resources/META-INF/services/muramasa.antimatter.integration.jei.JEIPlatformHelper deleted file mode 100644 index bb95dea01..000000000 --- a/common/src/main/resources/META-INF/services/muramasa.antimatter.integration.jei.JEIPlatformHelper +++ /dev/null @@ -1 +0,0 @@ -muramasa.antimatter.integration.jei.forge.JEIPlatformHelperImpl \ No newline at end of file