uniform constants to SFCraft.MOD_ID

This commit is contained in:
iceBear67 committed 2024-09-29 12:37:37 +08:00
1 parent 2309ea1d4b
commit fd25a93c6f
6 files changed
+11 -7

No files matched your search

+2 -1
View File
@@ -14,6 +14,7 @@ import java.nio.file.Path;
import java.util.function.Supplier; import java.util.function.Supplier;
public class SFCraft extends AbstractModule { public class SFCraft extends AbstractModule {
public static final String MOD_ID = "sfcraft";
@Getter(AccessLevel.PUBLIC) @Getter(AccessLevel.PUBLIC)
static Injector injector; static Injector injector;
/** /**
@@ -27,7 +28,7 @@ public class SFCraft extends AbstractModule {
@ConfigRoot @ConfigRoot
@Singleton @Singleton
public static Path getRoot() { public static Path getRoot() {
return Path.of("sfcraft"); return Path.of(MOD_ID);
} }
@Provides @Provides
@@ -21,7 +21,7 @@ import java.util.concurrent.ConcurrentHashMap;
public class SFEntityType { public class SFEntityType {
public static final EntityType<SFGuiderEntity> GUIDER = Registry.register( public static final EntityType<SFGuiderEntity> GUIDER = Registry.register(
Registries.ENTITY_TYPE, Registries.ENTITY_TYPE,
Identifier.of("sfcraft", "guider"), Identifier.of(SFCraft.MOD_ID , "guider"),
EntityType.Builder.create(SFGuiderEntity::new, SpawnGroup.CREATURE) EntityType.Builder.create(SFGuiderEntity::new, SpawnGroup.CREATURE)
.dimensions(0.35F, 0.6F) .dimensions(0.35F, 0.6F)
.eyeHeight(0.36F) .eyeHeight(0.36F)
@@ -20,7 +20,7 @@ public abstract class WorldMixin {
@Inject(method = "getGameRules", at = @At("HEAD"), cancellable = true) @Inject(method = "getGameRules", at = @At("HEAD"), cancellable = true)
private void beforeGetGameRules(CallbackInfoReturnable<GameRules> cir) { private void beforeGetGameRules(CallbackInfoReturnable<GameRules> cir) {
if (!isClient() && registryKey.getValue().getNamespace().equals("sfcraft")) { if (!isClient() && registryKey.getValue().getNamespace().equals(SFCraft.MOD_ID)) {
if (sfcraft$customGameRule == null) { if (sfcraft$customGameRule == null) {
sfcraft$customGameRule = SFCraft.getInjector().getInstance(RoomModule.class).readGameRuleForRoom((ServerWorld) (Object) this); sfcraft$customGameRule = SFCraft.getInjector().getInstance(RoomModule.class).readGameRuleForRoom((ServerWorld) (Object) this);
} }
@@ -1,6 +1,7 @@
package io.ib67.sfcraft.room; package io.ib67.sfcraft.room;
import com.google.inject.Inject; import com.google.inject.Inject;
import io.ib67.sfcraft.SFCraft;
import io.ib67.sfcraft.config.SFConfig; import io.ib67.sfcraft.config.SFConfig;
import io.ib67.sfcraft.inject.MinecraftServerSupplier; import io.ib67.sfcraft.inject.MinecraftServerSupplier;
import io.ib67.sfcraft.module.RoomModule; import io.ib67.sfcraft.module.RoomModule;
@@ -25,7 +26,7 @@ public class RoomTeleporter {
@Inject @Inject
private SFConfig config; private SFConfig config;
public static final Identifier ROOM_COOKIE = Identifier.of("sfcraft", "room"); public static final Identifier ROOM_COOKIE = Identifier.of(SFCraft.MOD_ID, "room");
public void teleportTo(Room room, ServerPlayerEntity player) { public void teleportTo(Room room, ServerPlayerEntity player) {
if (roomModule.isVirtual(player.getUuid())) { if (roomModule.isVirtual(player.getUuid())) {
@@ -1,5 +1,6 @@
package io.ib67.sfcraft.room.create; package io.ib67.sfcraft.room.create;
import io.ib67.sfcraft.SFCraft;
import io.ib67.sfcraft.module.room.CreativeRoomModule; import io.ib67.sfcraft.module.room.CreativeRoomModule;
import io.ib67.sfcraft.subserver.Room; import io.ib67.sfcraft.subserver.Room;
import io.ib67.sfcraft.subserver.RoomPlayerManager; import io.ib67.sfcraft.subserver.RoomPlayerManager;
@@ -13,8 +14,8 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
public class CreativeSpaceRoom implements Room { public class CreativeSpaceRoom implements Room {
public static final RegistryKey<World> WORLD = RegistryKey.of(RegistryKeys.WORLD, Identifier.of("sfcraft", "playground")); public static final RegistryKey<World> WORLD = RegistryKey.of(RegistryKeys.WORLD, Identifier.of(SFCraft.MOD_ID, "playground"));
public static final Identifier IDENTIFIER = Identifier.of("sfcraft", "creative_space"); public static final Identifier IDENTIFIER = Identifier.of(SFCraft.MOD_ID, "creative_space");
public static final BlockPos SPAWN_POS = new BlockPos(0, 66, 0); public static final BlockPos SPAWN_POS = new BlockPos(0, 66, 0);
@Getter @Getter
private final RoomPlayerManager playerManager; private final RoomPlayerManager playerManager;
@@ -1,5 +1,6 @@
package io.ib67.sfcraft.util; package io.ib67.sfcraft.util;
import io.ib67.sfcraft.SFCraft;
import io.ib67.sfcraft.util.Permission; import io.ib67.sfcraft.util.Permission;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.FabricLoader;
@@ -8,7 +9,7 @@ import net.minecraft.server.network.ServerPlayerEntity;
@UtilityClass @UtilityClass
public class SFConsts { public class SFConsts {
public static final String VERSION = FabricLoader.getInstance().getModContainer("sfcraft").get().getMetadata().getVersion().getFriendlyString(); public static final String VERSION = FabricLoader.getInstance().getModContainer(SFCraft.MOD_ID).get().getMetadata().getVersion().getFriendlyString();
public static final String SPECIAL_SUDO = "sfcraft.special.state.sudo"; public static final String SPECIAL_SUDO = "sfcraft.special.state.sudo";
public static final Permission<PlayerEntity> USE_AT = ofSFCPermission("chat.at", true); public static final Permission<PlayerEntity> USE_AT = ofSFCPermission("chat.at", true);
public static final Permission<PlayerEntity> USE_BROADCAST_LOCATION = ofSFCPermission("chat.xyz", true); public static final Permission<PlayerEntity> USE_BROADCAST_LOCATION = ofSFCPermission("chat.xyz", true);