Downgrade to MC 1.20.1

sweetrpg · Jan 21, 2024 · c0d3b96 · c0d3b96
1 parent 91d8bd9
commit c0d3b96
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 20 deletions.
diff --git a/build.gradle b/build.gradle
@@ -80,7 +80,6 @@ minecraft {
 
     runs {
         client {
-            taskName 'catherder_client'
             workingDirectory file('run')
 
             property 'forge.logging.console.level', 'debug'
@@ -90,12 +89,11 @@ minecraft {
             property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
 
             mods {
-                catherder.sources((SourceSet[]) [sourceSets.main])
+                gamemaster.sources((SourceSet[]) [sourceSets.main])
             }
         }
 
         server {
-            taskName 'catherder_server'
             workingDirectory file('run-server')
 
             property 'forge.logging.console.level', 'debug'
@@ -104,22 +102,21 @@ minecraft {
             property 'mixin.env.remapRefMap', 'true'
             property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
             mods {
-                catherder.sources((SourceSet[]) [sourceSets.main])
+                gamemaster.sources((SourceSet[]) [sourceSets.main])
             }
         }
 
         data {
-            taskName 'catherder_data'
             workingDirectory file('run')
 
             property 'forge.logging.console.level', 'debug'
             property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
 
             property 'mixin.env.remapRefMap', 'true'
             property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
-            args '--mod', 'catherder', '--all', '--output', '"' + file('src/generated/resources/') + '"', '--existing', '"' + sourceSets.main.resources.srcDirs[0] + '"'
+            args '--mod', 'gamemaster', '--all', '--output', '"' + file('src/generated/resources/') + '"', '--existing', '"' + sourceSets.main.resources.srcDirs[0] + '"'
             mods {
-                catherder.sources((SourceSet[]) [sourceSets.main])
+                gamemaster.sources((SourceSet[]) [sourceSets.main])
             }
         }
     }

diff --git a/gradle.properties b/gradle.properties
@@ -7,20 +7,20 @@ org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
 org.gradle.console=verbose
 
-forge_version=1.20.2-48.1.0
+forge_version=1.20.1-47.2.0
 mcp_channel=official
-mcp_mappings=1.20.2
-parchment_version=2023.12.10-1.20.2
+mcp_mappings=1.20.1
+parchment_version=2023.09.03-1.20.1
 jupiter_version=5.8.1
 # for the Apple Silicon plugin
-mc_version=1.20.2
+mc_version=1.20.1
 base_mc_version=1.20
-target_mc_version=1.20.2
+target_mc_version=1.20.1
 additional_mc_versions=1.20
 
-fml_version_range=[48,)
-forge_version_range=[48.1.0,)
-minecraft_version_range=[1.20.2, 1.21)
+fml_version_range=[47,)
+forge_version_range=[47.2.0,)
+minecraft_version_range=[1.20.1, 1.21)
 
 curseforge_project_id=965101
 curseforge_release_type=alpha
@@ -29,7 +29,7 @@ modrinth_project_id=
 modrinth_release_type=alpha
 
 # JEI
-jei_version=16.0.0.28
+jei_version=15.2.0.27
 
 # The One Probe
 top_version=10.0.1

diff --git a/src/main/java/com/sweetrpg/minecraft/gamemaster/common/config/ConfigHandler.java b/src/main/java/com/sweetrpg/minecraft/gamemaster/common/config/ConfigHandler.java
@@ -1,9 +1,5 @@
 package com.sweetrpg.minecraft.gamemaster.common.config;
 
-import com.sweetrpg.catherder.CatHerder;
-import com.sweetrpg.catherder.api.CatHerderAPI;
-import com.sweetrpg.catherder.api.registry.Talent;
-import com.sweetrpg.catherder.common.lib.Constants;
 import com.sweetrpg.minecraft.gamemaster.GameMaster;
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.eventbus.api.IEventBus;