Merge pull request #560 from refinedmods/release/2.0.0-milestone.3.11

Release v2.0.0-milestone.3.11

CHANGELOG.md

@@ -7,6 +7,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [2.0.0-milestone.3.11] - 2024-06-16
+
+### Removed
+
+-   The Curios integration has been removed and will be moved to an addon mod.
+
 ## [2.0.0-milestone.3.10] - 2024-06-16
 
 ## [2.0.0-milestone.3.9] - 2024-06-09
@@ -592,7 +598,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 -   The Grid can now use smooth scrolling.
 -   The Grid now has syntax highlighting for the search query.
 
-[Unreleased]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.3.10...HEAD
+[Unreleased]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.3.11...HEAD
+
+[2.0.0-milestone.3.11]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.3.10...v2.0.0-milestone.3.11
 
 [2.0.0-milestone.3.10]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.3.9...v2.0.0-milestone.3.10
 

gradle.properties

@@ -1,6 +1,5 @@
 noIndiumVersion=1.1.0+1.20.4
 trinketsVersion=3.8.0
 cardinalComponentsVersion=5.4.0
-curiosVersion=7.1.0+1.20.4
 # Gradle
 org.gradle.jvmargs=-Xmx1G

refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json

@@ -270,7 +270,6 @@
   "key.refinedstorage2.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory",
   "key.refinedstorage2.open_wireless_grid": "Open Wireless Grid",
   "refinedstorage2.subtitle.wrench": "Wrench used",
-  "curios.identifier.refinedstorage2": "Refined Storage 2",
   "trinkets.slot.refinedstorage2.wireless": "Refined Storage 2",
   "permission.refinedstorage2.insert": "Insert",
   "permission.refinedstorage2.insert.description": "Whether the player can insert resources in a network.",

refinedstorage2-platform-forge/build.gradle

@@ -1,21 +1,5 @@
-plugins {
-    id 'java-library'
-}
-
-repositories {
-    maven {
-        name = 'Curios'
-        url = "https://maven.theillusivec4.top/"
-    }
-}
-
 forgeProject("refinedstorage2", project(":refinedstorage2-platform-common"), apis, compileApis)
 
 archivesBaseName = 'refinedstorage2-platform-forge'
 
-dependencies {
-    runtimeOnly "top.theillusivec4.curios:curios-neoforge:${curiosVersion}"
-    compileOnlyApi "top.theillusivec4.curios:curios-neoforge:${curiosVersion}:api"
-}
-
 enablePublishing()

refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ModInitializer.java

@@ -37,8 +37,6 @@
 import com.refinedmods.refinedstorage2.platform.forge.storage.externalstorage.ItemHandlerPlatformExternalStorageProviderFactory;
 import com.refinedmods.refinedstorage2.platform.forge.storage.portablegrid.ForgePortableGridBlockEntity;
 import com.refinedmods.refinedstorage2.platform.forge.support.energy.EnergyStorageAdapter;
-import com.refinedmods.refinedstorage2.platform.forge.support.network.bounditem.CuriosSlotReferenceFactory;
-import com.refinedmods.refinedstorage2.platform.forge.support.network.bounditem.CuriosSlotReferenceProvider;
 import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.CraftingGridClearPacket;
 import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.CraftingGridRecipeTransferPacket;
 import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.GridExtractPacket;
@@ -383,18 +381,6 @@ private void registerTickHandler() {
         NeoForge.EVENT_BUS.addListener(this::onServerTick);
     }
 
-    @Override
-    protected void registerSlotReferenceProviders() {
-        super.registerSlotReferenceProviders();
-        CuriosSlotReferenceProvider.create().ifPresent(slotReferenceProvider -> {
-            PlatformApi.INSTANCE.getSlotReferenceFactoryRegistry().register(
-                createIdentifier("curios"),
-                CuriosSlotReferenceFactory.INSTANCE
-            );
-            PlatformApi.INSTANCE.addSlotReferenceProvider(slotReferenceProvider);
-        });
-    }
-
     @SubscribeEvent
     public void onCommonSetup(final FMLCommonSetupEvent e) {
         registerUpgradeMappings();