AxTps/CarpetSLSAddition
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: pca

Browse Source
This commit is contained in:
zly2006 committed 2024-07-11 12:14:01 +08:00
1 parent eb110fedde
commit 93a84a3682
2 files changed
+14 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/github/zly2006/carpetslsaddition/ServerMain.java
-4
View File
@@ -142,8 +142,4 @@ public class ServerMain implements ModInitializer, CarpetExtension {
}) })
); );
} }
public static Identifier createId(String path) {
return new Identifier(MOD_ID, path);
}
} }
src/main/java/com/github/zly2006/carpetslsaddition/network/pca/PcaSyncProtocol.java
+14 -8
View File
@@ -31,6 +31,7 @@ import net.minecraft.world.World;
import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.MutablePair; import org.apache.commons.lang3.tuple.MutablePair;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -45,15 +46,15 @@ public class PcaSyncProtocol {
public static final ReentrantLock lock = new ReentrantLock(true); public static final ReentrantLock lock = new ReentrantLock(true);
public static final ReentrantLock pairLock = new ReentrantLock(true); public static final ReentrantLock pairLock = new ReentrantLock(true);
// 发送包 // 发送包
private static final Identifier ENABLE_PCA_SYNC_PROTOCOL = ServerMain.createId("enable_pca_sync_protocol"); private static final Identifier ENABLE_PCA_SYNC_PROTOCOL = createId("enable_pca_sync_protocol");
private static final Identifier DISABLE_PCA_SYNC_PROTOCOL = ServerMain.createId("disable_pca_sync_protocol"); private static final Identifier DISABLE_PCA_SYNC_PROTOCOL = createId("disable_pca_sync_protocol");
private static final Identifier UPDATE_ENTITY = ServerMain.createId("update_entity"); private static final Identifier UPDATE_ENTITY = createId("update_entity");
private static final Identifier UPDATE_BLOCK_ENTITY = ServerMain.createId("update_block_entity"); private static final Identifier UPDATE_BLOCK_ENTITY = createId("update_block_entity");
// 响应包 // 响应包
private static final Identifier SYNC_BLOCK_ENTITY = ServerMain.createId("sync_block_entity"); private static final Identifier SYNC_BLOCK_ENTITY = createId("sync_block_entity");
private static final Identifier SYNC_ENTITY = ServerMain.createId("sync_entity"); private static final Identifier SYNC_ENTITY = createId("sync_entity");
private static final Identifier CANCEL_SYNC_BLOCK_ENTITY = ServerMain.createId("cancel_sync_block_entity"); private static final Identifier CANCEL_SYNC_BLOCK_ENTITY = createId("cancel_sync_block_entity");
private static final Identifier CANCEL_SYNC_ENTITY = ServerMain.createId("cancel_sync_entity"); private static final Identifier CANCEL_SYNC_ENTITY = createId("cancel_sync_entity");
private static final Map<ServerPlayerEntity, Pair<Identifier, BlockPos>> playerWatchBlockPos = new HashMap<>(); private static final Map<ServerPlayerEntity, Pair<Identifier, BlockPos>> playerWatchBlockPos = new HashMap<>();
private static final Map<ServerPlayerEntity, Pair<Identifier, Entity>> playerWatchEntity = new HashMap<>(); private static final Map<ServerPlayerEntity, Pair<Identifier, Entity>> playerWatchEntity = new HashMap<>();
private static final Map<Pair<Identifier, BlockPos>, Set<ServerPlayerEntity>> blockPosWatchPlayerSet = new HashMap<>(); private static final Map<Pair<Identifier, BlockPos>, Set<ServerPlayerEntity>> blockPosWatchPlayerSet = new HashMap<>();
@@ -415,4 +416,9 @@ public class PcaSyncProtocol {
private static CarpetRule<?> getCarpetRule(String rule){ private static CarpetRule<?> getCarpetRule(String rule){
return CarpetServer.settingsManager.getCarpetRule(rule); return CarpetServer.settingsManager.getCarpetRule(rule);
} }
@Contract(value = "_ -> new", pure = true)
private static @NotNull Identifier createId(String name) {
return new Identifier("pca", name);
}
} }