Rewrite ItemGroupBridge in Java

Juuxel · Aug 2, 2024 · 2d1811c · 2d1811c
1 parent 1ca7696
commit 2d1811c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 34 deletions.
diff --git a/common/src/main/java/juuxel/adorn/platform/ItemGroupBridge.java b/common/src/main/java/juuxel/adorn/platform/ItemGroupBridge.java
@@ -0,0 +1,20 @@
+package juuxel.adorn.platform;
+
+import juuxel.adorn.item.group.ItemGroupModifyContext;
+import juuxel.adorn.util.InlineServices;
+import juuxel.adorn.util.Services;
+import net.minecraft.item.ItemGroup;
+import net.minecraft.registry.RegistryKey;
+
+import java.util.function.Consumer;
+
+@InlineServices
+public interface ItemGroupBridge {
+    ItemGroup.Builder builder();
+    void addItems(RegistryKey<ItemGroup> group, Consumer<ItemGroupModifyContext> configurator);
+
+    @InlineServices.Getter
+    static ItemGroupBridge get() {
+        return Services.load(ItemGroupBridge.class);
+    }
+}
diff --git a/common/src/main/kotlin/juuxel/adorn/platform/ItemGroupBridge.kt b/common/src/main/kotlin/juuxel/adorn/platform/ItemGroupBridge.kt
diff --git a/fabric/src/main/java/juuxel/adorn/platform/fabric/ItemGroupBridgeFabric.java b/fabric/src/main/java/juuxel/adorn/platform/fabric/ItemGroupBridgeFabric.java
@@ -2,15 +2,14 @@
 
 import juuxel.adorn.item.group.ItemGroupModifyContext;
 import juuxel.adorn.platform.ItemGroupBridge;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
 import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.minecraft.item.ItemConvertible;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.registry.RegistryKey;
 
 import java.util.List;
+import java.util.function.Consumer;
 
 public final class ItemGroupBridgeFabric implements ItemGroupBridge {
     @Override
@@ -19,7 +18,7 @@ public ItemGroup.Builder builder() {
     }
 
     @Override
-    public void addItems(RegistryKey<ItemGroup> group, Function1<? super ItemGroupModifyContext, Unit> configurator) {
+    public void addItems(RegistryKey<ItemGroup> group, Consumer<ItemGroupModifyContext> configurator) {
         ItemGroupEvents.modifyEntriesEvent(group).register(entries -> {
             var context = new ItemGroupModifyContext() {
                 @Override
@@ -33,7 +32,7 @@ public void addAfter(ItemConvertible after, List<? extends ItemConvertible> item
                 }
             };
 
-            configurator.invoke(context);
+            configurator.accept(context);
         });
     }
 }
diff --git a/forge/src/main/java/juuxel/adorn/platform/forge/ItemGroupBridgeForge.java b/forge/src/main/java/juuxel/adorn/platform/forge/ItemGroupBridgeForge.java
@@ -3,8 +3,6 @@
 import com.mojang.datafixers.util.Pair;
 import juuxel.adorn.item.group.ItemGroupModifyContext;
 import juuxel.adorn.platform.ItemGroupBridge;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
 import net.minecraft.item.ItemConvertible;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
@@ -14,18 +12,19 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Consumer;
 
 public final class ItemGroupBridgeForge implements ItemGroupBridge {
     private static final ItemGroup.StackVisibility DEFAULT_STACK_VISIBILITY = ItemGroup.StackVisibility.PARENT_AND_SEARCH_TABS;
-    private final List<Pair<RegistryKey<ItemGroup>, Function1<? super ItemGroupModifyContext, Unit>>> additions = new ArrayList<>();
+    private final List<Pair<RegistryKey<ItemGroup>, Consumer<ItemGroupModifyContext>>> additions = new ArrayList<>();
 
     @Override
     public ItemGroup.Builder builder() {
         return ItemGroup.builder();
     }
 
     @Override
-    public void addItems(RegistryKey<ItemGroup> group, Function1<? super ItemGroupModifyContext, Unit> configurator) {
+    public void addItems(RegistryKey<ItemGroup> group, Consumer<ItemGroupModifyContext> configurator) {
         additions.add(new Pair<>(group, configurator));
     }
 
@@ -54,7 +53,7 @@ public void addAfter(ItemConvertible after, List<? extends ItemConvertible> item
                     }
                 }
             };
-            configurator.invoke(context);
+            configurator.accept(context);
         }
     }
 }