Fix C2ME file loading

2024-02-15 21:45:11 -06:00
parent 761f802ced
commit a6143780fa
3 changed files with 87 additions and 46 deletions
@@ -28,56 +28,66 @@ public class MixinChunkMap
 	@Final
 	ServerLevel level;
 	
-	@Inject(method = "save", at = @At(value = "INVOKE", target = CHUNK_SERIALIZER_WRITE))
+	// firing at INVOKE causes issues with C2ME and is probably unnecessary since we
+	// don't need the chunk(s) before MC has finished saving them
+	@Inject(method = "save", at = @At(value = "RETURN", target = CHUNK_SERIALIZER_WRITE))
 	private void onChunkSave(ChunkAccess chunk, CallbackInfoReturnable<Boolean> ci)
 	{
-		//=====================================//
-		// corrupt/incomplete chunk validation //
-		//=====================================//
-		
-		// MC has a tendency to try saving incomplete or corrupted chunks (which show up as empty or black chunks)
-		// this logic should prevent that from happening
-		#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
-		if (chunk.isUnsaved() || chunk.getUpgradeData() != null || !chunk.isLightCorrect())
+		// true means a chunk was saved to disk
+		if (ci.getReturnValue())
 		{
-			return;
+			// TODO is this validation necessary since we are checking above if 
+			//  the callback return value should state if the chunk was actually saved or not?
+			//  Do we trust it to always be correct?
+			
+			//=====================================//
+			// corrupt/incomplete chunk validation //
+			//=====================================//
+			
+			// MC has a tendency to try saving incomplete or corrupted chunks (which show up as empty or black chunks)
+			// this logic should prevent that from happening
+			#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
+			if (chunk.isUnsaved() || chunk.getUpgradeData() != null || !chunk.isLightCorrect())
+			{
+				return;
+			}
+			#else
+			if (chunk.isUnsaved() || chunk.isUpgrading() || !chunk.isLightCorrect())
+			{
+				return;
+			}
+			#endif
+			
+			
+			//==================//
+			// biome validation //
+			//==================//
+			
+			// some chunks may be missing their biomes, which cause issues when attempting to save them
+			#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
+			if (chunk.getBiomes() == null)
+			{
+				return;
+			}
+			#else
+			try
+			{
+				// this will throw an exception if the biomes aren't set up
+				chunk.getNoiseBiome(0,0,0);
+			}
+			catch (Exception e)
+			{
+				return;
+			}
+			#endif
+			
+			
+			
+			ServerApi.INSTANCE.serverChunkSaveEvent(
+					new ChunkWrapper(chunk, this.level, ServerLevelWrapper.getWrapper(this.level)),
+					ServerLevelWrapper.getWrapper(this.level)
+			);
 		}
-		#else
-		if (chunk.isUnsaved() || chunk.isUpgrading() || !chunk.isLightCorrect())
-		{
-			return;
-		}
-		#endif
-		
-		
-		//==================//
-		// biome validation //
-		//==================//
-		
-		// some chunks may be missing their biomes, which cause issues when attempting to save them
-		#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
-		if (chunk.getBiomes() == null)
-		{
-			return;
-		}
-		#else
-		try
-		{
-			// this will throw an exception if the biomes aren't set up
-			chunk.getNoiseBiome(0,0,0);
-		}
-		catch (Exception e)
-		{
-			return;
-		}
-		#endif
-		
-		
-		
-		ServerApi.INSTANCE.serverChunkSaveEvent(
-				new ChunkWrapper(chunk, this.level, ServerLevelWrapper.getWrapper(this.level)),
-				ServerLevelWrapper.getWrapper(this.level)
-		);
 	}
 	
 }