1.21.1 RS Bridge to RS2 port

CHANGELOG.md

@@ -7,6 +7,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Changed
+- We enhanced the RS Bridge in a major way including new functions, a better crafting system and more. Refer to the [docs](https://docs.advanced-peripherals.de/0.7-bridges/guides/storage_system_functions/)
+
 ### Fixed
 - [#711] Fixed that the block reader would not be able to access registries for component information
 

build.gradle

@@ -175,15 +175,23 @@ repositories {
         }
     }
     maven {
-        url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage")
+        url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2")
         credentials {
             username = "anything"
             password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
         }
-        content {
-            includeModule("com.refinedmods", "refinedstorage")
+    }
+    maven {
+        url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage-mekanism-integration")
+        credentials {
+            username = "anything"
+            password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
         }
     }
+    maven {
+        name = "EMI"
+        url = uri("https://maven.terraformersmc.com/")
+    }
     maven {
         name = 'Kotlin for Forge'
         url = 'https://thedarkcolour.github.io/KotlinForForge/'
@@ -214,13 +222,21 @@ dependencies {
     compileOnly "org.jetbrains:annotations:${jb_annotations}"
     implementation "net.neoforged:neoforge:${neo_version}"
     implementation "cc.tweaked:cc-tweaked-${minecraft_version}-forge:${cc_version}"
-
     // Minimal requirements end
 
+    compileOnly("com.refinedmods.refinedstorage:refinedstorage-neoforge:${refinedstorage_version}")
+    runtimeOnly("com.refinedmods.refinedstorage:refinedstorage-neoforge:${refinedstorage_version}")
+
+    compileOnly("com.refinedmods.refinedstorage:refinedstorage-mekanism-integration:${refinedstorage_mekanism_version}")
+    runtimeOnly("com.refinedmods.refinedstorage:refinedstorage-mekanism-integration:${refinedstorage_mekanism_version}")
+
+    // Needed for the refined storage mek integration
+    compileOnlyApi("dev.emi:emi-neoforge:${emiVersion}")
+
     // Extended requirements
     // We don't use the api since we need a specific class from mekanism
     compileOnly "mekanism:Mekanism:${mekanism_version}"
-    // runtimeOnly "mekanism:Mekanism:${mekanism_version}"
+    runtimeOnly "mekanism:Mekanism:${mekanism_version}"
 
     // Applied Energistics 2
     compileOnly "appeng:appliedenergistics2:${appliedenergistics_version}"

gradle.properties

@@ -10,7 +10,7 @@ mod_id=advancedperipherals
 mod_version=0.7.49a
 minecraft_version=1.21.1
 mod_artifact_suffix=
-neo_version=21.1.115
+neo_version=21.1.133
 parchment_minecraft_version=1.21.1
 parchment_mappings_version=2024.11.17
 loader_version=4
@@ -25,14 +25,16 @@ kotlinx_coroutines_version=1.6.0-RC3
 ttoolkit_version=0.1.3
 
 # Mod dependencies
-cc_version=1.113.1
+cc_version=1.115.1
 
 ae2things_version=5637783
 appliedenergistics_version=19.1.2-beta
 appliedmekanistics_version=5978711
-mekanism_version=1.21.1-10.7.8.70
+refinedstorage_version=2.0.0-beta.2
+refinedstorage_mekanism_version=1.0.0
 minecolonies_version=1.1.846-1.21.1-snapshot
 patchouli_version=1.21-87
+mekanism_version=1.21.1-10.7.12.77
 powah_version=6143661
 
 # Mod dependencies which are needed for other mods
@@ -41,6 +43,8 @@ structurize_version=1.0.755-1.21.1-snapshot
 multipiston_version=1.2.51-1.21.1-snapshot
 blockui_version=1.0.192-1.21.1-snapshot
 domumornamentum_version=1.0.204-1.21.1-snapshot
+# refined storage mek integration
+emiVersion=1.1.11+1.21
 # powah
 cloth_config_version=15.0.127
 

src/generated/resources/.cache/2f719b8031aed5e605ed8d6694b19245ca45c6ca

@@ -1,2 +1,2 @@
-// 1.21.1	2025-01-15T03:22:26.2798836	Languages: en_us for mod: advancedperipherals
-df95afe714aeff7559b0093257aeca501dabb1e2 assets/advancedperipherals/lang/en_us.json
+// 1.21.1	2025-03-20T00:32:42.9859105	Languages: en_us for mod: advancedperipherals
+d2006c7f1d9c5f1f768b50a3c445dc8b566bf9dd assets/advancedperipherals/lang/en_us.json

src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d

@@ -1,4 +1,4 @@
-// 1.21.1	2025-01-14T18:51:29.8897473	Loot Tables
+// 1.21.1	2025-01-14T21:35:41.3183672	Loot Tables
 9b54955770745d55de988a86cbd08aa9ae23ff86 data/advancedperipherals/loot_table/blocks/block_reader.json
 d4f1bc579f83dc67ce9f94d35926d34b8894c990 data/advancedperipherals/loot_table/blocks/chat_box.json
 9ac96b8e3da827886d8da459a2f146e8ae3ee798 data/advancedperipherals/loot_table/blocks/colony_integrator.json
@@ -11,3 +11,4 @@ ae62bfa75e39a59374602c8a87cc2afe8b4923dd data/advancedperipherals/loot_table/blo
 fa56de9a073f32ab8a65b5f17c57f360a157b5c1 data/advancedperipherals/loot_table/blocks/peripheral_casing.json
 d61b1c54dd6da8f0213d5eb8a5b40d78bff5ba90 data/advancedperipherals/loot_table/blocks/player_detector.json
 6bad9bed7baa7af4b5ca3cae7c4cb8d47dc7b593 data/advancedperipherals/loot_table/blocks/redstone_integrator.json
+76cdba2795aafc897a579670afb264b75147f498 data/advancedperipherals/loot_table/blocks/rs_bridge.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -1,4 +1,4 @@
-// 1.21.1	2025-01-14T19:12:56.350339	Recipes
+// 1.21.1	2025-01-14T21:43:25.122686	Recipes
 f5ba1f7d129c88dca1a13c8deaae2d269644c7fa data/advancedperipherals/advancement/recipes/redstone/block_reader.json
 e172645262ade9fc4a1c999a2c0041711c2eab55 data/advancedperipherals/advancement/recipes/redstone/chat_box.json
 213de9a7e340c5eb9c01d82a72e7b58921c5290a data/advancedperipherals/advancement/recipes/redstone/chunk_controller.json
@@ -17,6 +17,7 @@ f218420f4c94524614229bb2d50e5c7f8e6beb28 data/advancedperipherals/advancement/re
 2c38bc3468e8db1caac94d8ddfff68f50d596439 data/advancedperipherals/advancement/recipes/redstone/peripheral_casing.json
 7dd96be9f8e31ce60752727119aa9fc738c43e3b data/advancedperipherals/advancement/recipes/redstone/player_detector.json
 38be5210a7d2bb22d63674af46867a1b38c022e1 data/advancedperipherals/advancement/recipes/redstone/redstone_integrator.json
+a0cab6b6139cd0d6fa86842031a59a3eff69a4ea data/advancedperipherals/advancement/recipes/redstone/rs_bridge.json
 6489fff67f0d703c3a087d728eb4801413b686f5 data/advancedperipherals/advancement/recipes/redstone/weak_automata_core.json
 b48e0eed6f4cfbe62c8b7c411e92e3b38ad4e4f9 data/advancedperipherals/recipe/block_reader.json
 c8d06dd085c0477f94d90f3a5f0800c3efc08d02 data/advancedperipherals/recipe/chat_box.json
@@ -36,4 +37,5 @@ ba80666226c2a0d1aa30709e31756ca27076069a data/advancedperipherals/recipe/overpow
 0d659e0d2c832e4eef3e43cb77ddad64e071345a data/advancedperipherals/recipe/peripheral_casing.json
 205166613824976d691cd0503f0e399e5b17616e data/advancedperipherals/recipe/player_detector.json
 b219e8902fcea47776cb23c85e25e58efecc8f00 data/advancedperipherals/recipe/redstone_integrator.json
+e0228e5cddd9cc266fadb0fd7c9476285f79143c data/advancedperipherals/recipe/rs_bridge.json
 898d1243e5d1038e934f3ef5522aeae2f0468f43 data/advancedperipherals/recipe/weak_automata_core.json

src/generated/resources/.cache/b8526e444ae7356037f3a813274f6835d1f3dd16

@@ -1,4 +1,4 @@
-// 1.21.1	2025-01-15T03:30:04.6987737	Block States: advancedperipherals
+// 1.21.1	2025-01-15T15:11:12.9901322	Block States: advancedperipherals
 5e28ce1be9a6996d982641e5df1fa7162090b8cc assets/advancedperipherals/blockstates/block_reader.json
 f42bdde60f84fdb312f7cf3b2be461d9c11ebdc8 assets/advancedperipherals/blockstates/chat_box.json
 1227aa092fcf1327547ace6ccc9db230e45891b0 assets/advancedperipherals/blockstates/colony_integrator.json
@@ -11,6 +11,7 @@ d1fe6188b0b0ce8779cb9795a746177858cbaa41 assets/advancedperipherals/blockstates/
 51d1ce8b8772773acc82895ff6314370138c9d5a assets/advancedperipherals/blockstates/peripheral_casing.json
 ff12c7217911184266589813a2c8f9b0d46cfd65 assets/advancedperipherals/blockstates/player_detector.json
 726cf2599b0c765bcfacda88a1943be74f985877 assets/advancedperipherals/blockstates/redstone_integrator.json
+6b176e8fdb048f7b6678bfbc1c4baf2bcfa67a1f assets/advancedperipherals/blockstates/rs_bridge.json
 544ff1ecb58622350b58940036b4b1908e1146da assets/advancedperipherals/models/block/block_reader.json
 dab55424ec184c5495c7ca11e5bbe77210e04c26 assets/advancedperipherals/models/block/chat_box.json
 7e207db9b2b170f52565c8ed23bcc92762be6c4d assets/advancedperipherals/models/block/colony_integrator.json
@@ -23,3 +24,4 @@ dab55424ec184c5495c7ca11e5bbe77210e04c26 assets/advancedperipherals/models/block
 36b6ac01be085492aa6298eeb89e6ecaa3cb6f82 assets/advancedperipherals/models/block/peripheral_casing.json
 120df29f21059aa9d4dff53bbb80953dee8d5214 assets/advancedperipherals/models/block/player_detector.json
 d08b8946e1eb01cc9c8af4fa297b582614d1034b assets/advancedperipherals/models/block/redstone_integrator.json
+15685a3c58f78db663609d56ee6fdb29652eef5f assets/advancedperipherals/models/block/rs_bridge.json

src/generated/resources/.cache/f95c7003282837dabaa33e3ffceec4e6865b5218

@@ -1,4 +1,4 @@
-// 1.21.1	2025-01-14T18:51:29.8886424	Block tags
-6566cca83fe6d74441cb2b220aa517b93951dac9 data/minecraft/tags/blocks/mineable/pickaxe.json
-5c9d90b6cb82fe772165b794f1eb511db72cb639 data/minecraft/tags/blocks/needs_iron_tool.json
+// 1.21.1	2025-01-14T21:35:41.316368	Block tags
+ad2dad8f4f2ec5a67735fe462d83d1ac4c3ef006 data/minecraft/tags/blocks/mineable/pickaxe.json
+f4459900cde17548776562b1a6f3c12ccc86efa5 data/minecraft/tags/blocks/needs_iron_tool.json
 e1f71dcb4f9e7e36e29b0ad09d6520dc3adfa4a6 data/neoforge/tags/blocks/needs_wood_tool.json

src/generated/resources/assets/advancedperipherals/blockstates/rs_bridge.json

@@ -0,0 +1,57 @@
+{
+  "variants": {
+    "orientation=down_east": {
+      "model": "advancedperipherals:block/rs_bridge",
+      "x": 90,
+      "y": 90
+    },
+    "orientation=down_north": {
+      "model": "advancedperipherals:block/rs_bridge",
+      "x": 90
+    },
+    "orientation=down_south": {
+      "model": "advancedperipherals:block/rs_bridge",
+      "x": 90,
+      "y": 180
+    },
+    "orientation=down_west": {
+      "model": "advancedperipherals:block/rs_bridge",
+      "x": 90,
+      "y": 270
+    },
+    "orientation=east_up": {
+      "model": "advancedperipherals:block/rs_bridge",
+      "y": 90
+    },
+    "orientation=north_up": {
+      "model": "advancedperipherals:block/rs_bridge"
+    },
+    "orientation=south_up": {
+      "model": "advancedperipherals:block/rs_bridge",
+      "y": 180
+    },
+    "orientation=up_east": {
+      "model": "advancedperipherals:block/rs_bridge",
+      "x": 270,
+      "y": 90
+    },
+    "orientation=up_north": {
+      "model": "advancedperipherals:block/rs_bridge",
+      "x": 270
+    },
+    "orientation=up_south": {
+      "model": "advancedperipherals:block/rs_bridge",
+      "x": 270,
+      "y": 180
+    },
+    "orientation=up_west": {
+      "model": "advancedperipherals:block/rs_bridge",
+      "x": 270,
+      "y": 270
+    },
+    "orientation=west_up": {
+      "model": "advancedperipherals:block/rs_bridge",
+      "y": 270
+    }
+  }
+}

src/generated/resources/assets/advancedperipherals/lang/en_us.json

@@ -28,6 +28,7 @@
   "block.advancedperipherals.peripheral_casing": "Peripheral Casing",
   "block.advancedperipherals.player_detector": "Player Detector",
   "block.advancedperipherals.redstone_integrator": "Redstone Integrator",
+  "block.advancedperipherals.rs_bridge": "RS Bridge",
   "entity.minecraft.villager.advancedperipherals.computer_scientist": "Computer Scientist",
   "item.advancedperipherals.chunk_controller": "Chunk Controller",
   "item.advancedperipherals.computer_tool": "Computer Tool",
@@ -59,6 +60,7 @@
   "item.advancedperipherals.tooltip.peripheral_casing": "&7An empty hull without the love it deserves. Used as a crafting ingredient",
   "item.advancedperipherals.tooltip.player_detector": "&7This peripheral can be used to interact with players, but don't be a stalker.",
   "item.advancedperipherals.tooltip.redstone_integrator": "&7This block is able to interact with redstone. Works exactly like the redstone api of an computer.",
+  "item.advancedperipherals.tooltip.rs_bridge": "&7The RS Bridge interacts with Refined Storage to manage your items.",
   "item.advancedperipherals.tooltip.show_desc": "&b[&7%s&b] &7For Description",
   "item.advancedperipherals.tooltip.weak_automata_core": "&7Upgrade for turtles, which makes turtles more useful.",
   "item.advancedperipherals.weak_automata_core": "Weak Automata Core",

src/generated/resources/assets/advancedperipherals/models/block/rs_bridge.json

@@ -0,0 +1,9 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "advancedperipherals:block/rs_bridge",
+    "north": "advancedperipherals:block/rs_bridge_front",
+    "particle": "advancedperipherals:block/rs_bridge_front",
+    "up": "advancedperipherals:block/rs_bridge_top"
+  }
+}

src/generated/resources/data/advancedperipherals/advancement/recipes/redstone/rs_bridge.json

@@ -0,0 +1,38 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "refinedstorage"
+    }
+  ],
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "items": "advancedperipherals:peripheral_casing"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "advancedperipherals:rs_bridge"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_item"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "advancedperipherals:rs_bridge"
+    ]
+  }
+}

src/generated/resources/data/advancedperipherals/loot_table/blocks/rs_bridge.json

@@ -0,0 +1,30 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_components",
+              "include": [
+                "minecraft:custom_name"
+              ],
+              "source": "block_entity"
+            }
+          ],
+          "name": "advancedperipherals:rs_bridge"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "advancedperipherals:blocks/rs_bridge"
+}

src/generated/resources/data/advancedperipherals/recipe/rs_bridge.json

@@ -0,0 +1,39 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:mod_loaded",
+      "modid": "refinedstorage"
+    }
+  ],
+  "type": "minecraft:crafting_shaped",
+  "category": "redstone",
+  "key": {
+    "C": {
+      "item": "advancedperipherals:peripheral_casing"
+    },
+    "E": {
+      "tag": "refinedstorage:exporters"
+    },
+    "I": {
+      "item": "refinedstorage:interface"
+    },
+    "P": {
+      "item": "refinedstorage:advanced_processor"
+    },
+    "R": {
+      "tag": "refinedstorage:importers"
+    },
+    "X": {
+      "tag": "refinedstorage:external_storages"
+    }
+  },
+  "pattern": [
+    "PXP",
+    "ECR",
+    "PIP"
+  ],
+  "result": {
+    "count": 1,
+    "id": "advancedperipherals:rs_bridge"
+  }
+}

src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -4,6 +4,7 @@
     "advancedperipherals:chat_box",
     "advancedperipherals:player_detector",
     "advancedperipherals:me_bridge",
+    "advancedperipherals:rs_bridge",
     "advancedperipherals:energy_detector",
     "advancedperipherals:peripheral_casing",
     "advancedperipherals:inventory_manager",

src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json

@@ -4,6 +4,7 @@
     "advancedperipherals:chat_box",
     "advancedperipherals:player_detector",
     "advancedperipherals:me_bridge",
+    "advancedperipherals:rs_bridge",
     "advancedperipherals:energy_detector",
     "advancedperipherals:inventory_manager",
     "advancedperipherals:redstone_integrator",