Merge branch 'refs/heads/main' into mc1.19.2/main

# Conflicts:
#	build.gradle
#	gradle.properties
#	src/main/java/com/hlysine/create_connected/CCBlocks.java
#	src/main/java/com/hlysine/create_connected/datagen/recipes/ItemApplicationRecipeGen.java
#	src/main/resources/META-INF/accesstransformer.cfg

Author: hlysine

CHANGELOG.md

@@ -5,6 +5,57 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.9.3 - 2025-01-01
+
+### Fixed
+
+- Inventory bridge not working with two inventories when both item filters are empty
+- Copycat incompatibility with AdditionalPlacements
+
+## 0.9.2 - 2024-10-12
+
+### Fixed
+
+- Restored compatibility with Create 0.5.1f
+- Fixed a crash when contraption data is fixed with a copycat block assembled in a contraption
+
+## 0.9.1 - 2024-09-18
+
+### Changed
+
+- Enabled auto-report for crashes in the mod if you have Neruina installed
+
+### Fixed
+
+- Ticking block entity crash due to incompatibility with contraption changes in Create 0.5.1g
+  - This version also attempts to fix worlds that have already been corrupted by the crash, but due to the nature of the crash, multi-block silos may be split into individual silos after recovery
+- Incorrect rotation propagation for encased chain cogwheels (again)
+
+## 0.9.0 - 2024-09-16
+
+### Added
+
+- **Inventory Access Port**
+  - Attaches to an inventory to expand its surface area for other blocks to interact with
+- **Inventory Bridge**
+  - Attaches to two inventories to access both inventories simultaneously
+  - Accepts filters to control which items are allowed to pass through
+- **Fan Sanding/Seething Catalyst**
+  - Compatibility for bulk sanding/superheating in Create: Dreams & Desires
+- **Feature categories**
+  - Disable features of the same category at once
+
+### Changed
+
+- Catalysts are now hidden if the corresponding add-on is not installed
+- Updated Control Chip texture (credits to @LunarAnticGitHub)
+
+### Fixed
+
+- Crash when copycats from Create: Connected are migrated to newer versions of Create: Copycats+
+- Remove debug exports of mixin code
+- Incorrect rotation propagation for encased chain cogwheels
+
 ## 0.8.2 - 2024-05-29
 
 ### Fixed

README.md

@@ -14,39 +14,42 @@ A Create mod add-on adding quality-of-life blocks that you wish existed in Creat
 
 [![BisectHosting](https://www.bisecthosting.com/partners/custom-banners/cd02548b-be01-4a01-b707-ffcb913f5299.webp)](https://bisecthosting.com/lysine)
 
+[![Create: Addon Hub server](https://discordapp.com/api/guilds/891929048895356948/widget.png?style=banner2)](https://discord.gg/3AvrppcgG3)
+
 > **Want reliable, immersive chunk-loading for your Create machines? Check
 out [Create: Power Loader](https://modrinth.com/mod/create-power-loader)**
 
-> Join us in the [Create: Addon Hub](https://discord.gg/3AvrppcgG3) server for a chat!
+## What's new in 0.9
+
+![inventory_access_port](https://github.com/user-attachments/assets/11f8bc2b-3c63-4aa4-a068-f581e114a4a0) **Inventory Access Port**
 
-## What's new in 0.8
+Attach to any inventory to expand its surface area. Great for access in tight spaces and smart setups with threshold switches.
 
-![fluid_vessel](https://github.com/hlysine/create_connected/assets/25472513/aeebc30a-ea8c-4aaa-b80c-36993ea7b5d5) ![creative_fluid_vessel](https://github.com/hlysine/create_connected/assets/25472513/80ad7d61-731e-494d-a334-d59215874aa3) **Fluid Vessel**
+![inventory_bridge](https://github.com/user-attachments/assets/a92555a4-4f27-441a-8128-4c03edccdb85) **Inventory Bridge**
 
-Horizontal fluid tanks with full support of all fluid tank features! Boilers made from fluid vessels are nerfed by
-default, but can be changed in the server config. You can also cycle through multiple window shapes using a wrench.
+Provides an interface to access two inventories simultaneously. Also comes with filter slots to quickly sort incoming items.
 
-![crank_wheel](https://github.com/hlysine/create_connected/assets/25472513/36c28f61-423b-493e-943b-534a4d4bcd39) ![large_crank_wheel](https://github.com/hlysine/create_connected/assets/25472513/c4b94676-4ec0-46de-8a15-317c1689aa57) **Small/Large Crank Wheels**
+![fan_sanding_catalyst](https://github.com/user-attachments/assets/0689fddd-f698-4b72-80e8-19a3f9833440) ![fan_seething_catalyst](https://github.com/user-attachments/assets/8e15a9e4-a173-40de-9240-990beaefc43e) **Fan Sanding/Seething Catalyst**
 
-Hand cranks with built-in cogwheels. Useful in tight spaces and for gear ratios.
+More bulk processing compatibility with Create: Dreams and Desires. Only appears when Create: Dreams and Desires is installed.
 
-![fan_freezing_catalyst](https://github.com/hlysine/create_connected/assets/25472513/f7e07503-f2ec-48d1-9fb1-d74e65253632) **Fan Freezing Catalyst**
+**Note for 1.18 and 1.19 users**
 
-A new catalyst for bulk freezing. Works with Create: Garnished and Create: Dreams & Desires.
+Create has dropped support for 1.18 and 1.19 since 0.5.1g. As a result, backporting to 1.18 and 1.19 is no longer
+a priority for Create: Connected. Depending on circumstances, updates will be delayed and new features may not be backported.
 
 ## Features
 
 ### New Blocks and Items
 
-New kinetic components, copycats, redstone components and more!
-Visit [the GitHub wiki](https://github.com/hlysine/create_connected/wiki/New-Features) for a complete list!
+Clutches and gearboxes for your Create machines, diodes and transmitters for your redstone circuits, and rotated vaults and tanks for better logistics!
+A complete package for all your technical Create needs. Visit [the GitHub wiki](https://github.com/hlysine/create_connected/wiki/New-Features) for a complete list.
 
 [![All features](https://cdn.modrinth.com/data/Vg5TIO6d/images/897c4d67eae94a366c49782ddb1654c5a6e383c5.png)](https://github.com/hlysine/create_connected/wiki/New-Features)
 
 ### Feature toggle
 
-Selectively enable/disable features in this mod as you see fit. Disabled features are unobtainable in survival and
-hidden in creative/JEI.
+Don't like certain features? You can disable them in the configs. Think a horizontal tank is too OP? You can nerf it in the configs. This mod is highly customizable to fit your modpack's needs.
 
 [![Feature Toggle System](https://cdn.modrinth.com/data/Vg5TIO6d/images/d74a9a1a353caee83b0d5dc69c60305a14699d3a.png)](https://github.com/hlysine/create_connected/wiki/Configs)
 
@@ -59,18 +62,15 @@ Small and simple QoL enhancement to Create's features.
 
 ## Download
 
-This is a pre-release version of the mod. World corruption is not expected, but do expect small bugs and rare crashes.
-Make regular backups if you decide to play this mod in your long-term worlds.
-
 Find this mod on [**Modrinth**](https://modrinth.com/mod/create-connected) or
 [**CurseForge**](https://legacy.curseforge.com/minecraft/mc-mods/create-connected).
 
 **Supported Create versions:**
 
-| Create | Create: Connected |
-|--------|-------------------|
-| 0.5.1e | 0.0.2             |
-| 0.5.1f | 0.0.3 - latest    |
+| Create   | Create: Connected |
+|----------|-------------------|
+| 0.5.1e   | 0.0.2             |
+| 0.5.1f/g | 0.0.3 - latest    |
 
 ## Compatibility
 
@@ -100,8 +100,7 @@ at [the contributing guide](https://github.com/hlysine/create_connected/blob/mai
 
 ## Support
 
-The best way to support my work is to simply download this mod on [**Modrinth
-**](https://modrinth.com/mod/create-connected).
+The best way to support my work is to simply download this mod on [**Modrinth**](https://modrinth.com/mod/create-connected).
 Enjoy a smoother download experience and support open source software with a single click.
 
 If you would like to offer more direct support, you
@@ -112,8 +111,7 @@ can [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/O4O2
 **Translation**
 
 - Thanks [Crowdin contributors](https://crowdin.com/project/create-connected-mod/reports/top-members) for their effort
-  in
-  localization
+  in localization
 
 **Inspiration**
 
@@ -126,4 +124,4 @@ can [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/O4O2
   http://creativecommons.org/licenses/by/3.0/
 - Local Forecast - Elevator Kevin MacLeod (incompetech.com)<br>
   Licensed under Creative Commons: By Attribution 3.0 License<br>
-  http://creativecommons.org/licenses/by/3.0/
+  http://creativecommons.org/licenses/by/3.0/

build.gradle

@@ -93,7 +93,6 @@ minecraft {
 
             property 'mixin.env.remapRefMap', 'true'
             property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
-            property 'mixin.debug.countInjections', 'true'
 
             //Allows for reloading the project during runtime with compatible java
             jvmArg "-XX:+AllowEnhancedClassRedefinition"
@@ -161,6 +160,11 @@ repositories {
         name = "ModMaven"
         url = "https://modmaven.dev"
     }
+    maven {
+        // maven for Copycats+
+        name = "realrobotixCopycats"
+        url = "https://maven.realrobotix.me/copycats"
+    }
     exclusiveContent {
         forRepository {
             maven {
@@ -201,8 +205,8 @@ dependencies {
     // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
-    compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.3.5"))
-    implementation(jarJar("io.github.llamalad7:mixinextras-forge:0.3.5")) {
+    compileOnly annotationProcessor("io.github.llamalad7:mixinextras-common:0.3.5")
+    implementation jarJar("io.github.llamalad7:mixinextras-forge:0.3.5") {
         jarJar.ranged(it, "[0.3.5,)")
     }
 
@@ -213,17 +217,18 @@ dependencies {
     // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
     // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
     // compile against the JEI API but do not include it at runtime
-    compileOnly(fg.deobf("mezz.jei:jei-${jei_minecraft_version}-common-api:${jei_version}"))
-    compileOnly(fg.deobf("mezz.jei:jei-${jei_minecraft_version}-forge-api:${jei_version}"))
+    compileOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}-common-api:${jei_version}")
+    compileOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}-forge-api:${jei_version}")
     // at runtime, use the full JEI jar for Forge
-    runtimeOnly(fg.deobf("mezz.jei:jei-${jei_minecraft_version}-forge:${jei_version}"))
+    runtimeOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}-forge:${jei_version}")
 
     // Example mod dependency using a mod jar from ./libs with a flat dir repository
     // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar
     // The group id is ignored when searching -- in this case, it is "blank"
-    implementation fg.deobf("blank:copycats-${copycats_minecraft_version}:${copycats_version}")
 //    implementation fg.deobf("maven.modrinth:create-garnished:${garnished_version}+${garnished_minecraft_version}")
-//    implementation fg.deobf("maven.modrinth:create-dreams-and-desires:${dreams_desires_version}")
+//    runtimeOnly fg.deobf("maven.modrinth:create-dreams-and-desires:${dreams_desires_minecraft_version}-${dreams_desires_version}")
+    implementation fg.deobf("com.copycatsplus:copycats:${copycats_version}+mc.${copycats_minecraft_version}-forge")
+    runtimeOnly fg.deobf("curse.maven:additional-placements-674852:6057790")
 
     // For more info:
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html

gradle.properties

@@ -41,9 +41,9 @@ mapping_version=2022.11.27-1.19.2
 
 create_minecraft_version = 1.19.2
 flywheel_minecraft_version = 1.19.2
-create_version = 0.5.1.f-46
+create_version = 0.5.1.i-59
 create_version_range = [0.5.1.e,)
-flywheel_version = 0.6.10-20
+flywheel_version = 0.6.11-22
 registrate_version = MC1.19-1.1.5
 
 jei_minecraft_version = 1.19.2
@@ -65,7 +65,7 @@ mod_name=Create: Connected
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=GNU Affero General Public License v3.0
 # The mod version. See https://semver.org/
-mod_version=0.8.2-mc1.19.2
+mod_version=0.9.3-mc1.19.2
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/generated/resources/assets/create_connected/blockstates/fan_sanding_catalyst.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "create_connected:block/fan_sanding_catalyst/block"
+    }
+  }
+}

src/generated/resources/assets/create_connected/blockstates/fan_seething_catalyst.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "create_connected:block/fan_seething_catalyst/block"
+    }
+  }
+}

src/generated/resources/assets/create_connected/blockstates/inventory_access_port.json

@@ -0,0 +1,94 @@
+{
+  "variants": {
+    "attached=false,facing=east,target=ceiling": {
+      "model": "create_connected:block/inventory_access_port/block_ceiling_off",
+      "y": 90
+    },
+    "attached=false,facing=east,target=floor": {
+      "model": "create_connected:block/inventory_access_port/block_floor_off",
+      "y": 90
+    },
+    "attached=false,facing=east,target=wall": {
+      "model": "create_connected:block/inventory_access_port/block_wall_off",
+      "y": 90
+    },
+    "attached=false,facing=north,target=ceiling": {
+      "model": "create_connected:block/inventory_access_port/block_ceiling_off"
+    },
+    "attached=false,facing=north,target=floor": {
+      "model": "create_connected:block/inventory_access_port/block_floor_off"
+    },
+    "attached=false,facing=north,target=wall": {
+      "model": "create_connected:block/inventory_access_port/block_wall_off"
+    },
+    "attached=false,facing=south,target=ceiling": {
+      "model": "create_connected:block/inventory_access_port/block_ceiling_off",
+      "y": 180
+    },
+    "attached=false,facing=south,target=floor": {
+      "model": "create_connected:block/inventory_access_port/block_floor_off",
+      "y": 180
+    },
+    "attached=false,facing=south,target=wall": {
+      "model": "create_connected:block/inventory_access_port/block_wall_off",
+      "y": 180
+    },
+    "attached=false,facing=west,target=ceiling": {
+      "model": "create_connected:block/inventory_access_port/block_ceiling_off",
+      "y": 270
+    },
+    "attached=false,facing=west,target=floor": {
+      "model": "create_connected:block/inventory_access_port/block_floor_off",
+      "y": 270
+    },
+    "attached=false,facing=west,target=wall": {
+      "model": "create_connected:block/inventory_access_port/block_wall_off",
+      "y": 270
+    },
+    "attached=true,facing=east,target=ceiling": {
+      "model": "create_connected:block/inventory_access_port/block_ceiling_on",
+      "y": 90
+    },
+    "attached=true,facing=east,target=floor": {
+      "model": "create_connected:block/inventory_access_port/block_floor_on",
+      "y": 90
+    },
+    "attached=true,facing=east,target=wall": {
+      "model": "create_connected:block/inventory_access_port/block_wall_on",
+      "y": 90
+    },
+    "attached=true,facing=north,target=ceiling": {
+      "model": "create_connected:block/inventory_access_port/block_ceiling_on"
+    },
+    "attached=true,facing=north,target=floor": {
+      "model": "create_connected:block/inventory_access_port/block_floor_on"
+    },
+    "attached=true,facing=north,target=wall": {
+      "model": "create_connected:block/inventory_access_port/block_wall_on"
+    },
+    "attached=true,facing=south,target=ceiling": {
+      "model": "create_connected:block/inventory_access_port/block_ceiling_on",
+      "y": 180
+    },
+    "attached=true,facing=south,target=floor": {
+      "model": "create_connected:block/inventory_access_port/block_floor_on",
+      "y": 180
+    },
+    "attached=true,facing=south,target=wall": {
+      "model": "create_connected:block/inventory_access_port/block_wall_on",
+      "y": 180
+    },
+    "attached=true,facing=west,target=ceiling": {
+      "model": "create_connected:block/inventory_access_port/block_ceiling_on",
+      "y": 270
+    },
+    "attached=true,facing=west,target=floor": {
+      "model": "create_connected:block/inventory_access_port/block_floor_on",
+      "y": 270
+    },
+    "attached=true,facing=west,target=wall": {
+      "model": "create_connected:block/inventory_access_port/block_wall_on",
+      "y": 270
+    }
+  }
+}