From 3107ecf1c095641a41144ae30076d48597e81e64 Mon Sep 17 00:00:00 2001 From: Kogepan229 Date: Thu, 30 Oct 2025 22:09:12 +0900 Subject: [PATCH] Remove terminal type filter --- .../java/com/glodblock/github/FluidCraft.java | 5 --- .../github/loader/filter/FluidFilter.java | 33 ------------------- .../github/util/ModAndClassUtil.java | 7 ---- 3 files changed, 45 deletions(-) delete mode 100644 src/main/java/com/glodblock/github/loader/filter/FluidFilter.java diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java index a01ed5a2..706ce9da 100644 --- a/src/main/java/com/glodblock/github/FluidCraft.java +++ b/src/main/java/com/glodblock/github/FluidCraft.java @@ -10,11 +10,9 @@ import com.glodblock.github.loader.CalculatorV2PluginLoader; import com.glodblock.github.loader.ChannelLoader; import com.glodblock.github.loader.ItemAndBlockHolder; import com.glodblock.github.loader.RecipeLoader; -import com.glodblock.github.loader.filter.FluidFilter; import com.glodblock.github.proxy.CommonProxy; import com.glodblock.github.util.ModAndClassUtil; -import appeng.api.AEApi; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -79,9 +77,6 @@ public class FluidCraft { if (ModAndClassUtil.isV2) { CalculatorV2PluginLoader.installCalculatorV2Plugins(); } - if (ModAndClassUtil.isTypeFilter) { - AEApi.instance().registries().itemDisplay().addItemFilter(FluidFilter::filter); - } proxy.postInit(event); } diff --git a/src/main/java/com/glodblock/github/loader/filter/FluidFilter.java b/src/main/java/com/glodblock/github/loader/filter/FluidFilter.java deleted file mode 100644 index 9f8ac6d7..00000000 --- a/src/main/java/com/glodblock/github/loader/filter/FluidFilter.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.glodblock.github.loader.filter; - -import static appeng.api.config.TypeFilter.ALL; - -import net.minecraft.item.Item; - -import com.glodblock.github.common.item.ItemFluidDrop; - -import appeng.api.config.TypeFilter; -import appeng.api.storage.data.IAEItemStack; -import appeng.api.storage.data.IAEStack; - -public class FluidFilter { - - public static boolean filter(TypeFilter typeFilter, IAEStack stack) { - if (typeFilter == ALL) return true; - if (stack instanceof IAEItemStack) { - Item item = ((IAEItemStack) stack).getItem(); - if (item != null) { - switch (typeFilter) { - case ITEMS -> { - return !(item instanceof ItemFluidDrop); - } - case FLUIDS -> { - return item instanceof ItemFluidDrop; - } - default -> {} - } - } - } - return true; - } -} diff --git a/src/main/java/com/glodblock/github/util/ModAndClassUtil.java b/src/main/java/com/glodblock/github/util/ModAndClassUtil.java index 65b62cac..e0ddf206 100644 --- a/src/main/java/com/glodblock/github/util/ModAndClassUtil.java +++ b/src/main/java/com/glodblock/github/util/ModAndClassUtil.java @@ -37,7 +37,6 @@ public final class ModAndClassUtil { public static boolean NEW_HORIZONS_CORE_MOD = false; public static boolean isV2; - public static boolean isTypeFilter; public static boolean isDoubleButton; public static boolean isSaveText; public static boolean isSearchStringTooltip; @@ -120,12 +119,6 @@ public final class ModAndClassUtil { } catch (ClassNotFoundException e) { isV2 = false; } - try { - Class filter = Class.forName("appeng.core.features.registries.ItemDisplayRegistry"); - isTypeFilter = true; - } catch (ClassNotFoundException e) { - isTypeFilter = false; - } if (Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi")) { try {