1.20.1 update

build.gradle

@@ -1,34 +1,44 @@
 plugins {
     id 'eclipse'
+    id 'idea'
     id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '5.1.+'
+    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
-    id 'org.parchmentmc.librarian.forgegradle' version '1.+'
 }
 
-version = "${project.mc_version}-${project.mod_version}"
+version = "${minecraft_version}-${mod_version}"
-group = 'ru.yurannnzzz'
+group = mod_group_id
-archivesBaseName = 'MoreRed-CCT-Compat'
+
+base {
+    archivesName = archive_base_name
+}
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
-println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 minecraft {
-    mappings channel: 'parchment', version: "${project.parchment_version}-${project.mc_version}"
+    mappings channel: mapping_channel, version: mapping_version
+
+    copyIdeResources = true
 
     runs {
-        client {
+        configureEach {
             workingDirectory project.file('run')
-
             property 'forge.logging.console.level', 'debug'
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
 
             mods {
-                moreredxcctcompat {
+                "${mod_id}" {
                     source sourceSets.main
                 }
             }
         }
+
+        client {
+            property 'forge.enabledGameTestNamespaces', mod_id
+        }
+
+        server {
+            property 'forge.enabledGameTestNamespaces', mod_id
+            args '--nogui'
+        }
     }
 }
 
@@ -36,7 +46,8 @@ repositories {
     maven {
         url 'https://squiddev.cc/maven/'
         content {
-            includeGroup 'org.squiddev'
+            includeGroup 'cc.tweaked'
+            includeModule('org.squiddev', 'Cobalt')
         }
     }
     maven {
@@ -48,38 +59,59 @@ repositories {
 }
 
 dependencies {
-    minecraft "net.minecraftforge:forge:${project.mc_version}-${project.forge_version}"
+    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
-    compileOnly fg.deobf("org.squiddev:cc-tweaked-${project.mc_version}:${project.cctweaked_version}:api")
+    compileOnly("cc.tweaked:cc-tweaked-${minecraft_version}-core-api:${cctweaked_version}")
-    implementation fg.deobf("org.squiddev:cc-tweaked-${project.mc_version}:${project.cctweaked_version}")
+    compileOnly(fg.deobf("cc.tweaked:cc-tweaked-${minecraft_version}-forge-api:${cctweaked_version}"))
+    implementation(fg.deobf("cc.tweaked:cc-tweaked-${minecraft_version}-forge:${cctweaked_version}"))
 
-    implementation fg.deobf("commoble.morered:morered-${project.mc_version}:${morered_version}")
+    implementation fg.deobf("commoble.morered:morered-${minecraft_version}:${morered_version}")
 }
 
-// Example for how to get properties into the manifest for reading at runtime.
+tasks.named('processResources', ProcessResources).configure {
-jar {
+    var replaceProperties = [
-    manifest {
+            minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range,
-        attributes([
+            forge_version: forge_version, forge_version_range: forge_version_range,
-                "Specification-Title"     : "More Red x CC:T Compat",
+            loader_version_range: loader_version_range,
-                "Specification-Vendor"    : "YuRaNnNzZZ",
+            mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
-                "Specification-Version"   : "1", // We are version 1 of ourselves
+            mod_authors: mod_authors, mod_description: mod_description,
-                "Implementation-Title"    : project.name,
+            mod_issue_tracker_url: mod_issue_tracker_url, mod_display_url: mod_display_url,
-                "Implementation-Version"  : project.jar.archiveVersion,
+            cctweaked_version_range: cctweaked_version_range, morered_version_range: morered_version_range,
-                "Implementation-Vendor"   : "YuRaNnNzZZ",
+    ]
-                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+    inputs.properties replaceProperties
-        ])
+
+    filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
+        expand replaceProperties + [project: project]
     }
 }
 
-// Example configuration to allow publishing using the maven-publish plugin
+// Example for how to get properties into the manifest for reading at runtime.
-// This is the preferred method to reobfuscate your jar file
+tasks.named('jar', Jar).configure {
-jar.finalizedBy('reobfJar')
+    manifest {
-// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
+        attributes([
-// publish.dependsOn('reobfJar')
+                'Specification-Title'     : mod_id,
+                'Specification-Vendor'    : mod_authors,
+                'Specification-Version'   : '1', // We are version 1 of ourselves
+                'Implementation-Title'    : project.name,
+                'Implementation-Version'  : project.jar.archiveVersion,
+                'Implementation-Vendor'   : mod_authors,
+                'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+        ])
+    }
 
+    // This is the preferred method to reobfuscate your jar file
+    finalizedBy 'reobfJar'
+}
+
+// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing:
+// tasks.named('publish').configure {
+//     dependsOn 'reobfJar'
+// }
+
+// Example configuration to allow publishing using the maven-publish plugin
 publishing {
     publications {
-        mavenJava(MavenPublication) {
+        register('mavenJava', MavenPublication) {
             artifact jar
         }
     }

gradle.properties

@@ -3,12 +3,73 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-mc_version=1.19.2
-forge_version=43.2.11
-parchment_version=2022.11.27
 
+## Environment Properties
+
+# The Minecraft version must agree with the Forge version to get a valid artifact
+minecraft_version=1.20.1
+# The Minecraft version range can use any release version of Minecraft as bounds.
+# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
+# as they do not follow standard versioning conventions.
+minecraft_version_range=[1.20.1,1.21)
+# The Forge version must agree with the Minecraft version to get a valid artifact
+forge_version=47.1.0
+# The Forge version range can use any version of Forge as bounds or match the loader version range
+forge_version_range=[47.1.0,)
+# The loader version range can only use the major version of Forge/FML as bounds
+loader_version_range=[47,)
+# The mapping channel to use for mappings.
+# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
+# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin.
+#
+# | Channel   | Version              |                                                                                |
+# |-----------|----------------------|--------------------------------------------------------------------------------|
+# | official  | MCVersion            | Official field/method names from Mojang mapping files                          |
+# | parchment | YYYY.MM.DD-MCVersion | Open community-sourced parameter names and javadocs layered on top of official |
+#
+# You must be aware of the Mojang license when using the 'official' or 'parchment' mappings.
+# See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
+#
+# Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge.
+# Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started
+mapping_channel=official
+# The mapping version to query from the mapping channel.
+# This must match the format required by the mapping channel.
+mapping_version=1.20.1
+
+
+## Mod Properties
+
+# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63}
+# Must match the String constant located in the main mod class annotated with @Mod.
+mod_id=moreredxcctcompat
+# The human-readable display name for the mod.
+mod_name=More Red x CC:Tweaked Compat
+# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
+mod_license=MIT
+# The mod version. See https://semver.org/
 mod_version=1.0.0
+# 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
+mod_group_id=ru.yurannnzzz
+# The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
+mod_authors=YuRaNnNzZZ
+# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
+mod_description=Adds support for More Red colored and bundled cables to CC:Tweaked computers
+# A URL to refer people to when problems occur with this mod.
+mod_issue_tracker_url=https://github.com/YuRaNnNzZZ/More-Red-CCT-Compat/issues
+# A URL for the "homepage" for this mod, displayed in the mod UI.
+mod_display_url=https://www.curseforge.com/minecraft/mc-mods/more-red-x-cc-tweaked-compat
 
-cctweaked_version=1.101.2
+# Mod JAR output base file name
-morered_version=3.0.0.0
+archive_base_name=MoreRed-CCT-Compat
 
+## Mod Dependencies Properties
+
+# CC:Tweaked version
+cctweaked_version=1.106.1
+cctweaked_version_range=[1.106.1,)
+# More Red version
+morered_version=4.0.0.0
+morered_version_range=[4.0.0.0,)

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# This is normally unused
-
+# shellcheck disable=SC2034
-APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

settings.gradle

@@ -1,7 +1,13 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        maven { url = 'https://maven.minecraftforge.net/' }
+        maven {
-        maven { url = 'https://maven.parchmentmc.org' }
+            name = 'MinecraftForge'
+            url = 'https://maven.minecraftforge.net/'
+        }
     }
+}
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
 }

src/main/java/ru/yurannnzzz/moreredcccompat/MoreRedCCCompatMod.java

@@ -3,8 +3,8 @@ package ru.yurannnzzz.moreredcccompat;
 import commoble.morered.api.MoreRedAPI;
 import commoble.morered.api.WireConnector;
 import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.shared.Registry;
+import dan200.computercraft.shared.ModRegistry;
-import dan200.computercraft.shared.computer.blocks.TileComputerBase;
+import dan200.computercraft.shared.computer.blocks.AbstractComputerBlockEntity;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraftforge.common.MinecraftForge;
@@ -35,16 +35,16 @@ public class MoreRedCCCompatMod {
         ComputerWireConnector connector = new ComputerWireConnector();
         Map<Block, WireConnector> registry = MoreRedAPI.getCableConnectabilityRegistry();
 
-        registry.put(Registry.ModBlocks.COMPUTER_NORMAL.get(), connector);
+        registry.put(ModRegistry.Blocks.COMPUTER_NORMAL.get(), connector);
-        registry.put(Registry.ModBlocks.COMPUTER_ADVANCED.get(), connector);
+        registry.put(ModRegistry.Blocks.COMPUTER_ADVANCED.get(), connector);
-        registry.put(Registry.ModBlocks.COMPUTER_COMMAND.get(), connector);
+        registry.put(ModRegistry.Blocks.COMPUTER_COMMAND.get(), connector);
-        registry.put(Registry.ModBlocks.TURTLE_NORMAL.get(), connector);
+        registry.put(ModRegistry.Blocks.TURTLE_NORMAL.get(), connector);
-        registry.put(Registry.ModBlocks.TURTLE_ADVANCED.get(), connector);
+        registry.put(ModRegistry.Blocks.TURTLE_ADVANCED.get(), connector);
     }
 
     @SubscribeEvent
     public void attachCapability(AttachCapabilitiesEvent<BlockEntity> event) {
-        if (event.getObject() instanceof TileComputerBase) {
+        if (event.getObject() instanceof AbstractComputerBlockEntity) {
             event.addCapability(ComputerChanneledPowerCapability.LOCATION, new ComputerChanneledPowerCapability.Provider());
         }
     }

src/main/java/ru/yurannnzzz/moreredcccompat/cc/MoreRedBundledRedstoneProvider.java

@@ -2,7 +2,7 @@ package ru.yurannnzzz.moreredcccompat.cc;
 
 import commoble.morered.api.ChanneledPowerSupplier;
 import commoble.morered.api.MoreRedAPI;
-import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
+import dan200.computercraft.api.redstone.BundledRedstoneProvider;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.Level;
@@ -10,7 +10,7 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraftforge.common.util.LazyOptional;
 import org.jetbrains.annotations.NotNull;
 
-public class MoreRedBundledRedstoneProvider implements IBundledRedstoneProvider {
+public class MoreRedBundledRedstoneProvider implements BundledRedstoneProvider {
     @Override
     public int getBundledRedstoneOutput(@NotNull Level world, @NotNull BlockPos pos, @NotNull Direction side) {
         BlockEntity blockEntity = world.getBlockEntity(pos);

src/main/resources/META-INF/mods.toml

@@ -1,40 +1,40 @@
 modLoader="javafml"
-loaderVersion="[43,)"
+loaderVersion="${loader_version_range}"
-license="MIT"
+license="${mod_license}"
+issueTrackerURL="${mod_issue_tracker_url}"
 
 [[mods]]
-modId="moreredxcctcompat"
+modId="${mod_id}"
-version="${file.jarVersion}"
+version="${minecraft_version}-${mod_version}"
-displayName="More Red x CC:Tweaked Compat"
+displayName="${mod_name}"
-authors="YuRaNnNzZZ"
+displayURL="${mod_display_url}"
-description='''
+authors="${mod_authors}"
-Adds support for More Red colored and bundled cables to CC:Tweaked computers
+description='''${mod_description}'''
-'''
 
-[[dependencies.moreredxcctcompat]]
+[[dependencies.${mod_id}]]
     modId="forge"
     mandatory=true
-    versionRange="[43,)"
+    versionRange="${forge_version_range}"
     ordering="NONE"
     side="BOTH"
 
-[[dependencies.moreredxcctcompat]]
+[[dependencies.${mod_id}]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.19.2,1.20)"
+    versionRange="${minecraft_version_range}"
     ordering="NONE"
     side="BOTH"
 
-[[dependencies.moreredxcctcompat]]
+[[dependencies.${mod_id}]]
     modId="computercraft"
     mandatory=true
-    versionRange="[1.101.2,)"
+    versionRange="${cctweaked_version_range}"
     ordering="NONE"
     side="BOTH"
 
-[[dependencies.moreredxcctcompat]]
+[[dependencies.${mod_id}]]
     modId="morered"
     mandatory=true
-    versionRange="[3.0.0.0,)"
+    versionRange="${morered_version_range}"
     ordering="NONE"
-    side="BOTH"
+    side="BOTH"

src/main/resources/pack.mcmeta

@@ -1,8 +1,8 @@
 {
-    "pack": {
+  "pack": {
-        "description": "moreredxcctcompat resources",
+    "description": {
-        "pack_format": 9,
+      "text": "${mod_id} resources"
-        "forge:resource_pack_format": 9,
+    },
-        "forge:data_pack_format": 10
+    "pack_format": 15
-    }
+  }
-}
+}