fixed spawner processor replacing

TelepathicGrunt/RepurposedStructures-Quilt#216
TelepathicGrunt · Jul 23, 2022 · 2a22a52 · 2a22a52
1 parent 25ea176
commit 2a22a52
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ### **(V.6.1.4 Changes) (1.19.0 Minecraft)**
 
+#### RS Spawners:
+Fixed bug where removing all mobs for an RS Spawner will cause air pockets to spawn in place of the spawner in 
+ Ocean Mineshafts and Ocean Dungeons. Also causes Pig Spawners to spawn in End Dungeons.
+ Now, removing all mobs will remove the spawner block properly without placing air pockets or Pig Spawners
+ for Ocean Mineshafts, Ocean Dungeons, and End Dungeons.
+
 #### Mod Compat:
 Added some William Wythers' Overhauled Overworld biomes to RS's biome tags to improve compat.
  Also, update to v3.0.3 or newer William Wythers' Overhauled Overworld have maximum compat with RS.

diff --git a/src/main/java/com/telepathicgrunt/repurposedstructures/world/features/NbtDungeon.java b/src/main/java/com/telepathicgrunt/repurposedstructures/world/features/NbtDungeon.java
@@ -176,19 +176,6 @@ private boolean isValidNonSolidBlock(NbtDungeonConfig config, BlockState state)
         return state.isAir();
     }
 
-    /**
-     * Makes the given block entity now have the correct spawner mob
-     */
-    private void SetMobSpawnerEntity(RandomSource random, NbtDungeonConfig config, SpawnerBlockEntity blockEntity) {
-        EntityType<?> entity = RepurposedStructures.mobSpawnerManager.getSpawnerMob(config.rsSpawnerResourcelocation, random);
-        if(entity != null) {
-            blockEntity.getSpawner().setEntityId(entity);
-        }
-        else{
-            RepurposedStructures.LOGGER.warn("EntityType in a dungeon does not exist in registry! : {}", config.rsSpawnerResourcelocation);
-        }
-    }
-
     /**
      * Makes the targeted slab block now a full block.
      */
@@ -311,13 +298,16 @@ else if(GeneralUtils.isFullCube(world, mutable, neighboringState) && !(neighbori
                             RandomizableContainerBlockEntity.setLootTable(world, random, mutable, config.chestResourcelocation);
                             mutable.move(Direction.DOWN);
                             if(lootBlock.getBlock() == Blocks.SHULKER_BOX && world.getBlockEntity(mutable) == null) {
-                                world.setBlock(mutable, Blocks.SPAWNER.defaultBlockState(), 2);
-                                BlockEntity blockEntity = world.getBlockEntity(mutable);
-                                if (blockEntity instanceof SpawnerBlockEntity) {
-                                    SetMobSpawnerEntity(random, config, (SpawnerBlockEntity) blockEntity);
+                                EntityType<?> entity = RepurposedStructures.mobSpawnerManager.getSpawnerMob(config.rsSpawnerResourcelocation, random);
+                                if (entity != null) {
+                                    world.setBlock(mutable, Blocks.SPAWNER.defaultBlockState(), 2);
+                                    BlockEntity blockEntity = world.getBlockEntity(mutable);
+                                    if (blockEntity instanceof SpawnerBlockEntity spawnerBlockEntity) {
+                                        spawnerBlockEntity.getSpawner().setEntityId(entity);
+                                    }
                                 }
                             }
-                            else{
+                            else {
                                 SolidifyBlock(world, mutable);
                             }
 

diff --git a/...om/telepathicgrunt/repurposedstructures/world/processors/SpawnerRandomizingProcessor.java b/...om/telepathicgrunt/repurposedstructures/world/processors/SpawnerRandomizingProcessor.java
@@ -14,6 +14,7 @@
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.SpawnerBlock;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.LegacyRandomSource;
 import net.minecraft.world.level.levelgen.WorldgenRandom;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings;
@@ -36,7 +37,8 @@ public class SpawnerRandomizingProcessor extends StructureProcessor {
             Codec.intRange(0, Integer.MAX_VALUE).fieldOf("min_spawn_delay").orElse(200).forGetter(spawnerRandomizingProcessor -> spawnerRandomizingProcessor.minSpawnDelay),
             Codec.intRange(0, Integer.MAX_VALUE).fieldOf("required_player_range").orElse(16).forGetter(spawnerRandomizingProcessor -> spawnerRandomizingProcessor.requiredPlayerRange),
             Codec.intRange(0, Integer.MAX_VALUE).fieldOf("spawn_count").orElse(4).forGetter(spawnerRandomizingProcessor -> spawnerRandomizingProcessor.spawnCount),
-            Codec.intRange(0, Integer.MAX_VALUE).fieldOf("spawn_range").orElse(4).forGetter(spawnerRandomizingProcessor -> spawnerRandomizingProcessor.spawnRange)
+            Codec.intRange(0, Integer.MAX_VALUE).fieldOf("spawn_range").orElse(4).forGetter(spawnerRandomizingProcessor -> spawnerRandomizingProcessor.spawnRange),
+            BlockState.CODEC.fieldOf("spawner_replacement_block").orElse(Blocks.AIR.defaultBlockState()).forGetter(spawnerRandomizingProcessor -> spawnerRandomizingProcessor.replacementState)
     ).apply(instance, instance.stable(SpawnerRandomizingProcessor::new)));
 
     public final ResourceLocation rsSpawnerResourcelocation;
@@ -49,6 +51,7 @@ public class SpawnerRandomizingProcessor extends StructureProcessor {
     public final int requiredPlayerRange;
     public final int spawnCount;
     public final int spawnRange;
+    public final BlockState replacementState;
 
     private SpawnerRandomizingProcessor(ResourceLocation rsSpawnerResourcelocation,
                                         Optional<InclusiveRange<Integer>> validBlockLightLevel,
@@ -59,7 +62,9 @@ private SpawnerRandomizingProcessor(ResourceLocation rsSpawnerResourcelocation,
                                         int minSpawnDelay,
                                         int requiredPlayerRange,
                                         int spawnCount,
-                                        int spawnRange) {
+                                        int spawnRange,
+                                        BlockState replacementState)
+    {
         this.rsSpawnerResourcelocation = rsSpawnerResourcelocation;
         this.validBlockLightLevel = validBlockLightLevel;
         this.validSkyLightLevel = validSkyLightLevel;
@@ -70,6 +75,7 @@ private SpawnerRandomizingProcessor(ResourceLocation rsSpawnerResourcelocation,
         this.requiredPlayerRange = requiredPlayerRange;
         this.spawnCount = spawnCount;
         this.spawnRange = spawnRange;
+        this.replacementState = replacementState;
     }
 
     @Override
@@ -81,7 +87,7 @@ public StructureTemplate.StructureBlockInfo processBlock(LevelReader worldView,
             CompoundTag spawnerNBT = SetMobSpawnerEntity(random, structureBlockInfoWorld.nbt);
 
             if(spawnerNBT == null) {
-                return new StructureTemplate.StructureBlockInfo(worldPos, Blocks.AIR.defaultBlockState(), null);
+                return new StructureTemplate.StructureBlockInfo(worldPos, replacementState, null);
             }
             else {
                 return new StructureTemplate.StructureBlockInfo(worldPos, structureBlockInfoWorld.state, spawnerNBT);

diff --git a/src/main/resources/data/repurposed_structures/worldgen/processor_list/dungeons/end.json b/src/main/resources/data/repurposed_structures/worldgen/processor_list/dungeons/end.json
@@ -25,7 +25,10 @@
     },
     {
       "processor_type": "repurposed_structures:spawner_randomizing_processor",
-      "rs_spawner_resourcelocation": "repurposed_structures:dungeons/end"
+      "rs_spawner_resourcelocation": "repurposed_structures:dungeons/end",
+      "spawner_replacement_block": {
+        "Name": "minecraft:end_stone_bricks"
+      }
     }
   ]
 }
diff --git a/...ain/resources/data/repurposed_structures/worldgen/processor_list/dungeons/ocean_cold.json b/...ain/resources/data/repurposed_structures/worldgen/processor_list/dungeons/ocean_cold.json
@@ -403,6 +403,12 @@
       "valid_block_light_level": {
         "min_inclusive": 0,
         "max_inclusive": 7
+      },
+      "spawner_replacement_block": {
+        "Name": "minecraft:water",
+        "Properties": {
+          "level": "0"
+        }
       }
     }
   ]

diff --git a/...n/resources/data/repurposed_structures/worldgen/processor_list/dungeons/ocean_frozen.json b/...n/resources/data/repurposed_structures/worldgen/processor_list/dungeons/ocean_frozen.json
@@ -403,6 +403,12 @@
       "valid_block_light_level": {
         "min_inclusive": 0,
         "max_inclusive": 7
+      },
+      "spawner_replacement_block": {
+        "Name": "minecraft:water",
+        "Properties": {
+          "level": "0"
+        }
       }
     }
   ]

diff --git a/...resources/data/repurposed_structures/worldgen/processor_list/dungeons/ocean_lukewarm.json b/...resources/data/repurposed_structures/worldgen/processor_list/dungeons/ocean_lukewarm.json
@@ -403,6 +403,12 @@
       "valid_block_light_level": {
         "min_inclusive": 0,
         "max_inclusive": 7
+      },
+      "spawner_replacement_block": {
+        "Name": "minecraft:water",
+        "Properties": {
+          "level": "0"
+        }
       }
     }
   ]

diff --git a/.../resources/data/repurposed_structures/worldgen/processor_list/dungeons/ocean_neutral.json b/.../resources/data/repurposed_structures/worldgen/processor_list/dungeons/ocean_neutral.json
@@ -403,6 +403,12 @@
       "valid_block_light_level": {
         "min_inclusive": 0,
         "max_inclusive": 7
+      },
+      "spawner_replacement_block": {
+        "Name": "minecraft:water",
+        "Properties": {
+          "level": "0"
+        }
       }
     }
   ]

diff --git a/...ain/resources/data/repurposed_structures/worldgen/processor_list/dungeons/ocean_warm.json b/...ain/resources/data/repurposed_structures/worldgen/processor_list/dungeons/ocean_warm.json
@@ -403,6 +403,12 @@
       "valid_block_light_level": {
         "min_inclusive": 0,
         "max_inclusive": 7
+      },
+      "spawner_replacement_block": {
+        "Name": "minecraft:water",
+        "Properties": {
+          "level": "0"
+        }
       }
     }
   ]

diff --git a/src/main/resources/data/repurposed_structures/worldgen/processor_list/dungeons/snow.json b/src/main/resources/data/repurposed_structures/worldgen/processor_list/dungeons/snow.json
@@ -168,6 +168,9 @@
       "valid_block_light_level": {
         "min_inclusive": 0,
         "max_inclusive": 7
+      },
+      "spawner_replacement_block": {
+        "Name": "minecraft:snow_block"
       }
     }
   ]

diff --git a/...esources/data/repurposed_structures/worldgen/processor_list/mineshafts/ocean_spawner.json b/...esources/data/repurposed_structures/worldgen/processor_list/mineshafts/ocean_spawner.json
@@ -102,6 +102,12 @@
       "valid_block_light_level": {
         "min_inclusive": 0,
         "max_inclusive": 7
+      },
+      "spawner_replacement_block": {
+        "Name": "minecraft:water",
+        "Properties": {
+          "level": "0"
+        }
       }
     },
     {