Fix crash when using CTM by including it and making it mandatory again.

Author: PlatinPython

build.gradle

@@ -23,7 +23,7 @@ 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: '2022.03.13-1.18.2'
+    mappings channel: 'parchment', version: '2022.05.22-1.18.2'
 
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
@@ -77,10 +77,10 @@ minecraft {
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 repositories {
-    maven { // CTM, TOP
+    maven { // CTM
         url "https://maven.tterrag.com/"
     }
-    maven {
+    maven { // TOP
         url "https://www.cursemaven.com/"
         content {
             includeGroup "curse.maven"
@@ -89,23 +89,13 @@ repositories {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.18.2-40.0.19'
+    minecraft 'net.minecraftforge:forge:1.18.2-40.1.30'
 
-//    implementation fg.deobf("team.chisel.ctm:CTM:1.18-${ctm_version}")
-
-//    implementation fg.deobf("mcjty.theoneprobe:TheOneProbe-1.16:${top_version}")
+    implementation fg.deobf("team.chisel.ctm:CTM:${ctm_version}")
 
     implementation fg.deobf("curse.maven:top-245211:3671753")
 }
 
-sourceSets {
-    main {
-        java {
-            exclude 'platinpython/rgbblocks/util/ctm/**'
-        }
-    }
-}
-
 jar {
     manifest {
         attributes([
@@ -121,16 +111,3 @@ jar {
 }
 
 jar.finalizedBy('reobfJar')
-
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifact jar
-        }
-    }
-    repositories {
-        maven {
-            url "file:///${project.projectDir}/mcmodsrepo"
-        }
-    }
-}

gradle.properties

@@ -5,6 +5,6 @@ org.gradle.daemon=false
 
 #version info
 minecraft_version=1.18.2
-mod_version=1.1.5.0
-ctm_version=1.1.3+1
+mod_version=1.1.5.1
+ctm_version=1.18.2-1.1.4+4
 top_version=1.16-3.1.4-22

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

@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[37,)"
+loaderVersion="[40,)"
 license="MIT"
 issueTrackerURL="https://github.com/PlatinPython/RGBBlocks/issues"
 
@@ -17,20 +17,20 @@ issueTrackerURL="https://github.com/PlatinPython/RGBBlocks/issues"
 [[dependencies.rgbblocks]]
   modId="forge"
   mandatory=true
-  versionRange="[37,)"
+  versionRange="[40,)"
   ordering="NONE"
   side="BOTH"
 
 [[dependencies.rgbblocks]]
   modId="minecraft"
   mandatory=true
-  versionRange="[1.17.1,)"
+  versionRange="[1.18.2,)"
   ordering="NONE"
   side="BOTH"
 
 [[dependencies.rgbblocks]]
   modId="ctm"
-  mandatory=false
-  versionRange="[MC1.16.1-1,)"
+  mandatory=true
+  versionRange="[MC1.18.2-1,)"
   ordering="NONE"
   side="CLIENT"

src/main/resources/pack.mcmeta

@@ -1,6 +1,6 @@
 {
     "pack": {
         "description": "RGB Blocks",
-        "pack_format": 7
+        "pack_format": 8
     }
 }