diff --git a/src/main/java/org/betterx/betterend/mixin/common/EndCityFeatureMixin.java b/src/main/java/org/betterx/betterend/mixin/common/EndCityFeatureMixin.java
index 81cb4f2e..4ae0698a 100644
--- a/src/main/java/org/betterx/betterend/mixin/common/EndCityFeatureMixin.java
+++ b/src/main/java/org/betterx/betterend/mixin/common/EndCityFeatureMixin.java
@@ -24,12 +24,12 @@ public class EndCityFeatureMixin {
     ) {
         final ChunkPos pos = context.chunkPos();
         WorldgenRandom chunkRandom = new WorldgenRandom(new XoroshiroRandomSource(pos.x, pos.z));
+        chunkRandom.consumeCount(1);
 
         if (GeneratorOptions.useNewGenerator()) {
             int chance = GeneratorOptions.getEndCityFailChance();
             if (chance > 0 && chunkRandom.nextInt(chance) != 0) {
                 info.setReturnValue(Optional.empty());
-                info.cancel();
             }
         }
     }
diff --git a/src/main/resources/betterend.mixins.common.json b/src/main/resources/betterend.mixins.common.json
index 33ede3c7..917baba8 100644
--- a/src/main/resources/betterend.mixins.common.json
+++ b/src/main/resources/betterend.mixins.common.json
@@ -2,34 +2,35 @@
 	"required": true,
 	"minVersion": "0.8",
 	"package": "org.betterx.betterend.mixin.common",
-	"compatibilityLevel": "JAVA_16",
+	"compatibilityLevel": "JAVA_17",
 	"mixins": [
-		"LevelMixin",
-		"NoiseBasedChunkGeneratorAccessor",
-		"NoiseGeneratorSettingsMixin",
-		"NoiseInterpolatorAccessor",
-		"ChorusPlantFeatureMixin",
-		"PlayerAdvancementsMixin",
+		"BlockBehaviourMixin",
 		"ChorusFlowerBlockMixin",
 		"ChorusPlantBlockMixin",
-		"EndPodiumFeatureMixin",
-		"EndDragonFightMixin",
-		"MappedRegistryMixin",
-		"WorldGenRegionMixin",
-		"BlockBehaviourMixin",
-		"NoiseChunkAccessor",
+		"ChorusPlantFeatureMixin",
 		"CraftingMenuMixin",
-		"LivingEntityMixin",
-		"ServerPlayerMixin",
-		"SpikeFeatureMixin",
-		"ServerLevelMixin",
-		"NoiseChunkMixin",
+		"EndCityFeatureMixin",
+		"EndDragonFightMixin",
 		"EnderManMixin",
+		"EndPodiumFeatureMixin",
 		"EndSpikeMixin",
-		"MonsterMixin",
 		"EntityMixin",
+		"LevelMixin",
+		"LivingEntityMixin",
+		"MappedRegistryMixin",
+		"MonsterMixin",
+		"NoiseBasedChunkGeneratorAccessor",
+		"NoiseChunkAccessor",
+		"NoiseChunkMixin",
+		"NoiseGeneratorSettingsMixin",
+		"NoiseInterpolatorAccessor",
+		"PlayerAdvancementsMixin",
 		"PlayerMixin",
-		"SlimeMixin"
+		"ServerLevelMixin",
+		"ServerPlayerMixin",
+		"SlimeMixin",
+		"SpikeFeatureMixin",
+		"WorldGenRegionMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1