Merge remote-tracking branch 'origin/master-1.21' into feature/multil…

…oader
CyclopsMC · Aug 15, 2024 · 80ff178 · 80ff178
2 parents 1cbcddb + db10a26
commit 80ff178
Show file tree

Hide file tree

Showing 65 changed files with 70 additions and 3,844 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "src/api/java/org/cyclops/commoncapabilities/api"]
-	path = src/api/java/org/cyclops/commoncapabilities/api
+[submodule "loader-neoforge/src/api/java/org/cyclops/commoncapabilities/api"]
+	path = loader-neoforge/src/api/java/org/cyclops/commoncapabilities/api
 	url = https://github.com/CyclopsMC/CommonCapabilitiesAPI.git
diff --git a/buildSrc/src/main/groovy/multiloader-loader-common.gradle b/buildSrc/src/main/groovy/multiloader-loader-common.gradle
@@ -13,7 +13,7 @@ neoForge {
         accessTransformers.add(at.absolutePath)
     }
     parchment {
-        minecraftVersion = parchment_minecraft
+        minecraftVersion = parchment_minecraft_version
         mappingsVersion = parchment_version
     }
 }

diff --git a/buildSrc/src/main/groovy/multiloader-loader-fabric.gradle b/buildSrc/src/main/groovy/multiloader-loader-fabric.gradle
@@ -8,7 +8,7 @@ dependencies {
     minecraft "com.mojang:minecraft:${minecraft_version}"
     mappings loom.layered {
         officialMojangMappings()
-        parchment("org.parchmentmc.data:parchment-${parchment_minecraft}:${parchment_version}@zip")
+        parchment("org.parchmentmc.data:parchment-${parchment_minecraft_version}:${parchment_version}@zip")
     }
     modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}"
     modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"

diff --git a/buildSrc/src/main/groovy/multiloader-loader-neoforge.gradle b/buildSrc/src/main/groovy/multiloader-loader-neoforge.gradle
@@ -46,7 +46,7 @@ minecraft {
 
 subsystems {
     parchment {
-        minecraftVersion = "${minecraft_version}"
+        minecraftVersion = "${parchment_minecraft_version}"
         mappingsVersion = "${parchment_version}"
     }
 }

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ group=org.cyclops.cyclopscore
 java_version=21
 
 # Common
-minecraft_version=1.21
+minecraft_version=1.21.1
 mod_name=Cyclops Core
 mod_author=rubensworks (aka kroeser)
 mod_id=cyclopscore
@@ -17,20 +17,21 @@ fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
 neo_form_version=1.21-20240613.152323
 parchment_minecraft=1.21
 parchment_version=2024.06.23
+parchment_minecraft_version=1.21
 curseforge_project_id=232758
 modrinth_project_id=Z9DM0LJ4
 
 # Fabric
-fabric_version=0.100.1+1.21
+fabric_version=0.102.1+1.21.1
 fabric_loader_version=0.15.11
 
 # NeoForge
-neoforge_version=21.0.43-beta
+neoforge_version=21.1.2
 neoforge_loader_version_range=[4,)
 neoforge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/neoforge_update/cyclops-core.json
 
 # Forge
-forge_version=51.0.21
+forge_version=52.0.3
 forge_loader_version_range=[2,)
 forge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/forge_update/cyclops-core.json
 

diff --git a/loader-neoforge/src/api/java/org/cyclops/commoncapabilities/api b/loader-neoforge/src/api/java/org/cyclops/commoncapabilities/api
diff --git a/loader-neoforge/src/api/java/org/cyclops/commoncapabilities/api/.gitignore b/loader-neoforge/src/api/java/org/cyclops/commoncapabilities/api/.gitignore
diff --git a/loader-neoforge/src/api/java/org/cyclops/commoncapabilities/api/LICENSE.txt b/loader-neoforge/src/api/java/org/cyclops/commoncapabilities/api/LICENSE.txt
diff --git a/loader-neoforge/src/api/java/org/cyclops/commoncapabilities/api/README.md b/loader-neoforge/src/api/java/org/cyclops/commoncapabilities/api/README.md
diff --git a/loader-neoforge/src/api/java/org/cyclops/commoncapabilities/api/capability/Capabilities.java b/loader-neoforge/src/api/java/org/cyclops/commoncapabilities/api/capability/Capabilities.java
diff --git a/...ommoncapabilities/api/capability/fluidhandler/FilteredFluidHandlerFluidStackIterator.java b/...ommoncapabilities/api/capability/fluidhandler/FilteredFluidHandlerFluidStackIterator.java
diff --git a/...yclops/commoncapabilities/api/capability/fluidhandler/FluidHandlerFluidStackIterator.java b/...yclops/commoncapabilities/api/capability/fluidhandler/FluidHandlerFluidStackIterator.java
diff --git a/...e/src/api/java/org/cyclops/commoncapabilities/api/capability/fluidhandler/FluidMatch.java b/...e/src/api/java/org/cyclops/commoncapabilities/api/capability/fluidhandler/FluidMatch.java
diff --git a/...pi/java/org/cyclops/commoncapabilities/api/capability/inventorystate/IInventoryState.java b/...pi/java/org/cyclops/commoncapabilities/api/capability/inventorystate/IInventoryState.java