Make Architectury Plugin compile only

3 files changed, 12 insertions, 30 deletions

diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
index e97098ea7..240e85bef 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
@@ -26,8 +26,6 @@ package me.shedaniel.rei.plugin.client;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import dev.architectury.injectables.annotations.ExpectPlatform;
-import dev.architectury.injectables.annotations.PlatformOnly;
 import dev.architectury.platform.Platform;
 import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
 import it.unimi.dsi.fastutil.objects.ReferenceSet;
@@ -321,9 +319,7 @@ public class DefaultClientPlugin implements REIClientPlugin, BuiltinClientPlugin
         }
     }
     
-    @ExpectPlatform
-    @PlatformOnly(PlatformOnly.FORGE)
-    private static void registerForgePotions(DisplayRegistry registry, BuiltinClientPlugin clientPlugin) {
+    protected void registerForgePotions(DisplayRegistry registry, BuiltinClientPlugin clientPlugin) {
         
     }
     
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java
index f51fed428..c86cec93a 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java
@@ -24,10 +24,8 @@
 package me.shedaniel.rei.plugin.common;
 
 import dev.architectury.event.CompoundEventResult;
+import dev.architectury.hooks.fluid.FluidBucketHooks;
 import dev.architectury.hooks.fluid.FluidStackHooks;
-import dev.architectury.injectables.annotations.ExpectPlatform;
-import dev.architectury.injectables.annotations.PlatformOnly;
-import dev.architectury.platform.Platform;
 import me.shedaniel.rei.api.common.display.DisplaySerializerRegistry;
 import me.shedaniel.rei.api.common.entry.comparison.EntryComparator;
 import me.shedaniel.rei.api.common.entry.comparison.ItemComparatorRegistry;
@@ -92,27 +90,13 @@ public class DefaultPlugin implements BuiltinPlugin, REIServerPlugin {
             ItemStack stack = entry.getValue();
             Item item = stack.getItem();
             if (item instanceof BucketItem bucketItem) {
-                Fluid fluid = getFluidFromBucket(bucketItem);
+                Fluid fluid = FluidBucketHooks.getFluid(bucketItem);
                 if (fluid != null) {
                     return CompoundEventResult.interruptTrue(Stream.of(EntryStacks.of(fluid, FluidStackHooks.bucketAmount())));
                 }
             }
             return CompoundEventResult.pass();
         });
-        if (Platform.isForge()) {
-            registerForgeFluidSupport(support);
-        }
-    }
-    
-    @ExpectPlatform
-    @PlatformOnly(PlatformOnly.FORGE)
-    private static void registerForgeFluidSupport(FluidSupportProvider support) {
-        throw new AssertionError();
-    }
-    
-    @ExpectPlatform
-    private static Fluid getFluidFromBucket(BucketItem item) {
-        throw new AssertionError();
     }
     
     @Override
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultCraftingDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultCraftingDisplay.java
index ba64c1529..84f4b50e1 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultCraftingDisplay.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultCraftingDisplay.java
@@ -23,7 +23,7 @@
 
 package me.shedaniel.rei.plugin.common.displays.crafting;
 
-import dev.architectury.injectables.annotations.ExpectPlatform;
+import dev.architectury.platform.Platform;
 import it.unimi.dsi.fastutil.ints.IntIntImmutablePair;
 import it.unimi.dsi.fastutil.ints.IntIntPair;
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
@@ -49,6 +49,7 @@ import net.minecraft.world.item.crafting.ShapedRecipe;
 import net.minecraft.world.item.crafting.ShapelessRecipe;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 
 public abstract class DefaultCraftingDisplay<C extends Recipe<?>> extends BasicDisplay implements SimpleGridMenuDisplay {
@@ -66,7 +67,13 @@ public abstract class DefaultCraftingDisplay<C extends Recipe<?>> extends BasicD
     private static final List<CraftingRecipeSizeProvider<?>> SIZE_PROVIDER = new ArrayList<>();
     
     static {
-        registerPlatformSizeProvider();
+        try {
+            Class.forName("me.shedaniel.rei.plugin.common.displays.crafting.%s.DefaultCraftingDisplayImpl".formatted(Platform.isForge() ? "forge" : "fabric"))
+                    .getDeclaredMethod("registerPlatformSizeProvider")
+                    .invoke(null);
+        } catch (IllegalAccessException | ClassNotFoundException | NoSuchMethodException | InvocationTargetException e) {
+            throw new RuntimeException(e);
+        }
     }
     
     /**
@@ -106,11 +113,6 @@ public abstract class DefaultCraftingDisplay<C extends Recipe<?>> extends BasicD
         return null;
     }
     
-    @ExpectPlatform
-    private static void registerPlatformSizeProvider() {
-        throw new AssertionError();
-    }
-    
     @Override
     public CategoryIdentifier<?> getCategoryIdentifier() {
         return BuiltinPlugin.CRAFTING;