diff --git a/src/main/java/io/ib67/sfcraft/SFCraft.java b/src/main/java/io/ib67/sfcraft/SFCraft.java index 830a4de..5dc3d66 100644 --- a/src/main/java/io/ib67/sfcraft/SFCraft.java +++ b/src/main/java/io/ib67/sfcraft/SFCraft.java @@ -14,6 +14,7 @@ import java.nio.file.Path; import java.util.function.Supplier; public class SFCraft extends AbstractModule { + public static final String MOD_ID = "sfcraft"; @Getter(AccessLevel.PUBLIC) static Injector injector; /** @@ -27,7 +28,7 @@ public class SFCraft extends AbstractModule { @ConfigRoot @Singleton public static Path getRoot() { - return Path.of("sfcraft"); + return Path.of(MOD_ID); } @Provides diff --git a/src/main/java/io/ib67/sfcraft/SFEntityType.java b/src/main/java/io/ib67/sfcraft/SFEntityType.java index d3c7b9d..c5cc97d 100644 --- a/src/main/java/io/ib67/sfcraft/SFEntityType.java +++ b/src/main/java/io/ib67/sfcraft/SFEntityType.java @@ -21,7 +21,7 @@ import java.util.concurrent.ConcurrentHashMap; public class SFEntityType { public static final EntityType GUIDER = Registry.register( Registries.ENTITY_TYPE, - Identifier.of("sfcraft", "guider"), + Identifier.of(SFCraft.MOD_ID , "guider"), EntityType.Builder.create(SFGuiderEntity::new, SpawnGroup.CREATURE) .dimensions(0.35F, 0.6F) .eyeHeight(0.36F) diff --git a/src/main/java/io/ib67/sfcraft/mixin/server/subserver/WorldMixin.java b/src/main/java/io/ib67/sfcraft/mixin/server/subserver/WorldMixin.java index 8291a0f..412d159 100644 --- a/src/main/java/io/ib67/sfcraft/mixin/server/subserver/WorldMixin.java +++ b/src/main/java/io/ib67/sfcraft/mixin/server/subserver/WorldMixin.java @@ -20,7 +20,7 @@ public abstract class WorldMixin { @Inject(method = "getGameRules", at = @At("HEAD"), cancellable = true) private void beforeGetGameRules(CallbackInfoReturnable cir) { - if (!isClient() && registryKey.getValue().getNamespace().equals("sfcraft")) { + if (!isClient() && registryKey.getValue().getNamespace().equals(SFCraft.MOD_ID)) { if (sfcraft$customGameRule == null) { sfcraft$customGameRule = SFCraft.getInjector().getInstance(RoomModule.class).readGameRuleForRoom((ServerWorld) (Object) this); } diff --git a/src/main/java/io/ib67/sfcraft/room/RoomTeleporter.java b/src/main/java/io/ib67/sfcraft/room/RoomTeleporter.java index bd42baf..52df847 100644 --- a/src/main/java/io/ib67/sfcraft/room/RoomTeleporter.java +++ b/src/main/java/io/ib67/sfcraft/room/RoomTeleporter.java @@ -1,6 +1,7 @@ package io.ib67.sfcraft.room; import com.google.inject.Inject; +import io.ib67.sfcraft.SFCraft; import io.ib67.sfcraft.config.SFConfig; import io.ib67.sfcraft.inject.MinecraftServerSupplier; import io.ib67.sfcraft.module.RoomModule; @@ -25,7 +26,7 @@ public class RoomTeleporter { @Inject 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) { if (roomModule.isVirtual(player.getUuid())) { diff --git a/src/main/java/io/ib67/sfcraft/room/create/CreativeSpaceRoom.java b/src/main/java/io/ib67/sfcraft/room/create/CreativeSpaceRoom.java index 6c09ab5..1fd0832 100644 --- a/src/main/java/io/ib67/sfcraft/room/create/CreativeSpaceRoom.java +++ b/src/main/java/io/ib67/sfcraft/room/create/CreativeSpaceRoom.java @@ -1,5 +1,6 @@ package io.ib67.sfcraft.room.create; +import io.ib67.sfcraft.SFCraft; import io.ib67.sfcraft.module.room.CreativeRoomModule; import io.ib67.sfcraft.subserver.Room; import io.ib67.sfcraft.subserver.RoomPlayerManager; @@ -13,8 +14,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class CreativeSpaceRoom implements Room { - public static final RegistryKey WORLD = RegistryKey.of(RegistryKeys.WORLD, Identifier.of("sfcraft", "playground")); - public static final Identifier IDENTIFIER = Identifier.of("sfcraft", "creative_space"); + public static final RegistryKey WORLD = RegistryKey.of(RegistryKeys.WORLD, Identifier.of(SFCraft.MOD_ID, "playground")); + public static final Identifier IDENTIFIER = Identifier.of(SFCraft.MOD_ID, "creative_space"); public static final BlockPos SPAWN_POS = new BlockPos(0, 66, 0); @Getter private final RoomPlayerManager playerManager; diff --git a/src/main/java/io/ib67/sfcraft/util/SFConsts.java b/src/main/java/io/ib67/sfcraft/util/SFConsts.java index 678157e..2db8bec 100644 --- a/src/main/java/io/ib67/sfcraft/util/SFConsts.java +++ b/src/main/java/io/ib67/sfcraft/util/SFConsts.java @@ -1,5 +1,6 @@ package io.ib67.sfcraft.util; +import io.ib67.sfcraft.SFCraft; import io.ib67.sfcraft.util.Permission; import lombok.experimental.UtilityClass; import net.fabricmc.loader.api.FabricLoader; @@ -8,7 +9,7 @@ import net.minecraft.server.network.ServerPlayerEntity; @UtilityClass 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 Permission USE_AT = ofSFCPermission("chat.at", true); public static final Permission USE_BROADCAST_LOCATION = ofSFCPermission("chat.xyz", true);