Fixed random crashing

TerraformersMC · Aug 17, 2021 · 9055afe · 9055afe
1 parent 20eb559
commit 9055afe
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/src/main/java/com/terraformersmc/vistas/Vistas.java b/src/main/java/com/terraformersmc/vistas/Vistas.java
@@ -4,7 +4,6 @@
 import org.apache.logging.log4j.Logger;
 
 import com.terraformersmc.vistas.config.VistasConfig;
-import com.terraformersmc.vistas.registry.VistasRegistry;
 import com.terraformersmc.vistas.util.PanoramicScreenshots;
 
 import net.fabricmc.api.ClientModInitializer;
@@ -18,7 +17,6 @@ public class Vistas implements ClientModInitializer {
 	public void onInitializeClient() {
 		VistasConfig.init();
 		PanoramicScreenshots.registerKeyBinding();
-		VistasRegistry.registerApiPanoramas();
 	}
 
 	public static Identifier id(String id) {

diff --git a/src/main/java/com/terraformersmc/vistas/mixin/MinecraftClientMixin.java b/src/main/java/com/terraformersmc/vistas/mixin/MinecraftClientMixin.java
@@ -48,6 +48,9 @@ public class MinecraftClientMixin implements MinecraftClientAccess {
 
 	@Inject(method = "tick", at = @At("HEAD"))
 	private void vistas$tick(CallbackInfo ci) {
+		if (VistasRegistry.PANORAMA_REGISTRY.isEmpty()) {
+			VistasRegistry.registerApiPanoramas();
+		}
 		if (this.getCurrentPanorama() == null) {
 			this.setCurrentPanorama(VistasRegistry.getChosenPanorama());
 			VistasConfig.getInstance().panorama = VistasRegistry.PANORAMA_REGISTRY.getId(this.getCurrentPanorama()).toString();

diff --git a/src/main/java/com/terraformersmc/vistas/mixin/TitleScreenMixin.java b/src/main/java/com/terraformersmc/vistas/mixin/TitleScreenMixin.java
@@ -80,7 +80,11 @@ protected TitleScreenMixin(Text title) {
 
 			if (this.isVistasReadyToChange == true) {
 				this.isVistasReadyToChange = false;
-				this.isVistas = VistasRegistry.PANORAMA_REGISTRY.getId(panorama).equals(Vistas.id("default")) && new Random().nextDouble() < 1.0E-4D;
+				if (VistasRegistry.PANORAMA_REGISTRY.getId(panorama) != null) {
+					this.isVistas = VistasRegistry.PANORAMA_REGISTRY.getId(panorama).equals(Vistas.id("default")) && new Random().nextDouble() < 1.0E-4D;
+				} else {
+					this.isVistas = false;
+				}
 			}
 		}
 		backgroundRenderers.forEach((rcmr) -> rcmr.render(delta, MathHelper.clamp(MathHelper.clamp(f, 0.0F, 1.0F) * ((float) rcmr.panorama.visualSettings.alpha / 255.0F), 0.0F, 1.0F)));

diff --git a/src/main/java/com/terraformersmc/vistas/registry/resource/PanoramaResourceManager.java b/src/main/java/com/terraformersmc/vistas/registry/resource/PanoramaResourceManager.java
@@ -109,6 +109,7 @@ protected void apply(HashMap<Identifier, PanoramaGroup> prepared, ResourceManage
 				Registry.register(VistasRegistry.PANORAMA_REGISTRY, id, group);
 			}
 		});
+		VistasRegistry.setCurrentPanorama(VistasRegistry.getChosenPanorama());
 	}
 
 	protected void add(Identifier id, PanoramaGroup panGroup) {
-Original file line number
+Diff line change
@@ Expand Up @@
     				Registry.register(VistasRegistry.PANORAMA_REGISTRY, id, group);
     			}
     		});
+    		VistasRegistry.setCurrentPanorama(VistasRegistry.getChosenPanorama());
     	}
     	protected void add(Identifier id, PanoramaGroup panGroup) {
@@ Expand Down @@