Merge pull request #276 from IxPrumxI/fix/worldgen-mixin

LordDeatHunter · web-flow · commit 5ea44737933b · 2025-02-26T17:32:56.000+01:00
Fix worldgen mixin and refactoring other mixin names
diff --git a/src/main/java/wraith/fwaystones/access/ClientPlayerEntityMixinAccess.java b/src/main/java/wraith/fwaystones/access/ClientPlayerEntityMixinAccess.java
@@ -4,7 +4,7 @@
 
 public interface ClientPlayerEntityMixinAccess extends PlayerAccess {
 
-    void requestSync();
-    ArrayList<String> getWaystonesSorted();
+    void fabricWaystones$requestSync();
+    ArrayList<String> fabricWaystones$getWaystonesSorted();
 
 }
diff --git a/src/main/java/wraith/fwaystones/access/StructurePiecesListAccess.java b/src/main/java/wraith/fwaystones/access/StructurePiecesListAccess.java
@@ -6,6 +6,6 @@
 
 public interface StructurePiecesListAccess {
 
-    void setPieces(List<StructurePiece> pieces);
+    void fabricWaystones$setPieces(List<StructurePiece> pieces);
 
 }
diff --git a/src/main/java/wraith/fwaystones/access/StructurePoolBasedGenerator_StructurePoolGeneratorAccess.java b/src/main/java/wraith/fwaystones/access/StructurePoolBasedGenerator_StructurePoolGeneratorAccess.java
@@ -2,6 +2,6 @@
 
 public interface StructurePoolBasedGenerator_StructurePoolGeneratorAccess {
 
-    void setMaxWaystoneCount(int maxWaystoneCount);
+    void fabricWaystones$setMaxWaystoneCount(int maxWaystoneCount);
 
 }
diff --git a/src/main/java/wraith/fwaystones/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/wraith/fwaystones/mixin/ClientPlayNetworkHandlerMixin.java
@@ -16,14 +16,14 @@ public class ClientPlayNetworkHandlerMixin {
     @Inject(method = "onPlayerRespawn", at = @At("RETURN"))
     public void onPlayerRespawn(PlayerRespawnS2CPacket packet, CallbackInfo ci) {
         if (MinecraftClient.getInstance().player != null) {
-            ((ClientPlayerEntityMixinAccess) MinecraftClient.getInstance().player).requestSync();
+            ((ClientPlayerEntityMixinAccess) MinecraftClient.getInstance().player).fabricWaystones$requestSync();
         }
     }
 
     @Inject(method = "onGameJoin", at = @At("RETURN"))
     public void onPlayerSpawn(GameJoinS2CPacket packet, CallbackInfo ci) {
         if (MinecraftClient.getInstance().player != null) {
-            ((ClientPlayerEntityMixinAccess) MinecraftClient.getInstance().player).requestSync();
+            ((ClientPlayerEntityMixinAccess) MinecraftClient.getInstance().player).fabricWaystones$requestSync();
         }
     }
 
diff --git a/src/main/java/wraith/fwaystones/mixin/ClientPlayerEntityMixin.java b/src/main/java/wraith/fwaystones/mixin/ClientPlayerEntityMixin.java
@@ -1,15 +1,12 @@
 package wraith.fwaystones.mixin;
 
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
-import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
 import net.minecraft.client.network.ClientPlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import wraith.fwaystones.FabricWaystones;
 import wraith.fwaystones.access.ClientPlayerEntityMixinAccess;
 import wraith.fwaystones.access.PlayerEntityMixinAccess;
 import wraith.fwaystones.packets.RequestPlayerSyncPacket;
-import wraith.fwaystones.packets.WaystonePacketHandler;
-
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashSet;
@@ -18,12 +15,12 @@
 public class ClientPlayerEntityMixin implements ClientPlayerEntityMixinAccess {
 
     @Override
-    public void requestSync() {
+    public void fabricWaystones$requestSync() {
         ClientPlayNetworking.send(new RequestPlayerSyncPacket());
     }
 
     @Override
-    public ArrayList<String> getWaystonesSorted() {
+    public ArrayList<String> fabricWaystones$getWaystonesSorted() {
         ArrayList<String> waystones = new ArrayList<>();
         HashSet<String> toRemove = new HashSet<>();
         var discoveredWaystones = ((PlayerEntityMixinAccess) this).fabricWaystones$getDiscoveredWaystones();
diff --git a/src/main/java/wraith/fwaystones/mixin/StructurePiecesListMixin.java b/src/main/java/wraith/fwaystones/mixin/StructurePiecesListMixin.java
@@ -19,7 +19,7 @@ public class StructurePiecesListMixin implements StructurePiecesListAccess {
     private List<StructurePiece> pieces;
 
     @Override
-    public void setPieces(List<StructurePiece> pieces) {
+    public void fabricWaystones$setPieces(List<StructurePiece> pieces) {
         this.pieces = pieces;
     }
 
diff --git a/src/main/java/wraith/fwaystones/mixin/StructurePoolBasedGeneratorMixin.java b/src/main/java/wraith/fwaystones/mixin/StructurePoolBasedGeneratorMixin.java
@@ -38,7 +38,7 @@ private static void preGenerate2(NoiseConfig noiseConfig, int maxSize, boolean m
     private static void onInit(StructurePoolBasedGenerator.StructurePoolGenerator structurePoolGenerator) {
         var config = FabricWaystones.CONFIG.worldgen;
         int maxWaystoneCount = Utils.getRandomIntInRange(config.min_per_village(), config.max_per_village());
-        ((StructurePoolBasedGenerator_StructurePoolGeneratorAccess) (Object) structurePoolGenerator).setMaxWaystoneCount(maxWaystoneCount);
+        ((StructurePoolBasedGenerator_StructurePoolGeneratorAccess) (Object) structurePoolGenerator).fabricWaystones$setMaxWaystoneCount(maxWaystoneCount);
     }
 
 }
diff --git a/src/main/java/wraith/fwaystones/mixin/StructurePoolBasedGenerator_StructurePoolGeneratorMixin.java b/src/main/java/wraith/fwaystones/mixin/StructurePoolBasedGenerator_StructurePoolGeneratorMixin.java
@@ -1,20 +1,15 @@
 package wraith.fwaystones.mixin;
 
+import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.registry.RegistryKey;
-import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.structure.PoolStructurePiece;
 import net.minecraft.structure.StructureLiquidSettings;
-import net.minecraft.structure.StructureTemplate;
 import net.minecraft.structure.pool.SinglePoolElement;
 import net.minecraft.structure.pool.StructurePool;
 import net.minecraft.structure.pool.StructurePoolBasedGenerator;
 import net.minecraft.structure.pool.StructurePoolElement;
 import net.minecraft.structure.pool.alias.StructurePoolAliasLookup;
-import net.minecraft.util.BlockRotation;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockBox;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Direction;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.HeightLimitView;
 import net.minecraft.world.gen.noise.NoiseConfig;
@@ -26,14 +21,10 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 import wraith.fwaystones.FabricWaystones;
 import wraith.fwaystones.access.StructurePoolBasedGenerator_StructurePoolGeneratorAccess;
 import wraith.fwaystones.util.WaystonesWorldgen;
-
-import java.util.Iterator;
 import java.util.List;
-import java.util.Optional;
 
 @Mixin(StructurePoolBasedGenerator.StructurePoolGenerator.class)
 public class StructurePoolBasedGenerator_StructurePoolGeneratorMixin implements StructurePoolBasedGenerator_StructurePoolGeneratorAccess {
@@ -57,37 +48,23 @@ private static boolean isWaystone(StructurePoolElement element) {
     }
 
     @Unique
-    public void setMaxWaystoneCount(int maxWaystoneCount) {
+    public void fabricWaystones$setMaxWaystoneCount(int maxWaystoneCount) {
         this.maxWaystoneCount = maxWaystoneCount;
     }
 
     @Inject(method = "generatePiece",
-        at = @At(value = "INVOKE", target = "Ljava/util/List;addAll(Ljava/util/Collection;)Z", ordinal = 0, shift = At.Shift.AFTER, remap = false),
-        locals = LocalCapture.CAPTURE_FAILSOFT)
-    private void fabricwaystones_limitWaystonePieceSpawning(PoolStructurePiece piece, MutableObject<VoxelShape> pieceShape, int minY, boolean modifyBoundingBox, HeightLimitView world, NoiseConfig noiseConfig, StructurePoolAliasLookup aliasLookup, StructureLiquidSettings liquidSettings,
+        at = @At(value = "INVOKE", target = "Ljava/util/List;addAll(Ljava/util/Collection;)Z", ordinal = 0, shift = At.Shift.AFTER, remap = false))
+    private void fabricwaystones_limitWaystonePieceSpawning(PoolStructurePiece piece,
+                                                            MutableObject<VoxelShape> pieceShape,
+                                                            int depth,
+                                                            boolean modifyBoundingBox,
+                                                            HeightLimitView world,
+                                                            NoiseConfig noiseConfig,
+                                                            StructurePoolAliasLookup aliasLookup,
+                                                            StructureLiquidSettings liquidSettings,
                                                             CallbackInfo ci,
-                                                            StructurePoolElement structurePoolElement,
-                                                            BlockPos blockPos,
-                                                            BlockRotation blockRotation,
-                                                            StructurePool.Projection projection,
-                                                            boolean bl,
-                                                            MutableObject<VoxelShape> mutableObject,
-                                                            BlockBox blockBox,
-                                                            int i,
-                                                            Iterator var17,
-                                                            StructureTemplate.StructureBlockInfo structureBlockInfo,
-                                                            Direction direction,
-                                                            BlockPos blockPos2,
-                                                            BlockPos blockPos3,
-                                                            int j,
-                                                            int k,
-                                                            RegistryKey<StructurePool> registryKey,
-                                                            Optional optional,
-                                                            RegistryEntry<StructurePool> registryEntry,
-                                                            RegistryEntry<StructurePool> registryEntry2,
-                                                            MutableObject mutableObject2,
-                                                            boolean bl2,
-                                                            List<StructurePoolElement> list
+                                                            @Local RegistryKey<StructurePool> registryKey,
+                                                            @Local List<StructurePoolElement> list
     ) {
         if (!FabricWaystones.CONFIG.worldgen.generate_in_villages() ||
             maxWaystoneCount < 0 ||

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`public interface ClientPlayerEntityMixinAccess extends PlayerAccess {`
`6`	`6`
`7`		`- void requestSync();`
`8`		`- ArrayList<String> getWaystonesSorted();`
	`7`	`+ void fabricWaystones$requestSync();`
	`8`	`+ ArrayList<String> fabricWaystones$getWaystonesSorted();`
`9`	`9`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`
`7`	`7`	`public interface StructurePiecesListAccess {`
`8`	`8`
`9`		`- void setPieces(List<StructurePiece> pieces);`
	`9`	`+ void fabricWaystones$setPieces(List<StructurePiece> pieces);`
`10`	`10`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`
`3`	`3`	`public interface StructurePoolBasedGenerator_StructurePoolGeneratorAccess {`
`4`	`4`
`5`		`- void setMaxWaystoneCount(int maxWaystoneCount);`
	`5`	`+ void fabricWaystones$setMaxWaystoneCount(int maxWaystoneCount);`
`6`	`6`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,14 @@ public class ClientPlayNetworkHandlerMixin {`
`16`	`16`	`@Inject(method = "onPlayerRespawn", at = @At("RETURN"))`
`17`	`17`	`public void onPlayerRespawn(PlayerRespawnS2CPacket packet, CallbackInfo ci) {`
`18`	`18`	`if (MinecraftClient.getInstance().player != null) {`
`19`		`- ((ClientPlayerEntityMixinAccess) MinecraftClient.getInstance().player).requestSync();`
	`19`	`+ ((ClientPlayerEntityMixinAccess) MinecraftClient.getInstance().player).fabricWaystones$requestSync();`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`@Inject(method = "onGameJoin", at = @At("RETURN"))`
`24`	`24`	`public void onPlayerSpawn(GameJoinS2CPacket packet, CallbackInfo ci) {`
`25`	`25`	`if (MinecraftClient.getInstance().player != null) {`
`26`		`- ((ClientPlayerEntityMixinAccess) MinecraftClient.getInstance().player).requestSync();`
	`26`	`+ ((ClientPlayerEntityMixinAccess) MinecraftClient.getInstance().player).fabricWaystones$requestSync();`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class StructurePiecesListMixin implements StructurePiecesListAccess {`
`19`	`19`	`private List<StructurePiece> pieces;`
`20`	`20`
`21`	`21`	`@Override`
`22`		`- public void setPieces(List<StructurePiece> pieces) {`
	`22`	`+ public void fabricWaystones$setPieces(List<StructurePiece> pieces) {`
`23`	`23`	`this.pieces = pieces;`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ private static void preGenerate2(NoiseConfig noiseConfig, int maxSize, boolean m`
`38`	`38`	`private static void onInit(StructurePoolBasedGenerator.StructurePoolGenerator structurePoolGenerator) {`
`39`	`39`	`var config = FabricWaystones.CONFIG.worldgen;`
`40`	`40`	`int maxWaystoneCount = Utils.getRandomIntInRange(config.min_per_village(), config.max_per_village());`
`41`		`- ((StructurePoolBasedGenerator_StructurePoolGeneratorAccess) (Object) structurePoolGenerator).setMaxWaystoneCount(maxWaystoneCount);`
	`41`	`+ ((StructurePoolBasedGenerator_StructurePoolGeneratorAccess) (Object) structurePoolGenerator).fabricWaystones$setMaxWaystoneCount(maxWaystoneCount);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`}`