Avoid/catch problems setting up a StructureBlockRegistry (#592)

Fixes a problem that @akisephila encountered. When an exception is thrown in `ILandType.registerBlocks()`, the error ended up not being logged, thus making it harder to find the actual problem. This PR fixes this issue in two ways: - Uses by `TitleLandType.isAspectCompatible()` have been replaced by terrain land type tags. - When the structure block registry is set up for `LandGenSettings`, any exceptions are now caught and logged.
lunar-sway · Apr 13, 2024 · 4527014 · 4527014
1 parent a063d13
commit 4527014
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 19 deletions.
diff --git a/...ain/generated/resources/data/minestuck/tags/minestuck/terrain_land_type/is_dangerous.json b/...ain/generated/resources/data/minestuck/tags/minestuck/terrain_land_type/is_dangerous.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minestuck:heat"
+  ]
+}
diff --git a/...nerated/resources/data/minestuck/tags/minestuck/terrain_land_type/is_fluid_important.json b/...nerated/resources/data/minestuck/tags/minestuck/terrain_land_type/is_fluid_important.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minestuck:heat"
+  ]
+}
diff --git a/src/main/java/com/mraof/minestuck/data/tag/TerrainLandTypeTagsProvider.java b/src/main/java/com/mraof/minestuck/data/tag/TerrainLandTypeTagsProvider.java
@@ -39,6 +39,8 @@ protected void addTags(HolderLookup.Provider provider)
 		this.tag(SAND).add(LandTypes.SAND.get(), LandTypes.RED_SAND.get(), LandTypes.LUSH_DESERTS.get());
 		this.tag(SANDSTONE).add(LandTypes.SANDSTONE.get(), LandTypes.RED_SANDSTONE.get());
 		this.tag(IS_DESOLATE).addTags(SAND, SANDSTONE, ROCK);
+		this.tag(IS_DANGEROUS).add(LandTypes.HEAT.get());
+		this.tag(IS_FLUID_IMPORTANT).add(LandTypes.HEAT.get());
 	}
 
 	@Override

diff --git a/src/main/java/com/mraof/minestuck/util/MSTags.java b/src/main/java/com/mraof/minestuck/util/MSTags.java
@@ -208,6 +208,8 @@ public static class TerrainLandTypes
 		public static final TagKey<TerrainLandType> SAND = tag("sand");
 		public static final TagKey<TerrainLandType> SANDSTONE = tag("sandstone");
 		public static final TagKey<TerrainLandType> IS_DESOLATE = tag("is_desolate");
+		public static final TagKey<TerrainLandType> IS_DANGEROUS = tag("is_dangerous");
+		public static final TagKey<TerrainLandType> IS_FLUID_IMPORTANT = tag("is_fluid_important");
 
 		private static TagKey<TerrainLandType> tag(String name)
 		{

diff --git a/src/main/java/com/mraof/minestuck/world/gen/LandGenSettings.java b/src/main/java/com/mraof/minestuck/world/gen/LandGenSettings.java
@@ -52,9 +52,7 @@ public final class LandGenSettings
 	{
 		this.landTypes = landTypes;
 
-		blockRegistry = new StructureBlockRegistry();
-		landTypes.getTerrain().registerBlocks(blockRegistry);
-		landTypes.getTitle().registerBlocks(blockRegistry);
+		blockRegistry = StructureBlockRegistry.init(landTypes);
 
 		landTypes.getTerrain().setGenSettings(this);
 		landTypes.getTitle().setGenSettings(this);

diff --git a/src/main/java/com/mraof/minestuck/world/gen/structure/blocks/StructureBlockRegistry.java b/src/main/java/com/mraof/minestuck/world/gen/structure/blocks/StructureBlockRegistry.java
@@ -2,6 +2,7 @@
 
 import com.mraof.minestuck.block.MSBlocks;
 import com.mraof.minestuck.world.gen.LandChunkGenerator;
+import com.mraof.minestuck.world.lands.LandTypePair;
 import net.minecraft.core.Direction;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.Block;
@@ -16,13 +17,16 @@
 import net.minecraft.world.level.levelgen.structure.templatesystem.BlockStateMatchTest;
 import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest;
 import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Supplier;
 
 public final class StructureBlockRegistry
 {
+	private static final Logger LOGGER = LogManager.getLogger();
 
 	private static final Map<String, BlockEntry> staticRegistry = new HashMap<>();
 	private static final Map<Block, String> templateBlockMap = new HashMap<>();
@@ -130,6 +134,21 @@ public static StructureBlockRegistry getOrDefault(ChunkGenerator generator)
 		else return defaultRegistry;
 	}
 
+	public static StructureBlockRegistry init(LandTypePair landTypes)
+	{
+		try
+		{
+			StructureBlockRegistry blockRegistry = new StructureBlockRegistry();
+			landTypes.getTerrain().registerBlocks(blockRegistry);
+			landTypes.getTitle().registerBlocks(blockRegistry);
+			return blockRegistry;
+		} catch(RuntimeException e)
+		{
+			LOGGER.error("Caught exception while setting up StructureBlockRegistry.", e);
+			return defaultRegistry;
+		}
+	}
+
 	private static class BlockEntry
 	{
 		//TODO define restriction with a set of block state properties instead of base class

diff --git a/src/main/java/com/mraof/minestuck/world/lands/title/FrogsLandType.java b/src/main/java/com/mraof/minestuck/world/lands/title/FrogsLandType.java
@@ -2,6 +2,7 @@
 
 import com.mraof.minestuck.entity.MSEntityTypes;
 import com.mraof.minestuck.util.MSSoundEvents;
+import com.mraof.minestuck.util.MSTags;
 import com.mraof.minestuck.world.biome.LandBiomeSetType;
 import com.mraof.minestuck.world.biome.LandBiomeType;
 import com.mraof.minestuck.world.gen.feature.MSPlacedFeatures;
@@ -13,7 +14,6 @@
 import net.minecraft.world.level.biome.MobSpawnSettings;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.material.Fluids;
 
 public class FrogsLandType extends TitleLandType
 {
@@ -61,9 +61,7 @@ public void addBiomeGeneration(LandBiomeGenBuilder builder, StructureBlockRegist
 	@Override
 	public boolean isAspectCompatible(TerrainLandType otherType)
 	{
-		StructureBlockRegistry registry = new StructureBlockRegistry();
-		otherType.registerBlocks(registry);
-		return !registry.getBlockState("ocean").getFluidState().is(Fluids.LAVA);
+		return !otherType.is(MSTags.TerrainLandTypes.IS_DANGEROUS);
 	}
 
 	@Override

diff --git a/src/main/java/com/mraof/minestuck/world/lands/title/PulseLandType.java b/src/main/java/com/mraof/minestuck/world/lands/title/PulseLandType.java
@@ -2,6 +2,7 @@
 
 import com.mraof.minestuck.block.MSBlocks;
 import com.mraof.minestuck.util.MSSoundEvents;
+import com.mraof.minestuck.util.MSTags;
 import com.mraof.minestuck.world.biome.LandBiomeSetType;
 import com.mraof.minestuck.world.biome.LandBiomeType;
 import com.mraof.minestuck.world.gen.LandGenSettings;
@@ -15,7 +16,6 @@
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.GenerationStep;
 import net.minecraft.world.level.levelgen.blockpredicates.BlockPredicate;
-import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.phys.Vec3;
 
 public class PulseLandType extends TitleLandType
@@ -66,9 +66,7 @@ public void addBiomeGeneration(LandBiomeGenBuilder builder, StructureBlockRegist
 	@Override
 	public boolean isAspectCompatible(TerrainLandType otherType)
 	{
-		StructureBlockRegistry registry = new StructureBlockRegistry();
-		otherType.registerBlocks(registry);
-		return !registry.getBlockState("ocean").getFluidState().is(Fluids.LAVA);	//Lava is likely a too important part of the terrain aspect to be replaced
+		return !otherType.is(MSTags.TerrainLandTypes.IS_FLUID_IMPORTANT);
 	}
 
 	@Override

diff --git a/src/main/java/com/mraof/minestuck/world/lands/title/RabbitsLandType.java b/src/main/java/com/mraof/minestuck/world/lands/title/RabbitsLandType.java
@@ -1,6 +1,7 @@
 package com.mraof.minestuck.world.lands.title;
 
 import com.mraof.minestuck.util.MSSoundEvents;
+import com.mraof.minestuck.util.MSTags;
 import com.mraof.minestuck.world.biome.LandBiomeSetType;
 import com.mraof.minestuck.world.biome.LandBiomeType;
 import com.mraof.minestuck.world.gen.feature.MSPlacedFeatures;
@@ -10,7 +11,6 @@
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.material.Fluids;
 
 public class RabbitsLandType extends TitleLandType
 {
@@ -44,9 +44,7 @@ public void addBiomeGeneration(LandBiomeGenBuilder builder, StructureBlockRegist
 	@Override
 	public boolean isAspectCompatible(TerrainLandType otherType)
 	{
-		StructureBlockRegistry registry = new StructureBlockRegistry();
-		otherType.registerBlocks(registry);
-		return !registry.getBlockState("ocean").getFluidState().is(Fluids.LAVA);
+		return !otherType.is(MSTags.TerrainLandTypes.IS_DANGEROUS);
 	}
 
 	@Override

diff --git a/src/main/java/com/mraof/minestuck/world/lands/title/ThoughtLandType.java b/src/main/java/com/mraof/minestuck/world/lands/title/ThoughtLandType.java
@@ -2,6 +2,7 @@
 
 import com.mraof.minestuck.block.MSBlocks;
 import com.mraof.minestuck.util.MSSoundEvents;
+import com.mraof.minestuck.util.MSTags;
 import com.mraof.minestuck.world.biome.LandBiomeSetType;
 import com.mraof.minestuck.world.biome.LandBiomeType;
 import com.mraof.minestuck.world.gen.LandGenSettings;
@@ -13,7 +14,6 @@
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.phys.Vec3;
 
 public class ThoughtLandType extends TitleLandType
@@ -60,9 +60,7 @@ public void addBiomeGeneration(LandBiomeGenBuilder builder, StructureBlockRegist
 	@Override
 	public boolean isAspectCompatible(TerrainLandType otherType)
 	{
-		StructureBlockRegistry registry = new StructureBlockRegistry();
-		otherType.registerBlocks(registry);
-		return !registry.getBlockState("ocean").getFluidState().is(Fluids.LAVA);
+		return !otherType.is(MSTags.TerrainLandTypes.IS_FLUID_IMPORTANT);
 	}
 
 	@Override