From cad8c0bbd162bd56c7cbffd60807c028031fddef Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Tue, 23 Jun 2020 01:15:12 -0300
Subject: [PATCH] structure lag, booyah

---
 .../carpet/fakes/ChunkGeneratorInterface.java    |  6 ++++++
 .../java/carpet/mixins/ChunkGeneratorMixin.java  | 11 ++++++++++-
 .../java/carpet/script/CarpetExpression.java     | 16 ++++------------
 src/main/resources/carpet.mixins.json            |  1 +
 4 files changed, 21 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/carpet/fakes/ChunkGeneratorInterface.java

diff --git a/src/main/java/carpet/fakes/ChunkGeneratorInterface.java b/src/main/java/carpet/fakes/ChunkGeneratorInterface.java
new file mode 100644
index 00000000..3206e3a7
--- /dev/null
+++ b/src/main/java/carpet/fakes/ChunkGeneratorInterface.java
@@ -0,0 +1,6 @@
+package carpet.fakes;
+
+public interface ChunkGeneratorInterface
+{
+    void initStrongholds();
+}
diff --git a/src/main/java/carpet/mixins/ChunkGeneratorMixin.java b/src/main/java/carpet/mixins/ChunkGeneratorMixin.java
index dccce59c..9d63b47d 100644
--- a/src/main/java/carpet/mixins/ChunkGeneratorMixin.java
+++ b/src/main/java/carpet/mixins/ChunkGeneratorMixin.java
@@ -1,18 +1,27 @@
 package carpet.mixins;
 
 import carpet.CarpetSettings;
+import carpet.fakes.ChunkGeneratorInterface;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.gen.chunk.ChunkGenerator;
 import net.minecraft.world.gen.feature.FeatureConfig;
 import net.minecraft.world.gen.feature.StructureFeature;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(ChunkGenerator.class)
-public abstract class ChunkGeneratorMixin
+public abstract class ChunkGeneratorMixin implements ChunkGeneratorInterface
 {
+    @Shadow protected abstract void method_28509();
+
+    @Override
+    public void initStrongholds()
+    {
+        method_28509();
+    }
     // this might not be needed anymore
     /*
     @Inject(method = "hasStructure", at = @At("HEAD"), cancellable = true)
diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java
index bba0a4b3..e9e46d8f 100644
--- a/src/main/java/carpet/script/CarpetExpression.java
+++ b/src/main/java/carpet/script/CarpetExpression.java
@@ -2,16 +2,17 @@ package carpet.script;
 
 import carpet.CarpetServer;
 import carpet.fakes.BiomeArrayInterface;
+import carpet.fakes.ChunkGeneratorInterface;
 import carpet.fakes.ChunkTicketManagerInterface;
 import carpet.fakes.IngredientInterface;
 import carpet.fakes.MinecraftServerInterface;
-import carpet.fakes.BiomeArrayInterface;
 import carpet.fakes.RecipeManagerInterface;
 import carpet.fakes.ServerChunkManagerInterface;
 import carpet.fakes.SpawnHelperInnerInterface;
 import carpet.fakes.StatTypeInterface;
 import carpet.fakes.ThreadedAnvilChunkStorageInterface;
 import carpet.helpers.FeatureGenerator;
+import carpet.mixins.ChunkGeneratorMixin;
 import carpet.mixins.PointOfInterest_scarpetMixin;
 import carpet.script.Fluff.TriFunction;
 import carpet.script.argument.BlockArgument;
@@ -75,7 +76,6 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.ItemEntity;
-import net.minecraft.entity.LightningEntity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.decoration.ArmorStandEntity;
@@ -109,7 +109,6 @@ import net.minecraft.stat.Stat;
 import net.minecraft.stat.StatType;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.Property;
-import net.minecraft.structure.StructureFeatures;
 import net.minecraft.structure.StructurePiece;
 import net.minecraft.structure.StructureStart;
 import net.minecraft.text.LiteralText;
@@ -130,7 +129,6 @@ import net.minecraft.util.math.Vec3i;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.util.registry.RegistryKey;
 import net.minecraft.world.gen.chunk.ChunkGenerator;
-import net.minecraft.world.gen.feature.Feature;
 import net.minecraft.world.gen.feature.StructureFeature;
 import net.minecraft.world.SpawnHelper;
 import net.minecraft.world.poi.PointOfInterest;
@@ -143,11 +141,9 @@ import net.minecraft.world.biome.Biome;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.ChunkStatus;
 import net.minecraft.world.chunk.WorldChunk;
-import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.gen.ChunkRandom;
 import org.apache.commons.lang3.tuple.Pair;
 
-import java.util.Date;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -361,16 +357,11 @@ public class CarpetExpression
         return MapValue.wrap(ret);
     }
 
-    private static long lastSeed = -1;
     private void BooYah(ChunkGenerator generator)
     {
         synchronized (generator)
         {
-            if (generator.getSeed() != lastSeed)
-            {
-                StructureFeatures.STRONGHOLD.shouldStartAt(null, generator, null, 0, 0, null);
-                lastSeed = generator.getSeed();
-            }
+            ((ChunkGeneratorInterface)generator).initStrongholds();
         }
     }
     private void API_BlockManipulation()
@@ -1159,6 +1150,7 @@ public class CarpetExpression
 
             ServerWorld world = cc.s.getWorld();
 
+            // well, because
             BooYah(world.getChunkManager().getChunkGenerator());
 
             BlockPos pos = locator.block.getPos();
diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json
index 35a9ec12..e6921420 100644
--- a/src/main/resources/carpet.mixins.json
+++ b/src/main/resources/carpet.mixins.json
@@ -79,6 +79,7 @@
     "SaplingBlockMixin",
     "EntityMixin",
     "FlatChunkGeneratorMixin",
+    "ChunkGeneratorMixin",
 
     "BiomeArray_getBiomeArrayMixin",