Merge pull request #8 from refinedmods/release/0.1.2

Release v0.1.2
refinedmods · Jun 20, 2024 · c301ba9 · c301ba9
2 parents 4dd73e1 + 3bd8251
commit c301ba9
Show file tree

Hide file tree

Showing 15 changed files with 67 additions and 104 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.1.2] - 2024-06-20
+
+### Fixed
+
+-   Potential load order issues on Fabric.
+
 ## [0.1.1] - 2024-06-16
 
 ### Fixed
@@ -24,7 +30,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 -   Support for REI collapsable entries.
 -   Grid / REI search box synchronization options.
 
-[Unreleased]: https://github.com/refinedmods/refinedstorage-rei-integration/compare/v0.1.1...HEAD
+[Unreleased]: https://github.com/refinedmods/refinedstorage-rei-integration/compare/v0.1.2...HEAD
+
+[0.1.2]: https://github.com/refinedmods/refinedstorage-rei-integration/compare/v0.1.1...v0.1.2
 
 [0.1.1]: https://github.com/refinedmods/refinedstorage-rei-integration/compare/v0.1.0...v0.1.1
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-refinedstorageVersion=2.0.0-milestone.3.10
+refinedstorageVersion=2.0.0-milestone.3.13
 architecturyVersion=11.1.17
 clothConfigVersion=13.0.121
 reiVersion=14.1.727

diff --git a/refinedstorage-rei-integration-fabric/build.gradle b/refinedstorage-rei-integration-fabric/build.gradle
@@ -10,21 +10,17 @@ repositories {
             password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
         }
     }
-    maven {
-        name = 'ModMenu'
-        url 'https://maven.terraformersmc.com/'
-    }
     maven {
         name = 'Cloth Config, REI'
         url 'https://maven.shedaniel.me/'
     }
     maven {
-        name = 'NoIndium'
-        url = 'https://maven.cafeteria.dev/releases/'
+        name = 'ModMenu'
+        url 'https://maven.terraformersmc.com/'
     }
     maven {
-        name = "Trinkets"
-        url = 'https://maven.ladysnake.org/releases'
+        name = 'NoIndium'
+        url = 'https://maven.cafeteria.dev/releases/'
     }
 }
 

diff --git a/...ric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/ClientModInitializerImpl.java b/...ric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/ClientModInitializerImpl.java
diff --git a/...ic/src/main/java/com/refinedmods/refinedstorage/rei/fabric/DraggableStackVisitorImpl.java b/...ic/src/main/java/com/refinedmods/refinedstorage/rei/fabric/DraggableStackVisitorImpl.java
@@ -4,8 +4,8 @@
 import java.util.List;
 import java.util.stream.Stream;
 
+import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
 import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
-import com.refinedmods.refinedstorage2.platform.api.support.resource.RecipeModIngredientConverter;
 import com.refinedmods.refinedstorage2.platform.common.Platform;
 import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen;
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu;
@@ -19,12 +19,6 @@
 
 class DraggableStackVisitorImpl
     implements DraggableStackVisitor<AbstractBaseScreen<? extends AbstractResourceContainerMenu>> {
-    private final RecipeModIngredientConverter ingredientConverter;
-
-    DraggableStackVisitorImpl(final RecipeModIngredientConverter ingredientConverter) {
-        this.ingredientConverter = ingredientConverter;
-    }
-
     @Override
     public Stream<BoundsProvider> getDraggableAcceptingBounds(
         final DraggingContext<AbstractBaseScreen<? extends AbstractResourceContainerMenu>> context,
@@ -34,7 +28,7 @@ public Stream<BoundsProvider> getDraggableAcceptingBounds(
         final var menu = screen.getMenu();
         final var value = stack.getStack().getValue();
         final List<BoundsProvider> bounds = new ArrayList<>();
-        ingredientConverter.convertToResource(value).ifPresent(resource -> {
+        PlatformApi.INSTANCE.getIngredientConverter().convertToResource(value).ifPresent(resource -> {
             for (final ResourceSlot slot : menu.getResourceSlots()) {
                 if (slot.isFilter() && slot.isValid(resource)) {
                     bounds.add(BoundsProvider.ofRectangle(toRectangle(screen, slot)));
@@ -52,7 +46,7 @@ public DraggedAcceptorResult acceptDraggedStack(
         final var screen = context.getScreen();
         final var menu = screen.getMenu();
         final Object value = stack.getStack().getValue();
-        return ingredientConverter.convertToResource(value)
+        return PlatformApi.INSTANCE.getIngredientConverter().convertToResource(value)
             .map(resource -> accept(context, menu, screen, resource))
             .orElse(DraggedAcceptorResult.PASS);
     }

diff --git a/...ric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/GridFocusedStackProvider.java b/...ric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/GridFocusedStackProvider.java
@@ -1,7 +1,7 @@
 package com.refinedmods.refinedstorage.rei.fabric;
 
+import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
 import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
-import com.refinedmods.refinedstorage2.platform.api.support.resource.RecipeModIngredientConverter;
 import com.refinedmods.refinedstorage2.platform.common.grid.screen.AbstractGridScreen;
 import dev.architectury.event.CompoundEventResult;
 import me.shedaniel.math.Point;
@@ -10,12 +10,6 @@
 import net.minecraft.client.gui.screens.Screen;
 
 class GridFocusedStackProvider implements FocusedStackProvider {
-    private final RecipeModIngredientConverter converter;
-
-    GridFocusedStackProvider(final RecipeModIngredientConverter converter) {
-        this.converter = converter;
-    }
-
     @Override
     public CompoundEventResult<EntryStack<?>> provide(final Screen screen, final Point mouse) {
         if (!(screen instanceof AbstractGridScreen<?> gridScreen)) {
@@ -25,7 +19,9 @@ public CompoundEventResult<EntryStack<?>> provide(final Screen screen, final Poi
         if (resource == null) {
             return CompoundEventResult.pass();
         }
-        final Object converted = converter.convertToIngredient(resource).orElse(null);
+        final Object converted = PlatformApi.INSTANCE.getIngredientConverter()
+            .convertToIngredient(resource)
+            .orElse(null);
         if (converted instanceof EntryStack<?> stack) {
             return CompoundEventResult.interruptTrue(stack);
         }

diff --git a/...ation-fabric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/ReiClientPlugin.java b/...ation-fabric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/ReiClientPlugin.java
@@ -2,8 +2,6 @@
 
 import java.util.function.Supplier;
 
-import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
-import com.refinedmods.refinedstorage2.platform.api.support.resource.RecipeModIngredientConverter;
 import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap;
 import com.refinedmods.refinedstorage2.platform.common.content.Blocks;
 import com.refinedmods.refinedstorage2.platform.common.content.ContentIds;
@@ -32,10 +30,9 @@
 public class ReiClientPlugin implements REIClientPlugin {
     @Override
     public void registerScreens(final ScreenRegistry registry) {
-        final RecipeModIngredientConverter converter = PlatformApi.INSTANCE.getIngredientConverter();
-        registry.registerFocusedStack(new GridFocusedStackProvider(converter));
-        registry.registerFocusedStack(new ResourceFocusedStackProvider(converter));
-        registry.registerDraggableStackVisitor(new DraggableStackVisitorImpl(converter));
+        registry.registerFocusedStack(new GridFocusedStackProvider());
+        registry.registerFocusedStack(new ResourceFocusedStackProvider());
+        registry.registerDraggableStackVisitor(new DraggableStackVisitorImpl());
     }
 
     @Override

diff --git a/...bric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/ReiRefinedStoragePlugin.java b/...bric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/ReiRefinedStoragePlugin.java
@@ -0,0 +1,16 @@
+package com.refinedmods.refinedstorage.rei.fabric;
+
+import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
+import com.refinedmods.refinedstorage2.platform.api.RefinedStoragePlugin;
+
+import static com.refinedmods.refinedstorage.rei.common.Common.SYNCHRONIZER_ID;
+import static com.refinedmods.refinedstorage.rei.common.Common.TWO_WAY_SYNCHRONIZER_ID;
+
+public class ReiRefinedStoragePlugin implements RefinedStoragePlugin {
+    @Override
+    public void onPlatformApiAvailable(final PlatformApi platformApi) {
+        platformApi.addIngredientConverter(new ReiRecipeModIngredientConverter());
+        platformApi.getGridSynchronizerRegistry().register(SYNCHRONIZER_ID, new ReiGridSynchronizer(false));
+        platformApi.getGridSynchronizerRegistry().register(TWO_WAY_SYNCHRONIZER_ID, new ReiGridSynchronizer(true));
+    }
+}
diff --git a/...src/main/java/com/refinedmods/refinedstorage/rei/fabric/ResourceFocusedStackProvider.java b/...src/main/java/com/refinedmods/refinedstorage/rei/fabric/ResourceFocusedStackProvider.java
@@ -1,7 +1,7 @@
 package com.refinedmods.refinedstorage.rei.fabric;
 
+import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
 import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
-import com.refinedmods.refinedstorage2.platform.api.support.resource.RecipeModIngredientConverter;
 import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen;
 import dev.architectury.event.CompoundEventResult;
 import me.shedaniel.math.Point;
@@ -10,12 +10,6 @@
 import net.minecraft.client.gui.screens.Screen;
 
 class ResourceFocusedStackProvider implements FocusedStackProvider {
-    private final RecipeModIngredientConverter converter;
-
-    ResourceFocusedStackProvider(final RecipeModIngredientConverter converter) {
-        this.converter = converter;
-    }
-
     @Override
     public CompoundEventResult<EntryStack<?>> provide(final Screen screen, final Point mouse) {
         if (!(screen instanceof AbstractBaseScreen<?> baseScreen)) {
@@ -25,7 +19,9 @@ public CompoundEventResult<EntryStack<?>> provide(final Screen screen, final Poi
         if (hoveredResource == null) {
             return CompoundEventResult.pass();
         }
-        final Object converted = converter.convertToIngredient(hoveredResource).orElse(null);
+        final Object converted = PlatformApi.INSTANCE.getIngredientConverter()
+            .convertToIngredient(hoveredResource)
+            .orElse(null);
         if (converted instanceof EntryStack<?> stack) {
             return CompoundEventResult.interruptTrue(stack);
         }

diff --git a/refinedstorage-rei-integration-fabric/src/main/resources/fabric.mod.json b/refinedstorage-rei-integration-fabric/src/main/resources/fabric.mod.json
@@ -14,8 +14,8 @@
   "license": "MIT",
   "environment": "*",
   "entrypoints": {
-    "client": [
-      "com.refinedmods.refinedstorage.rei.fabric.ClientModInitializerImpl"
+    "refinedstorage_plugin": [
+      "com.refinedmods.refinedstorage.rei.fabric.ReiRefinedStoragePlugin"
     ],
     "rei_client": [
       "com.refinedmods.refinedstorage.rei.fabric.ReiClientPlugin"

diff --git a/refinedstorage-rei-integration-forge/build.gradle b/refinedstorage-rei-integration-forge/build.gradle
@@ -7,6 +7,13 @@ archivesBaseName = 'refinedstorage-rei-integration-forge'
 forgeProject("refinedstorage_rei_integration", project(":refinedstorage-rei-integration-common"))
 
 repositories {
+    maven {
+        url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2")
+        credentials {
+            username = "anything"
+            password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
+        }
+    }
     maven {
         name = 'REI'
         url 'https://maven.shedaniel.me/'
@@ -15,17 +22,6 @@ repositories {
         name = 'Architectury'
         url "https://maven.architectury.dev/"
     }
-    maven {
-        name = 'Curios'
-        url = "https://maven.theillusivec4.top/"
-    }
-    maven {
-        url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2")
-        credentials {
-            username = "anything"
-            password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
-        }
-    }
 }
 
 dependencies {

diff --git a/...rge/src/main/java/com/refinedmods/refinedstorage/rei/forge/DraggableStackVisitorImpl.java b/...rge/src/main/java/com/refinedmods/refinedstorage/rei/forge/DraggableStackVisitorImpl.java
@@ -4,8 +4,8 @@
 import java.util.List;
 import java.util.stream.Stream;
 
+import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
 import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
-import com.refinedmods.refinedstorage2.platform.api.support.resource.RecipeModIngredientConverter;
 import com.refinedmods.refinedstorage2.platform.common.Platform;
 import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen;
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu;
@@ -19,12 +19,6 @@
 
 class DraggableStackVisitorImpl
     implements DraggableStackVisitor<AbstractBaseScreen<? extends AbstractResourceContainerMenu>> {
-    private final RecipeModIngredientConverter ingredientConverter;
-
-    DraggableStackVisitorImpl(final RecipeModIngredientConverter ingredientConverter) {
-        this.ingredientConverter = ingredientConverter;
-    }
-
     @Override
     public Stream<BoundsProvider> getDraggableAcceptingBounds(
         final DraggingContext<AbstractBaseScreen<? extends AbstractResourceContainerMenu>> context,
@@ -34,7 +28,7 @@ public Stream<BoundsProvider> getDraggableAcceptingBounds(
         final var menu = screen.getMenu();
         final var value = stack.getStack().getValue();
         final List<BoundsProvider> bounds = new ArrayList<>();
-        ingredientConverter.convertToResource(value).ifPresent(resource -> {
+        PlatformApi.INSTANCE.getIngredientConverter().convertToResource(value).ifPresent(resource -> {
             for (final ResourceSlot slot : menu.getResourceSlots()) {
                 if (slot.isFilter() && slot.isValid(resource)) {
                     bounds.add(BoundsProvider.ofRectangle(toRectangle(screen, slot)));
@@ -52,7 +46,7 @@ public DraggedAcceptorResult acceptDraggedStack(
         final var screen = context.getScreen();
         final var menu = screen.getMenu();
         final Object value = stack.getStack().getValue();
-        return ingredientConverter.convertToResource(value)
+        return PlatformApi.INSTANCE.getIngredientConverter().convertToResource(value)
             .map(resource -> accept(context, menu, screen, resource))
             .orElse(DraggedAcceptorResult.PASS);
     }

diff --git a/...orge/src/main/java/com/refinedmods/refinedstorage/rei/forge/GridFocusedStackProvider.java b/...orge/src/main/java/com/refinedmods/refinedstorage/rei/forge/GridFocusedStackProvider.java
@@ -1,7 +1,7 @@
 package com.refinedmods.refinedstorage.rei.forge;
 
+import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
 import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
-import com.refinedmods.refinedstorage2.platform.api.support.resource.RecipeModIngredientConverter;
 import com.refinedmods.refinedstorage2.platform.common.grid.screen.AbstractGridScreen;
 import dev.architectury.event.CompoundEventResult;
 import me.shedaniel.math.Point;
@@ -10,12 +10,6 @@
 import net.minecraft.client.gui.screens.Screen;
 
 class GridFocusedStackProvider implements FocusedStackProvider {
-    private final RecipeModIngredientConverter converter;
-
-    GridFocusedStackProvider(final RecipeModIngredientConverter converter) {
-        this.converter = converter;
-    }
-
     @Override
     public CompoundEventResult<EntryStack<?>> provide(final Screen screen, final Point mouse) {
         if (!(screen instanceof AbstractGridScreen<?> gridScreen)) {
@@ -25,7 +19,9 @@ public CompoundEventResult<EntryStack<?>> provide(final Screen screen, final Poi
         if (underlyingResource == null) {
             return CompoundEventResult.pass();
         }
-        final Object converted = converter.convertToIngredient(underlyingResource).orElse(null);
+        final Object converted = PlatformApi.INSTANCE.getIngredientConverter()
+            .convertToIngredient(underlyingResource)
+            .orElse(null);
         if (converted instanceof EntryStack<?> stack) {
             return CompoundEventResult.interruptTrue(stack);
         }

diff --git a/...gration-forge/src/main/java/com/refinedmods/refinedstorage/rei/forge/ReiClientPlugin.java b/...gration-forge/src/main/java/com/refinedmods/refinedstorage/rei/forge/ReiClientPlugin.java
@@ -2,8 +2,6 @@
 
 import java.util.function.Supplier;
 
-import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
-import com.refinedmods.refinedstorage2.platform.api.support.resource.RecipeModIngredientConverter;
 import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap;
 import com.refinedmods.refinedstorage2.platform.common.content.Blocks;
 import com.refinedmods.refinedstorage2.platform.common.content.ContentIds;
@@ -31,10 +29,9 @@
 public class ReiClientPlugin implements REIClientPlugin {
     @Override
     public void registerScreens(final ScreenRegistry registry) {
-        final RecipeModIngredientConverter converter = PlatformApi.INSTANCE.getIngredientConverter();
-        registry.registerFocusedStack(new GridFocusedStackProvider(converter));
-        registry.registerFocusedStack(new ResourceFocusedStackProvider(converter));
-        registry.registerDraggableStackVisitor(new DraggableStackVisitorImpl(converter));
+        registry.registerFocusedStack(new GridFocusedStackProvider());
+        registry.registerFocusedStack(new ResourceFocusedStackProvider());
+        registry.registerDraggableStackVisitor(new DraggableStackVisitorImpl());
     }
 
     @Override

diff --git a/.../src/main/java/com/refinedmods/refinedstorage/rei/forge/ResourceFocusedStackProvider.java b/.../src/main/java/com/refinedmods/refinedstorage/rei/forge/ResourceFocusedStackProvider.java
@@ -1,7 +1,7 @@
 package com.refinedmods.refinedstorage.rei.forge;
 
+import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
 import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
-import com.refinedmods.refinedstorage2.platform.api.support.resource.RecipeModIngredientConverter;
 import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen;
 import dev.architectury.event.CompoundEventResult;
 import me.shedaniel.math.Point;
@@ -10,12 +10,6 @@
 import net.minecraft.client.gui.screens.Screen;
 
 class ResourceFocusedStackProvider implements FocusedStackProvider {
-    private final RecipeModIngredientConverter converter;
-
-    ResourceFocusedStackProvider(final RecipeModIngredientConverter converter) {
-        this.converter = converter;
-    }
-
     @Override
     public CompoundEventResult<EntryStack<?>> provide(final Screen screen, final Point mouse) {
         if (!(screen instanceof AbstractBaseScreen<?> baseScreen)) {
@@ -25,7 +19,9 @@ public CompoundEventResult<EntryStack<?>> provide(final Screen screen, final Poi
         if (hoveredResource == null) {
             return CompoundEventResult.pass();
         }
-        final Object converted = converter.convertToIngredient(hoveredResource).orElse(null);
+        final Object converted = PlatformApi.INSTANCE.getIngredientConverter()
+            .convertToIngredient(hoveredResource)
+            .orElse(null);
         if (converted instanceof EntryStack<?> stack) {
             return CompoundEventResult.interruptTrue(stack);
         }