Merge pull request #24 from gniftygnome/1.17

Updates and fixes for 1.18.2.

.github/workflows/release.yml

@@ -45,7 +45,7 @@ jobs:
  if: ${{ runner.os != 'Windows' }}
  run: chmod +x ./gradlew
  - name: Build
- run: ./gradlew generateChangelog build publish curseforge github publishModrinth --stacktrace --parallel -PlastTag="v${{ github.event.inputs.previousVersion }}" -PcurrentTag="v${{ github.event.inputs.version }}"
+ run: ./gradlew generateChangelog build publish curseforge github modrinth --stacktrace --parallel -PlastTag="v${{ github.event.inputs.previousVersion }}" -PcurrentTag="v${{ github.event.inputs.version }}"
  env:
  MAVEN_URL: ${{ secrets.MAVEN_URL }}
  MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}

build.gradle

@@ -2,7 +2,7 @@ plugins {
  id 'fabric-loom' version '0.10-SNAPSHOT'
 }
 
-apply from: 'https://raw.githubusercontent.com/TerraformersMC/GradleScripts/2.1/ferry.gradle'
+apply from: 'https://raw.githubusercontent.com/TerraformersMC/GradleScripts/2.5/ferry.gradle'
 
 sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17

gradle.properties

@@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx1G
 maven_group=com.terraformersmc
 archive_name=vistas
 
-minecraft_version=1.18
-yarn_mappings=1.18+build.1
-loader_version=0.12.6
-fabric_version=0.43.1+1.18
-modmenu_version=3.0.0
-clothconfig_version=6.0.42
+minecraft_version=1.18.2
+yarn_mappings=1.18.2+build.4
+loader_version=0.14.9
+fabric_version=0.58.0+1.18.2
+modmenu_version=3.2.3
+clothconfig_version=6.2.62
 
 # Project Metadata
 project_name=Vistas
@@ -21,14 +21,14 @@ default_release_type=beta
 # CurseForge Metadata
 curseforge_slug=vistas
 curseforge_id=423659
-curseforge_game_versions=1.18, Fabric
+curseforge_game_versions=1.18.2, Fabric
 curseforge_required_dependencies=
 curseforge_optional_dependencies=
 
 # Modrinth Metadata
 modrinth_slug=vistas
 modrinth_id=itzZXRxq
-modrinth_game_versions=1.18
+modrinth_game_versions=1.18.2
 modrinth_mod_loaders=fabric
 
 # Mod Loader Metadata

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/terraformersmc/vistas/mixin/MinecraftClientMixin.java

@@ -20,7 +20,7 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.RunArgs;
 import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.resource.ReloadableResourceManager;
+import net.minecraft.resource.ReloadableResourceManagerImpl;
 import net.minecraft.sound.MusicSound;
 
 @Environment(EnvType.CLIENT)
@@ -32,13 +32,13 @@ public class MinecraftClientMixin implements MinecraftClientAccess {
 
  @Shadow
  @Final
- private ReloadableResourceManager resourceManager;
+ private ReloadableResourceManagerImpl resourceManager;
 
  @Nullable
  @Shadow
  public ClientPlayerEntity player;
 
- @Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/ReloadableResourceManager;registerReloader(Lnet/minecraft/resource/ResourceReloader;)V", ordinal = 2, shift = Shift.AFTER))
+ @Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/ReloadableResourceManagerImpl;registerReloader(Lnet/minecraft/resource/ResourceReloader;)V", ordinal = 2, shift = Shift.AFTER))
  private void vistas$init$registerPanoramaReloader(RunArgs args, CallbackInfo ci) {
  this.panoramaResourceReloader = new PanoramaResourceReloader();
  this.resourceManager.registerReloader(panoramaResourceReloader);

src/main/java/com/terraformersmc/vistas/mixin/SplashTextResourceSupplierMixin.java

@@ -1,5 +1,7 @@
 package com.terraformersmc.vistas.mixin;
 
+import com.terraformersmc.vistas.title.VistasTitle;
+import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -30,7 +32,9 @@ public class SplashTextResourceSupplierMixin {
  private void vistas$get(CallbackInfoReturnable<String> ci) {
  MinecraftClient client = MinecraftClient.getInstance();
  PanoramaResourceReloader resourceReloader = ((MinecraftClientAccess) client).getPanoramaResourceReloader();
- if (resourceReloader != null) {
+ Identifier panoramaId = VistasTitle.PANORAMAS_INVERT.get(VistasTitle.CURRENT.getValue());
+
+ if (resourceReloader != null && panoramaId != null) {
  ci.setReturnValue(resourceReloader.get());
  }
  }