Remove terminal type filter

This commit is contained in:
Kogepan229 committed 2025-10-30 22:09:12 +09:00
1 parent cdc86aaca9
commit 3107ecf1c0
3 files changed
-45

No files matched your search

@@ -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);
}
@@ -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;
}
}
@@ -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 {