Merge branch 'refs/heads/dev/1.19.2' into feat/tests

# Conflicts:
#	build.gradle

.github/workflows/build-and-test.yaml

@@ -0,0 +1,13 @@
+name: Build and Test
+
+on:
+  workflow_dispatch:
+  push:
+  pull_request_target:
+    types:
+      - opened
+      - synchronize
+
+jobs:
+  build-and-test:
+    uses: IntelligenceModding/actions/.github/workflows/build-and-test.yaml@master

CHANGELOG.md

@@ -6,6 +6,21 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [1.19.2-0.7.35r] - 2024-04-12
+
+### Fixed
+- [#559] Fixed the creation of empty nbt tags when inserting items into the ME System - @Thanks to michele-grifa!
+- [#577,#570] Fixed that the RS bridge does not show `isCraftable` in `getItem` or `getPattern` - Thanks to @tomprince!
+- [#570] Improved performance of ME Bridge's iterating functions by making the functions not quadratic - Thanks to @tomprince!
+- [#560] Fixed stacking problems when using `getItems` from the inventory manager
+- [#551] Fixed that RS Bridge's `isItemCrafting` is false when the item is not in the system
+- [#536] Invalidate the energy detectors in and output energy providers to prevent the energy detector from stopping to transfer energy
+- [#575] Added support for more disk cells and portable cells for the ME Bridge - Thanks to @iTrooz
+
+### Added
+- [#571] Added `selectionMode` to the output of ME Bridge's `getCraftingCPUs` function - Thanks to @tomprince!
+- [#564] Added optional parameter to `getPlayerPos` to specify the amount of decimal places to retrieve the position of - Thanks to @minecraf7771
+
 ## [1.19.2-0.7.34r] - 2024-02-13
 
 ### Fixed

build.gradle

@@ -2,38 +2,24 @@ import net.darkhax.curseforgegradle.TaskPublishCurseForge
 
 import java.text.SimpleDateFormat
 
-buildscript {
-    repositories {
-        maven {
-            name = "Intelligence Minecraft"
-            url = "https://mvn.intelligence-modding.de/Minecraft"
-        }
-        mavenCentral()
-        gradlePluginPortal()
-    }
-    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.0+', changing: true
-        classpath 'org.parchmentmc:librarian:1.+'
-    }
-}
-
 plugins {
     id "maven-publish"
     id 'net.darkhax.curseforgegradle' version '1.1.16'
     id 'org.jetbrains.changelog' version '1.2.1'
     id "com.modrinth.minotaur" version "2.+"
+    id "org.jetbrains.kotlin.jvm" version "1.6.10"
+    id 'net.minecraftforge.gradle' version '[6.0.18,6.2)'
+    id 'org.parchmentmc.librarian.forgegradle' version '1.+'
+    id 'org.spongepowered.mixin' version '0.7.+'
     id "com.github.breadmoirai.github-release" version "2.5.2"
     id 'checkstyle'
     id 'java'
 }
 
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'org.parchmentmc.librarian.forgegradle'
-
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 wrapper {
-    gradleVersion = '8.1.1'
+    gradleVersion = '8.4'
     distributionType = Wrapper.DistributionType.ALL
 }
 
@@ -187,67 +173,83 @@ repositories {
     maven {
         name = "Blamejared maven botania patchouli"
         url = 'https://maven.blamejared.com'
+        content {
+            includeGroup("vazkii.botania")
+            includeGroup("vazkii.patchouli")
+        }
     }
     maven {
         name = "Squiddev maven cct"
         url = 'https://squiddev.cc/maven/'
         content {
             includeGroup("org.squiddev")
+            includeGroup("cc.tweaked")
             includeModule("org.squiddev", "Cobalt")
         }
     }
     maven {
         name = "Theillusivec4 maven curios"
         url = "https://maven.theillusivec4.top/"
+        content {
+            includeGroup("top.theillusivec4.curios")
+        }
     }
     maven {
         name = "LDT Team minecolonies"
         url = 'https://ldtteam.jfrog.io/ldtteam/modding'
+        content {
+            includeGroup("com.ldtteam")
+        }
     }
     maven {
         name = "Modmaven Jei"
         url = 'https://modmaven.dev/'
-    }
-    maven {
-        name = "Create maven"
-        url = "https://maven.tterrag.com/"
         content {
-            includeGroup "com.simibubi.create"
-            includeGroup "com.jozufozu.flywheel"
+            includeGroup("mezz.jei")
+            includeGroup("appeng")
+            includeGroup("mekanism")
         }
     }
     maven {
-        name = "SirEdvin's private repository"
-        url = "https://repo.repsy.io/mvn/siredvin/default"
+        name = "Create maven"
+        url = "https://maven.tterrag.com/"
         content {
-            includeGroup "site.siredvin.ttoolkit"
+            includeGroup("com.simibubi.create")
+            includeGroup("com.jozufozu.flywheel")
+            includeGroup("com.tterrag.registrate")
         }
     }
     maven {
         name = "Shedaniel cloth"
         url = "https://maven.shedaniel.me/"
+        content {
+            includeGroup("dev.architectury")
+            includeGroup("me.shedaniel.cloth")
+        }
     }
     maven {
         url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage")
         credentials {
             username = "anything"
             password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
         }
+        content {
+            includeModule("com.refinedmods", "refinedstorage")
+        }
     }
     maven {
         name = 'Kotlin for Forge'
         url = 'https://thedarkcolour.github.io/KotlinForForge/'
+        content {
+            includeModule("thedarkcolour", "kotlinforforge")
+        }
     }
     maven {
         url = "https://cursemaven.com"
         content {
             includeGroup "curse.maven"
         }
     }
-    maven {
-        name = "Intelligence repository"
-        url = "https://mvn.intelligence-modding.de/Intelligence"
-    }
 }
 
 configurations {
@@ -349,6 +351,10 @@ dependencies {
     // Testing stuff
     // JEI
     implementation fg.deobf("mezz.jei:jei-${jei_version}")
+
+    // Create Crafts & Additions
+    compileOnly fg.deobf("curse.maven:createaddition-439890:5099757")
+    // runtimeOnly fg.deobf("curse.maven:createaddition-439890:5099757")
 }
 
 
@@ -472,6 +478,8 @@ tasks.register('publishCurseForge', TaskPublishCurseForge, { task ->
 
         addRequirement('cc-tweaked')
 
+        addModLoader("forge", "neoforge")
+
         releaseType = "${release_type}"
     }
 })
@@ -505,7 +513,7 @@ modrinth {
     versionType = release_type
     uploadFile = jar
     gameVersions = [minecraft_version]
-    loaders = ["forge"]
+    loaders = ["forge", "neoforge"]
     dependencies {
         required.project "cc-tweaked"
     }
@@ -579,4 +587,4 @@ publishing {
             }
         }
     }
-}
+}

gradle.properties

@@ -7,7 +7,7 @@ mod_id=advancedperipherals
 minecraft_version=1.19.2
 forge_version=43.3.8
 loader_version=43
-mod_version=0.7.35r
+mod_version=0.7.36r
 release_type=release
 mappings_channel=parchment
 mappings_version=2022.11.27-1.19.2
@@ -26,7 +26,8 @@ appliedenergistics_version=12.9.5
 patchouli_version=1.19.2-77
 refinedstorage_version=1.11.6
 botania_version=1.19.2-440-FORGE
-create_version=0.5.1.b-30
+create_version=0.5.1.f-46
+createca_version=5099757
 mekanism_version=1.19.2-10.3.9.13
 ae2things_version=4367610
 powah_version=4183078

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -0,0 +1,20 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven {
+            name = 'MinecraftForge'
+            url = 'https://maven.minecraftforge.net/'
+            content {
+                includeGroup("net.minecraftforge")
+                includeGroup("net.minecraftforge.gradle")
+                includeGroup("org.spongepowered.mixin")
+                includeGroup("org.spongepowered")
+            }
+        }
+        maven { url = 'https://maven.parchmentmc.org' }
+    }
+}
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
+}