Ported all current 1.20.1 changes to 1.20.2

Author: Jeryn99

common/src/main/java/whocraft/tardis_refined/client/screen/screens/ShellSelectionScreen.java

@@ -111,10 +111,10 @@ public GenericMonitorSelectionList<SelectionListEntry> createSelectionList() {
         for (ShellTheme shellTheme : values) {
             ResourceLocation shellThemeId = ShellTheme.getKey(shellTheme);
 
-            String owner = Platform.getModName(shellTheme.getKey().location().getNamespace());
+            String owner = Platform.getModName(shellThemeId.getNamespace());
             Component tooltip = Component.literal(ChatFormatting.BLUE + owner);
 
-            SelectionListEntry selectionListEntry = new SelectionListEntry(shellTheme.getValue().getDisplayName(), (entry) -> {
+            SelectionListEntry selectionListEntry = new SelectionListEntry(shellTheme.getDisplayName(), (entry) -> {
                 CURRENTSHELLTHEME = shellThemeId;
 
                 for (Object child : selectionList.children()) {

common/src/main/java/whocraft/tardis_refined/client/screen/screens/VortexSelectionScreen.java

@@ -91,7 +91,7 @@ public GenericMonitorSelectionList<SelectionListEntry> createSelectionList() {
 
         for (VortexRegistry vort : values) {
             ResourceLocation vortId = VortexRegistry.VORTEX_REGISTRY.getKey(vort);
-            String owner = Platform.getModName(vort.getKey().location().getNamespace());
+            String owner = Platform.getModName(vortId.getNamespace());
             Component tooltip = Component.literal(ChatFormatting.BLUE + owner);
 
             SelectionListEntry selectionListEntry = new SelectionListEntry(vort.getDisplayName(), (entry) -> {

common/src/main/java/whocraft/tardis_refined/client/screen/upgrades/UpgradeWidget.java

@@ -187,7 +187,7 @@ public void drawHover(GuiGraphics guiGraphics, int i, int j, float f, int k, int
         int var10001 = this.description.size();
         Objects.requireNonNull(this.minecraft.font);
         int r = 32 + var10001 * 9;
-        int n = 32 + this.description.size() * 17;
+
         if (!this.description.isEmpty()) {
             if (bl2) {
                 guiGraphics.blitSprite(TITLE_BOX_SPRITE, q, p + 26 - r, this.width, r);

fabric/build.gradle

@@ -92,7 +92,6 @@ dependencies {
     modImplementation "com.terraformersmc:modmenu:${rootProject.mod_menu_version}"
     modImplementation "curse.maven:jei-238222:${rootProject.jei_fabric_version}"
     modImplementation "curse.maven:huge-structure-blocks-474114:4803539"
-    modImplementation "curse.maven:configured-457570:5180902"
 
     // Trinkets
     modCompileOnly ("dev.emi:trinkets:${rootProject.trinkets_version}") {

forge/build.gradle

@@ -104,8 +104,6 @@ dependencies {
     //   modCompileOnly "curse.maven:worldedit-225608:${world_edit_version}"
 //    modCompileOnly "curse.maven:structure-expansion-398430:${structure_expansion_version}"
 
-//    modCompileOnly "curse.maven:configured-457570:${configured_version}"
-    //   modCompileOnly "curse.maven:jei-238222:${jei_version}"
 
     compileOnly "curse.maven:immersive-portals-355440:${immersive_portals_forge_version}"
     modImplementation "curse.maven:curios-309927:4921744"

gradle.properties

@@ -85,12 +85,12 @@ cloth_config_fabric_version=12.0.109
 #Forge Dependencies
 world_edit_version=4807512
 structure_expansion_version=3909814
-configured_version=4462894
 jei_version=4473386
 immersive_portals_forge_version=4477738
 dev_auth_module_forge=forge-latest
 dev_auth_forge_version=1.1.2
-sodium_version=mc1.20.1-0.5.8
+
+sodium_version=mc1.20.2-0.5.5
 
 
 #Mod versions