Skip to content

Commit 62740e7

Browse files
committed
Rename methods in mixins to include fabricWaystones$
1 parent 3ab337e commit 62740e7

8 files changed

+11
-14
lines changed

src/main/java/wraith/fwaystones/access/ClientPlayerEntityMixinAccess.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
public interface ClientPlayerEntityMixinAccess extends PlayerAccess {
66

7-
void requestSync();
8-
ArrayList<String> getWaystonesSorted();
7+
void fabricWaystones$requestSync();
8+
ArrayList<String> fabricWaystones$getWaystonesSorted();
99

1010
}

src/main/java/wraith/fwaystones/access/StructurePiecesListAccess.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66

77
public interface StructurePiecesListAccess {
88

9-
void setPieces(List<StructurePiece> pieces);
9+
void fabricWaystones$setPieces(List<StructurePiece> pieces);
1010

1111
}

src/main/java/wraith/fwaystones/access/StructurePoolBasedGenerator_StructurePoolGeneratorAccess.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
public interface StructurePoolBasedGenerator_StructurePoolGeneratorAccess {
44

5-
void setMaxWaystoneCount(int maxWaystoneCount);
5+
void fabricWaystones$setMaxWaystoneCount(int maxWaystoneCount);
66

77
}

src/main/java/wraith/fwaystones/mixin/ClientPlayNetworkHandlerMixin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ public class ClientPlayNetworkHandlerMixin {
1616
@Inject(method = "onPlayerRespawn", at = @At("RETURN"))
1717
public void onPlayerRespawn(PlayerRespawnS2CPacket packet, CallbackInfo ci) {
1818
if (MinecraftClient.getInstance().player != null) {
19-
((ClientPlayerEntityMixinAccess) MinecraftClient.getInstance().player).requestSync();
19+
((ClientPlayerEntityMixinAccess) MinecraftClient.getInstance().player).fabricWaystones$requestSync();
2020
}
2121
}
2222

2323
@Inject(method = "onGameJoin", at = @At("RETURN"))
2424
public void onPlayerSpawn(GameJoinS2CPacket packet, CallbackInfo ci) {
2525
if (MinecraftClient.getInstance().player != null) {
26-
((ClientPlayerEntityMixinAccess) MinecraftClient.getInstance().player).requestSync();
26+
((ClientPlayerEntityMixinAccess) MinecraftClient.getInstance().player).fabricWaystones$requestSync();
2727
}
2828
}
2929

src/main/java/wraith/fwaystones/mixin/ClientPlayerEntityMixin.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
package wraith.fwaystones.mixin;
22

33
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
4-
import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
54
import net.minecraft.client.network.ClientPlayerEntity;
65
import org.spongepowered.asm.mixin.Mixin;
76
import wraith.fwaystones.FabricWaystones;
87
import wraith.fwaystones.access.ClientPlayerEntityMixinAccess;
98
import wraith.fwaystones.access.PlayerEntityMixinAccess;
109
import wraith.fwaystones.packets.RequestPlayerSyncPacket;
11-
import wraith.fwaystones.packets.WaystonePacketHandler;
12-
1310
import java.util.ArrayList;
1411
import java.util.Comparator;
1512
import java.util.HashSet;
@@ -18,12 +15,12 @@
1815
public class ClientPlayerEntityMixin implements ClientPlayerEntityMixinAccess {
1916

2017
@Override
21-
public void requestSync() {
18+
public void fabricWaystones$requestSync() {
2219
ClientPlayNetworking.send(new RequestPlayerSyncPacket());
2320
}
2421

2522
@Override
26-
public ArrayList<String> getWaystonesSorted() {
23+
public ArrayList<String> fabricWaystones$getWaystonesSorted() {
2724
ArrayList<String> waystones = new ArrayList<>();
2825
HashSet<String> toRemove = new HashSet<>();
2926
var discoveredWaystones = ((PlayerEntityMixinAccess) this).fabricWaystones$getDiscoveredWaystones();

src/main/java/wraith/fwaystones/mixin/StructurePiecesListMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class StructurePiecesListMixin implements StructurePiecesListAccess {
1919
private List<StructurePiece> pieces;
2020

2121
@Override
22-
public void setPieces(List<StructurePiece> pieces) {
22+
public void fabricWaystones$setPieces(List<StructurePiece> pieces) {
2323
this.pieces = pieces;
2424
}
2525

src/main/java/wraith/fwaystones/mixin/StructurePoolBasedGeneratorMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ private static void preGenerate2(NoiseConfig noiseConfig, int maxSize, boolean m
3838
private static void onInit(StructurePoolBasedGenerator.StructurePoolGenerator structurePoolGenerator) {
3939
var config = FabricWaystones.CONFIG.worldgen;
4040
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);
4242
}
4343

4444
}

src/main/java/wraith/fwaystones/mixin/StructurePoolBasedGenerator_StructurePoolGeneratorMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ private static boolean isWaystone(StructurePoolElement element) {
4848
}
4949

5050
@Unique
51-
public void setMaxWaystoneCount(int maxWaystoneCount) {
51+
public void fabricWaystones$setMaxWaystoneCount(int maxWaystoneCount) {
5252
this.maxWaystoneCount = maxWaystoneCount;
5353
}
5454

0 commit comments

Comments
 (0)